Bug 505385 - Part 4: Fix some warnings. r=joe
authorBobby Holley <bobbyholley@gmail.com>
Fri, 12 Oct 2012 12:11:20 -0400
changeset 118743 f11329484155b73a14090ef2e5364c8e7393b290
parent 118742 6d585c429449947d73f472d5781b8943fc3ee365
child 118744 3dce664cb6636aa13ff8adca3889f12433fe8360
push id273
push userlsblakk@mozilla.com
push dateThu, 14 Feb 2013 23:19:38 +0000
treeherdermozilla-release@c5e807a3f8b8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjoe
bugs505385
milestone19.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 505385 - Part 4: Fix some warnings. r=joe
image/decoders/nsICODecoder.cpp
image/encoders/ico/nsICOEncoder.cpp
--- a/image/decoders/nsICODecoder.cpp
+++ b/image/decoders/nsICODecoder.cpp
@@ -453,20 +453,20 @@ nsICODecoder::WriteInternal(const char* 
   // If we have a BMP
   if (!mIsPNG && mContainedDecoder && mPos >= mImageOffset + BITMAPINFOSIZE) {
     uint16_t numColors = GetNumColors();
     if (numColors == (uint16_t)-1) {
       PostDataError();
       return;
     }
     // Feed the actual image data (not including headers) into the BMP decoder
-    int32_t bmpDataOffset = mDirEntry.mImageOffset + BITMAPINFOSIZE;
-    int32_t bmpDataEnd = mDirEntry.mImageOffset + BITMAPINFOSIZE + 
-                         static_cast<nsBMPDecoder*>(mContainedDecoder.get())->GetCompressedImageSize() +
-                         4 * numColors;
+    uint32_t bmpDataOffset = mDirEntry.mImageOffset + BITMAPINFOSIZE;
+    uint32_t bmpDataEnd = mDirEntry.mImageOffset + BITMAPINFOSIZE + 
+                          static_cast<nsBMPDecoder*>(mContainedDecoder.get())->GetCompressedImageSize() +
+                          4 * numColors;
 
     // If we are feeding in the core image data, but we have not yet
     // reached the ICO's 'AND buffer mask'
     if (mPos >= bmpDataOffset && mPos < bmpDataEnd) {
 
       // Figure out how much data the BMP decoder wants
       uint32_t toFeed = bmpDataEnd - mPos;
       if (toFeed > aCount) {
--- a/image/encoders/ico/nsICOEncoder.cpp
+++ b/image/encoders/ico/nsICOEncoder.cpp
@@ -273,17 +273,17 @@ nsICOEncoder::ParseOptions(const nsAStri
   // From format: format=<png|bmp>;bpp=<bpp_value>
   // to format: [0] = format=<png|bmp>, [1] = bpp=<bpp_value>
   nsTArray<nsCString> nameValuePairs;
   if (!ParseString(NS_ConvertUTF16toUTF8(aOptions), ';', nameValuePairs)) {
     return NS_ERROR_INVALID_ARG;
   }
 
   // For each name/value pair in the set
-  for (int i = 0; i < nameValuePairs.Length(); ++i) {
+  for (unsigned i = 0; i < nameValuePairs.Length(); ++i) {
 
     // Split the name value pair [0] = name, [1] = value
     nsTArray<nsCString> nameValuePair;
     if (!ParseString(nameValuePairs[i], '=', nameValuePair)) {
       return NS_ERROR_INVALID_ARG;
     }
     if (nameValuePair.Length() != 2) {
       return NS_ERROR_INVALID_ARG;