diff options
Diffstat (limited to 'src/images/bmpdecoderhelper.cpp')
-rw-r--r-- | src/images/bmpdecoderhelper.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/images/bmpdecoderhelper.cpp b/src/images/bmpdecoderhelper.cpp index 77496649c2..9f0e61b8ef 100644 --- a/src/images/bmpdecoderhelper.cpp +++ b/src/images/bmpdecoderhelper.cpp @@ -18,7 +18,7 @@ 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); @@ -182,7 +182,7 @@ void BmpDecoderHelper::DoRLEDecode() { 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(); @@ -210,7 +210,7 @@ void BmpDecoderHelper::DoRLEDecode() { return; } } else if (cmd == RLE_DELTA) { - if (pos_ < len_ - 1) { + if (pos_ + 1 < len_) { uint8 dx = GetByte(); uint8 dy = GetByte(); x += dx; |