[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 2bce2ced221f8374850aa9f8063c9db1e9e7b7b6
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 22 06:57:16 2009 +0000

    2009-12-21  Kwang Yul Seo  <skyul at company100.net>
    
            Reviewed by Eric Seidel.
    
            Use ASSERT instead of assert in image-decoders
            https://bugs.webkit.org/show_bug.cgi?id=32852
    
            Other decoders use WTF's ASSERT macro.
            Follow this convention.
    
            * platform/image-decoders/jpeg/JPEGImageDecoder.cpp:
            (WebCore::JPEGImageReader::decode):
            * platform/image-decoders/png/PNGImageDecoder.cpp:
            (WebCore::PNGImageDecoder::headerAvailable):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52483 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 00e3b4a..e23ab29 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,21 @@
 
         Reviewed by Eric Seidel.
 
+        Use ASSERT instead of assert in image-decoders
+        https://bugs.webkit.org/show_bug.cgi?id=32852
+
+        Other decoders use WTF's ASSERT macro.
+        Follow this convention.
+
+        * platform/image-decoders/jpeg/JPEGImageDecoder.cpp:
+        (WebCore::JPEGImageReader::decode):
+        * platform/image-decoders/png/PNGImageDecoder.cpp:
+        (WebCore::PNGImageDecoder::headerAvailable):
+
+2009-12-21  Kwang Yul Seo  <skyul at company100.net>
+
+        Reviewed by Eric Seidel.
+
         Use vsnprintf instead of vasprintf for RVCT.
         https://bugs.webkit.org/show_bug.cgi?id=32851
 
diff --git a/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp b/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
index 410ef60..9ae03fc 100644
--- a/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
+++ b/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
@@ -39,7 +39,6 @@
 
 #include "config.h"
 #include "JPEGImageDecoder.h"
-#include <assert.h>
 #include <stdio.h>  // Needed by jpeglib.h for FILE.
 
 #if PLATFORM(WINCE)
@@ -271,7 +270,7 @@ public:
                         return true; /* I/O suspension */
       
                     /* If we've completed image output ... */
-                    assert(m_info.output_scanline == m_info.output_height);
+                    ASSERT(m_info.output_scanline == m_info.output_height);
                     m_state = JPEG_DONE;
                 }
             }
diff --git a/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp b/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
index ad79fc8..2ea012b 100644
--- a/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
+++ b/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
@@ -39,7 +39,6 @@
 #include "config.h"
 #include "PNGImageDecoder.h"
 #include "png.h"
-#include "assert.h"
 
 namespace WebCore {
 
@@ -292,7 +291,7 @@ void PNGImageDecoder::headerAvailable()
     // Update our info now
     png_read_update_info(png, info);
     channels = png_get_channels(png, info);
-    assert(channels == 3 || channels == 4);
+    ASSERT(channels == 3 || channels == 4);
 
     reader()->setHasAlpha(channels == 4);
 

-- 
WebKit Debian packaging