123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810811812813814815816817818819820821822823824825826827828829830831832833834835836837838839840841842843844845846847848849850851852853854855856857858859860861862863864865866867868869870871872873874875876877878879880881882883884885886887888889890891892893894895896897898899900901902903904905906907908909910911912913914915916917918919920921922923924925926927928929930931932933934935936937938939940941942943944945946947948949950951952953954955956957958959960961962963964965966967968969970971972973974975976977978979980981982983984985986987988989990991992993994995996997998999100010011002100310041005100610071008100910101011101210131014101510161017101810191020102110221023102410251026102710281029103010311032103310341035103610371038103910401041104210431044104510461047104810491050105110521053105410551056105710581059106010611062106310641065106610671068106910701071107210731074107510761077107810791080108110821083108410851086108710881089109010911092109310941095109610971098109911001101110211031104110511061107110811091110111111121113111411151116111711181119112011211122112311241125112611271128112911301131113211331134113511361137113811391140114111421143114411451146114711481149115011511152115311541155115611571158115911601161116211631164116511661167116811691170117111721173117411751176117711781179118011811182118311841185118611871188118911901191119211931194119511961197119811991200120112021203120412051206120712081209121012111212121312141215121612171218121912201221122212231224122512261227122812291230123112321233123412351236123712381239124012411242124312441245124612471248124912501251125212531254125512561257125812591260126112621263126412651266126712681269127012711272127312741275127612771278127912801281128212831284128512861287128812891290129112921293129412951296129712981299130013011302130313041305130613071308130913101311131213131314131513161317131813191320132113221323132413251326132713281329133013311332133313341335133613371338133913401341134213431344134513461347134813491350135113521353135413551356135713581359136013611362136313641365136613671368136913701371137213731374137513761377137813791380138113821383138413851386138713881389139013911392139313941395139613971398139914001401140214031404140514061407140814091410141114121413141414151416141714181419142014211422142314241425142614271428142914301431143214331434143514361437143814391440144114421443144414451446144714481449145014511452145314541455145614571458145914601461146214631464146514661467146814691470147114721473147414751476147714781479148014811482148314841485148614871488148914901491149214931494149514961497149814991500150115021503150415051506150715081509151015111512151315141515151615171518151915201521152215231524152515261527152815291530153115321533153415351536153715381539154015411542154315441545154615471548154915501551155215531554155515561557155815591560156115621563156415651566156715681569157015711572157315741575157615771578157915801581158215831584158515861587158815891590159115921593159415951596159715981599160016011602160316041605160616071608160916101611161216131614161516161617161816191620162116221623162416251626162716281629163016311632163316341635163616371638163916401641164216431644164516461647164816491650165116521653165416551656165716581659166016611662166316641665166616671668166916701671167216731674167516761677167816791680168116821683168416851686168716881689169016911692169316941695169616971698169917001701 |
- diff -Naru libpng-1.6.12.org/png.h libpng-1.6.12/png.h
- --- libpng-1.6.12.org/png.h 2014-06-12 20:50:55.236436493 +0900
- +++ libpng-1.6.12/png.h 2014-06-12 20:50:55.301438712 +0900
- @@ -464,6 +464,10 @@
- # include "pnglibconf.h"
- #endif
-
- +#define PNG_APNG_SUPPORTED
- +#define PNG_READ_APNG_SUPPORTED
- +#define PNG_WRITE_APNG_SUPPORTED
- +
- #ifndef PNG_VERSION_INFO_ONLY
- /* Machine specific configuration. */
- # include "pngconf.h"
- @@ -554,6 +558,17 @@
- * See pngconf.h for base types that vary by machine/system
- */
-
- +#ifdef PNG_APNG_SUPPORTED
- +/* dispose_op flags from inside fcTL */
- +#define PNG_DISPOSE_OP_NONE 0x00
- +#define PNG_DISPOSE_OP_BACKGROUND 0x01
- +#define PNG_DISPOSE_OP_PREVIOUS 0x02
- +
- +/* blend_op flags from inside fcTL */
- +#define PNG_BLEND_OP_SOURCE 0x00
- +#define PNG_BLEND_OP_OVER 0x01
- +#endif /* PNG_APNG_SUPPORTED */
- +
- /* This triggers a compiler error in png.c, if png.c and png.h
- * do not agree upon the version number.
- */
- @@ -874,6 +889,10 @@
- #define PNG_INFO_sPLT 0x2000 /* ESR, 1.0.6 */
- #define PNG_INFO_sCAL 0x4000 /* ESR, 1.0.6 */
- #define PNG_INFO_IDAT 0x8000 /* ESR, 1.0.6 */
- +#ifdef PNG_APNG_SUPPORTED
- +#define PNG_INFO_acTL 0x10000
- +#define PNG_INFO_fcTL 0x20000
- +#endif
-
- /* This is used for the transformation routines, as some of them
- * change these values for the row. It also should enable using
- @@ -911,6 +930,10 @@
- #ifdef PNG_PROGRESSIVE_READ_SUPPORTED
- typedef PNG_CALLBACK(void, *png_progressive_info_ptr, (png_structp, png_infop));
- typedef PNG_CALLBACK(void, *png_progressive_end_ptr, (png_structp, png_infop));
- +#ifdef PNG_APNG_SUPPORTED
- +typedef PNG_CALLBACK(void, *png_progressive_frame_ptr, (png_structp,
- + png_uint_32));
- +#endif
-
- /* The following callback receives png_uint_32 row_number, int pass for the
- * png_bytep data of the row. When transforming an interlaced image the
- @@ -3246,6 +3269,74 @@
- /*******************************************************************************
- * END OF HARDWARE AND SOFTWARE OPTIONS
- ******************************************************************************/
- +#ifdef PNG_APNG_SUPPORTED
- +PNG_EXPORT(245, png_uint_32, png_get_acTL, (png_structp png_ptr,
- + png_infop info_ptr, png_uint_32 *num_frames, png_uint_32 *num_plays));
- +
- +PNG_EXPORT(246, png_uint_32, png_set_acTL, (png_structp png_ptr,
- + png_infop info_ptr, png_uint_32 num_frames, png_uint_32 num_plays));
- +
- +PNG_EXPORT(247, png_uint_32, png_get_num_frames, (png_structp png_ptr,
- + png_infop info_ptr));
- +
- +PNG_EXPORT(248, png_uint_32, png_get_num_plays, (png_structp png_ptr,
- + png_infop info_ptr));
- +
- +PNG_EXPORT(249, png_uint_32, png_get_next_frame_fcTL,
- + (png_structp png_ptr, png_infop info_ptr, png_uint_32 *width,
- + png_uint_32 *height, png_uint_32 *x_offset, png_uint_32 *y_offset,
- + png_uint_16 *delay_num, png_uint_16 *delay_den, png_byte *dispose_op,
- + png_byte *blend_op));
- +
- +PNG_EXPORT(250, png_uint_32, png_set_next_frame_fcTL,
- + (png_structp png_ptr, png_infop info_ptr, png_uint_32 width,
- + png_uint_32 height, png_uint_32 x_offset, png_uint_32 y_offset,
- + png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op,
- + png_byte blend_op));
- +
- +PNG_EXPORT(251, png_uint_32, png_get_next_frame_width,
- + (png_structp png_ptr, png_infop info_ptr));
- +PNG_EXPORT(252, png_uint_32, png_get_next_frame_height,
- + (png_structp png_ptr, png_infop info_ptr));
- +PNG_EXPORT(253, png_uint_32, png_get_next_frame_x_offset,
- + (png_structp png_ptr, png_infop info_ptr));
- +PNG_EXPORT(254, png_uint_32, png_get_next_frame_y_offset,
- + (png_structp png_ptr, png_infop info_ptr));
- +PNG_EXPORT(255, png_uint_16, png_get_next_frame_delay_num,
- + (png_structp png_ptr, png_infop info_ptr));
- +PNG_EXPORT(256, png_uint_16, png_get_next_frame_delay_den,
- + (png_structp png_ptr, png_infop info_ptr));
- +PNG_EXPORT(257, png_byte, png_get_next_frame_dispose_op,
- + (png_structp png_ptr, png_infop info_ptr));
- +PNG_EXPORT(258, png_byte, png_get_next_frame_blend_op,
- + (png_structp png_ptr, png_infop info_ptr));
- +PNG_EXPORT(259, png_byte, png_get_first_frame_is_hidden,
- + (png_structp png_ptr, png_infop info_ptr));
- +PNG_EXPORT(260, png_uint_32, png_set_first_frame_is_hidden,
- + (png_structp png_ptr, png_infop info_ptr, png_byte is_hidden));
- +
- +#ifdef PNG_READ_APNG_SUPPORTED
- +PNG_EXPORT(261, void, png_read_frame_head, (png_structp png_ptr,
- + png_infop info_ptr));
- +#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
- +PNG_EXPORT(262, void, png_set_progressive_frame_fn, (png_structp png_ptr,
- + png_progressive_frame_ptr frame_info_fn,
- + png_progressive_frame_ptr frame_end_fn));
- +#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
- +#endif /* PNG_READ_APNG_SUPPORTED */
- +
- +#ifdef PNG_WRITE_APNG_SUPPORTED
- +PNG_EXPORT(263, void, png_write_frame_head, (png_structp png_ptr,
- + png_infop info_ptr, png_bytepp row_pointers,
- + png_uint_32 width, png_uint_32 height,
- + png_uint_32 x_offset, png_uint_32 y_offset,
- + png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op,
- + png_byte blend_op));
- +
- +PNG_EXPORT(264, void, png_write_frame_tail, (png_structp png_ptr,
- + png_infop info_ptr));
- +#endif /* PNG_WRITE_APNG_SUPPORTED */
- +#endif /* PNG_APNG_SUPPORTED */
-
- /* Maintainer: Put new public prototypes here ^, in libpng.3, and project
- * defs, scripts/pnglibconf.h, and scripts/pnglibconf.h.prebuilt
- @@ -3256,7 +3347,11 @@
- * scripts/symbols.def as well.
- */
- #ifdef PNG_EXPORT_LAST_ORDINAL
- +#ifdef PNG_APNG_SUPPORTED
- + PNG_EXPORT_LAST_ORDINAL(264);
- +#else
- PNG_EXPORT_LAST_ORDINAL(244);
- +#endif /* PNG_APNG_SUPPORTED */
- #endif
-
- #ifdef __cplusplus
- diff -Naru libpng-1.6.12.org/pngget.c libpng-1.6.12/pngget.c
- --- libpng-1.6.12.org/pngget.c 2014-06-12 20:50:55.237436527 +0900
- +++ libpng-1.6.12/pngget.c 2014-06-12 20:50:55.302438746 +0900
- @@ -1195,4 +1195,166 @@
- # endif
- #endif
-
- +#ifdef PNG_APNG_SUPPORTED
- +png_uint_32 PNGAPI
- +png_get_acTL(png_structp png_ptr, png_infop info_ptr,
- + png_uint_32 *num_frames, png_uint_32 *num_plays)
- +{
- + png_debug1(1, "in %s retrieval function", "acTL");
- +
- + if (png_ptr != NULL && info_ptr != NULL &&
- + (info_ptr->valid & PNG_INFO_acTL) &&
- + num_frames != NULL && num_plays != NULL)
- + {
- + *num_frames = info_ptr->num_frames;
- + *num_plays = info_ptr->num_plays;
- + return (1);
- + }
- +
- + return (0);
- +}
- +
- +png_uint_32 PNGAPI
- +png_get_num_frames(png_structp png_ptr, png_infop info_ptr)
- +{
- + png_debug(1, "in png_get_num_frames()");
- +
- + if (png_ptr != NULL && info_ptr != NULL)
- + return (info_ptr->num_frames);
- + return (0);
- +}
- +
- +png_uint_32 PNGAPI
- +png_get_num_plays(png_structp png_ptr, png_infop info_ptr)
- +{
- + png_debug(1, "in png_get_num_plays()");
- +
- + if (png_ptr != NULL && info_ptr != NULL)
- + return (info_ptr->num_plays);
- + return (0);
- +}
- +
- +png_uint_32 PNGAPI
- +png_get_next_frame_fcTL(png_structp png_ptr, png_infop info_ptr,
- + png_uint_32 *width, png_uint_32 *height,
- + png_uint_32 *x_offset, png_uint_32 *y_offset,
- + png_uint_16 *delay_num, png_uint_16 *delay_den,
- + png_byte *dispose_op, png_byte *blend_op)
- +{
- + png_debug1(1, "in %s retrieval function", "fcTL");
- +
- + if (png_ptr != NULL && info_ptr != NULL &&
- + (info_ptr->valid & PNG_INFO_fcTL) &&
- + width != NULL && height != NULL &&
- + x_offset != NULL && y_offset != NULL &&
- + delay_num != NULL && delay_den != NULL &&
- + dispose_op != NULL && blend_op != NULL)
- + {
- + *width = info_ptr->next_frame_width;
- + *height = info_ptr->next_frame_height;
- + *x_offset = info_ptr->next_frame_x_offset;
- + *y_offset = info_ptr->next_frame_y_offset;
- + *delay_num = info_ptr->next_frame_delay_num;
- + *delay_den = info_ptr->next_frame_delay_den;
- + *dispose_op = info_ptr->next_frame_dispose_op;
- + *blend_op = info_ptr->next_frame_blend_op;
- + return (1);
- + }
- +
- + return (0);
- +}
- +
- +png_uint_32 PNGAPI
- +png_get_next_frame_width(png_structp png_ptr, png_infop info_ptr)
- +{
- + png_debug(1, "in png_get_next_frame_width()");
- +
- + if (png_ptr != NULL && info_ptr != NULL)
- + return (info_ptr->next_frame_width);
- + return (0);
- +}
- +
- +png_uint_32 PNGAPI
- +png_get_next_frame_height(png_structp png_ptr, png_infop info_ptr)
- +{
- + png_debug(1, "in png_get_next_frame_height()");
- +
- + if (png_ptr != NULL && info_ptr != NULL)
- + return (info_ptr->next_frame_height);
- + return (0);
- +}
- +
- +png_uint_32 PNGAPI
- +png_get_next_frame_x_offset(png_structp png_ptr, png_infop info_ptr)
- +{
- + png_debug(1, "in png_get_next_frame_x_offset()");
- +
- + if (png_ptr != NULL && info_ptr != NULL)
- + return (info_ptr->next_frame_x_offset);
- + return (0);
- +}
- +
- +png_uint_32 PNGAPI
- +png_get_next_frame_y_offset(png_structp png_ptr, png_infop info_ptr)
- +{
- + png_debug(1, "in png_get_next_frame_y_offset()");
- +
- + if (png_ptr != NULL && info_ptr != NULL)
- + return (info_ptr->next_frame_y_offset);
- + return (0);
- +}
- +
- +png_uint_16 PNGAPI
- +png_get_next_frame_delay_num(png_structp png_ptr, png_infop info_ptr)
- +{
- + png_debug(1, "in png_get_next_frame_delay_num()");
- +
- + if (png_ptr != NULL && info_ptr != NULL)
- + return (info_ptr->next_frame_delay_num);
- + return (0);
- +}
- +
- +png_uint_16 PNGAPI
- +png_get_next_frame_delay_den(png_structp png_ptr, png_infop info_ptr)
- +{
- + png_debug(1, "in png_get_next_frame_delay_den()");
- +
- + if (png_ptr != NULL && info_ptr != NULL)
- + return (info_ptr->next_frame_delay_den);
- + return (0);
- +}
- +
- +png_byte PNGAPI
- +png_get_next_frame_dispose_op(png_structp png_ptr, png_infop info_ptr)
- +{
- + png_debug(1, "in png_get_next_frame_dispose_op()");
- +
- + if (png_ptr != NULL && info_ptr != NULL)
- + return (info_ptr->next_frame_dispose_op);
- + return (0);
- +}
- +
- +png_byte PNGAPI
- +png_get_next_frame_blend_op(png_structp png_ptr, png_infop info_ptr)
- +{
- + png_debug(1, "in png_get_next_frame_blend_op()");
- +
- + if (png_ptr != NULL && info_ptr != NULL)
- + return (info_ptr->next_frame_blend_op);
- + return (0);
- +}
- +
- +png_byte PNGAPI
- +png_get_first_frame_is_hidden(png_structp png_ptr, png_infop info_ptr)
- +{
- + png_debug(1, "in png_first_frame_is_hidden()");
- +
- + if (png_ptr != NULL)
- + return (png_byte)(png_ptr->apng_flags & PNG_FIRST_FRAME_HIDDEN);
- +
- + PNG_UNUSED(info_ptr)
- +
- + return 0;
- +}
- +#endif /* PNG_APNG_SUPPORTED */
- #endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
- diff -Naru libpng-1.6.12.org/pnginfo.h libpng-1.6.12/pnginfo.h
- --- libpng-1.6.12.org/pnginfo.h 2014-06-12 20:50:55.237436527 +0900
- +++ libpng-1.6.12/pnginfo.h 2014-06-12 20:50:55.302438746 +0900
- @@ -256,5 +256,18 @@
- png_bytepp row_pointers; /* the image bits */
- #endif
-
- +#ifdef PNG_APNG_SUPPORTED
- + png_uint_32 num_frames; /* including default image */
- + png_uint_32 num_plays;
- + png_uint_32 next_frame_width;
- + png_uint_32 next_frame_height;
- + png_uint_32 next_frame_x_offset;
- + png_uint_32 next_frame_y_offset;
- + png_uint_16 next_frame_delay_num;
- + png_uint_16 next_frame_delay_den;
- + png_byte next_frame_dispose_op;
- + png_byte next_frame_blend_op;
- +#endif
- +
- };
- #endif /* PNGINFO_H */
- diff -Naru libpng-1.6.12.org/pngpread.c libpng-1.6.12/pngpread.c
- --- libpng-1.6.12.org/pngpread.c 2014-06-12 20:50:55.237436527 +0900
- +++ libpng-1.6.12/pngpread.c 2014-06-12 20:50:55.302438746 +0900
- @@ -217,6 +217,109 @@
-
- chunk_name = png_ptr->chunk_name;
-
- +#ifdef PNG_READ_APNG_SUPPORTED
- + if (png_ptr->num_frames_read > 0 &&
- + png_ptr->num_frames_read < info_ptr->num_frames)
- + {
- + if (chunk_name == png_IDAT)
- + {
- + /* Discard trailing IDATs for the first frame */
- + if (png_ptr->mode & PNG_HAVE_fcTL || png_ptr->num_frames_read > 1)
- + png_error(png_ptr, "out of place IDAT");
- +
- + if (png_ptr->push_length + 4 > png_ptr->buffer_size)
- + {
- + png_push_save_buffer(png_ptr);
- + return;
- + }
- +
- + png_push_crc_skip(png_ptr, png_ptr->push_length);
- + png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
- + return;
- + }
- + else if (chunk_name == png_fdAT)
- + {
- + if (png_ptr->buffer_size < 4)
- + {
- + png_push_save_buffer(png_ptr);
- + return;
- + }
- +
- + png_ensure_sequence_number(png_ptr, 4);
- +
- + if (!(png_ptr->mode & PNG_HAVE_fcTL))
- + {
- + /* Discard trailing fdATs for frames other than the first */
- + if (png_ptr->num_frames_read < 2)
- + png_error(png_ptr, "out of place fdAT");
- +
- + if (png_ptr->push_length + 4 > png_ptr->buffer_size)
- + {
- + png_push_save_buffer(png_ptr);
- + return;
- + }
- +
- + png_push_crc_skip(png_ptr, png_ptr->push_length);
- + png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
- + return;
- + }
- +
- + else
- + {
- + /* frame data follows */
- + png_ptr->idat_size = png_ptr->push_length - 4;
- + png_ptr->mode |= PNG_HAVE_IDAT;
- + png_ptr->process_mode = PNG_READ_IDAT_MODE;
- +
- + return;
- + }
- + }
- +
- + else if (chunk_name == png_fcTL)
- + {
- + if (png_ptr->push_length + 4 > png_ptr->buffer_size)
- + {
- + png_push_save_buffer(png_ptr);
- + return;
- + }
- +
- + png_read_reset(png_ptr);
- + png_ptr->mode &= ~PNG_HAVE_fcTL;
- +
- + png_handle_fcTL(png_ptr, info_ptr, png_ptr->push_length);
- +
- + if (!(png_ptr->mode & PNG_HAVE_fcTL))
- + png_error(png_ptr, "missing required fcTL chunk");
- +
- + png_read_reinit(png_ptr, info_ptr);
- + png_progressive_read_reset(png_ptr);
- +
- + if (png_ptr->frame_info_fn != NULL)
- + (*(png_ptr->frame_info_fn))(png_ptr, png_ptr->num_frames_read);
- +
- + png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
- +
- + return;
- + }
- +
- + else
- + {
- + if (png_ptr->push_length + 4 > png_ptr->buffer_size)
- + {
- + png_push_save_buffer(png_ptr);
- + return;
- + }
- + png_warning(png_ptr, "Skipped (ignored) a chunk "
- + "between APNG chunks");
- + png_push_crc_skip(png_ptr, png_ptr->push_length);
- + png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
- + return;
- + }
- +
- + return;
- + }
- +#endif /* PNG_READ_APNG_SUPPORTED */
- +
- if (chunk_name == png_IDAT)
- {
- if (png_ptr->mode & PNG_AFTER_IDAT)
- @@ -300,6 +403,9 @@
-
- else if (chunk_name == png_IDAT)
- {
- +#ifdef PNG_READ_APNG_SUPPORTED
- + png_have_info(png_ptr, info_ptr);
- +#endif
- png_ptr->idat_size = png_ptr->push_length;
- png_ptr->process_mode = PNG_READ_IDAT_MODE;
- png_push_have_info(png_ptr, info_ptr);
- @@ -530,6 +636,30 @@
- png_handle_iTXt(png_ptr, info_ptr, png_ptr->push_length);
- }
- #endif
- +#ifdef PNG_READ_APNG_SUPPORTED
- + else if (chunk_name == png_acTL)
- + {
- + if (png_ptr->push_length + 4 > png_ptr->buffer_size)
- + {
- + png_push_save_buffer(png_ptr);
- + return;
- + }
- +
- + png_handle_acTL(png_ptr, info_ptr, png_ptr->push_length);
- + }
- +
- + else if (chunk_name == png_fcTL)
- + {
- + if (png_ptr->push_length + 4 > png_ptr->buffer_size)
- + {
- + png_push_save_buffer(png_ptr);
- + return;
- + }
- +
- + png_handle_fcTL(png_ptr, info_ptr, png_ptr->push_length);
- + }
- +
- +#endif /* PNG_READ_APNG_SUPPORTED */
-
- else
- {
- @@ -732,7 +862,11 @@
- png_byte chunk_tag[4];
-
- /* TODO: this code can be commoned up with the same code in push_read */
- +#ifdef PNG_READ_APNG_SUPPORTED
- + if (png_ptr->buffer_size < 12)
- +#else
- if (png_ptr->buffer_size < 8)
- +#endif
- {
- png_push_save_buffer(png_ptr);
- return;
- @@ -745,17 +879,64 @@
- png_ptr->chunk_name = PNG_CHUNK_FROM_STRING(chunk_tag);
- png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
-
- +#ifdef PNG_READ_APNG_SUPPORTED
- + if (png_ptr->chunk_name != png_fdAT && png_ptr->num_frames_read > 0)
- + {
- + if (png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED)
- + {
- + png_ptr->process_mode = PNG_READ_CHUNK_MODE;
- + if (png_ptr->frame_end_fn != NULL)
- + (*(png_ptr->frame_end_fn))(png_ptr, png_ptr->num_frames_read);
- + png_ptr->num_frames_read++;
- + return;
- + }
- + else
- + {
- + if (png_ptr->chunk_name == png_IEND)
- + png_error(png_ptr, "Not enough image data");
- + if (png_ptr->push_length + 4 > png_ptr->buffer_size)
- + {
- + png_push_save_buffer(png_ptr);
- + return;
- + }
- + png_warning(png_ptr, "Skipping (ignoring) a chunk between "
- + "APNG chunks");
- + png_crc_finish(png_ptr, png_ptr->push_length);
- + png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
- + return;
- + }
- + }
- + else
- +#endif
- +#ifdef PNG_READ_APNG_SUPPORTED
- + if (png_ptr->chunk_name != png_IDAT && png_ptr->num_frames_read == 0)
- +#else
- if (png_ptr->chunk_name != png_IDAT)
- +#endif
- {
- png_ptr->process_mode = PNG_READ_CHUNK_MODE;
-
- if (!(png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED))
- png_error(png_ptr, "Not enough compressed data");
-
- +#ifdef PNG_READ_APNG_SUPPORTED
- + if (png_ptr->frame_end_fn != NULL)
- + (*(png_ptr->frame_end_fn))(png_ptr, png_ptr->num_frames_read);
- + png_ptr->num_frames_read++;
- +#endif
- +
- return;
- }
-
- png_ptr->idat_size = png_ptr->push_length;
- +
- +#ifdef PNG_READ_APNG_SUPPORTED
- + if (png_ptr->num_frames_read > 0)
- + {
- + png_ensure_sequence_number(png_ptr, 4);
- + png_ptr->idat_size -= 4;
- + }
- +#endif
- }
-
- if (png_ptr->idat_size && png_ptr->save_buffer_size)
- @@ -833,6 +1014,15 @@
- if (!(buffer_length > 0) || buffer == NULL)
- png_error(png_ptr, "No IDAT data (internal error)");
-
- +#ifdef PNG_READ_APNG_SUPPORTED
- + /* If the app is not APNG-aware, decode only the first frame */
- + if (!(png_ptr->apng_flags & PNG_APNG_APP) && png_ptr->num_frames_read > 0)
- + {
- + png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED;
- + return;
- + }
- +#endif
- +
- /* This routine must process all the data it has been given
- * before returning, calling the row callback as required to
- * handle the uncompressed results.
- @@ -1275,6 +1465,18 @@
- png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer);
- }
-
- +#ifdef PNG_READ_APNG_SUPPORTED
- +void PNGAPI
- +png_set_progressive_frame_fn(png_structp png_ptr,
- + png_progressive_frame_ptr frame_info_fn,
- + png_progressive_frame_ptr frame_end_fn)
- +{
- + png_ptr->frame_info_fn = frame_info_fn;
- + png_ptr->frame_end_fn = frame_end_fn;
- + png_ptr->apng_flags |= PNG_APNG_APP;
- +}
- +#endif
- +
- png_voidp PNGAPI
- png_get_progressive_ptr(png_const_structrp png_ptr)
- {
- diff -Naru libpng-1.6.12.org/pngpriv.h libpng-1.6.12/pngpriv.h
- --- libpng-1.6.12.org/pngpriv.h 2014-06-12 20:50:55.238436561 +0900
- +++ libpng-1.6.12/pngpriv.h 2014-06-12 20:50:55.303438780 +0900
- @@ -551,6 +551,10 @@
- #define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000 /* Have another chunk after IDAT */
- /* 0x4000 (unused) */
- #define PNG_IS_READ_STRUCT 0x8000 /* Else is a write struct */
- +#ifdef PNG_APNG_SUPPORTED
- +#define PNG_HAVE_acTL 0x10000
- +#define PNG_HAVE_fcTL 0x20000
- +#endif
-
- /* Flags for the transformations the PNG library does on the image data */
- #define PNG_BGR 0x0001
- @@ -772,6 +776,16 @@
- #define png_tRNS PNG_U32(116, 82, 78, 83)
- #define png_zTXt PNG_U32(122, 84, 88, 116)
-
- +#ifdef PNG_APNG_SUPPORTED
- +#define png_acTL PNG_U32( 97, 99, 84, 76)
- +#define png_fcTL PNG_U32(102, 99, 84, 76)
- +#define png_fdAT PNG_U32(102, 100, 65, 84)
- +
- +/* For png_struct.apng_flags: */
- +#define PNG_FIRST_FRAME_HIDDEN 0x0001
- +#define PNG_APNG_APP 0x0002
- +#endif
- +
- /* The following will work on (signed char*) strings, whereas the get_uint_32
- * macro will fail on top-bit-set values because of the sign extension.
- */
- @@ -1472,6 +1486,47 @@
- */
- #endif
-
- +#ifdef PNG_APNG_SUPPORTED
- +PNG_INTERNAL_FUNCTION(void,png_ensure_fcTL_is_valid,(png_structp png_ptr,
- + png_uint_32 width, png_uint_32 height,
- + png_uint_32 x_offset, png_uint_32 y_offset,
- + png_uint_16 delay_num, png_uint_16 delay_den,
- + png_byte dispose_op, png_byte blend_op), PNG_EMPTY);
- +
- +#ifdef PNG_READ_APNG_SUPPORTED
- +PNG_INTERNAL_FUNCTION(void,png_handle_acTL,(png_structp png_ptr, png_infop info_ptr,
- + png_uint_32 length),PNG_EMPTY);
- +PNG_INTERNAL_FUNCTION(void,png_handle_fcTL,(png_structp png_ptr, png_infop info_ptr,
- + png_uint_32 length),PNG_EMPTY);
- +PNG_INTERNAL_FUNCTION(void,png_handle_fdAT,(png_structp png_ptr, png_infop info_ptr,
- + png_uint_32 length),PNG_EMPTY);
- +PNG_INTERNAL_FUNCTION(void,png_have_info,(png_structp png_ptr, png_infop info_ptr),PNG_EMPTY);
- +PNG_INTERNAL_FUNCTION(void,png_ensure_sequence_number,(png_structp png_ptr,
- + png_uint_32 length),PNG_EMPTY);
- +PNG_INTERNAL_FUNCTION(void,png_read_reset,(png_structp png_ptr),PNG_EMPTY);
- +PNG_INTERNAL_FUNCTION(void,png_read_reinit,(png_structp png_ptr,
- + png_infop info_ptr),PNG_EMPTY);
- +#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
- +PNG_INTERNAL_FUNCTION(void,png_progressive_read_reset,(png_structp png_ptr),PNG_EMPTY);
- +#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
- +#endif /* PNG_READ_APNG_SUPPORTED */
- +
- +#ifdef PNG_WRITE_APNG_SUPPORTED
- +PNG_INTERNAL_FUNCTION(void,png_write_acTL,(png_structp png_ptr,
- + png_uint_32 num_frames, png_uint_32 num_plays),PNG_EMPTY);
- +PNG_INTERNAL_FUNCTION(void,png_write_fcTL,(png_structp png_ptr,
- + png_uint_32 width, png_uint_32 height,
- + png_uint_32 x_offset, png_uint_32 y_offset,
- + png_uint_16 delay_num, png_uint_16 delay_den,
- + png_byte dispose_op, png_byte blend_op),PNG_EMPTY);
- +PNG_INTERNAL_FUNCTION(void,png_write_fdAT,(png_structp png_ptr,
- + png_const_bytep data, png_size_t length),PNG_EMPTY);
- +PNG_INTERNAL_FUNCTION(void,png_write_reset,(png_structp png_ptr),PNG_EMPTY);
- +PNG_INTERNAL_FUNCTION(void,png_write_reinit,(png_structp png_ptr,
- + png_infop info_ptr, png_uint_32 width, png_uint_32 height),PNG_EMPTY);
- +#endif /* PNG_WRITE_APNG_SUPPORTED */
- +#endif /* PNG_APNG_SUPPORTED */
- +
- /* Added at libpng version 1.4.0 */
- #ifdef PNG_COLORSPACE_SUPPORTED
- /* These internal functions are for maintaining the colorspace structure within
- diff -Naru libpng-1.6.12.org/pngread.c libpng-1.6.12/pngread.c
- --- libpng-1.6.12.org/pngread.c 2014-06-12 20:50:55.238436561 +0900
- +++ libpng-1.6.12/pngread.c 2014-06-12 20:50:55.304438815 +0900
- @@ -158,6 +158,9 @@
-
- else if (chunk_name == png_IDAT)
- {
- +#ifdef PNG_READ_APNG_SUPPORTED
- + png_have_info(png_ptr, info_ptr);
- +#endif
- png_ptr->idat_size = length;
- break;
- }
- @@ -247,6 +250,17 @@
- png_handle_iTXt(png_ptr, info_ptr, length);
- #endif
-
- +#ifdef PNG_READ_APNG_SUPPORTED
- + else if (chunk_name == png_acTL)
- + png_handle_acTL(png_ptr, info_ptr, length);
- +
- + else if (chunk_name == png_fcTL)
- + png_handle_fcTL(png_ptr, info_ptr, length);
- +
- + else if (chunk_name == png_fdAT)
- + png_handle_fdAT(png_ptr, info_ptr, length);
- +#endif
- +
- else
- png_handle_unknown(png_ptr, info_ptr, length,
- PNG_HANDLE_CHUNK_AS_DEFAULT);
- @@ -254,6 +268,72 @@
- }
- #endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
-
- +#ifdef PNG_READ_APNG_SUPPORTED
- +void PNGAPI
- +png_read_frame_head(png_structp png_ptr, png_infop info_ptr)
- +{
- + png_byte have_chunk_after_DAT; /* after IDAT or after fdAT */
- +
- + png_debug(0, "Reading frame head");
- +
- + if (!(png_ptr->mode & PNG_HAVE_acTL))
- + png_error(png_ptr, "attempt to png_read_frame_head() but "
- + "no acTL present");
- +
- + /* do nothing for the main IDAT */
- + if (png_ptr->num_frames_read == 0)
- + return;
- +
- + png_read_reset(png_ptr);
- + png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
- + png_ptr->mode &= ~PNG_HAVE_fcTL;
- +
- + have_chunk_after_DAT = 0;
- + for (;;)
- + {
- + png_uint_32 length = png_read_chunk_header(png_ptr);
- +
- + if (png_ptr->chunk_name == png_IDAT)
- + {
- + /* discard trailing IDATs for the first frame */
- + if (have_chunk_after_DAT || png_ptr->num_frames_read > 1)
- + png_error(png_ptr, "png_read_frame_head(): out of place IDAT");
- + png_crc_finish(png_ptr, length);
- + }
- +
- + else if (png_ptr->chunk_name == png_fcTL)
- + {
- + png_handle_fcTL(png_ptr, info_ptr, length);
- + have_chunk_after_DAT = 1;
- + }
- +
- + else if (png_ptr->chunk_name == png_fdAT)
- + {
- + png_ensure_sequence_number(png_ptr, length);
- +
- + /* discard trailing fdATs for frames other than the first */
- + if (!have_chunk_after_DAT && png_ptr->num_frames_read > 1)
- + png_crc_finish(png_ptr, length - 4);
- + else if(png_ptr->mode & PNG_HAVE_fcTL)
- + {
- + png_ptr->idat_size = length - 4;
- + png_ptr->mode |= PNG_HAVE_IDAT;
- +
- + break;
- + }
- + else
- + png_error(png_ptr, "png_read_frame_head(): out of place fdAT");
- + }
- + else
- + {
- + png_warning(png_ptr, "Skipped (ignored) a chunk "
- + "between APNG chunks");
- + png_crc_finish(png_ptr, length);
- + }
- + }
- +}
- +#endif /* PNG_READ_APNG_SUPPORTED */
- +
- /* Optional call to update the users info_ptr structure */
- void PNGAPI
- png_read_update_info(png_structrp png_ptr, png_inforp info_ptr)
- diff -Naru libpng-1.6.12.org/pngrutil.c libpng-1.6.12/pngrutil.c
- --- libpng-1.6.12.org/pngrutil.c 2014-06-12 20:50:55.240436630 +0900
- +++ libpng-1.6.12/pngrutil.c 2014-06-12 20:50:55.305438849 +0900
- @@ -818,6 +818,11 @@
- filter_type = buf[11];
- interlace_type = buf[12];
-
- +#ifdef PNG_READ_APNG_SUPPORTED
- + png_ptr->first_frame_width = width;
- + png_ptr->first_frame_height = height;
- +#endif
- +
- /* Set internal variables */
- png_ptr->width = width;
- png_ptr->height = height;
- @@ -2698,6 +2703,179 @@
- }
- #endif
-
- +#ifdef PNG_READ_APNG_SUPPORTED
- +void /* PRIVATE */
- +png_handle_acTL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
- +{
- + png_byte data[8];
- + png_uint_32 num_frames;
- + png_uint_32 num_plays;
- + png_uint_32 didSet;
- +
- + png_debug(1, "in png_handle_acTL");
- +
- + if (!(png_ptr->mode & PNG_HAVE_IHDR))
- + {
- + png_error(png_ptr, "Missing IHDR before acTL");
- + }
- + else if (png_ptr->mode & PNG_HAVE_IDAT)
- + {
- + png_warning(png_ptr, "Invalid acTL after IDAT skipped");
- + png_crc_finish(png_ptr, length);
- + return;
- + }
- + else if (png_ptr->mode & PNG_HAVE_acTL)
- + {
- + png_warning(png_ptr, "Duplicate acTL skipped");
- + png_crc_finish(png_ptr, length);
- + return;
- + }
- + else if (length != 8)
- + {
- + png_warning(png_ptr, "acTL with invalid length skipped");
- + png_crc_finish(png_ptr, length);
- + return;
- + }
- +
- + png_crc_read(png_ptr, data, 8);
- + png_crc_finish(png_ptr, 0);
- +
- + num_frames = png_get_uint_31(png_ptr, data);
- + num_plays = png_get_uint_31(png_ptr, data + 4);
- +
- + /* the set function will do error checking on num_frames */
- + didSet = png_set_acTL(png_ptr, info_ptr, num_frames, num_plays);
- + if(didSet)
- + png_ptr->mode |= PNG_HAVE_acTL;
- +}
- +
- +void /* PRIVATE */
- +png_handle_fcTL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
- +{
- + png_byte data[22];
- + png_uint_32 width;
- + png_uint_32 height;
- + png_uint_32 x_offset;
- + png_uint_32 y_offset;
- + png_uint_16 delay_num;
- + png_uint_16 delay_den;
- + png_byte dispose_op;
- + png_byte blend_op;
- +
- + png_debug(1, "in png_handle_fcTL");
- +
- + png_ensure_sequence_number(png_ptr, length);
- +
- + if (!(png_ptr->mode & PNG_HAVE_IHDR))
- + {
- + png_error(png_ptr, "Missing IHDR before fcTL");
- + }
- + else if (png_ptr->mode & PNG_HAVE_IDAT)
- + {
- + /* for any frames other then the first this message may be misleading,
- + * but correct. PNG_HAVE_IDAT is unset before the frame head is read
- + * i can't think of a better message */
- + png_warning(png_ptr, "Invalid fcTL after IDAT skipped");
- + png_crc_finish(png_ptr, length-4);
- + return;
- + }
- + else if (png_ptr->mode & PNG_HAVE_fcTL)
- + {
- + png_warning(png_ptr, "Duplicate fcTL within one frame skipped");
- + png_crc_finish(png_ptr, length-4);
- + return;
- + }
- + else if (length != 26)
- + {
- + png_warning(png_ptr, "fcTL with invalid length skipped");
- + png_crc_finish(png_ptr, length-4);
- + return;
- + }
- +
- + png_crc_read(png_ptr, data, 22);
- + png_crc_finish(png_ptr, 0);
- +
- + width = png_get_uint_31(png_ptr, data);
- + height = png_get_uint_31(png_ptr, data + 4);
- + x_offset = png_get_uint_31(png_ptr, data + 8);
- + y_offset = png_get_uint_31(png_ptr, data + 12);
- + delay_num = png_get_uint_16(data + 16);
- + delay_den = png_get_uint_16(data + 18);
- + dispose_op = data[20];
- + blend_op = data[21];
- +
- + if (png_ptr->num_frames_read == 0 && (x_offset != 0 || y_offset != 0))
- + {
- + png_warning(png_ptr, "fcTL for the first frame must have zero offset");
- + return;
- + }
- +
- + if (info_ptr != NULL)
- + {
- + if (png_ptr->num_frames_read == 0 &&
- + (width != info_ptr->width || height != info_ptr->height))
- + {
- + png_warning(png_ptr, "size in first frame's fcTL must match "
- + "the size in IHDR");
- + return;
- + }
- +
- + /* The set function will do more error checking */
- + png_set_next_frame_fcTL(png_ptr, info_ptr, width, height,
- + x_offset, y_offset, delay_num, delay_den,
- + dispose_op, blend_op);
- +
- + png_read_reinit(png_ptr, info_ptr);
- +
- + png_ptr->mode |= PNG_HAVE_fcTL;
- + }
- +}
- +
- +void /* PRIVATE */
- +png_have_info(png_structp png_ptr, png_infop info_ptr)
- +{
- + if((info_ptr->valid & PNG_INFO_acTL) && !(info_ptr->valid & PNG_INFO_fcTL))
- + {
- + png_ptr->apng_flags |= PNG_FIRST_FRAME_HIDDEN;
- + info_ptr->num_frames++;
- + }
- +}
- +
- +void /* PRIVATE */
- +png_handle_fdAT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
- +{
- + png_ensure_sequence_number(png_ptr, length);
- +
- + /* This function is only called from png_read_end(), png_read_info(),
- + * and png_push_read_chunk() which means that:
- + * - the user doesn't want to read this frame
- + * - or this is an out-of-place fdAT
- + * in either case it is safe to ignore the chunk with a warning */
- + png_warning(png_ptr, "ignoring fdAT chunk");
- + png_crc_finish(png_ptr, length - 4);
- + PNG_UNUSED(info_ptr)
- +}
- +
- +void /* PRIVATE */
- +png_ensure_sequence_number(png_structp png_ptr, png_uint_32 length)
- +{
- + png_byte data[4];
- + png_uint_32 sequence_number;
- +
- + if (length < 4)
- + png_error(png_ptr, "invalid fcTL or fdAT chunk found");
- +
- + png_crc_read(png_ptr, data, 4);
- + sequence_number = png_get_uint_31(png_ptr, data);
- +
- + if (sequence_number != png_ptr->next_seq_num)
- + png_error(png_ptr, "fcTL or fdAT chunk with out-of-order sequence "
- + "number found");
- +
- + png_ptr->next_seq_num++;
- +}
- +#endif /* PNG_READ_APNG_SUPPORTED */
- +
- #ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
- /* Utility function for png_handle_unknown; set up png_ptr::unknown_chunk */
- static int
- @@ -3954,7 +4132,38 @@
- {
- uInt avail_in;
- png_bytep buffer;
- +#ifdef PNG_READ_APNG_SUPPORTED
- + png_uint_32 bytes_to_skip = 0;
- +
- + while (png_ptr->idat_size == 0 || bytes_to_skip != 0)
- + {
- + png_crc_finish(png_ptr, bytes_to_skip);
- + bytes_to_skip = 0;
-
- + png_ptr->idat_size = png_read_chunk_header(png_ptr);
- + if (png_ptr->num_frames_read == 0)
- + {
- + if (png_ptr->chunk_name != png_IDAT)
- + png_error(png_ptr, "Not enough image data");
- + }
- + else
- + {
- + if (png_ptr->chunk_name == png_IEND)
- + png_error(png_ptr, "Not enough image data");
- + if (png_ptr->chunk_name != png_fdAT)
- + {
- + png_warning(png_ptr, "Skipped (ignored) a chunk "
- + "between APNG chunks");
- + bytes_to_skip = png_ptr->idat_size;
- + continue;
- + }
- +
- + png_ensure_sequence_number(png_ptr, png_ptr->idat_size);
- +
- + png_ptr->idat_size -= 4;
- + }
- + }
- +#else
- while (png_ptr->idat_size == 0)
- {
- png_crc_finish(png_ptr, 0);
- @@ -3966,7 +4175,7 @@
- if (png_ptr->chunk_name != png_IDAT)
- png_error(png_ptr, "Not enough image data");
- }
- -
- +#endif /* PNG_READ_APNG_SUPPORTED */
- avail_in = png_ptr->IDAT_read_size;
-
- if (avail_in > png_ptr->idat_size)
- @@ -4029,6 +4238,9 @@
-
- png_ptr->mode |= PNG_AFTER_IDAT;
- png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED;
- +#ifdef PNG_READ_APNG_SUPPORTED
- + png_ptr->num_frames_read++;
- +#endif
-
- if (png_ptr->zstream.avail_in > 0 || png_ptr->idat_size > 0)
- png_chunk_benign_error(png_ptr, "Extra compressed data");
- @@ -4466,4 +4678,80 @@
-
- png_ptr->flags |= PNG_FLAG_ROW_INIT;
- }
- +
- +#ifdef PNG_READ_APNG_SUPPORTED
- +/* This function is to be called after the main IDAT set has been read and
- + * before a new IDAT is read. It resets some parts of png_ptr
- + * to make them usable by the read functions again */
- +void /* PRIVATE */
- +png_read_reset(png_structp png_ptr)
- +{
- + png_ptr->mode &= ~PNG_HAVE_IDAT;
- + png_ptr->mode &= ~PNG_AFTER_IDAT;
- + png_ptr->row_number = 0;
- + png_ptr->pass = 0;
- +}
- +
- +void /* PRIVATE */
- +png_read_reinit(png_structp png_ptr, png_infop info_ptr)
- +{
- + png_ptr->width = info_ptr->next_frame_width;
- + png_ptr->height = info_ptr->next_frame_height;
- + png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth,png_ptr->width);
- + png_ptr->info_rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth,
- + png_ptr->width);
- + if (png_ptr->prev_row)
- + memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
- +}
- +
- +#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
- +/* same as png_read_reset() but for the progressive reader */
- +void /* PRIVATE */
- +png_progressive_read_reset(png_structp png_ptr)
- +{
- +#ifdef PNG_READ_INTERLACING_SUPPORTED
- + /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
- +
- + /* Start of interlace block */
- + const int png_pass_start[] = {0, 4, 0, 2, 0, 1, 0};
- +
- + /* Offset to next interlace block */
- + const int png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1};
- +
- + /* Start of interlace block in the y direction */
- + const int png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1};
- +
- + /* Offset to next interlace block in the y direction */
- + const int png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2};
- +
- + if (png_ptr->interlaced)
- + {
- + if (!(png_ptr->transformations & PNG_INTERLACE))
- + png_ptr->num_rows = (png_ptr->height + png_pass_yinc[0] - 1 -
- + png_pass_ystart[0]) / png_pass_yinc[0];
- + else
- + png_ptr->num_rows = png_ptr->height;
- +
- + png_ptr->iwidth = (png_ptr->width +
- + png_pass_inc[png_ptr->pass] - 1 -
- + png_pass_start[png_ptr->pass]) /
- + png_pass_inc[png_ptr->pass];
- + }
- + else
- +#endif /* PNG_READ_INTERLACING_SUPPORTED */
- + {
- + png_ptr->num_rows = png_ptr->height;
- + png_ptr->iwidth = png_ptr->width;
- + }
- + png_ptr->flags &= ~PNG_FLAG_ZSTREAM_ENDED;
- + if (inflateReset(&(png_ptr->zstream)) != Z_OK)
- + png_error(png_ptr, "inflateReset failed");
- + png_ptr->zstream.avail_in = 0;
- + png_ptr->zstream.next_in = 0;
- + png_ptr->zstream.next_out = png_ptr->row_buf;
- + png_ptr->zstream.avail_out = (uInt)PNG_ROWBYTES(png_ptr->pixel_depth,
- + png_ptr->iwidth) + 1;
- +}
- +#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
- +#endif /* PNG_READ_APNG_SUPPORTED */
- #endif /* PNG_READ_SUPPORTED */
- diff -Naru libpng-1.6.12.org/pngset.c libpng-1.6.12/pngset.c
- --- libpng-1.6.12.org/pngset.c 2014-06-12 20:50:55.240436630 +0900
- +++ libpng-1.6.12/pngset.c 2014-06-12 20:50:55.306438883 +0900
- @@ -239,6 +239,11 @@
- info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth);
-
- info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, width);
- +
- +#ifdef PNG_APNG_SUPPORTED
- + /* for non-animated png. this may be overwritten from an acTL chunk later */
- + info_ptr->num_frames = 1;
- +#endif
- }
-
- #ifdef PNG_oFFs_SUPPORTED
- @@ -1065,6 +1070,147 @@
- }
- #endif /* PNG_sPLT_SUPPORTED */
-
- +#ifdef PNG_APNG_SUPPORTED
- +png_uint_32 PNGAPI
- +png_set_acTL(png_structp png_ptr, png_infop info_ptr,
- + png_uint_32 num_frames, png_uint_32 num_plays)
- +{
- + png_debug1(1, "in %s storage function", "acTL");
- +
- + if (png_ptr == NULL || info_ptr == NULL)
- + {
- + png_warning(png_ptr,
- + "Call to png_set_acTL() with NULL png_ptr "
- + "or info_ptr ignored");
- + return (0);
- + }
- + if (num_frames == 0)
- + {
- + png_warning(png_ptr,
- + "Ignoring attempt to set acTL with num_frames zero");
- + return (0);
- + }
- + if (num_frames > PNG_UINT_31_MAX)
- + {
- + png_warning(png_ptr,
- + "Ignoring attempt to set acTL with num_frames > 2^31-1");
- + return (0);
- + }
- + if (num_plays > PNG_UINT_31_MAX)
- + {
- + png_warning(png_ptr,
- + "Ignoring attempt to set acTL with num_plays "
- + "> 2^31-1");
- + return (0);
- + }
- +
- + info_ptr->num_frames = num_frames;
- + info_ptr->num_plays = num_plays;
- +
- + info_ptr->valid |= PNG_INFO_acTL;
- +
- + return (1);
- +}
- +
- +/* delay_num and delay_den can hold any 16-bit values including zero */
- +png_uint_32 PNGAPI
- +png_set_next_frame_fcTL(png_structp png_ptr, png_infop info_ptr,
- + png_uint_32 width, png_uint_32 height,
- + png_uint_32 x_offset, png_uint_32 y_offset,
- + png_uint_16 delay_num, png_uint_16 delay_den,
- + png_byte dispose_op, png_byte blend_op)
- +{
- + png_debug1(1, "in %s storage function", "fcTL");
- +
- + if (png_ptr == NULL || info_ptr == NULL)
- + {
- + png_warning(png_ptr,
- + "Call to png_set_fcTL() with NULL png_ptr or info_ptr "
- + "ignored");
- + return (0);
- + }
- +
- + png_ensure_fcTL_is_valid(png_ptr, width, height, x_offset, y_offset,
- + delay_num, delay_den, dispose_op, blend_op);
- +
- + if (blend_op == PNG_BLEND_OP_OVER)
- + {
- + if (!(png_ptr->color_type & PNG_COLOR_MASK_ALPHA) &&
- + !(png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)))
- + {
- + png_warning(png_ptr, "PNG_BLEND_OP_OVER is meaningless "
- + "and wasteful for opaque images, ignored");
- + blend_op = PNG_BLEND_OP_SOURCE;
- + }
- + }
- +
- + info_ptr->next_frame_width = width;
- + info_ptr->next_frame_height = height;
- + info_ptr->next_frame_x_offset = x_offset;
- + info_ptr->next_frame_y_offset = y_offset;
- + info_ptr->next_frame_delay_num = delay_num;
- + info_ptr->next_frame_delay_den = delay_den;
- + info_ptr->next_frame_dispose_op = dispose_op;
- + info_ptr->next_frame_blend_op = blend_op;
- +
- + info_ptr->valid |= PNG_INFO_fcTL;
- +
- + return (1);
- +}
- +
- +void /* PRIVATE */
- +png_ensure_fcTL_is_valid(png_structp png_ptr,
- + png_uint_32 width, png_uint_32 height,
- + png_uint_32 x_offset, png_uint_32 y_offset,
- + png_uint_16 delay_num, png_uint_16 delay_den,
- + png_byte dispose_op, png_byte blend_op)
- +{
- + if (width > PNG_UINT_31_MAX)
- + png_error(png_ptr, "invalid width in fcTL (> 2^31-1)");
- + if (height > PNG_UINT_31_MAX)
- + png_error(png_ptr, "invalid height in fcTL (> 2^31-1)");
- + if (x_offset > PNG_UINT_31_MAX)
- + png_error(png_ptr, "invalid x_offset in fcTL (> 2^31-1)");
- + if (y_offset > PNG_UINT_31_MAX)
- + png_error(png_ptr, "invalid y_offset in fcTL (> 2^31-1)");
- + if (width + x_offset > png_ptr->first_frame_width ||
- + height + y_offset > png_ptr->first_frame_height)
- + png_error(png_ptr, "dimensions of a frame are greater than"
- + "the ones in IHDR");
- +
- + if (dispose_op != PNG_DISPOSE_OP_NONE &&
- + dispose_op != PNG_DISPOSE_OP_BACKGROUND &&
- + dispose_op != PNG_DISPOSE_OP_PREVIOUS)
- + png_error(png_ptr, "invalid dispose_op in fcTL");
- +
- + if (blend_op != PNG_BLEND_OP_SOURCE &&
- + blend_op != PNG_BLEND_OP_OVER)
- + png_error(png_ptr, "invalid blend_op in fcTL");
- +
- + PNG_UNUSED(delay_num)
- + PNG_UNUSED(delay_den)
- +}
- +
- +png_uint_32 PNGAPI
- +png_set_first_frame_is_hidden(png_structp png_ptr, png_infop info_ptr,
- + png_byte is_hidden)
- +{
- + png_debug(1, "in png_first_frame_is_hidden()");
- +
- + if (png_ptr == NULL)
- + return 0;
- +
- + if (is_hidden)
- + png_ptr->apng_flags |= PNG_FIRST_FRAME_HIDDEN;
- + else
- + png_ptr->apng_flags &= ~PNG_FIRST_FRAME_HIDDEN;
- +
- + PNG_UNUSED(info_ptr)
- +
- + return 1;
- +}
- +#endif /* PNG_APNG_SUPPORTED */
- +
- #ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
- static png_byte
- check_location(png_const_structrp png_ptr, int location)
- diff -Naru libpng-1.6.12.org/pngstruct.h libpng-1.6.12/pngstruct.h
- --- libpng-1.6.12.org/pngstruct.h 2014-06-12 20:50:55.240436630 +0900
- +++ libpng-1.6.12/pngstruct.h 2014-06-12 20:50:55.306438883 +0900
- @@ -409,6 +409,27 @@
- png_byte filter_type;
- #endif
-
- +#ifdef PNG_APNG_SUPPORTED
- + png_uint_32 apng_flags;
- + png_uint_32 next_seq_num; /* next fcTL/fdAT chunk sequence number */
- + png_uint_32 first_frame_width;
- + png_uint_32 first_frame_height;
- +
- +#ifdef PNG_READ_APNG_SUPPORTED
- + png_uint_32 num_frames_read; /* incremented after all image data of */
- + /* a frame is read */
- +#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
- + png_progressive_frame_ptr frame_info_fn; /* frame info read callback */
- + png_progressive_frame_ptr frame_end_fn; /* frame data read callback */
- +#endif
- +#endif
- +
- +#ifdef PNG_WRITE_APNG_SUPPORTED
- + png_uint_32 num_frames_to_write;
- + png_uint_32 num_frames_written;
- +#endif
- +#endif /* PNG_APNG_SUPPORTED */
- +
- /* New members added in libpng-1.2.0 */
-
- /* New members added in libpng-1.0.2 but first enabled by default in 1.2.0 */
- diff -Naru libpng-1.6.12.org/pngtest.c libpng-1.6.12/pngtest.c
- --- libpng-1.6.12.org/pngtest.c 2014-06-12 20:50:55.241436664 +0900
- +++ libpng-1.6.12/pngtest.c 2014-06-12 20:50:55.306438883 +0900
- @@ -848,6 +848,10 @@
- png_uint_32 width, height;
- int num_pass = 1, pass;
- int bit_depth, color_type;
- +#ifdef PNG_APNG_SUPPORTED
- + png_uint_32 num_frames;
- + png_uint_32 num_plays;
- +#endif
-
- row_buf = NULL;
- error_parameters.file_name = inname;
- @@ -1314,6 +1318,20 @@
- }
- }
- #endif
- +#ifdef PNG_APNG_SUPPORTED
- + if (png_get_valid(read_ptr, read_info_ptr, PNG_INFO_acTL))
- + {
- + if (png_get_acTL(read_ptr, read_info_ptr, &num_frames, &num_plays))
- + {
- + png_byte is_hidden;
- + pngtest_debug2("Handling acTL chunks (frames %ld, plays %ld)",
- + num_frames, num_plays);
- + png_set_acTL(write_ptr, write_info_ptr, num_frames, num_plays);
- + is_hidden = png_get_first_frame_is_hidden(read_ptr, read_info_ptr);
- + png_set_first_frame_is_hidden(write_ptr, write_info_ptr, is_hidden);
- + }
- + }
- +#endif
- #ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
- {
- png_unknown_chunkp unknowns;
- @@ -1375,6 +1393,89 @@
- t_misc += (t_stop - t_start);
- t_start = t_stop;
- #endif
- +#ifdef PNG_APNG_SUPPORTED
- + if (png_get_valid(read_ptr, read_info_ptr, PNG_INFO_acTL))
- + {
- + png_uint_32 frame;
- + for (frame = 0; frame < num_frames; frame++)
- + {
- + png_uint_32 frame_width;
- + png_uint_32 frame_height;
- + png_uint_32 x_offset;
- + png_uint_32 y_offset;
- + png_uint_16 delay_num;
- + png_uint_16 delay_den;
- + png_byte dispose_op;
- + png_byte blend_op;
- + png_read_frame_head(read_ptr, read_info_ptr);
- + if (png_get_valid(read_ptr, read_info_ptr, PNG_INFO_fcTL))
- + {
- + png_get_next_frame_fcTL(read_ptr, read_info_ptr,
- + &frame_width, &frame_height,
- + &x_offset, &y_offset,
- + &delay_num, &delay_den,
- + &dispose_op, &blend_op);
- + }
- + else
- + {
- + frame_width = width;
- + frame_height = height;
- + x_offset = 0;
- + y_offset = 0;
- + delay_num = 1;
- + delay_den = 1;
- + dispose_op = PNG_DISPOSE_OP_NONE;
- + blend_op = PNG_BLEND_OP_SOURCE;
- + }
- +#ifdef PNG_WRITE_APNG_SUPPORTED
- + png_write_frame_head(write_ptr, write_info_ptr, (png_bytepp)&row_buf,
- + frame_width, frame_height,
- + x_offset, y_offset,
- + delay_num, delay_den,
- + dispose_op, blend_op);
- +#endif
- + for (pass = 0; pass < num_pass; pass++)
- + {
- + pngtest_debug1("Writing row data for pass %d", pass);
- + for (y = 0; y < frame_height; y++)
- + {
- +#ifndef SINGLE_ROWBUF_ALLOC
- + pngtest_debug2("Allocating row buffer (pass %d, y = %ld)...", pass, y);
- + row_buf = (png_bytep)png_malloc(read_ptr,
- + png_get_rowbytes(read_ptr, read_info_ptr));
- + pngtest_debug2("0x%08lx (%ld bytes)", (unsigned long)row_buf,
- + png_get_rowbytes(read_ptr, read_info_ptr));
- +#endif /* !SINGLE_ROWBUF_ALLOC */
- + png_read_rows(read_ptr, (png_bytepp)&row_buf, NULL, 1);
- +
- +#ifdef PNG_WRITE_SUPPORTED
- +#ifdef PNGTEST_TIMING
- + t_stop = (float)clock();
- + t_decode += (t_stop - t_start);
- + t_start = t_stop;
- +#endif
- + png_write_rows(write_ptr, (png_bytepp)&row_buf, 1);
- +#ifdef PNGTEST_TIMING
- + t_stop = (float)clock();
- + t_encode += (t_stop - t_start);
- + t_start = t_stop;
- +#endif
- +#endif /* PNG_WRITE_SUPPORTED */
- +
- +#ifndef SINGLE_ROWBUF_ALLOC
- + pngtest_debug2("Freeing row buffer (pass %d, y = %ld)", pass, y);
- + png_free(read_ptr, row_buf);
- + row_buf = NULL;
- +#endif /* !SINGLE_ROWBUF_ALLOC */
- + }
- + }
- +#ifdef PNG_WRITE_APNG_SUPPORTED
- + png_write_frame_tail(write_ptr, write_info_ptr);
- +#endif
- + }
- + }
- + else
- +#endif
- for (pass = 0; pass < num_pass; pass++)
- {
- pngtest_debug1("Writing row data for pass %d", pass);
- diff -Naru libpng-1.6.12.org/pngwrite.c libpng-1.6.12/pngwrite.c
- --- libpng-1.6.12.org/pngwrite.c 2014-06-12 20:50:55.241436664 +0900
- +++ libpng-1.6.12/pngwrite.c 2014-06-12 20:50:55.307438917 +0900
- @@ -127,6 +127,10 @@
- * application continues writing the PNG. So check the 'invalid' flag here
- * too.
- */
- +#ifdef PNG_WRITE_APNG_SUPPORTED
- + if (info_ptr->valid & PNG_INFO_acTL)
- + png_write_acTL(png_ptr, info_ptr->num_frames, info_ptr->num_plays);
- +#endif
- #ifdef PNG_GAMMA_SUPPORTED
- # ifdef PNG_WRITE_gAMA_SUPPORTED
- if (!(info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) &&
- @@ -357,6 +361,11 @@
- png_benign_error(png_ptr, "Wrote palette index exceeding num_palette");
- #endif
-
- +#ifdef PNG_WRITE_APNG_SUPPORTED
- + if (png_ptr->num_frames_written != png_ptr->num_frames_to_write)
- + png_error(png_ptr, "Not enough frames written");
- +#endif
- +
- /* See if user wants us to write information chunks */
- if (info_ptr != NULL)
- {
- @@ -1662,6 +1671,43 @@
- }
- #endif
-
- +#ifdef PNG_WRITE_APNG_SUPPORTED
- +void PNGAPI
- +png_write_frame_head(png_structp png_ptr, png_infop info_ptr,
- + png_bytepp row_pointers, png_uint_32 width, png_uint_32 height,
- + png_uint_32 x_offset, png_uint_32 y_offset,
- + png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op,
- + png_byte blend_op)
- +{
- + png_debug(1, "in png_write_frame_head");
- +
- + /* there is a chance this has been set after png_write_info was called,
- + * so it would be set but not written. is there a way to be sure? */
- + if (!(info_ptr->valid & PNG_INFO_acTL))
- + png_error(png_ptr, "png_write_frame_head(): acTL not set");
- +
- + png_write_reset(png_ptr);
- +
- + png_write_reinit(png_ptr, info_ptr, width, height);
- +
- + if ( !(png_ptr->num_frames_written == 0 &&
- + (png_ptr->apng_flags & PNG_FIRST_FRAME_HIDDEN) ) )
- + png_write_fcTL(png_ptr, width, height, x_offset, y_offset,
- + delay_num, delay_den, dispose_op, blend_op);
- +
- + PNG_UNUSED(row_pointers)
- +}
- +
- +void PNGAPI
- +png_write_frame_tail(png_structp png_ptr, png_infop info_ptr)
- +{
- + png_debug(1, "in png_write_frame_tail");
- +
- + png_ptr->num_frames_written++;
- +
- + PNG_UNUSED(info_ptr)
- +}
- +#endif /* PNG_WRITE_APNG_SUPPORTED */
-
- #ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED
- #ifdef PNG_STDIO_SUPPORTED /* currently required for png_image_write_* */
- diff -Naru libpng-1.6.12.org/pngwutil.c libpng-1.6.12/pngwutil.c
- --- libpng-1.6.12.org/pngwutil.c 2014-06-12 20:50:55.242436698 +0900
- +++ libpng-1.6.12/pngwutil.c 2014-06-12 20:50:55.307438917 +0900
- @@ -898,6 +898,11 @@
- /* Write the chunk */
- png_write_complete_chunk(png_ptr, png_IHDR, buf, (png_size_t)13);
-
- +#ifdef PNG_WRITE_APNG_SUPPORTED
- + png_ptr->first_frame_width = width;
- + png_ptr->first_frame_height = height;
- +#endif
- +
- if ((png_ptr->do_filter) == PNG_NO_FILTERS)
- {
- if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE ||
- @@ -1076,7 +1081,14 @@
- optimize_cmf(data, png_image_size(png_ptr));
- # endif
-
- +# ifdef PNG_WRITE_APNG_SUPPORTED
- + if (png_ptr->num_frames_written == 0)
- +# endif
- png_write_complete_chunk(png_ptr, png_IDAT, data, size);
- +# ifdef PNG_WRITE_APNG_SUPPORTED
- + else
- + png_write_fdAT(png_ptr, data, size);
- +# endif /* PNG_WRITE_APNG_SUPPORTED */
- png_ptr->mode |= PNG_HAVE_IDAT;
-
- png_ptr->zstream.next_out = data;
- @@ -1122,7 +1134,15 @@
- optimize_cmf(data, png_image_size(png_ptr));
- # endif
-
- +# ifdef PNG_WRITE_APNG_SUPPORTED
- + if (png_ptr->num_frames_written == 0)
- +# endif
- png_write_complete_chunk(png_ptr, png_IDAT, data, size);
- +# ifdef PNG_WRITE_APNG_SUPPORTED
- + else
- + png_write_fdAT(png_ptr, data, size);
- +# endif /* PNG_WRITE_APNG_SUPPORTED */
- +
- png_ptr->zstream.avail_out = 0;
- png_ptr->zstream.next_out = NULL;
- png_ptr->mode |= PNG_HAVE_IDAT | PNG_AFTER_IDAT;
- @@ -1936,6 +1956,82 @@
- }
- #endif
-
- +#ifdef PNG_WRITE_APNG_SUPPORTED
- +void /* PRIVATE */
- +png_write_acTL(png_structp png_ptr,
- + png_uint_32 num_frames, png_uint_32 num_plays)
- +{
- + png_byte buf[8];
- +
- + png_debug(1, "in png_write_acTL");
- +
- + png_ptr->num_frames_to_write = num_frames;
- +
- + if (png_ptr->apng_flags & PNG_FIRST_FRAME_HIDDEN)
- + num_frames--;
- +
- + png_save_uint_32(buf, num_frames);
- + png_save_uint_32(buf + 4, num_plays);
- +
- + png_write_complete_chunk(png_ptr, png_acTL, buf, (png_size_t)8);
- +}
- +
- +void /* PRIVATE */
- +png_write_fcTL(png_structp png_ptr, png_uint_32 width, png_uint_32 height,
- + png_uint_32 x_offset, png_uint_32 y_offset,
- + png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op,
- + png_byte blend_op)
- +{
- + png_byte buf[26];
- +
- + png_debug(1, "in png_write_fcTL");
- +
- + if (png_ptr->num_frames_written == 0 && (x_offset != 0 || y_offset != 0))
- + png_error(png_ptr, "x and/or y offset for the first frame aren't 0");
- + if (png_ptr->num_frames_written == 0 &&
- + (width != png_ptr->first_frame_width ||
- + height != png_ptr->first_frame_height))
- + png_error(png_ptr, "width and/or height in the first frame's fcTL "
- + "don't match the ones in IHDR");
- +
- + /* more error checking */
- + png_ensure_fcTL_is_valid(png_ptr, width, height, x_offset, y_offset,
- + delay_num, delay_den, dispose_op, blend_op);
- +
- + png_save_uint_32(buf, png_ptr->next_seq_num);
- + png_save_uint_32(buf + 4, width);
- + png_save_uint_32(buf + 8, height);
- + png_save_uint_32(buf + 12, x_offset);
- + png_save_uint_32(buf + 16, y_offset);
- + png_save_uint_16(buf + 20, delay_num);
- + png_save_uint_16(buf + 22, delay_den);
- + buf[24] = dispose_op;
- + buf[25] = blend_op;
- +
- + png_write_complete_chunk(png_ptr, png_fcTL, buf, (png_size_t)26);
- +
- + png_ptr->next_seq_num++;
- +}
- +
- +void /* PRIVATE */
- +png_write_fdAT(png_structp png_ptr,
- + png_const_bytep data, png_size_t length)
- +{
- + png_byte buf[4];
- +
- + png_write_chunk_header(png_ptr, png_fdAT, (png_uint_32)(4 + length));
- +
- + png_save_uint_32(buf, png_ptr->next_seq_num);
- + png_write_chunk_data(png_ptr, buf, 4);
- +
- + png_write_chunk_data(png_ptr, data, length);
- +
- + png_write_chunk_end(png_ptr);
- +
- + png_ptr->next_seq_num++;
- +}
- +#endif /* PNG_WRITE_APNG_SUPPORTED */
- +
- /* Initializes the row writing capability of libpng */
- void /* PRIVATE */
- png_write_start_row(png_structrp png_ptr)
- @@ -3023,4 +3119,39 @@
- }
- #endif
- }
- +
- +#ifdef PNG_WRITE_APNG_SUPPORTED
- +void /* PRIVATE */
- +png_write_reset(png_structp png_ptr)
- +{
- + png_ptr->row_number = 0;
- + png_ptr->pass = 0;
- + png_ptr->mode &= ~PNG_HAVE_IDAT;
- +}
- +
- +void /* PRIVATE */
- +png_write_reinit(png_structp png_ptr, png_infop info_ptr,
- + png_uint_32 width, png_uint_32 height)
- +{
- + if (png_ptr->num_frames_written == 0 &&
- + (width != png_ptr->first_frame_width ||
- + height != png_ptr->first_frame_height))
- + png_error(png_ptr, "width and/or height in the first frame's fcTL "
- + "don't match the ones in IHDR");
- + if (width > png_ptr->first_frame_width ||
- + height > png_ptr->first_frame_height)
- + png_error(png_ptr, "width and/or height for a frame greater than"
- + "the ones in IHDR");
- +
- + png_set_IHDR(png_ptr, info_ptr, width, height,
- + info_ptr->bit_depth, info_ptr->color_type,
- + info_ptr->interlace_type, info_ptr->compression_type,
- + info_ptr->filter_type);
- +
- + png_ptr->width = width;
- + png_ptr->height = height;
- + png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth, width);
- + png_ptr->usr_width = png_ptr->width;
- +}
- +#endif /* PNG_WRITE_APNG_SUPPORTED */
- #endif /* PNG_WRITE_SUPPORTED */
- diff -Naru libpng-1.6.12.org/scripts/symbols.def libpng-1.6.12/scripts/symbols.def
- --- libpng-1.6.12.org/scripts/symbols.def 2014-06-12 20:50:55.248436903 +0900
- +++ libpng-1.6.12/scripts/symbols.def 2014-06-12 20:50:55.314439156 +0900
- @@ -249,3 +249,23 @@
- png_set_check_for_invalid_index @242
- png_get_palette_max @243
- png_set_option @244
- + png_get_acTL @245
- + png_set_acTL @246
- + png_get_num_frames @247
- + png_get_num_plays @248
- + png_get_next_frame_fcTL @249
- + png_set_next_frame_fcTL @250
- + png_get_next_frame_width @251
- + png_get_next_frame_height @252
- + png_get_next_frame_x_offset @253
- + png_get_next_frame_y_offset @254
- + png_get_next_frame_delay_num @255
- + png_get_next_frame_delay_den @256
- + png_get_next_frame_dispose_op @257
- + png_get_next_frame_blend_op @258
- + png_get_first_frame_is_hidden @259
- + png_set_first_frame_is_hidden @260
- + png_read_frame_head @261
- + png_set_progressive_frame_fn @262
- + png_write_frame_head @263
- + png_write_frame_tail @264
|