33287 2010-01-06 19:52:19 -0800 PNGEncoder.cpp lacks support for libpng 1.4 2010-04-29 08:47:05 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Other Linux RESOLVED FIXED P5 Trivial --- 0 jbowler webkit-unassigned commit-queue evan jamesr jorlow phajdan.jr pipping pkasting oldest_to_newest 177931 0 jbowler 2010-01-06 19:52:19 -0800 Certain NULL macros were removed from png.h between 1.2 and 1.4, this patch fixes it (you probably want to use your favourite NULL definition, not 0). --- chromium-4.0.251.0/third_party/WebKit/WebCore/platform/image-encoders/skia/orig/PNGImageEncoder.cpp 2009-11-19 13:39:07.000000000 -0800 +++ chromium-4.0.251.0/third_party/WebKit/WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp 2009-11-19 13:39:25.000000000 -0800 @@ -130,9 +130,9 @@ } png_struct* pngPtr = png_create_write_struct(PNG_LIBPNG_VER_STRING, - png_voidp_NULL, - png_error_ptr_NULL, - png_error_ptr_NULL); + 0, + 0, + 0); if (!pngPtr) return false; 218618 1 pkasting 2010-04-28 14:00:22 -0700 I would r+ this if I were a reviewer. Make a real patch with a ChangeLog and ask for review. (I'd do that too, but I'm on vacation ATM.) 218627 2 evan 2010-04-28 14:11:37 -0700 I will make this a WK patch if Paweł doesn't want to. 219001 3 54696 phajdan.jr 2010-04-29 06:52:54 -0700 Created attachment 54696 libpng.patch 219011 4 54696 jorlow 2010-04-29 07:08:54 -0700 Comment on attachment 54696 libpng.patch This change log would be more standard. Note the moved url. """ 2010-04-29 Paweł Hajdan, Jr. <phajdan.jr@chromium.org> Reviewed by NOBODY (OOPS!). Fix building with libpng-1.4. https://bugs.webkit.org/show_bug.cgi?id=33287 No new tests (no behavior change). Original patch by John Bowler <jbowler@acm.org> * platform/image-encoders/skia/PNGImageEncoder.cpp: (WebCore::PNGImageEncoder::encode): """ > png_struct* pngPtr = png_create_write_struct(PNG_LIBPNG_VER_STRING, > - png_voidp_NULL, > - png_error_ptr_NULL, > - png_error_ptr_NULL); > + 0, > + 0, > + 0); Put all of these values on one line. 219013 5 54700 phajdan.jr 2010-04-29 07:18:44 -0700 Created attachment 54700 libpng.patch Fixes jorlow's review comments. 219016 6 54700 jorlow 2010-04-29 07:21:44 -0700 Comment on attachment 54700 libpng.patch > Index: WebCore/ChangeLog > =================================================================== > --- WebCore/ChangeLog (revision 58506) > +++ WebCore/ChangeLog (working copy) > @@ -1,3 +1,17 @@ > +2010-04-29 Paweł Hajdan, Jr. <phajdan.jr@chromium.org> > + > + Reviewed by NOBODY (OOPS!). > + > + Fix building with libpng-1.4. > + https://bugs.webkit.org/show_bug.cgi?id=33287 > + > + No new tests (no behavior change). > + > + Original patch by John Bowler <jbowler@acm.org> > + > + * platform/image-encoders/skia/PNGImageEncoder.cpp: > + (WebCore::PNGImageEncoder::encode): > + > 2010-04-29 Kwang Yul Seo <skyul@company100.net> > > Reviewed by Simon Hausmann. > Index: WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp > =================================================================== > --- WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp (revision 58494) > +++ WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp (working copy) > @@ -130,9 +130,7 @@ bool PNGImageEncoder::encode(const unsig > } > > png_struct* pngPtr = png_create_write_struct(PNG_LIBPNG_VER_STRING, > - png_voidp_NULL, > - png_error_ptr_NULL, > - png_error_ptr_NULL); > + 0, 0, 0); Sorry I wasn't clear, but the line needs to look like this: "png_struct* pngPtr = png_create_write_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0);" The original line was not in WebKit style. 219024 7 54704 phajdan.jr 2010-04-29 07:29:03 -0700 Created attachment 54704 libpng.patch No problem, please just take another look. 219026 8 54704 jorlow 2010-04-29 07:30:11 -0700 Comment on attachment 54704 libpng.patch Sweet!! 219050 9 54704 commit-queue 2010-04-29 08:46:59 -0700 Comment on attachment 54704 libpng.patch Clearing flags on attachment: 54704 Committed r58519: <http://trac.webkit.org/changeset/58519> 219051 10 commit-queue 2010-04-29 08:47:05 -0700 All reviewed patches have been landed. Closing bug. 54696 2010-04-29 06:52:54 -0700 2010-04-29 07:18:44 -0700 libpng.patch libpng.patch text/plain 1539 phajdan.jr SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1ODUwNikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTAtMDQtMjkgIFBhd2XFgiBIYWpkYW4sIEpyLiAgPHBoYWpkYW4u anJAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEZpeCBidWlsZGluZyB3aXRoIGxpYnBuZy0xLjQuCisKKyAgICAgICAgTm8gbmV3 IHRlc3RzIChub3QgbmVlZGVkLCBubyBiZWhhdmlvciBjaGFuZ2UpLgorCisgICAgICAgIE9yaWdp bmFsIHBhdGNoIGJ5IEpvaG4gQm93bGVyIDxqYm93bGVyQGFjbS5vcmc+IGluCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMzI4NworCisgICAgICAgICog cGxhdGZvcm0vaW1hZ2UtZW5jb2RlcnMvc2tpYS9QTkdJbWFnZUVuY29kZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UE5HSW1hZ2VFbmNvZGVyOjplbmNvZGUpOgorCiAyMDEwLTA0LTI5ICBLd2Fu ZyBZdWwgU2VvICA8c2t5dWxAY29tcGFueTEwMC5uZXQ+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg U2ltb24gSGF1c21hbm4uCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWVuY29kZXJzL3Nr aWEvUE5HSW1hZ2VFbmNvZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2lt YWdlLWVuY29kZXJzL3NraWEvUE5HSW1hZ2VFbmNvZGVyLmNwcAkocmV2aXNpb24gNTg0OTQpCisr KyBXZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWVuY29kZXJzL3NraWEvUE5HSW1hZ2VFbmNvZGVyLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMTMwLDkgKzEzMCw5IEBAIGJvb2wgUE5HSW1hZ2VFbmNvZGVy OjplbmNvZGUoY29uc3QgdW5zaWcKICAgICB9CiAKICAgICBwbmdfc3RydWN0KiBwbmdQdHIgPSBw bmdfY3JlYXRlX3dyaXRlX3N0cnVjdChQTkdfTElCUE5HX1ZFUl9TVFJJTkcsCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcG5nX3ZvaWRwX05VTEwsCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcG5nX2Vycm9y X3B0cl9OVUxMLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHBuZ19lcnJvcl9wdHJfTlVMTCk7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgMCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAwLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIDApOwogICAgIGlmICghcG5nUHRyKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAK 54700 2010-04-29 07:18:44 -0700 2010-04-29 07:29:03 -0700 libpng.patch libpng.patch text/plain 1424 phajdan.jr SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1ODUwNikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTAtMDQtMjkgIFBhd2XFgiBIYWpkYW4sIEpyLiAgPHBoYWpkYW4u anJAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEZpeCBidWlsZGluZyB3aXRoIGxpYnBuZy0xLjQuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMzI4NworCisgICAgICAgIE5vIG5ldyB0 ZXN0cyAobm8gYmVoYXZpb3IgY2hhbmdlKS4KKworICAgICAgICBPcmlnaW5hbCBwYXRjaCBieSBK b2huIEJvd2xlciA8amJvd2xlckBhY20ub3JnPgorCisgICAgICAgICogcGxhdGZvcm0vaW1hZ2Ut ZW5jb2RlcnMvc2tpYS9QTkdJbWFnZUVuY29kZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UE5H SW1hZ2VFbmNvZGVyOjplbmNvZGUpOgorCiAyMDEwLTA0LTI5ICBLd2FuZyBZdWwgU2VvICA8c2t5 dWxAY29tcGFueTEwMC5uZXQ+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gSGF1c21hbm4u CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWVuY29kZXJzL3NraWEvUE5HSW1hZ2VFbmNv ZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWVuY29kZXJzL3Nr aWEvUE5HSW1hZ2VFbmNvZGVyLmNwcAkocmV2aXNpb24gNTg0OTQpCisrKyBXZWJDb3JlL3BsYXRm b3JtL2ltYWdlLWVuY29kZXJzL3NraWEvUE5HSW1hZ2VFbmNvZGVyLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMTMwLDkgKzEzMCw3IEBAIGJvb2wgUE5HSW1hZ2VFbmNvZGVyOjplbmNvZGUoY29uc3Qg dW5zaWcKICAgICB9CiAKICAgICBwbmdfc3RydWN0KiBwbmdQdHIgPSBwbmdfY3JlYXRlX3dyaXRl X3N0cnVjdChQTkdfTElCUE5HX1ZFUl9TVFJJTkcsCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgcG5nX3ZvaWRwX05VTEwsCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcG5nX2Vycm9yX3B0cl9OVUxMLAotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBuZ19lcnJvcl9w dHJfTlVMTCk7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgMCwgMCwgMCk7CiAgICAgaWYgKCFwbmdQdHIpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAo= 54704 2010-04-29 07:29:03 -0700 2010-04-29 08:46:59 -0700 libpng.patch libpng.patch text/plain 1471 phajdan.jr SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1ODUwNikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTAtMDQtMjkgIFBhd2XFgiBIYWpkYW4sIEpyLiAgPHBoYWpkYW4u anJAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEZpeCBidWlsZGluZyB3aXRoIGxpYnBuZy0xLjQuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMzI4NworCisgICAgICAgIE5vIG5ldyB0 ZXN0cyAobm8gYmVoYXZpb3IgY2hhbmdlKS4KKworICAgICAgICBPcmlnaW5hbCBwYXRjaCBieSBK b2huIEJvd2xlciA8amJvd2xlckBhY20ub3JnPgorCisgICAgICAgICogcGxhdGZvcm0vaW1hZ2Ut ZW5jb2RlcnMvc2tpYS9QTkdJbWFnZUVuY29kZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UE5H SW1hZ2VFbmNvZGVyOjplbmNvZGUpOgorCiAyMDEwLTA0LTI5ICBLd2FuZyBZdWwgU2VvICA8c2t5 dWxAY29tcGFueTEwMC5uZXQ+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gSGF1c21hbm4u CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWVuY29kZXJzL3NraWEvUE5HSW1hZ2VFbmNv ZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWVuY29kZXJzL3Nr aWEvUE5HSW1hZ2VFbmNvZGVyLmNwcAkocmV2aXNpb24gNTg0OTQpCisrKyBXZWJDb3JlL3BsYXRm b3JtL2ltYWdlLWVuY29kZXJzL3NraWEvUE5HSW1hZ2VFbmNvZGVyLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMTI5LDEwICsxMjksNyBAQCBib29sIFBOR0ltYWdlRW5jb2Rlcjo6ZW5jb2RlKGNvbnN0 IHVuc2lnCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAKLSAgICBwbmdfc3RydWN0KiBw bmdQdHIgPSBwbmdfY3JlYXRlX3dyaXRlX3N0cnVjdChQTkdfTElCUE5HX1ZFUl9TVFJJTkcsCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcG5nX3ZvaWRw X05VTEwsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg cG5nX2Vycm9yX3B0cl9OVUxMLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHBuZ19lcnJvcl9wdHJfTlVMTCk7CisgICAgcG5nX3N0cnVjdCogcG5nUHRy ID0gcG5nX2NyZWF0ZV93cml0ZV9zdHJ1Y3QoUE5HX0xJQlBOR19WRVJfU1RSSU5HLCAwLCAwLCAw KTsKICAgICBpZiAoIXBuZ1B0cikKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCg==