More Windows 64b compilation warning fixes

src/images/bmpdecoderhelper.cpp

 
 /*
  * Copyright 2007 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 // Author: cevans@google.com (Chris Evans)
 
 #include "bmpdecoderhelper.h"
 
 namespace image_codec {
 
 static const int kBmpHeaderSize = 14;
 static const int kBmpInfoSize = 40;
 static const int kBmpOS2InfoSize = 12;
 static const int kMaxDim = SHRT_MAX / 2;
 
 bool BmpDecoderHelper::DecodeImage(const char* p,
-                                   int len,
+                                   size_t len,
                                    int max_pixels,
                                    BmpDecoderCallback* callback) {
   data_ = reinterpret_cast<const uint8*>(p);
   pos_ = 0;
   len_ = len;
   inverted_ = true;
   // Parse the header structure.
   if (len < kBmpHeaderSize + 4) {
     return false;
   }
@@ skipping 143 matching lines @@
   return true;
 }
 
 void BmpDecoderHelper::DoRLEDecode() {
   static const uint8 RLE_ESCAPE = 0;
   static const uint8 RLE_EOL = 0;
   static const uint8 RLE_EOF = 1;
   static const uint8 RLE_DELTA = 2;
   int x = 0;
   int y = height_ - 1;
-  while (pos_ < len_ - 1) {
+  while (pos_ + 1 < len_) {
     uint8 cmd = GetByte();
     if (cmd != RLE_ESCAPE) {
       uint8 pixels = GetByte();
       int num = 0;
       uint8 col = pixels;
       while (cmd-- && x < width_) {
         if (bpp_ == 4) {
           if (num & 1) {
             col = pixels & 0xf;
           } else {
             col = pixels >> 4;
           }
         }
         PutPixel(x++, y, col);
         num++;
       }
     } else {
       cmd = GetByte();
       if (cmd == RLE_EOF) {
         return;
       } else if (cmd == RLE_EOL) {
         x = 0;
         y--;
         if (y < 0) {
           return;
         }
       } else if (cmd == RLE_DELTA) {
-        if (pos_ < len_ - 1) {
+        if (pos_ + 1 < len_) {
           uint8 dx = GetByte();
           uint8 dy = GetByte();
           x += dx;
           if (x > width_) {
             x = width_;
           }
           y -= dy;
           if (y < 0) {
             return;
           }
@@ skipping 136 matching lines @@
     mask >>= 1;
   }
   while (mask != 0 && !(mask & 0x80)) {
     mask <<= 1;
     ret++;
   }
   return ret;
 }
 
 }  // namespace image_codec