Use maximum image dimension definition from libwebp

https://bugs.webkit.org/show_bug.cgi?id=76980

Reviewed by Kent Tamura.

No new tests, no change in behavior.

* platform/image-encoders/skia/WEBPImageEncoder.cpp:
(WebCore::encodePixels): s/WEBP_MAX_DIMENSION/WEBPImageEncoder::MaximumImageDimension/
* platform/image-encoders/skia/WEBPImageEncoder.h:
(): Remove local definition of the maximum webp image dimension

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@105860 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index d58ebf3..8d93491 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,5 +1,19 @@
 2012-01-25  Noel Gordon  <noel.gordon@gmail.com>
 
+        Use maximum image dimension definition from libwebp
+        https://bugs.webkit.org/show_bug.cgi?id=76980
+
+        Reviewed by Kent Tamura.
+
+        No new tests, no change in behavior.
+
+        * platform/image-encoders/skia/WEBPImageEncoder.cpp:
+        (WebCore::encodePixels): s/WEBP_MAX_DIMENSION/WEBPImageEncoder::MaximumImageDimension/
+        * platform/image-encoders/skia/WEBPImageEncoder.h:
+        (): Remove local definition of the maximum webp image dimension
+
+2012-01-25  Noel Gordon  <noel.gordon@gmail.com>
+
         JPEGDecoder should use imageDecoder colorProfile helpers
         https://bugs.webkit.org/show_bug.cgi?id=76968
         

diff --git a/Source/WebCore/platform/image-encoders/skia/WEBPImageEncoder.cpp b/Source/WebCore/platform/image-encoders/skia/WEBPImageEncoder.cpp
index 631cf97..9cb24fc 100644 (file)
--- a/Source/WebCore/platform/image-encoders/skia/WEBPImageEncoder.cpp
+++ b/Source/WebCore/platform/image-encoders/skia/WEBPImageEncoder.cpp
@@ -96,10 +96,10 @@ static bool encodePixels(IntSize imageSize, const unsigned char* pixels, bool pr
         return false;
 
     imageSize.clampNegativeToZero();
-    if (!imageSize.width() || imageSize.width() > WEBPImageEncoder::MaximumImageDimension)
+    if (!imageSize.width() || imageSize.width() > WEBP_MAX_DIMENSION)
         return false;
     picture.width = imageSize.width();
-    if (!imageSize.height() || imageSize.height() > WEBPImageEncoder::MaximumImageDimension)
+    if (!imageSize.height() || imageSize.height() > WEBP_MAX_DIMENSION)
         return false;
     picture.height = imageSize.height();
 

diff --git a/Source/WebCore/platform/image-encoders/skia/WEBPImageEncoder.h b/Source/WebCore/platform/image-encoders/skia/WEBPImageEncoder.h
index ad786f6..4ec928e 100644 (file)
--- a/Source/WebCore/platform/image-encoders/skia/WEBPImageEncoder.h
+++ b/Source/WebCore/platform/image-encoders/skia/WEBPImageEncoder.h
@@ -49,9 +49,6 @@ public:
 
     // For callers: provide a reasonable compression quality default.
     enum Quality { DefaultCompressionQuality = 80 };
-
-    // Maximum image width or height allowed by the WEBP specification.
-    enum Dimension { MaximumImageDimension = 16383 };
 };
 
 } // namespace WebCore