Last Comment Bug 771394 - Update libpng to version 1.5.11
: Update libpng to version 1.5.11
Status: RESOLVED FIXED
:
Product: Core
Classification: Components
Component: ImageLib (show other bugs)
: Trunk
: All All
: -- normal (vote)
: mozilla16
Assigned To: Ryan VanderMeulen [:RyanVM]
:
: Milan Sreckovic [:milan]
Mentors:
Depends on:
Blocks: 745178 772732 795662
  Show dependency treegraph
 
Reported: 2012-07-05 17:39 PDT by Ryan VanderMeulen [:RyanVM]
Modified: 2012-09-29 20:26 PDT (History)
4 users (show)
ryanvm: in‑testsuite+
See Also:
Crash Signature:
(edit)
QA Whiteboard:
Iteration: ---
Points: ---
Has Regression Range: ---
Has STR: ---


Attachments
Upgrade libpng to version 1.5.11 (75.20 KB, patch)
2012-07-05 17:39 PDT, Ryan VanderMeulen [:RyanVM]
justin.lebar+bug: review+
Details | Diff | Splinter Review

Description Ryan VanderMeulen [:RyanVM] 2012-07-05 17:39:37 PDT
Created attachment 639533 [details] [diff] [review]
Upgrade libpng to version 1.5.11

libpng 1.5.11 doesn't really add much over libpng 1.5.10. However, in order to get 1.5.10 to build, we had to take a fix that didn't actually make it in until 1.5.11. To make life simpler, I would like to update us the rest of the 1.5.11 so that we're in sync with upstream again.

Already tested OK on Try. (Yes, I'll fix the commit message before landing)
Comment 1 Glenn Randers-Pehrson 2012-07-05 18:39:06 PDT
The part of the patch near the end of png.h looks a little strange:

+#ifdef PNG_APNG_SUPPORTED
-+PNG_EXPORT(234, png_uint_32, png_get_acTL, (png_structp png_ptr,
++PNG_EXPORT(235, png_uint_32, png_get_acTL, (png_structp png_ptr,
 +   png_infop info_ptr, png_uint_32 *num_frames, png_uint_32 *num_plays));
 etc.

as though we're splicing in a patch of a previous patch.  Shouldn't the
"-+" and "++" simply be "-" and "+"?

The "diff" view indicates that a lot of line are removed that
shouldn't be.
Comment 2 Ryan VanderMeulen [:RyanVM] 2012-07-05 18:44:26 PDT
Are you sure you aren't looking at the apng.patch part of the diff?
Comment 3 Max Stepin 2012-07-05 21:22:03 PDT
Ryan, maybe we could include one little fix from bug #759067 too?
Comment 4 Ryan VanderMeulen [:RyanVM] 2012-07-06 03:13:37 PDT
That should stay in its own bug. However, apng.patch should probably be updated when it lands. Were you going to request review at some point?
Comment 5 Justin Lebar (not reading bugmail) 2012-07-06 07:55:31 PDT
Comment on attachment 639533 [details] [diff] [review]
Upgrade libpng to version 1.5.11

r=me, I guess.  Don't forget to update MOZCHANGES as well as the commit message.
Comment 6 Glenn Randers-Pehrson 2012-07-06 08:54:59 PDT
(In reply to Ryan VanderMeulen from comment #2)
> Are you sure you aren't looking at the apng.patch part of the diff?

Oops, I was.
Comment 7 Ryan VanderMeulen [:RyanVM] 2012-07-07 07:22:52 PDT
https://hg.mozilla.org/integration/mozilla-inbound/rev/fb3ed8cb1024
Comment 8 Ryan VanderMeulen [:RyanVM] 2012-07-07 11:59:28 PDT
https://hg.mozilla.org/mozilla-central/rev/fb3ed8cb1024

Note You need to log in before you can comment on or make changes to this bug.