summaryrefslogtreecommitdiffstats
path: root/webkit/port/platform
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-15 16:06:35 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-15 16:06:35 +0000
commit3f96abd259a9b719df4122ced56cd276501417ee (patch)
tree9bf31c13ea734f319c770f941245a756732ab0c4 /webkit/port/platform
parentde3d02bea60d61158ab0ceb3cdd311c46b3b715c (diff)
downloadchromium_src-3f96abd259a9b719df4122ced56cd276501417ee.zip
chromium_src-3f96abd259a9b719df4122ced56cd276501417ee.tar.gz
chromium_src-3f96abd259a9b719df4122ced56cd276501417ee.tar.bz2
Remove few more errors in mac scons build.
BUG=5525 Review URL: http://codereview.chromium.org/14113 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6981 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/port/platform')
-rw-r--r--webkit/port/platform/image-decoders/gif/GIFImageReader.h10
-rw-r--r--webkit/port/platform/image-decoders/png/PNGImageDecoder.cpp2
2 files changed, 6 insertions, 6 deletions
diff --git a/webkit/port/platform/image-decoders/gif/GIFImageReader.h b/webkit/port/platform/image-decoders/gif/GIFImageReader.h
index faa08d2..c05c80b 100644
--- a/webkit/port/platform/image-decoders/gif/GIFImageReader.h
+++ b/webkit/port/platform/image-decoders/gif/GIFImageReader.h
@@ -165,11 +165,11 @@ struct GIFImageReader {
int version; /* Either 89 for GIF89 or 87 for GIF87 */
unsigned screen_width; /* Logical screen width & height */
unsigned screen_height;
- int global_colormap_size; /* Size of global colormap array. */
- int images_decoded; /* Counts completed frames for animated GIFs */
- int images_count; /* Counted all frames seen so far (including incomplete frames) */
- int loop_count; /* Netscape specific extension block to control
- the number of animation loops a GIF renders. */
+ int global_colormap_size; /* Size of global colormap array. */
+ unsigned int images_decoded; /* Counts completed frames for animated GIFs */
+ int images_count; /* Counted all frames seen so far (including incomplete frames) */
+ int loop_count; /* Netscape specific extension block to control
+ the number of animation loops a GIF renders. */
// Not really global, but convenient to locate here.
int count; /* Remaining # bytes in sub-block */
diff --git a/webkit/port/platform/image-decoders/png/PNGImageDecoder.cpp b/webkit/port/platform/image-decoders/png/PNGImageDecoder.cpp
index 7f62f63..dbfbac6 100644
--- a/webkit/port/platform/image-decoders/png/PNGImageDecoder.cpp
+++ b/webkit/port/platform/image-decoders/png/PNGImageDecoder.cpp
@@ -48,7 +48,7 @@ const double cDefaultGamma = 2.2;
const double cInverseGamma = 0.45455;
// Protect against large PNGs. See Mozilla's bug #251381 for more info.
-const long cMaxPNGSize = 1000000L;
+const unsigned long cMaxPNGSize = 1000000UL;
// Called if the decoding of the image fails.
static void PNGAPI decodingFailed(png_structp png_ptr, png_const_charp error_msg);