Changeset 52483 in webkit

Timestamp:

Dec 21, 2009 10:57:16 PM (14 years ago)

Author:

eric@webkit.org

Message:

2009-12-21 Kwang Yul Seo <​skyul@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):

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-21  Kwang Yul Seo  <skyul@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):
+
 2009-12-21  Kwang Yul Seo  <skyul@company100.net>
 

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

@@ -40 +40 @@
 #include "config.h"
 #include "JPEGImageDecoder.h"
-#include <assert.h>
 #include <stdio.h>  // Needed by jpeglib.h for FILE.
 
@@ -272 +271 @@
       
                     /* 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;
                 }

trunk/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp

@@ -40 +40 @@
 #include "PNGImageDecoder.h"
 #include "png.h"
-#include "assert.h"
 
 namespace WebCore {
@@ -293 +292 @@
     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);