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

Unified Diff: core/cross/bitmap_dds.cc

Issue 159168: This fixes a number of things that are warnings in the Mac compiler.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/o3d/
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
« no previous file with comments | « core/cross/bitmap.cc ('k') | core/cross/bitmap_png.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: core/cross/bitmap_dds.cc
===================================================================
--- core/cross/bitmap_dds.cc (revision 21208)
+++ core/cross/bitmap_dds.cc (working copy)
@@ -176,7 +176,7 @@
unsigned char *data) {
DCHECK(Bitmap::CheckImageDimensions(width, height));
// Height must be a power-of-two.
- DCHECK_EQ(height & (height - 1), 0);
+ DCHECK_EQ(height & (height - 1), 0u);
FlipBlockFunction full_block_function = NULL;
FlipBlockFunction half_block_function = NULL;
unsigned int block_bytes = 0;
@@ -341,7 +341,7 @@
// The size of the buffer needed to hold four-component per pixel
// image data, including MIPMaps
- int components_per_pixel = 0;
+ unsigned int components_per_pixel = 0;
bool add_filler_alpha = false;
bool rgb_to_bgr = false;
@@ -478,10 +478,10 @@
unsigned char *data = image_data.get() + face_size * face;
// convert to four components per pixel if necessary
if (add_filler_alpha) {
- DCHECK_EQ(components_per_pixel, 3);
+ DCHECK_EQ(components_per_pixel, 3u);
XYZToXYZA(data, pixel_count);
} else {
- DCHECK_EQ(components_per_pixel, 4);
+ DCHECK_EQ(components_per_pixel, 4u);
}
if (rgb_to_bgr)
RGBAToBGRA(data, pixel_count);
« no previous file with comments | « core/cross/bitmap.cc ('k') | core/cross/bitmap_png.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698