Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(474)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/base/video_frame_impl.cc

Issue 160288: Assorted fixes for 64-bit. (Closed)
Patch Set: Created 11 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/renderer/renderer_webkitclient_impl.cc ('K') | « chrome/renderer/renderer_webkitclient_impl.cc ('k') | net/base/file_stream_posix.cc » ('j') | net/disk_cache/mapped_file_posix.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/video_frame_impl.cc
diff --git a/media/base/video_frame_impl.cc b/media/base/video_frame_impl.cc
index d132d0ce411979929244a4ad2fb7800d8a248e92..aabda6c54ed9ccd48baae9fc16975ed53b2b7376 100644
--- a/media/base/video_frame_impl.cc
+++ b/media/base/video_frame_impl.cc
@@ -67,7 +67,8 @@ bool VideoFrameImpl::AllocateRGB(size_t bytes_per_pixel) {
surface_.data[VideoSurface::kRGBPlane] = new uint8[bytes_per_row *
surface_.height];
DCHECK(surface_.data[VideoSurface::kRGBPlane]);
- DCHECK(!(reinterpret_cast<int>(surface_.data[VideoSurface::kRGBPlane]) & 7));
+ DCHECK(!(reinterpret_cast<intptr_t>(
+ surface_.data[VideoSurface::kRGBPlane]) & 7));
COMPILE_ASSERT(0 == VideoSurface::kRGBPlane, RGB_data_must_be_index_0);
return (NULL != surface_.data[VideoSurface::kRGBPlane]);
}
« chrome/renderer/renderer_webkitclient_impl.cc ('K') | « chrome/renderer/renderer_webkitclient_impl.cc ('k') | net/base/file_stream_posix.cc » ('j') | net/disk_cache/mapped_file_posix.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698