Bug 32852 – Use ASSERT instead of assert in image-decoders

• Status: RESOLVED
• Resolution: FIXED
• Component: Images

[Kwang Yul Seo]

RVCT can't compile PNGImagerDecoder.cpp with the following compile error:

[1570/1814] cxx: WebCore\platform\image-decoders\png\PNGImageDecoder.cpp -> build\default\WebCore\platform\image-decoders\png\PNGImageDecoder_1.o
"..\WebCore\platform\image-decoders\png\PNGImageDecoder.cpp", line
295: Error:  #20: identifier "assert" is undefined
     assert(channels == 3 || channels == 4);
     ^
..\WebCore\platform\image-decoders\png\PNGImageDecoder.cpp: 0 warnings, 1 error
Waf: Leaving directory `C:\cygwin\home\skyul\WebKit\build'
Build failed
 -> task failed (err #1):
       {task: cxx PNGImageDecoder.cpp -> PNGImageDecoder_1.o}

After I changed #include "assert.h" to #include <assert.h>, I could compile the file without this error. I am not sure if this is a real RVCT bug. However, it seems that other decoders (BMP, GIF, ICO and XBM) use WTF's ASSERT macro instead of assert, so I suggest to change the remaining asserts in PNGImageDecoder.cpp and JPEGImageDecoder.cpp to ASSERT.

[Kwang Yul Seo]

Created attachment 45366 [details]
Use WTF's ASSERT macro in PNGImageDecoder.cpp and JPEGImageDecoder.cpp

[WebKit Review Bot]

style-queue ran check-webkit-style on attachment 45366 [details] without any errors.

[Eric Seidel (no email)]

Comment on attachment 45366 [details]
Use WTF's ASSERT macro in PNGImageDecoder.cpp and JPEGImageDecoder.cpp

LGTM.

[WebKit Commit Bot]

Comment on attachment 45366 [details]
Use WTF's ASSERT macro in PNGImageDecoder.cpp and JPEGImageDecoder.cpp

Clearing flags on attachment: 45366

Committed r52483: <http://trac.webkit.org/changeset/52483>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.