This fixes a number of things that are warnings in the Mac compiler....

core/cross/bitmap_dds.cc

 /*
  * Copyright 2009, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 48 matching lines @@
   // [0-1] color0.
   // [2-3] color1.
   // [4-7] color bitmap, 2 bits per pixel.
   // So each of the 4-7 bytes represents one line, flipping a block is just
   // flipping those bytes.
   unsigned char tmp = block[4];
   block[4] = block[7];
   block[7] = tmp;
   tmp = block[5];
   block[5] = block[6];
   block[6] = block[5];

[ruudvangaal, 2009/09/01 12:09:49]

should be: block[6]=tmp

 }
 
 // Flips the first 2 lines of a DXT1 block in the y direction.
 static void FlipDXT1BlockHalf(unsigned char *block) {
   // See layout above.
   unsigned char tmp = block[4];
   block[4] = block[5];
   block[5] = tmp;
 }
 
@@ skipping 60 matching lines @@
   unsigned int line_0_1 = block[2] + 256 * (block[3] + 256 * block[4]);
   unsigned int line_2_3 = block[5] + 256 * (block[6] + 256 * block[7]);
   // swap lines 0 and 1 in line_0_1.
   unsigned int line_1_0 = ((line_0_1 & 0x000fff) << 12) |
       ((line_0_1 & 0xfff000) >> 12);
   // swap lines 2 and 3 in line_2_3.
   unsigned int line_3_2 = ((line_2_3 & 0x000fff) << 12) |
       ((line_2_3 & 0xfff000) >> 12);
   block[2] = line_3_2 & 0xff;
   block[3] = (line_3_2 & 0xff00) >> 8;
   block[4] = (line_3_2 & 0xff0000) >> 8;

[ruudvangaal, 2009/09/01 13:28:10]

Strips all bits to 0; use >>16 instead.

   block[5] = line_1_0 & 0xff;
   block[6] = (line_1_0 & 0xff00) >> 8;
   block[7] = (line_1_0 & 0xff0000) >> 8;

[ruudvangaal, 2009/09/01 13:28:10]

Strips all bits to 0; use >>16 instead.

 
   // And flip the DXT1 block using the above function.
   FlipDXT1BlockFull(block + 8);
 }
 
 // Flips the first 2 lines of a DXT5 block in the y direction.
 static void FlipDXT5BlockHalf(unsigned char *block) {
   // See layout above.
   unsigned int line_0_1 = block[2] + 256 * (block[3] + 256 * block[4]);
   unsigned int line_1_0 = ((line_0_1 & 0x000fff) << 12) |
       ((line_0_1 & 0xfff000) >> 12);
   block[2] = line_1_0 & 0xff;
   block[3] = (line_1_0 & 0xff00) >> 8;
   block[4] = (line_1_0 & 0xff0000) >> 8;
   FlipDXT1BlockHalf(block + 8);
 }
 
 // Flips a DXTC image, by flipping and swapping DXTC blocks as appropriate.
 static void FlipDXTCImage(unsigned int width,
                           unsigned int height,
                           unsigned int levels,
                           Texture::Format format,
                           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;
   switch (format) {
     case Texture::DXT1:
       full_block_function = FlipDXT1BlockFull;
       half_block_function = FlipDXT1BlockHalf;
       block_bytes = 8;
       break;
     case Texture::DXT3:
@@ skipping 144 matching lines @@
     }
     if (dds_width != dds_height) {
       DLOG(ERROR) << "DDS file \"" << filename
                   << "\" is a cube map but doesn't have square dimensions.";
       return false;
     }
   }
 
   // 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;
 
   Texture::Format format = Texture::UNKNOWN_FORMAT;
   bool is_dxtc = false;
 
   DDPIXELFORMAT &pixel_format = dd_surface_descriptor.ddpfPixelFormat;
 
   if (pixel_format.dwFlags & DDPF_FOURCC) {
     switch (pixel_format.dwFourCC) {
@@ skipping 116 matching lines @@
   }
 
   // Do pixel conversions on non-DXT images.
   if (!is_dxtc) {
     DCHECK(components_per_pixel == 3 || components_per_pixel == 4);
     unsigned int pixel_count = disk_face_size / components_per_pixel;
     for (unsigned int face = 0; face < num_faces; ++face) {
       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);
     }
   }
 
   if (!is_cubemap) {
     // NOTE: we flip the images to respect max/maya's UV orientation.
     if (is_dxtc) {
       FlipDXTCImage(dds_width, dds_height, mip_count, format, image_data.get());
@@ skipping 24 matching lines @@
   image_data_.swap(image_data);
   format_ = format;
   width_  = dds_width;
   height_ = dds_height;
   num_mipmaps_ = final_mip_count;
   is_cubemap_ = is_cubemap;
   return true;
 }
 
 }  // namespace o3d