Changeset 47876 in webkit

Timestamp:

Aug 28, 2009 3:09:05 PM (15 years ago)

Author:

pkasting@chromium.org

Message:

​https://bugs.webkit.org/show_bug.cgi?id=28308
Fix some warnings introduced by r47381.

Reviewed by Jan Michael Alonzo.

• platform/image-decoders/jpeg/JPEGImageDecoder.cpp:

(WebCore::convertCMYKToRGBA):
(WebCore::convertRGBToRGBA):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/image-decoders/jpeg/JPEGImageDecoder.cpp (modified) (4 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-08-28  Peter Kasting  <pkasting@google.com>
+
+        Reviewed by Jan Michael Alonzo.
+
+        https://bugs.webkit.org/show_bug.cgi?id=28308
+        Fix some warnings introduced by r47381.
+
+        * platform/image-decoders/jpeg/JPEGImageDecoder.cpp:
+        (WebCore::convertCMYKToRGBA):
+        (WebCore::convertRGBToRGBA):
+
 2009-08-28  Ada Chan  <adachan@apple.com>
 

trunk/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp

@@ -462 +462 @@
 }
 
-static void convertCMYKToRGBA(RGBA32Buffer& dest, int destY, JSAMPROW src, int srcWidth
+static void convertCMYKToRGBA(RGBA32Buffer& dest, int destY, JSAMPROW src, JDIMENSION srcWidth
 #if ENABLE(IMAGE_DECODER_DOWN_SAMPLING)
                               , bool scaled, const Vector<int>& scaledColumns
@@ -482 +482 @@
     }
 #endif
-    for (unsigned x = 0; x < srcWidth; ++x) {
+    for (JDIMENSION x = 0; x < srcWidth; ++x) {
         unsigned c = *src++;
         unsigned m = *src++;
@@ -510 +510 @@
 }
 
-static void convertRGBToRGBA(RGBA32Buffer& dest, int destY, JSAMPROW src, int srcWidth
+static void convertRGBToRGBA(RGBA32Buffer& dest, int destY, JSAMPROW src, JDIMENSION srcWidth
 #if ENABLE(IMAGE_DECODER_DOWN_SAMPLING)
                               , bool scaled, const Vector<int>& scaledColumns
@@ -526 +526 @@
     }
 #endif
-    for (unsigned x = 0; x < srcWidth; ++x) {
+    for (JDIMENSION x = 0; x < srcWidth; ++x) {
         unsigned r = *src++;
         unsigned g = *src++;