32852 2009-12-21 22:28:07 -0800 Use ASSERT instead of assert in image-decoders 2009-12-21 22:57:32 -0800 1 1 1 Unclassified WebKit Images 528+ (Nightly build) Other Other RESOLVED FIXED P2 Normal --- 0 skyul webkit-unassigned commit-queue eric pkasting webkit.review.bot oldest_to_newest 174183 0 skyul 2009-12-21 22:28:07 -0800 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. 174184 1 45366 skyul 2009-12-21 22:32:39 -0800 Created attachment 45366 Use WTF's ASSERT macro in PNGImageDecoder.cpp and JPEGImageDecoder.cpp 174185 2 webkit.review.bot 2009-12-21 22:34:43 -0800 style-queue ran check-webkit-style on attachment 45366 without any errors. 174187 3 45366 eric 2009-12-21 22:40:20 -0800 Comment on attachment 45366 Use WTF's ASSERT macro in PNGImageDecoder.cpp and JPEGImageDecoder.cpp LGTM. 174191 4 45366 commit-queue 2009-12-21 22:57:27 -0800 Comment on attachment 45366 Use WTF's ASSERT macro in PNGImageDecoder.cpp and JPEGImageDecoder.cpp Clearing flags on attachment: 45366 Committed r52483: <http://trac.webkit.org/changeset/52483> 174192 5 commit-queue 2009-12-21 22:57:32 -0800 All reviewed patches have been landed. Closing bug. 45366 2009-12-21 22:32:39 -0800 2009-12-21 22:57:26 -0800 Use WTF's ASSERT macro in PNGImageDecoder.cpp and JPEGImageDecoder.cpp assert.patch text/plain 2321 skyul SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MjQ3OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMDktMTItMjEgIEt3YW5nIFl1bCBTZW8gIDxza3l1bEBjb21wYW55 MTAwLm5ldD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBVc2UgQVNTRVJUIGluc3RlYWQgb2YgYXNzZXJ0IGluIGltYWdlLWRlY29kZXJzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMjg1MgorCisgICAgICAg IE90aGVyIGRlY29kZXJzIHVzZSBXVEYncyBBU1NFUlQgbWFjcm8uCisgICAgICAgIEZvbGxvdyB0 aGlzIGNvbnZlbnRpb24uCisKKyAgICAgICAgKiBwbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9qcGVn L0pQRUdJbWFnZURlY29kZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SlBFR0ltYWdlUmVhZGVy OjpkZWNvZGUpOgorICAgICAgICAqIHBsYXRmb3JtL2ltYWdlLWRlY29kZXJzL3BuZy9QTkdJbWFn ZURlY29kZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UE5HSW1hZ2VEZWNvZGVyOjpoZWFkZXJB dmFpbGFibGUpOgorCiAyMDA5LTEyLTIxICBLd2FuZyBZdWwgU2VvICA8c2t5dWxAY29tcGFueTEw MC5uZXQ+CiAKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvanBlZy9KUEVH SW1hZ2VEZWNvZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRl Y29kZXJzL2pwZWcvSlBFR0ltYWdlRGVjb2Rlci5jcHAJKHJldmlzaW9uIDUyNDc5KQorKysgV2Vi Q29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9qcGVnL0pQRUdJbWFnZURlY29kZXIuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0zOSw3ICszOSw2IEBACiAKICNpbmNsdWRlICJjb25maWcuaCIKICNp bmNsdWRlICJKUEVHSW1hZ2VEZWNvZGVyLmgiCi0jaW5jbHVkZSA8YXNzZXJ0Lmg+CiAjaW5jbHVk ZSA8c3RkaW8uaD4gIC8vIE5lZWRlZCBieSBqcGVnbGliLmggZm9yIEZJTEUuCiAKICNpZiBQTEFU Rk9STShXSU5DRSkKQEAgLTI3MSw3ICsyNzAsNyBAQCBwdWJsaWM6CiAgICAgICAgICAgICAgICAg ICAgICAgICByZXR1cm4gdHJ1ZTsgLyogSS9PIHN1c3BlbnNpb24gKi8KICAgICAgIAogICAgICAg ICAgICAgICAgICAgICAvKiBJZiB3ZSd2ZSBjb21wbGV0ZWQgaW1hZ2Ugb3V0cHV0IC4uLiAqLwot ICAgICAgICAgICAgICAgICAgICBhc3NlcnQobV9pbmZvLm91dHB1dF9zY2FubGluZSA9PSBtX2lu Zm8ub3V0cHV0X2hlaWdodCk7CisgICAgICAgICAgICAgICAgICAgIEFTU0VSVChtX2luZm8ub3V0 cHV0X3NjYW5saW5lID09IG1faW5mby5vdXRwdXRfaGVpZ2h0KTsKICAgICAgICAgICAgICAgICAg ICAgbV9zdGF0ZSA9IEpQRUdfRE9ORTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9 CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL3BuZy9QTkdJbWFnZURlY29k ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvcG5n L1BOR0ltYWdlRGVjb2Rlci5jcHAJKHJldmlzaW9uIDUyNDc5KQorKysgV2ViQ29yZS9wbGF0Zm9y bS9pbWFnZS1kZWNvZGVycy9wbmcvUE5HSW1hZ2VEZWNvZGVyLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMzksNyArMzksNiBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIlBOR0ltYWdl RGVjb2Rlci5oIgogI2luY2x1ZGUgInBuZy5oIgotI2luY2x1ZGUgImFzc2VydC5oIgogCiBuYW1l c3BhY2UgV2ViQ29yZSB7CiAKQEAgLTI5Miw3ICsyOTEsNyBAQCB2b2lkIFBOR0ltYWdlRGVjb2Rl cjo6aGVhZGVyQXZhaWxhYmxlKCkKICAgICAvLyBVcGRhdGUgb3VyIGluZm8gbm93CiAgICAgcG5n X3JlYWRfdXBkYXRlX2luZm8ocG5nLCBpbmZvKTsKICAgICBjaGFubmVscyA9IHBuZ19nZXRfY2hh bm5lbHMocG5nLCBpbmZvKTsKLSAgICBhc3NlcnQoY2hhbm5lbHMgPT0gMyB8fCBjaGFubmVscyA9 PSA0KTsKKyAgICBBU1NFUlQoY2hhbm5lbHMgPT0gMyB8fCBjaGFubmVscyA9PSA0KTsKIAogICAg IHJlYWRlcigpLT5zZXRIYXNBbHBoYShjaGFubmVscyA9PSA0KTsKIAo=