1021713 - Update in-tree libpng to version 1.6.13

Status: VERIFIED FIXED

(Core :: Graphics: ImageLib, defect)

Description

[Glenn Randers-Pehrson]

libpng-1.6.11 has been released and an APNG patch is available at apng.sf.net.

Comment 1

[Glenn Randers-Pehrson]

There is a misplaced statement (ahead of declarations) in png.c.  This is fixed in libpng-1.6.12rc01;
libpng-1.6.12 will be released in a few days, so we need to skip updating mozilla to libpng-1.6.11 and do 1.6.12 instead.

Comment 2

[Glenn Randers-Pehrson]

Libpng-1.6.12 is out now, and an APNG patch is available.

Comment 3

[Ryan VanderMeulen [:RyanVM]]

Ugh, looks like the in-tree import has local changes without a diff included for the next upstream update. That's sadmaking.

Comment 4

[Ryan VanderMeulen [:RyanVM]]

Attachment: Update libpng to version 1.6.12

Glenn, given comment 3, I'd really appreciate if you could take a quick look at this for sanity too.

Comment 5

[Ryan VanderMeulen [:RyanVM]]

Comment on attachment 8440682 [details] [diff] [review]
Update libpng to version 1.6.12

This is busted on Try.
https://tbpl.mozilla.org/php/getParsedLog.php?id=41793715&tree=Try

Comment 6

[Glenn Randers-Pehrson]

(In reply to Ryan VanderMeulen [:RyanVM UTC-4] from comment #4)
> Created attachment 8440682 [details] [diff] [review]
> Update libpng to version 1.6.12
> 
> Glenn, given comment 3, I'd really appreciate if you could take a quick look
> at this for sanity too.

Yes there are a few differences between the in-tree libpng and the
apng-patched system libpng.  I'll see what I can do about that.  The differences
are mainly from back when the size of libpng mattered, but those are mostly
in mozlibpng.h not in libpng proper.

Comment 7

[Glenn Randers-Pehrson]

(In reply to Glenn Randers-Pehrson from comment #6)

> The
> differences
> are mainly from back when the size of libpng mattered, but those are mostly
> in mozlibpng.h not in libpng proper.

Others, including the three reported in the tryserver log about "options", etc.,
have to do with the fact that we are using mozlibpng.h instead of the "libpng"
configure system to build the in-tree libpng.

Comment 8

[Glenn Randers-Pehrson]

It should be sufficient to add "#define PNG_SET_OPTIONS_SUPPORTED" to media/libpng/mozpngconf.h.
Testing that now locally.

Comment 9

[Ryan VanderMeulen [:RyanVM]]

Attachment: Update libpng to version 1.6.12

Still busted:
https://tbpl.mozilla.org/php/getParsedLog.php?id=41815121&tree=Try

Attached is the patch I pushed. Do we need to do something with PNG_sRGB_PROFILE_CHECKS ?

Comment 10

[Glenn Randers-Pehrson]

(In reply to Ryan VanderMeulen [:RyanVM UTC-4] from comment #9)

> Still busted:

Yes there is a bit more to it than what I suggested in comment #8.  I'll
continue to work on this as time permits.  Fortunately there's nothing urgently needed in
libpng-1.6.12 in-tree (the PROFILE_CHECKS stuff would be helpful to
reduce some warnings when using the system libpng though).

Comment 11

[NVD]

http://sourceforge.net/projects/libpng/files/libpng16/1.6.13/

Libpng 1.6.13 is out.

Comment 12

[Glenn Randers-Pehrson]

Yes.  We'll skip libpng-1.6.11 and 1.6.12.  The update to libpng-1.6.13 is not urgent; it's just a minor code cleanup version and there aren't any security issues or new features.

Comment 13

[Glenn Randers-Pehrson]

I'm renaming media/libpng/mozpngconf.h to media/libpng/pnglibconf.h to be more consistent with libpng.  This should help avoid the bustage reported in comment #5 and comment #9.

Comment 14

[Glenn Randers-Pehrson]

Attachment: v00 Update intree libpng to version 1.6.13

Comment 15

[Glenn Randers-Pehrson]

Attachment: v01 Update intree libpng to version 1.6.13

Changed new exported function png_set_option to MOZ_PNG_set_option.
Set PNG_sRGB_PROFILE_CHECKS to -1, to skip unnecessary checking/warning.

Comment 16

[Glenn Randers-Pehrson]

Attachment: v02 Update intree libpng to version 1.6.13

Also modified image/decoders/nsPNGDecoder.cpp to skip sRGB profile checking when using the "system libpng".

Comment 17

[Glenn Randers-Pehrson]

v02 needs a tryserver run.  My local build on Ubuntu 14.04 is working well.

Comment 18

[Glenn Randers-Pehrson]

(In reply to Ryan VanderMeulen [:RyanVM UTC-4] from comment #3)
> Ugh, looks like the in-tree import has local changes without a diff included
> for the next upstream update. That's sadmaking.

Renaming mozpngconf.h to pnglibconf.h took care of that.  Now we are using the
same patch (apng.patch) for both the system library and the in-tree library.

Comment 19

[Ryan VanderMeulen [:RyanVM]]

https://tbpl.mozilla.org/?tree=Try&rev=b5d278501eec

Comment 20

[Glenn Randers-Pehrson]

Comment on attachment 8477401 [details] [diff] [review]
v02 Update intree libpng to version 1.6.13

Try was all green except for two reftest failures which appear to be unrelated to the patch.

Comment 21

[Ryan VanderMeulen [:RyanVM]]

Comment on attachment 8477401 [details] [diff] [review]
v02 Update intree libpng to version 1.6.13

Indeed, LGTM :)

Comment 22

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/d9c0f0fa42dc

Thanks, Glenn!

Comment 23

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/d9c0f0fa42dc