Bug 59607 – Fix build with libpng-1.5.1

• Component: Platform
• Status: RESOLVED FIXED

[ojab]

Created attachment 91286 [details]
patch

In png_get_iCCP, the type of "profile" was changed from png_charpp to png_bytepp, so change type of profile from char* to unsigned char*.
Don't know if I should " #if (PNG_LIBPNG_VER < 10500) ", let's try without it first.

[WebKit Review Bot]

Attachment 91286 [details] did not build on chromium:
Build output: http://queues.webkit.org/results/8508993

[ojab]

Created attachment 91289 [details]
Conditionalized patch

[David Levin]

Comment on attachment 91289 [details]
Conditionalized patch

Needs changelog see http://www.webkit.org/coding/contributing.html

[David Levin]

Adding Peter in case he has any comments on this change.

[Peter Kasting]

(In reply to comment #4)
> Adding Peter in case he has any comments on this change.

Is it possible for us to use the real types here, IOW "png_bytepp" in place of "unsigned char*"?  I realize we'll still need a conditional, but it seems like we might as well match the API exactly.

[ojab]

Created attachment 91433 [details]
Using real types

Something like that, I think.

Is svn-create-patch necessary or I could simply use `git diff`, if I'm using git repo?

[WebKit Review Bot]

Attachment 91433 [details] did not pass style-queue:

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1

Source/WebCore/ChangeLog:1:  Line contains tab character.  [whitespace/tab] [5]
Total errors found: 1 in 2 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[WebKit Review Bot]

Attachment 91433 [details] did not build on chromium:
Build output: http://queues.webkit.org/results/8513634

[ojab]

Created attachment 91434 [details]
Using real types

[WebKit Review Bot]

Attachment 91434 [details] did not build on chromium:
Build output: http://queues.webkit.org/results/8520246

[ojab]

Created attachment 91454 [details]
Using png_char/png_byte types

This time created with svn-create-patch after reading libpng docs.

[WebKit Review Bot]

Attachment 91454 [details] did not build on chromium:
Build output: http://queues.webkit.org/results/8514577

[ojab]

Created attachment 91462 [details]
Using png_charp/png_bytep types

[WebKit Commit Bot]

Comment on attachment 91462 [details]
Using png_charp/png_bytep types

Clearing flags on attachment: 91462

Committed r85181: <http://trac.webkit.org/changeset/85181>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.