fife-parpg: ext/libpng-1.2.29/pngpread.c annotate

author	mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222
date	Sun, 29 Jun 2008 18:44:17 +0000
parents
children

rev	line source
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	1
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	2 /* pngpread.c - read a png file in push mode
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	3 *
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	4 * Last changed in libpng 1.2.27 [April 29, 2008]
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	5 * For conditions of distribution and use, see copyright notice in png.h
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	6 * Copyright (c) 1998-2008 Glenn Randers-Pehrson
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	7 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	8 * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	9 */
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	10
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	11 #define PNG_INTERNAL
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	12 #include "png.h"
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	13
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	14 #ifdef PNG_PROGRESSIVE_READ_SUPPORTED
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	15
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	16 /* push model modes */
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	17 #define PNG_READ_SIG_MODE 0
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	18 #define PNG_READ_CHUNK_MODE 1
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	19 #define PNG_READ_IDAT_MODE 2
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	20 #define PNG_SKIP_MODE 3
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	21 #define PNG_READ_tEXt_MODE 4
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	22 #define PNG_READ_zTXt_MODE 5
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	23 #define PNG_READ_DONE_MODE 6
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	24 #define PNG_READ_iTXt_MODE 7
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	25 #define PNG_ERROR_MODE 8
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	26
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	27 void PNGAPI
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	28 png_process_data(png_structp png_ptr, png_infop info_ptr,
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	29 png_bytep buffer, png_size_t buffer_size)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	30 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	31 if(png_ptr == NULL \|\| info_ptr == NULL) return;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	32 png_push_restore_buffer(png_ptr, buffer, buffer_size);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	33
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	34 while (png_ptr->buffer_size)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	35 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	36 png_process_some_data(png_ptr, info_ptr);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	37 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	38 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	39
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	40 /* What we do with the incoming data depends on what we were previously
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	41 * doing before we ran out of data...
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	42 */
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	43 void /* PRIVATE */
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	44 png_process_some_data(png_structp png_ptr, png_infop info_ptr)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	45 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	46 if(png_ptr == NULL) return;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	47 switch (png_ptr->process_mode)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	48 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	49 case PNG_READ_SIG_MODE:
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	50 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	51 png_push_read_sig(png_ptr, info_ptr);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	52 break;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	53 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	54 case PNG_READ_CHUNK_MODE:
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	55 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	56 png_push_read_chunk(png_ptr, info_ptr);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	57 break;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	58 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	59 case PNG_READ_IDAT_MODE:
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	60 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	61 png_push_read_IDAT(png_ptr);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	62 break;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	63 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	64 #if defined(PNG_READ_tEXt_SUPPORTED)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	65 case PNG_READ_tEXt_MODE:
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	66 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	67 png_push_read_tEXt(png_ptr, info_ptr);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	68 break;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	69 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	70 #endif
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	71 #if defined(PNG_READ_zTXt_SUPPORTED)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	72 case PNG_READ_zTXt_MODE:
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	73 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	74 png_push_read_zTXt(png_ptr, info_ptr);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	75 break;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	76 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	77 #endif
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	78 #if defined(PNG_READ_iTXt_SUPPORTED)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	79 case PNG_READ_iTXt_MODE:
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	80 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	81 png_push_read_iTXt(png_ptr, info_ptr);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	82 break;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	83 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	84 #endif
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	85 case PNG_SKIP_MODE:
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	86 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	87 png_push_crc_finish(png_ptr);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	88 break;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	89 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	90 default:
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	91 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	92 png_ptr->buffer_size = 0;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	93 break;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	94 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	95 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	96 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	97
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	98 /* Read any remaining signature bytes from the stream and compare them with
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	99 * the correct PNG signature. It is possible that this routine is called
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	100 * with bytes already read from the signature, either because they have been
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	101 * checked by the calling application, or because of multiple calls to this
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	102 * routine.
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	103 */
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	104 void /* PRIVATE */
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	105 png_push_read_sig(png_structp png_ptr, png_infop info_ptr)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	106 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	107 png_size_t num_checked = png_ptr->sig_bytes,
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	108 num_to_check = 8 - num_checked;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	109
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	110 if (png_ptr->buffer_size < num_to_check)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	111 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	112 num_to_check = png_ptr->buffer_size;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	113 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	114
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	115 png_push_fill_buffer(png_ptr, &(info_ptr->signature[num_checked]),
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	116 num_to_check);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	117 png_ptr->sig_bytes = (png_byte)(png_ptr->sig_bytes+num_to_check);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	118
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	119 if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check))
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	120 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	121 if (num_checked < 4 &&
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	122 png_sig_cmp(info_ptr->signature, num_checked, num_to_check - 4))
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	123 png_error(png_ptr, "Not a PNG file");
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	124 else
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	125 png_error(png_ptr, "PNG file corrupted by ASCII conversion");
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	126 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	127 else
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	128 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	129 if (png_ptr->sig_bytes >= 8)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	130 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	131 png_ptr->process_mode = PNG_READ_CHUNK_MODE;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	132 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	133 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	134 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	135
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	136 void /* PRIVATE */
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	137 png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	138 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	139 #ifdef PNG_USE_LOCAL_ARRAYS
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	140 PNG_CONST PNG_IHDR;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	141 PNG_CONST PNG_IDAT;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	142 PNG_CONST PNG_IEND;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	143 PNG_CONST PNG_PLTE;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	144 #if defined(PNG_READ_bKGD_SUPPORTED)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	145 PNG_CONST PNG_bKGD;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	146 #endif
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	147 #if defined(PNG_READ_cHRM_SUPPORTED)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	148 PNG_CONST PNG_cHRM;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	149 #endif
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	150 #if defined(PNG_READ_gAMA_SUPPORTED)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	151 PNG_CONST PNG_gAMA;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	152 #endif
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	153 #if defined(PNG_READ_hIST_SUPPORTED)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	154 PNG_CONST PNG_hIST;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	155 #endif
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	156 #if defined(PNG_READ_iCCP_SUPPORTED)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	157 PNG_CONST PNG_iCCP;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	158 #endif
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	159 #if defined(PNG_READ_iTXt_SUPPORTED)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	160 PNG_CONST PNG_iTXt;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	161 #endif
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	162 #if defined(PNG_READ_oFFs_SUPPORTED)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	163 PNG_CONST PNG_oFFs;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	164 #endif
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	165 #if defined(PNG_READ_pCAL_SUPPORTED)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	166 PNG_CONST PNG_pCAL;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	167 #endif
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	168 #if defined(PNG_READ_pHYs_SUPPORTED)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	169 PNG_CONST PNG_pHYs;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	170 #endif
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	171 #if defined(PNG_READ_sBIT_SUPPORTED)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	172 PNG_CONST PNG_sBIT;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	173 #endif
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	174 #if defined(PNG_READ_sCAL_SUPPORTED)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	175 PNG_CONST PNG_sCAL;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	176 #endif
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	177 #if defined(PNG_READ_sRGB_SUPPORTED)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	178 PNG_CONST PNG_sRGB;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	179 #endif
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	180 #if defined(PNG_READ_sPLT_SUPPORTED)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	181 PNG_CONST PNG_sPLT;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	182 #endif
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	183 #if defined(PNG_READ_tEXt_SUPPORTED)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	184 PNG_CONST PNG_tEXt;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	185 #endif
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	186 #if defined(PNG_READ_tIME_SUPPORTED)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	187 PNG_CONST PNG_tIME;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	188 #endif
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	189 #if defined(PNG_READ_tRNS_SUPPORTED)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	190 PNG_CONST PNG_tRNS;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	191 #endif
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	192 #if defined(PNG_READ_zTXt_SUPPORTED)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	193 PNG_CONST PNG_zTXt;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	194 #endif
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	195 #endif /* PNG_USE_LOCAL_ARRAYS */
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	196 /* First we make sure we have enough data for the 4 byte chunk name
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	197 * and the 4 byte chunk length before proceeding with decoding the
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	198 * chunk data. To fully decode each of these chunks, we also make
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	199 * sure we have enough data in the buffer for the 4 byte CRC at the
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	200 * end of every chunk (except IDAT, which is handled separately).
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	201 */
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	202 if (!(png_ptr->mode & PNG_HAVE_CHUNK_HEADER))
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	203 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	204 png_byte chunk_length[4];
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	205
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	206 if (png_ptr->buffer_size < 8)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	207 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	208 png_push_save_buffer(png_ptr);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	209 return;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	210 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	211
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	212 png_push_fill_buffer(png_ptr, chunk_length, 4);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	213 png_ptr->push_length = png_get_uint_31(png_ptr,chunk_length);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	214 png_reset_crc(png_ptr);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	215 png_crc_read(png_ptr, png_ptr->chunk_name, 4);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	216 png_ptr->mode \|= PNG_HAVE_CHUNK_HEADER;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	217 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	218
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	219 if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	220 if(png_ptr->mode & PNG_AFTER_IDAT)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	221 png_ptr->mode \|= PNG_HAVE_CHUNK_AFTER_IDAT;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	222
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	223 if (!png_memcmp(png_ptr->chunk_name, png_IHDR, 4))
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	224 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	225 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	226 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	227 if (png_ptr->push_length != 13)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	228 png_error(png_ptr, "Invalid IHDR length");
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	229 png_push_save_buffer(png_ptr);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	230 return;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	231 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	232 png_handle_IHDR(png_ptr, info_ptr, png_ptr->push_length);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	233 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	234 else if (!png_memcmp(png_ptr->chunk_name, png_IEND, 4))
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	235 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	236 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	237 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	238 png_push_save_buffer(png_ptr);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	239 return;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	240 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	241 png_handle_IEND(png_ptr, info_ptr, png_ptr->push_length);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	242
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	243 png_ptr->process_mode = PNG_READ_DONE_MODE;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	244 png_push_have_end(png_ptr, info_ptr);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	245 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	246 #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	247 else if (png_handle_as_unknown(png_ptr, png_ptr->chunk_name))
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	248 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	249 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	250 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	251 png_push_save_buffer(png_ptr);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	252 return;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	253 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	254 if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	255 png_ptr->mode \|= PNG_HAVE_IDAT;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	256 png_handle_unknown(png_ptr, info_ptr, png_ptr->push_length);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	257 if (!png_memcmp(png_ptr->chunk_name, png_PLTE, 4))
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	258 png_ptr->mode \|= PNG_HAVE_PLTE;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	259 else if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	260 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	261 if (!(png_ptr->mode & PNG_HAVE_IHDR))
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	262 png_error(png_ptr, "Missing IHDR before IDAT");
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	263 else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	264 !(png_ptr->mode & PNG_HAVE_PLTE))
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	265 png_error(png_ptr, "Missing PLTE before IDAT");
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	266 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	267 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	268 #endif
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	269 else if (!png_memcmp(png_ptr->chunk_name, png_PLTE, 4))
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	270 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	271 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	272 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	273 png_push_save_buffer(png_ptr);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	274 return;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	275 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	276 png_handle_PLTE(png_ptr, info_ptr, png_ptr->push_length);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	277 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	278 else if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	279 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	280 /* If we reach an IDAT chunk, this means we have read all of the
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	281 * header chunks, and we can start reading the image (or if this
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	282 * is called after the image has been read - we have an error).
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	283 */
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	284 if (!(png_ptr->mode & PNG_HAVE_IHDR))
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	285 png_error(png_ptr, "Missing IHDR before IDAT");
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	286 else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	287 !(png_ptr->mode & PNG_HAVE_PLTE))
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	288 png_error(png_ptr, "Missing PLTE before IDAT");
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	289
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	290 if (png_ptr->mode & PNG_HAVE_IDAT)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	291 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	292 if (!(png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT))
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	293 if (png_ptr->push_length == 0)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	294 return;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	295
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	296 if (png_ptr->mode & PNG_AFTER_IDAT)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	297 png_error(png_ptr, "Too many IDAT's found");
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	298 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	299
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	300 png_ptr->idat_size = png_ptr->push_length;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	301 png_ptr->mode \|= PNG_HAVE_IDAT;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	302 png_ptr->process_mode = PNG_READ_IDAT_MODE;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	303 png_push_have_info(png_ptr, info_ptr);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	304 png_ptr->zstream.avail_out = (uInt)png_ptr->irowbytes;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	305 png_ptr->zstream.next_out = png_ptr->row_buf;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	306 return;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	307 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	308 #if defined(PNG_READ_gAMA_SUPPORTED)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	309 else if (!png_memcmp(png_ptr->chunk_name, png_gAMA, 4))
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	310 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	311 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	312 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	313 png_push_save_buffer(png_ptr);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	314 return;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	315 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	316 png_handle_gAMA(png_ptr, info_ptr, png_ptr->push_length);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	317 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	318 #endif
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	319 #if defined(PNG_READ_sBIT_SUPPORTED)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	320 else if (!png_memcmp(png_ptr->chunk_name, png_sBIT, 4))
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	321 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	322 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	323 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	324 png_push_save_buffer(png_ptr);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	325 return;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	326 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	327 png_handle_sBIT(png_ptr, info_ptr, png_ptr->push_length);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	328 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	329 #endif
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	330 #if defined(PNG_READ_cHRM_SUPPORTED)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	331 else if (!png_memcmp(png_ptr->chunk_name, png_cHRM, 4))
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	332 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	333 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	334 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	335 png_push_save_buffer(png_ptr);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	336 return;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	337 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	338 png_handle_cHRM(png_ptr, info_ptr, png_ptr->push_length);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	339 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	340 #endif
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	341 #if defined(PNG_READ_sRGB_SUPPORTED)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	342 else if (!png_memcmp(png_ptr->chunk_name, png_sRGB, 4))
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	343 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	344 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	345 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	346 png_push_save_buffer(png_ptr);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	347 return;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	348 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	349 png_handle_sRGB(png_ptr, info_ptr, png_ptr->push_length);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	350 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	351 #endif
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	352 #if defined(PNG_READ_iCCP_SUPPORTED)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	353 else if (!png_memcmp(png_ptr->chunk_name, png_iCCP, 4))
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	354 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	355 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	356 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	357 png_push_save_buffer(png_ptr);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	358 return;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	359 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	360 png_handle_iCCP(png_ptr, info_ptr, png_ptr->push_length);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	361 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	362 #endif
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	363 #if defined(PNG_READ_sPLT_SUPPORTED)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	364 else if (!png_memcmp(png_ptr->chunk_name, png_sPLT, 4))
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	365 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	366 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	367 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	368 png_push_save_buffer(png_ptr);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	369 return;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	370 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	371 png_handle_sPLT(png_ptr, info_ptr, png_ptr->push_length);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	372 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	373 #endif
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	374 #if defined(PNG_READ_tRNS_SUPPORTED)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	375 else if (!png_memcmp(png_ptr->chunk_name, png_tRNS, 4))
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	376 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	377 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	378 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	379 png_push_save_buffer(png_ptr);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	380 return;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	381 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	382 png_handle_tRNS(png_ptr, info_ptr, png_ptr->push_length);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	383 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	384 #endif
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	385 #if defined(PNG_READ_bKGD_SUPPORTED)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	386 else if (!png_memcmp(png_ptr->chunk_name, png_bKGD, 4))
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	387 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	388 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	389 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	390 png_push_save_buffer(png_ptr);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	391 return;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	392 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	393 png_handle_bKGD(png_ptr, info_ptr, png_ptr->push_length);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	394 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	395 #endif
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	396 #if defined(PNG_READ_hIST_SUPPORTED)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	397 else if (!png_memcmp(png_ptr->chunk_name, png_hIST, 4))
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	398 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	399 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	400 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	401 png_push_save_buffer(png_ptr);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	402 return;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	403 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	404 png_handle_hIST(png_ptr, info_ptr, png_ptr->push_length);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	405 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	406 #endif
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	407 #if defined(PNG_READ_pHYs_SUPPORTED)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	408 else if (!png_memcmp(png_ptr->chunk_name, png_pHYs, 4))
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	409 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	410 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	411 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	412 png_push_save_buffer(png_ptr);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	413 return;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	414 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	415 png_handle_pHYs(png_ptr, info_ptr, png_ptr->push_length);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	416 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	417 #endif
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	418 #if defined(PNG_READ_oFFs_SUPPORTED)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	419 else if (!png_memcmp(png_ptr->chunk_name, png_oFFs, 4))
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	420 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	421 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	422 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	423 png_push_save_buffer(png_ptr);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	424 return;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	425 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	426 png_handle_oFFs(png_ptr, info_ptr, png_ptr->push_length);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	427 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	428 #endif
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	429 #if defined(PNG_READ_pCAL_SUPPORTED)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	430 else if (!png_memcmp(png_ptr->chunk_name, png_pCAL, 4))
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	431 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	432 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	433 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	434 png_push_save_buffer(png_ptr);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	435 return;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	436 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	437 png_handle_pCAL(png_ptr, info_ptr, png_ptr->push_length);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	438 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	439 #endif
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	440 #if defined(PNG_READ_sCAL_SUPPORTED)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	441 else if (!png_memcmp(png_ptr->chunk_name, png_sCAL, 4))
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	442 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	443 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	444 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	445 png_push_save_buffer(png_ptr);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	446 return;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	447 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	448 png_handle_sCAL(png_ptr, info_ptr, png_ptr->push_length);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	449 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	450 #endif
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	451 #if defined(PNG_READ_tIME_SUPPORTED)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	452 else if (!png_memcmp(png_ptr->chunk_name, png_tIME, 4))
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	453 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	454 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	455 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	456 png_push_save_buffer(png_ptr);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	457 return;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	458 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	459 png_handle_tIME(png_ptr, info_ptr, png_ptr->push_length);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	460 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	461 #endif
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	462 #if defined(PNG_READ_tEXt_SUPPORTED)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	463 else if (!png_memcmp(png_ptr->chunk_name, png_tEXt, 4))
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	464 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	465 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	466 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	467 png_push_save_buffer(png_ptr);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	468 return;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	469 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	470 png_push_handle_tEXt(png_ptr, info_ptr, png_ptr->push_length);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	471 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	472 #endif
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	473 #if defined(PNG_READ_zTXt_SUPPORTED)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	474 else if (!png_memcmp(png_ptr->chunk_name, png_zTXt, 4))
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	475 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	476 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	477 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	478 png_push_save_buffer(png_ptr);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	479 return;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	480 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	481 png_push_handle_zTXt(png_ptr, info_ptr, png_ptr->push_length);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	482 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	483 #endif
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	484 #if defined(PNG_READ_iTXt_SUPPORTED)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	485 else if (!png_memcmp(png_ptr->chunk_name, png_iTXt, 4))
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	486 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	487 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	488 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	489 png_push_save_buffer(png_ptr);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	490 return;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	491 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	492 png_push_handle_iTXt(png_ptr, info_ptr, png_ptr->push_length);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	493 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	494 #endif
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	495 else
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	496 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	497 if (png_ptr->push_length + 4 > png_ptr->buffer_size)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	498 {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	499 png_push_save_buffer(png_ptr);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	500 return;

0

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

2 /* pngpread.c - read a png file in push mode

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

3 *

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

4 * Last changed in libpng 1.2.27 [April 29, 2008]

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

5 * For conditions of distribution and use, see copyright notice in png.h

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

9 */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

10

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

11 #define PNG_INTERNAL

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

12 #include "png.h"

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

13

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

14 #ifdef PNG_PROGRESSIVE_READ_SUPPORTED

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

15

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

16 /* push model modes */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

17 #define PNG_READ_SIG_MODE 0

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

18 #define PNG_READ_CHUNK_MODE 1

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

19 #define PNG_READ_IDAT_MODE 2

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

20 #define PNG_SKIP_MODE 3

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

21 #define PNG_READ_tEXt_MODE 4

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

22 #define PNG_READ_zTXt_MODE 5

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

23 #define PNG_READ_DONE_MODE 6

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

24 #define PNG_READ_iTXt_MODE 7

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

25 #define PNG_ERROR_MODE 8

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

26

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

27 void PNGAPI

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

28 png_process_data(png_structp png_ptr, png_infop info_ptr,

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

29 png_bytep buffer, png_size_t buffer_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

30 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

31 if(png_ptr == NULL || info_ptr == NULL) return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

32 png_push_restore_buffer(png_ptr, buffer, buffer_size);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

33

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

34 while (png_ptr->buffer_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

35 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

36 png_process_some_data(png_ptr, info_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

37 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

38 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

39

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

40 /* What we do with the incoming data depends on what we were previously

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

41 * doing before we ran out of data...

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

42 */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

43 void /* PRIVATE */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

44 png_process_some_data(png_structp png_ptr, png_infop info_ptr)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

45 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

46 if(png_ptr == NULL) return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

47 switch (png_ptr->process_mode)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

48 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

49 case PNG_READ_SIG_MODE:

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

50 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

51 png_push_read_sig(png_ptr, info_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

52 break;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

53 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

54 case PNG_READ_CHUNK_MODE:

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

55 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

56 png_push_read_chunk(png_ptr, info_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

57 break;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

58 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

59 case PNG_READ_IDAT_MODE:

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

60 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

61 png_push_read_IDAT(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

62 break;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

63 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

64 #if defined(PNG_READ_tEXt_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

65 case PNG_READ_tEXt_MODE:

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

66 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

67 png_push_read_tEXt(png_ptr, info_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

68 break;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

69 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

70 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

71 #if defined(PNG_READ_zTXt_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

72 case PNG_READ_zTXt_MODE:

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

73 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

74 png_push_read_zTXt(png_ptr, info_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

75 break;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

76 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

77 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

78 #if defined(PNG_READ_iTXt_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

79 case PNG_READ_iTXt_MODE:

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

80 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

81 png_push_read_iTXt(png_ptr, info_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

82 break;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

83 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

84 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

85 case PNG_SKIP_MODE:

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

86 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

87 png_push_crc_finish(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

88 break;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

89 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

90 default:

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

91 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

92 png_ptr->buffer_size = 0;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

93 break;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

94 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

95 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

96 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

97

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

98 /* Read any remaining signature bytes from the stream and compare them with

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

99 * the correct PNG signature. It is possible that this routine is called

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

100 * with bytes already read from the signature, either because they have been

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

101 * checked by the calling application, or because of multiple calls to this

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

102 * routine.

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

103 */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

104 void /* PRIVATE */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

105 png_push_read_sig(png_structp png_ptr, png_infop info_ptr)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

106 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

107 png_size_t num_checked = png_ptr->sig_bytes,

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

108 num_to_check = 8 - num_checked;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

109

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

110 if (png_ptr->buffer_size < num_to_check)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

111 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

112 num_to_check = png_ptr->buffer_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

113 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

114

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

115 png_push_fill_buffer(png_ptr, &(info_ptr->signature[num_checked]),

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

116 num_to_check);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

117 png_ptr->sig_bytes = (png_byte)(png_ptr->sig_bytes+num_to_check);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

118

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

119 if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

120 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

121 if (num_checked < 4 &&

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

122 png_sig_cmp(info_ptr->signature, num_checked, num_to_check - 4))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

123 png_error(png_ptr, "Not a PNG file");

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

124 else

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

125 png_error(png_ptr, "PNG file corrupted by ASCII conversion");

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

126 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

127 else

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

128 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

129 if (png_ptr->sig_bytes >= 8)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

130 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

131 png_ptr->process_mode = PNG_READ_CHUNK_MODE;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

132 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

133 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

134 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

135

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

136 void /* PRIVATE */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

137 png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

138 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

139 #ifdef PNG_USE_LOCAL_ARRAYS

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

140 PNG_CONST PNG_IHDR;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

141 PNG_CONST PNG_IDAT;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

142 PNG_CONST PNG_IEND;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

143 PNG_CONST PNG_PLTE;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

144 #if defined(PNG_READ_bKGD_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

145 PNG_CONST PNG_bKGD;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

146 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

147 #if defined(PNG_READ_cHRM_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

148 PNG_CONST PNG_cHRM;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

149 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

150 #if defined(PNG_READ_gAMA_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

151 PNG_CONST PNG_gAMA;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

152 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

153 #if defined(PNG_READ_hIST_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

154 PNG_CONST PNG_hIST;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

155 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

156 #if defined(PNG_READ_iCCP_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

157 PNG_CONST PNG_iCCP;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

158 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

159 #if defined(PNG_READ_iTXt_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

160 PNG_CONST PNG_iTXt;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

161 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

162 #if defined(PNG_READ_oFFs_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

163 PNG_CONST PNG_oFFs;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

164 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

165 #if defined(PNG_READ_pCAL_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

166 PNG_CONST PNG_pCAL;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

167 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

168 #if defined(PNG_READ_pHYs_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

169 PNG_CONST PNG_pHYs;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

170 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

171 #if defined(PNG_READ_sBIT_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

172 PNG_CONST PNG_sBIT;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

173 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

174 #if defined(PNG_READ_sCAL_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

175 PNG_CONST PNG_sCAL;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

176 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

177 #if defined(PNG_READ_sRGB_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

178 PNG_CONST PNG_sRGB;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

179 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

180 #if defined(PNG_READ_sPLT_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

181 PNG_CONST PNG_sPLT;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

182 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

183 #if defined(PNG_READ_tEXt_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

184 PNG_CONST PNG_tEXt;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

185 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

186 #if defined(PNG_READ_tIME_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

187 PNG_CONST PNG_tIME;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

188 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

189 #if defined(PNG_READ_tRNS_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

190 PNG_CONST PNG_tRNS;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

191 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

192 #if defined(PNG_READ_zTXt_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

193 PNG_CONST PNG_zTXt;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

194 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

195 #endif /* PNG_USE_LOCAL_ARRAYS */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

196 /* First we make sure we have enough data for the 4 byte chunk name

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

197 * and the 4 byte chunk length before proceeding with decoding the

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

198 * chunk data. To fully decode each of these chunks, we also make

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

199 * sure we have enough data in the buffer for the 4 byte CRC at the

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

200 * end of every chunk (except IDAT, which is handled separately).

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

201 */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

202 if (!(png_ptr->mode & PNG_HAVE_CHUNK_HEADER))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

203 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

204 png_byte chunk_length[4];

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

205

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

206 if (png_ptr->buffer_size < 8)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

207 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

208 png_push_save_buffer(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

209 return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

210 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

211

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

212 png_push_fill_buffer(png_ptr, chunk_length, 4);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

213 png_ptr->push_length = png_get_uint_31(png_ptr,chunk_length);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

214 png_reset_crc(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

215 png_crc_read(png_ptr, png_ptr->chunk_name, 4);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

216 png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

217 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

218

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

219 if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

220 if(png_ptr->mode & PNG_AFTER_IDAT)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

221 png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

222

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

223 if (!png_memcmp(png_ptr->chunk_name, png_IHDR, 4))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

224 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

225 if (png_ptr->push_length + 4 > png_ptr->buffer_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

226 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

227 if (png_ptr->push_length != 13)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

228 png_error(png_ptr, "Invalid IHDR length");

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

229 png_push_save_buffer(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

230 return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

231 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

232 png_handle_IHDR(png_ptr, info_ptr, png_ptr->push_length);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

233 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

234 else if (!png_memcmp(png_ptr->chunk_name, png_IEND, 4))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

235 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

236 if (png_ptr->push_length + 4 > png_ptr->buffer_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

237 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

238 png_push_save_buffer(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

239 return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

240 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

241 png_handle_IEND(png_ptr, info_ptr, png_ptr->push_length);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

242

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

243 png_ptr->process_mode = PNG_READ_DONE_MODE;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

244 png_push_have_end(png_ptr, info_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

245 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

246 #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

247 else if (png_handle_as_unknown(png_ptr, png_ptr->chunk_name))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

248 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

249 if (png_ptr->push_length + 4 > png_ptr->buffer_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

250 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

251 png_push_save_buffer(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

252 return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

253 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

254 if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

255 png_ptr->mode |= PNG_HAVE_IDAT;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

256 png_handle_unknown(png_ptr, info_ptr, png_ptr->push_length);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

257 if (!png_memcmp(png_ptr->chunk_name, png_PLTE, 4))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

258 png_ptr->mode |= PNG_HAVE_PLTE;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

259 else if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

260 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

261 if (!(png_ptr->mode & PNG_HAVE_IHDR))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

262 png_error(png_ptr, "Missing IHDR before IDAT");

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

263 else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

264 !(png_ptr->mode & PNG_HAVE_PLTE))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

265 png_error(png_ptr, "Missing PLTE before IDAT");

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

266 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

267 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

268 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

269 else if (!png_memcmp(png_ptr->chunk_name, png_PLTE, 4))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

270 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

271 if (png_ptr->push_length + 4 > png_ptr->buffer_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

272 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

273 png_push_save_buffer(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

274 return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

275 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

276 png_handle_PLTE(png_ptr, info_ptr, png_ptr->push_length);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

277 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

278 else if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

279 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

280 /* If we reach an IDAT chunk, this means we have read all of the

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

281 * header chunks, and we can start reading the image (or if this

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

282 * is called after the image has been read - we have an error).

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

283 */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

284 if (!(png_ptr->mode & PNG_HAVE_IHDR))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

285 png_error(png_ptr, "Missing IHDR before IDAT");

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

286 else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

287 !(png_ptr->mode & PNG_HAVE_PLTE))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

288 png_error(png_ptr, "Missing PLTE before IDAT");

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

289

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

290 if (png_ptr->mode & PNG_HAVE_IDAT)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

291 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

292 if (!(png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

293 if (png_ptr->push_length == 0)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

294 return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

295

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

296 if (png_ptr->mode & PNG_AFTER_IDAT)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

297 png_error(png_ptr, "Too many IDAT's found");

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

298 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

299

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

300 png_ptr->idat_size = png_ptr->push_length;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

301 png_ptr->mode |= PNG_HAVE_IDAT;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

302 png_ptr->process_mode = PNG_READ_IDAT_MODE;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

303 png_push_have_info(png_ptr, info_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

304 png_ptr->zstream.avail_out = (uInt)png_ptr->irowbytes;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

305 png_ptr->zstream.next_out = png_ptr->row_buf;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

306 return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

307 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

308 #if defined(PNG_READ_gAMA_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

309 else if (!png_memcmp(png_ptr->chunk_name, png_gAMA, 4))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

310 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

311 if (png_ptr->push_length + 4 > png_ptr->buffer_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

312 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

313 png_push_save_buffer(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

314 return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

315 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

316 png_handle_gAMA(png_ptr, info_ptr, png_ptr->push_length);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

317 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

318 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

319 #if defined(PNG_READ_sBIT_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

320 else if (!png_memcmp(png_ptr->chunk_name, png_sBIT, 4))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

321 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

322 if (png_ptr->push_length + 4 > png_ptr->buffer_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

323 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

324 png_push_save_buffer(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

325 return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

326 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

327 png_handle_sBIT(png_ptr, info_ptr, png_ptr->push_length);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

328 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

329 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

330 #if defined(PNG_READ_cHRM_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

331 else if (!png_memcmp(png_ptr->chunk_name, png_cHRM, 4))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

332 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

333 if (png_ptr->push_length + 4 > png_ptr->buffer_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

334 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

335 png_push_save_buffer(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

336 return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

337 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

338 png_handle_cHRM(png_ptr, info_ptr, png_ptr->push_length);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

339 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

340 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

341 #if defined(PNG_READ_sRGB_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

342 else if (!png_memcmp(png_ptr->chunk_name, png_sRGB, 4))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

343 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

344 if (png_ptr->push_length + 4 > png_ptr->buffer_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

345 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

346 png_push_save_buffer(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

347 return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

348 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

349 png_handle_sRGB(png_ptr, info_ptr, png_ptr->push_length);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

350 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

351 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

352 #if defined(PNG_READ_iCCP_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

353 else if (!png_memcmp(png_ptr->chunk_name, png_iCCP, 4))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

354 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

355 if (png_ptr->push_length + 4 > png_ptr->buffer_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

356 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

357 png_push_save_buffer(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

358 return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

359 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

360 png_handle_iCCP(png_ptr, info_ptr, png_ptr->push_length);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

361 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

362 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

363 #if defined(PNG_READ_sPLT_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

364 else if (!png_memcmp(png_ptr->chunk_name, png_sPLT, 4))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

365 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

366 if (png_ptr->push_length + 4 > png_ptr->buffer_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

367 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

368 png_push_save_buffer(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

369 return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

370 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

371 png_handle_sPLT(png_ptr, info_ptr, png_ptr->push_length);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

372 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

373 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

374 #if defined(PNG_READ_tRNS_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

375 else if (!png_memcmp(png_ptr->chunk_name, png_tRNS, 4))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

376 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

377 if (png_ptr->push_length + 4 > png_ptr->buffer_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

378 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

379 png_push_save_buffer(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

380 return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

381 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

382 png_handle_tRNS(png_ptr, info_ptr, png_ptr->push_length);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

383 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

384 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

385 #if defined(PNG_READ_bKGD_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

386 else if (!png_memcmp(png_ptr->chunk_name, png_bKGD, 4))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

387 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

388 if (png_ptr->push_length + 4 > png_ptr->buffer_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

389 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

390 png_push_save_buffer(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

391 return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

392 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

393 png_handle_bKGD(png_ptr, info_ptr, png_ptr->push_length);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

394 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

395 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

396 #if defined(PNG_READ_hIST_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

397 else if (!png_memcmp(png_ptr->chunk_name, png_hIST, 4))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

398 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

399 if (png_ptr->push_length + 4 > png_ptr->buffer_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

400 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

401 png_push_save_buffer(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

402 return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

403 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

404 png_handle_hIST(png_ptr, info_ptr, png_ptr->push_length);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

405 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

406 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

407 #if defined(PNG_READ_pHYs_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

408 else if (!png_memcmp(png_ptr->chunk_name, png_pHYs, 4))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

409 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

410 if (png_ptr->push_length + 4 > png_ptr->buffer_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

411 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

412 png_push_save_buffer(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

413 return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

414 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

415 png_handle_pHYs(png_ptr, info_ptr, png_ptr->push_length);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

416 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

417 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

418 #if defined(PNG_READ_oFFs_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

419 else if (!png_memcmp(png_ptr->chunk_name, png_oFFs, 4))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

420 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

421 if (png_ptr->push_length + 4 > png_ptr->buffer_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

422 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

423 png_push_save_buffer(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

424 return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

425 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

426 png_handle_oFFs(png_ptr, info_ptr, png_ptr->push_length);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

427 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

428 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

429 #if defined(PNG_READ_pCAL_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

430 else if (!png_memcmp(png_ptr->chunk_name, png_pCAL, 4))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

431 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

432 if (png_ptr->push_length + 4 > png_ptr->buffer_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

433 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

434 png_push_save_buffer(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

435 return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

436 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

437 png_handle_pCAL(png_ptr, info_ptr, png_ptr->push_length);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

438 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

439 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

440 #if defined(PNG_READ_sCAL_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

441 else if (!png_memcmp(png_ptr->chunk_name, png_sCAL, 4))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

442 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

443 if (png_ptr->push_length + 4 > png_ptr->buffer_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

444 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

445 png_push_save_buffer(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

446 return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

447 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

448 png_handle_sCAL(png_ptr, info_ptr, png_ptr->push_length);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

449 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

450 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

451 #if defined(PNG_READ_tIME_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

452 else if (!png_memcmp(png_ptr->chunk_name, png_tIME, 4))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

453 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

454 if (png_ptr->push_length + 4 > png_ptr->buffer_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

455 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

456 png_push_save_buffer(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

457 return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

458 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

459 png_handle_tIME(png_ptr, info_ptr, png_ptr->push_length);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

460 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

461 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

462 #if defined(PNG_READ_tEXt_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

463 else if (!png_memcmp(png_ptr->chunk_name, png_tEXt, 4))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

464 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

465 if (png_ptr->push_length + 4 > png_ptr->buffer_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

466 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

467 png_push_save_buffer(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

468 return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

469 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

470 png_push_handle_tEXt(png_ptr, info_ptr, png_ptr->push_length);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

471 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

472 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

473 #if defined(PNG_READ_zTXt_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

474 else if (!png_memcmp(png_ptr->chunk_name, png_zTXt, 4))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

475 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

476 if (png_ptr->push_length + 4 > png_ptr->buffer_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

477 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

478 png_push_save_buffer(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

479 return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

480 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

481 png_push_handle_zTXt(png_ptr, info_ptr, png_ptr->push_length);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

482 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

483 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

484 #if defined(PNG_READ_iTXt_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

485 else if (!png_memcmp(png_ptr->chunk_name, png_iTXt, 4))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

486 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

487 if (png_ptr->push_length + 4 > png_ptr->buffer_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

488 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

489 png_push_save_buffer(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

490 return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

491 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

492 png_push_handle_iTXt(png_ptr, info_ptr, png_ptr->push_length);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

493 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

494 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

495 else

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

496 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

497 if (png_ptr->push_length + 4 > png_ptr->buffer_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

498 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

499 png_push_save_buffer(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

500 return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

501 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

502 png_push_handle_unknown(png_ptr, info_ptr, png_ptr->push_length);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

503 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

504

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

505 png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

506 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

507

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

508 void /* PRIVATE */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

509 png_push_crc_skip(png_structp png_ptr, png_uint_32 skip)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

510 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

511 png_ptr->process_mode = PNG_SKIP_MODE;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

512 png_ptr->skip_length = skip;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

513 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

514

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

515 void /* PRIVATE */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

516 png_push_crc_finish(png_structp png_ptr)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

517 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

518 if (png_ptr->skip_length && png_ptr->save_buffer_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

519 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

520 png_size_t save_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

521

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

522 if (png_ptr->skip_length < (png_uint_32)png_ptr->save_buffer_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

523 save_size = (png_size_t)png_ptr->skip_length;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

524 else

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

525 save_size = png_ptr->save_buffer_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

526

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

527 png_calculate_crc(png_ptr, png_ptr->save_buffer_ptr, save_size);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

528

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

529 png_ptr->skip_length -= save_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

530 png_ptr->buffer_size -= save_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

531 png_ptr->save_buffer_size -= save_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

532 png_ptr->save_buffer_ptr += save_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

533 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

534 if (png_ptr->skip_length && png_ptr->current_buffer_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

535 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

536 png_size_t save_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

537

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

538 if (png_ptr->skip_length < (png_uint_32)png_ptr->current_buffer_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

539 save_size = (png_size_t)png_ptr->skip_length;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

540 else

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

541 save_size = png_ptr->current_buffer_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

542

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

543 png_calculate_crc(png_ptr, png_ptr->current_buffer_ptr, save_size);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

544

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

545 png_ptr->skip_length -= save_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

546 png_ptr->buffer_size -= save_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

547 png_ptr->current_buffer_size -= save_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

548 png_ptr->current_buffer_ptr += save_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

549 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

550 if (!png_ptr->skip_length)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

551 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

552 if (png_ptr->buffer_size < 4)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

553 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

554 png_push_save_buffer(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

555 return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

556 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

557

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

558 png_crc_finish(png_ptr, 0);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

559 png_ptr->process_mode = PNG_READ_CHUNK_MODE;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

560 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

561 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

562

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

563 void PNGAPI

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

564 png_push_fill_buffer(png_structp png_ptr, png_bytep buffer, png_size_t length)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

565 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

566 png_bytep ptr;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

567

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

568 if(png_ptr == NULL) return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

569 ptr = buffer;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

570 if (png_ptr->save_buffer_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

571 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

572 png_size_t save_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

573

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

574 if (length < png_ptr->save_buffer_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

575 save_size = length;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

576 else

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

577 save_size = png_ptr->save_buffer_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

578

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

579 png_memcpy(ptr, png_ptr->save_buffer_ptr, save_size);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

580 length -= save_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

581 ptr += save_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

582 png_ptr->buffer_size -= save_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

583 png_ptr->save_buffer_size -= save_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

584 png_ptr->save_buffer_ptr += save_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

585 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

586 if (length && png_ptr->current_buffer_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

587 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

588 png_size_t save_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

589

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

590 if (length < png_ptr->current_buffer_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

591 save_size = length;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

592 else

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

593 save_size = png_ptr->current_buffer_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

594

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

595 png_memcpy(ptr, png_ptr->current_buffer_ptr, save_size);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

596 png_ptr->buffer_size -= save_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

597 png_ptr->current_buffer_size -= save_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

598 png_ptr->current_buffer_ptr += save_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

599 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

600 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

601

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

602 void /* PRIVATE */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

603 png_push_save_buffer(png_structp png_ptr)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

604 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

605 if (png_ptr->save_buffer_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

606 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

607 if (png_ptr->save_buffer_ptr != png_ptr->save_buffer)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

608 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

609 png_size_t i,istop;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

610 png_bytep sp;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

611 png_bytep dp;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

612

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

613 istop = png_ptr->save_buffer_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

614 for (i = 0, sp = png_ptr->save_buffer_ptr, dp = png_ptr->save_buffer;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

615 i < istop; i++, sp++, dp++)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

616 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

617 *dp = *sp;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

618 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

619 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

620 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

621 if (png_ptr->save_buffer_size + png_ptr->current_buffer_size >

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

622 png_ptr->save_buffer_max)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

623 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

624 png_size_t new_max;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

625 png_bytep old_buffer;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

626

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

627 if (png_ptr->save_buffer_size > PNG_SIZE_MAX -

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

628 (png_ptr->current_buffer_size + 256))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

629 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

630 png_error(png_ptr, "Potential overflow of save_buffer");

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

631 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

632 new_max = png_ptr->save_buffer_size + png_ptr->current_buffer_size + 256;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

633 old_buffer = png_ptr->save_buffer;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

634 png_ptr->save_buffer = (png_bytep)png_malloc(png_ptr,

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

635 (png_uint_32)new_max);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

636 png_memcpy(png_ptr->save_buffer, old_buffer, png_ptr->save_buffer_size);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

637 png_free(png_ptr, old_buffer);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

638 png_ptr->save_buffer_max = new_max;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

639 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

640 if (png_ptr->current_buffer_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

641 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

642 png_memcpy(png_ptr->save_buffer + png_ptr->save_buffer_size,

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

643 png_ptr->current_buffer_ptr, png_ptr->current_buffer_size);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

644 png_ptr->save_buffer_size += png_ptr->current_buffer_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

645 png_ptr->current_buffer_size = 0;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

646 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

647 png_ptr->save_buffer_ptr = png_ptr->save_buffer;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

648 png_ptr->buffer_size = 0;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

649 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

650

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

651 void /* PRIVATE */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

652 png_push_restore_buffer(png_structp png_ptr, png_bytep buffer,

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

653 png_size_t buffer_length)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

654 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

655 png_ptr->current_buffer = buffer;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

656 png_ptr->current_buffer_size = buffer_length;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

657 png_ptr->buffer_size = buffer_length + png_ptr->save_buffer_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

658 png_ptr->current_buffer_ptr = png_ptr->current_buffer;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

659 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

660

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

661 void /* PRIVATE */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

662 png_push_read_IDAT(png_structp png_ptr)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

663 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

664 #ifdef PNG_USE_LOCAL_ARRAYS

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

665 PNG_CONST PNG_IDAT;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

666 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

667 if (!(png_ptr->mode & PNG_HAVE_CHUNK_HEADER))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

668 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

669 png_byte chunk_length[4];

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

670

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

671 if (png_ptr->buffer_size < 8)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

672 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

673 png_push_save_buffer(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

674 return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

675 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

676

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

677 png_push_fill_buffer(png_ptr, chunk_length, 4);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

678 png_ptr->push_length = png_get_uint_31(png_ptr,chunk_length);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

679 png_reset_crc(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

680 png_crc_read(png_ptr, png_ptr->chunk_name, 4);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

681 png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

682

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

683 if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

684 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

685 png_ptr->process_mode = PNG_READ_CHUNK_MODE;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

686 if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

687 png_error(png_ptr, "Not enough compressed data");

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

688 return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

689 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

690

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

691 png_ptr->idat_size = png_ptr->push_length;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

692 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

693 if (png_ptr->idat_size && png_ptr->save_buffer_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

694 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

695 png_size_t save_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

696

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

697 if (png_ptr->idat_size < (png_uint_32)png_ptr->save_buffer_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

698 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

699 save_size = (png_size_t)png_ptr->idat_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

700 /* check for overflow */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

701 if((png_uint_32)save_size != png_ptr->idat_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

702 png_error(png_ptr, "save_size overflowed in pngpread");

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

703 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

704 else

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

705 save_size = png_ptr->save_buffer_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

706

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

707 png_calculate_crc(png_ptr, png_ptr->save_buffer_ptr, save_size);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

708 if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

709 png_process_IDAT_data(png_ptr, png_ptr->save_buffer_ptr, save_size);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

710 png_ptr->idat_size -= save_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

711 png_ptr->buffer_size -= save_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

712 png_ptr->save_buffer_size -= save_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

713 png_ptr->save_buffer_ptr += save_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

714 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

715 if (png_ptr->idat_size && png_ptr->current_buffer_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

716 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

717 png_size_t save_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

718

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

719 if (png_ptr->idat_size < (png_uint_32)png_ptr->current_buffer_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

720 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

721 save_size = (png_size_t)png_ptr->idat_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

722 /* check for overflow */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

723 if((png_uint_32)save_size != png_ptr->idat_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

724 png_error(png_ptr, "save_size overflowed in pngpread");

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

725 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

726 else

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

727 save_size = png_ptr->current_buffer_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

728

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

729 png_calculate_crc(png_ptr, png_ptr->current_buffer_ptr, save_size);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

730 if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

731 png_process_IDAT_data(png_ptr, png_ptr->current_buffer_ptr, save_size);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

732

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

733 png_ptr->idat_size -= save_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

734 png_ptr->buffer_size -= save_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

735 png_ptr->current_buffer_size -= save_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

736 png_ptr->current_buffer_ptr += save_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

737 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

738 if (!png_ptr->idat_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

739 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

740 if (png_ptr->buffer_size < 4)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

741 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

742 png_push_save_buffer(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

743 return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

744 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

745

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

746 png_crc_finish(png_ptr, 0);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

747 png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

748 png_ptr->mode |= PNG_AFTER_IDAT;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

749 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

750 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

751

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

752 void /* PRIVATE */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

753 png_process_IDAT_data(png_structp png_ptr, png_bytep buffer,

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

754 png_size_t buffer_length)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

755 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

756 int ret;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

757

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

758 if ((png_ptr->flags & PNG_FLAG_ZLIB_FINISHED) && buffer_length)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

759 png_error(png_ptr, "Extra compression data");

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

760

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

761 png_ptr->zstream.next_in = buffer;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

762 png_ptr->zstream.avail_in = (uInt)buffer_length;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

763 for(;;)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

764 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

765 ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

766 if (ret != Z_OK)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

767 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

768 if (ret == Z_STREAM_END)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

769 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

770 if (png_ptr->zstream.avail_in)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

771 png_error(png_ptr, "Extra compressed data");

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

772 if (!(png_ptr->zstream.avail_out))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

773 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

774 png_push_process_row(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

775 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

776

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

777 png_ptr->mode |= PNG_AFTER_IDAT;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

778 png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

779 break;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

780 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

781 else if (ret == Z_BUF_ERROR)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

782 break;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

783 else

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

784 png_error(png_ptr, "Decompression Error");

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

785 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

786 if (!(png_ptr->zstream.avail_out))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

787 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

788 if ((

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

789 #if defined(PNG_READ_INTERLACING_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

790 png_ptr->interlaced && png_ptr->pass > 6) ||

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

791 (!png_ptr->interlaced &&

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

792 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

793 png_ptr->row_number == png_ptr->num_rows))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

794 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

795 if (png_ptr->zstream.avail_in)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

796 png_warning(png_ptr, "Too much data in IDAT chunks");

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

797 png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

798 break;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

799 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

800 png_push_process_row(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

801 png_ptr->zstream.avail_out = (uInt)png_ptr->irowbytes;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

802 png_ptr->zstream.next_out = png_ptr->row_buf;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

803 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

804 else

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

805 break;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

806 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

807 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

808

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

809 void /* PRIVATE */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

810 png_push_process_row(png_structp png_ptr)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

811 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

812 png_ptr->row_info.color_type = png_ptr->color_type;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

813 png_ptr->row_info.width = png_ptr->iwidth;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

814 png_ptr->row_info.channels = png_ptr->channels;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

815 png_ptr->row_info.bit_depth = png_ptr->bit_depth;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

816 png_ptr->row_info.pixel_depth = png_ptr->pixel_depth;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

817

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

818 png_ptr->row_info.rowbytes = PNG_ROWBYTES(png_ptr->row_info.pixel_depth,

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

819 png_ptr->row_info.width);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

820

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

821 png_read_filter_row(png_ptr, &(png_ptr->row_info),

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

822 png_ptr->row_buf + 1, png_ptr->prev_row + 1,

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

823 (int)(png_ptr->row_buf[0]));

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

824

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

825 png_memcpy_check(png_ptr, png_ptr->prev_row, png_ptr->row_buf,

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

826 png_ptr->rowbytes + 1);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

827

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

828 if (png_ptr->transformations || (png_ptr->flags&PNG_FLAG_STRIP_ALPHA))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

829 png_do_read_transformations(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

830

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

831 #if defined(PNG_READ_INTERLACING_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

832 /* blow up interlaced rows to full size */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

833 if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

834 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

835 if (png_ptr->pass < 6)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

836 /* old interface (pre-1.0.9):

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

837 png_do_read_interlace(&(png_ptr->row_info),

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

838 png_ptr->row_buf + 1, png_ptr->pass, png_ptr->transformations);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

839 */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

840 png_do_read_interlace(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

841

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

842 switch (png_ptr->pass)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

843 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

844 case 0:

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

845 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

846 int i;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

847 for (i = 0; i < 8 && png_ptr->pass == 0; i++)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

848 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

849 png_push_have_row(png_ptr, png_ptr->row_buf + 1);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

850 png_read_push_finish_row(png_ptr); /* updates png_ptr->pass */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

851 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

852 if (png_ptr->pass == 2) /* pass 1 might be empty */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

853 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

854 for (i = 0; i < 4 && png_ptr->pass == 2; i++)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

855 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

856 png_push_have_row(png_ptr, png_bytep_NULL);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

857 png_read_push_finish_row(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

858 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

859 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

860 if (png_ptr->pass == 4 && png_ptr->height <= 4)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

861 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

862 for (i = 0; i < 2 && png_ptr->pass == 4; i++)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

863 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

864 png_push_have_row(png_ptr, png_bytep_NULL);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

865 png_read_push_finish_row(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

866 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

867 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

868 if (png_ptr->pass == 6 && png_ptr->height <= 4)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

869 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

870 png_push_have_row(png_ptr, png_bytep_NULL);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

871 png_read_push_finish_row(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

872 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

873 break;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

874 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

875 case 1:

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

876 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

877 int i;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

878 for (i = 0; i < 8 && png_ptr->pass == 1; i++)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

879 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

880 png_push_have_row(png_ptr, png_ptr->row_buf + 1);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

881 png_read_push_finish_row(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

882 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

883 if (png_ptr->pass == 2) /* skip top 4 generated rows */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

884 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

885 for (i = 0; i < 4 && png_ptr->pass == 2; i++)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

886 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

887 png_push_have_row(png_ptr, png_bytep_NULL);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

888 png_read_push_finish_row(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

889 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

890 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

891 break;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

892 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

893 case 2:

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

894 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

895 int i;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

896 for (i = 0; i < 4 && png_ptr->pass == 2; i++)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

897 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

898 png_push_have_row(png_ptr, png_ptr->row_buf + 1);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

899 png_read_push_finish_row(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

900 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

901 for (i = 0; i < 4 && png_ptr->pass == 2; i++)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

902 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

903 png_push_have_row(png_ptr, png_bytep_NULL);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

904 png_read_push_finish_row(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

905 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

906 if (png_ptr->pass == 4) /* pass 3 might be empty */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

907 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

908 for (i = 0; i < 2 && png_ptr->pass == 4; i++)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

909 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

910 png_push_have_row(png_ptr, png_bytep_NULL);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

911 png_read_push_finish_row(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

912 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

913 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

914 break;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

915 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

916 case 3:

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

917 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

918 int i;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

919 for (i = 0; i < 4 && png_ptr->pass == 3; i++)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

920 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

921 png_push_have_row(png_ptr, png_ptr->row_buf + 1);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

922 png_read_push_finish_row(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

923 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

924 if (png_ptr->pass == 4) /* skip top two generated rows */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

925 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

926 for (i = 0; i < 2 && png_ptr->pass == 4; i++)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

927 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

928 png_push_have_row(png_ptr, png_bytep_NULL);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

929 png_read_push_finish_row(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

930 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

931 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

932 break;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

933 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

934 case 4:

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

935 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

936 int i;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

937 for (i = 0; i < 2 && png_ptr->pass == 4; i++)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

938 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

939 png_push_have_row(png_ptr, png_ptr->row_buf + 1);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

940 png_read_push_finish_row(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

941 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

942 for (i = 0; i < 2 && png_ptr->pass == 4; i++)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

943 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

944 png_push_have_row(png_ptr, png_bytep_NULL);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

945 png_read_push_finish_row(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

946 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

947 if (png_ptr->pass == 6) /* pass 5 might be empty */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

948 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

949 png_push_have_row(png_ptr, png_bytep_NULL);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

950 png_read_push_finish_row(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

951 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

952 break;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

953 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

954 case 5:

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

955 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

956 int i;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

957 for (i = 0; i < 2 && png_ptr->pass == 5; i++)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

958 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

959 png_push_have_row(png_ptr, png_ptr->row_buf + 1);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

960 png_read_push_finish_row(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

961 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

962 if (png_ptr->pass == 6) /* skip top generated row */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

963 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

964 png_push_have_row(png_ptr, png_bytep_NULL);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

965 png_read_push_finish_row(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

966 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

967 break;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

968 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

969 case 6:

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

970 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

971 png_push_have_row(png_ptr, png_ptr->row_buf + 1);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

972 png_read_push_finish_row(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

973 if (png_ptr->pass != 6)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

974 break;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

975 png_push_have_row(png_ptr, png_bytep_NULL);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

976 png_read_push_finish_row(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

977 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

978 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

979 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

980 else

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

981 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

982 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

983 png_push_have_row(png_ptr, png_ptr->row_buf + 1);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

984 png_read_push_finish_row(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

985 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

986 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

987

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

988 void /* PRIVATE */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

989 png_read_push_finish_row(png_structp png_ptr)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

990 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

991 #ifdef PNG_USE_LOCAL_ARRAYS

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

992 /* arrays to facilitate easy interlacing - use pass (0 - 6) as index */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

993

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

994 /* start of interlace block */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

995 PNG_CONST int FARDATA png_pass_start[] = {0, 4, 0, 2, 0, 1, 0};

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

996

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

997 /* offset to next interlace block */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

998 PNG_CONST int FARDATA png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1};

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

999

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1000 /* start of interlace block in the y direction */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1001 PNG_CONST int FARDATA png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1};

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1002

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1003 /* offset to next interlace block in the y direction */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1004 PNG_CONST int FARDATA png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2};

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1005

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1006 /* Height of interlace block. This is not currently used - if you need

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1007 * it, uncomment it here and in png.h

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1008 PNG_CONST int FARDATA png_pass_height[] = {8, 8, 4, 4, 2, 2, 1};

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1009 */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1010 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1011

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1012 png_ptr->row_number++;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1013 if (png_ptr->row_number < png_ptr->num_rows)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1014 return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1015

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1016 if (png_ptr->interlaced)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1017 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1018 png_ptr->row_number = 0;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1019 png_memset_check(png_ptr, png_ptr->prev_row, 0,

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1020 png_ptr->rowbytes + 1);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1021 do

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1022 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1023 int pass;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1024 pass = png_ptr->pass;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1025 pass++;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1026 if ((pass == 1 && png_ptr->width < 5) ||

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1027 (pass == 3 && png_ptr->width < 3) ||

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1028 (pass == 5 && png_ptr->width < 2))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1029 pass++;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1030

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1031 if (pass > 7)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1032 pass--;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1033 png_ptr->pass = (png_byte) pass;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1034 if (pass < 7)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1035 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1036 png_ptr->iwidth = (png_ptr->width +

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1037 png_pass_inc[pass] - 1 -

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1038 png_pass_start[pass]) /

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1039 png_pass_inc[pass];

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1040

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1041 png_ptr->irowbytes = PNG_ROWBYTES(png_ptr->pixel_depth,

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1042 png_ptr->iwidth) + 1;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1043

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1044 if (png_ptr->transformations & PNG_INTERLACE)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1045 break;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1046

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1047 png_ptr->num_rows = (png_ptr->height +

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1048 png_pass_yinc[pass] - 1 -

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1049 png_pass_ystart[pass]) /

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1050 png_pass_yinc[pass];

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1051 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1052 else

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1053 break;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1054

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1055 } while (png_ptr->iwidth == 0 || png_ptr->num_rows == 0);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1056 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1057 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1058

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1059 #if defined(PNG_READ_tEXt_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1060 void /* PRIVATE */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1061 png_push_handle_tEXt(png_structp png_ptr, png_infop info_ptr, png_uint_32

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1062 length)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1063 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1064 if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1065 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1066 png_error(png_ptr, "Out of place tEXt");

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1067 info_ptr = info_ptr; /* to quiet some compiler warnings */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1068 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1069

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1070 #ifdef PNG_MAX_MALLOC_64K

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1071 png_ptr->skip_length = 0; /* This may not be necessary */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1072

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1073 if (length > (png_uint_32)65535L) /* Can't hold entire string in memory */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1074 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1075 png_warning(png_ptr, "tEXt chunk too large to fit in memory");

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1076 png_ptr->skip_length = length - (png_uint_32)65535L;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1077 length = (png_uint_32)65535L;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1078 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1079 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1080

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1081 png_ptr->current_text = (png_charp)png_malloc(png_ptr,

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1082 (png_uint_32)(length+1));

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1083 png_ptr->current_text[length] = '\0';

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1084 png_ptr->current_text_ptr = png_ptr->current_text;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1085 png_ptr->current_text_size = (png_size_t)length;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1086 png_ptr->current_text_left = (png_size_t)length;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1087 png_ptr->process_mode = PNG_READ_tEXt_MODE;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1088 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1089

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1090 void /* PRIVATE */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1091 png_push_read_tEXt(png_structp png_ptr, png_infop info_ptr)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1092 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1093 if (png_ptr->buffer_size && png_ptr->current_text_left)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1094 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1095 png_size_t text_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1096

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1097 if (png_ptr->buffer_size < png_ptr->current_text_left)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1098 text_size = png_ptr->buffer_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1099 else

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1100 text_size = png_ptr->current_text_left;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1101 png_crc_read(png_ptr, (png_bytep)png_ptr->current_text_ptr, text_size);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1102 png_ptr->current_text_left -= text_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1103 png_ptr->current_text_ptr += text_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1104 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1105 if (!(png_ptr->current_text_left))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1106 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1107 png_textp text_ptr;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1108 png_charp text;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1109 png_charp key;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1110 int ret;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1111

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1112 if (png_ptr->buffer_size < 4)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1113 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1114 png_push_save_buffer(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1115 return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1116 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1117

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1118 png_push_crc_finish(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1119

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1120 #if defined(PNG_MAX_MALLOC_64K)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1121 if (png_ptr->skip_length)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1122 return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1123 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1124

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1125 key = png_ptr->current_text;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1126

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1127 for (text = key; *text; text++)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1128 /* empty loop */ ;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1129

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1130 if (text < key + png_ptr->current_text_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1131 text++;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1132

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1133 text_ptr = (png_textp)png_malloc(png_ptr,

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1134 (png_uint_32)png_sizeof(png_text));

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1135 text_ptr->compression = PNG_TEXT_COMPRESSION_NONE;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1136 text_ptr->key = key;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1137 #ifdef PNG_iTXt_SUPPORTED

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1138 text_ptr->lang = NULL;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1139 text_ptr->lang_key = NULL;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1140 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1141 text_ptr->text = text;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1142

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1143 ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1144

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1145 png_free(png_ptr, key);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1146 png_free(png_ptr, text_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1147 png_ptr->current_text = NULL;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1148

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1149 if (ret)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1150 png_warning(png_ptr, "Insufficient memory to store text chunk.");

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1151 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1152 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1153 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1154

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1155 #if defined(PNG_READ_zTXt_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1156 void /* PRIVATE */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1157 png_push_handle_zTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1158 length)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1159 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1160 if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1161 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1162 png_error(png_ptr, "Out of place zTXt");

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1163 info_ptr = info_ptr; /* to quiet some compiler warnings */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1164 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1165

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1166 #ifdef PNG_MAX_MALLOC_64K

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1167 /* We can't handle zTXt chunks > 64K, since we don't have enough space

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1168 * to be able to store the uncompressed data. Actually, the threshold

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1169 * is probably around 32K, but it isn't as definite as 64K is.

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1170 */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1171 if (length > (png_uint_32)65535L)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1172 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1173 png_warning(png_ptr, "zTXt chunk too large to fit in memory");

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1174 png_push_crc_skip(png_ptr, length);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1175 return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1176 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1177 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1178

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1179 png_ptr->current_text = (png_charp)png_malloc(png_ptr,

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1180 (png_uint_32)(length+1));

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1181 png_ptr->current_text[length] = '\0';

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1182 png_ptr->current_text_ptr = png_ptr->current_text;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1183 png_ptr->current_text_size = (png_size_t)length;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1184 png_ptr->current_text_left = (png_size_t)length;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1185 png_ptr->process_mode = PNG_READ_zTXt_MODE;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1186 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1187

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1188 void /* PRIVATE */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1189 png_push_read_zTXt(png_structp png_ptr, png_infop info_ptr)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1190 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1191 if (png_ptr->buffer_size && png_ptr->current_text_left)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1192 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1193 png_size_t text_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1194

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1195 if (png_ptr->buffer_size < (png_uint_32)png_ptr->current_text_left)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1196 text_size = png_ptr->buffer_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1197 else

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1198 text_size = png_ptr->current_text_left;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1199 png_crc_read(png_ptr, (png_bytep)png_ptr->current_text_ptr, text_size);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1200 png_ptr->current_text_left -= text_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1201 png_ptr->current_text_ptr += text_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1202 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1203 if (!(png_ptr->current_text_left))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1204 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1205 png_textp text_ptr;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1206 png_charp text;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1207 png_charp key;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1208 int ret;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1209 png_size_t text_size, key_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1210

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1211 if (png_ptr->buffer_size < 4)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1212 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1213 png_push_save_buffer(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1214 return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1215 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1216

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1217 png_push_crc_finish(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1218

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1219 key = png_ptr->current_text;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1220

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1221 for (text = key; *text; text++)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1222 /* empty loop */ ;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1223

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1224 /* zTXt can't have zero text */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1225 if (text >= key + png_ptr->current_text_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1226 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1227 png_ptr->current_text = NULL;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1228 png_free(png_ptr, key);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1229 return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1230 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1231

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1232 text++;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1233

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1234 if (*text != PNG_TEXT_COMPRESSION_zTXt) /* check compression byte */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1235 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1236 png_ptr->current_text = NULL;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1237 png_free(png_ptr, key);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1238 return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1239 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1240

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1241 text++;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1242

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1243 png_ptr->zstream.next_in = (png_bytep )text;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1244 png_ptr->zstream.avail_in = (uInt)(png_ptr->current_text_size -

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1245 (text - key));

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1246 png_ptr->zstream.next_out = png_ptr->zbuf;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1247 png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1248

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1249 key_size = text - key;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1250 text_size = 0;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1251 text = NULL;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1252 ret = Z_STREAM_END;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1253

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1254 while (png_ptr->zstream.avail_in)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1255 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1256 ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1257 if (ret != Z_OK && ret != Z_STREAM_END)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1258 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1259 inflateReset(&png_ptr->zstream);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1260 png_ptr->zstream.avail_in = 0;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1261 png_ptr->current_text = NULL;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1262 png_free(png_ptr, key);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1263 png_free(png_ptr, text);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1264 return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1265 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1266 if (!(png_ptr->zstream.avail_out) || ret == Z_STREAM_END)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1267 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1268 if (text == NULL)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1269 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1270 text = (png_charp)png_malloc(png_ptr,

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1271 (png_uint_32)(png_ptr->zbuf_size - png_ptr->zstream.avail_out

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1272 + key_size + 1));

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1273 png_memcpy(text + key_size, png_ptr->zbuf,

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1274 png_ptr->zbuf_size - png_ptr->zstream.avail_out);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1275 png_memcpy(text, key, key_size);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1276 text_size = key_size + png_ptr->zbuf_size -

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1277 png_ptr->zstream.avail_out;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1278 *(text + text_size) = '\0';

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1279 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1280 else

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1281 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1282 png_charp tmp;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1283

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1284 tmp = text;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1285 text = (png_charp)png_malloc(png_ptr, text_size +

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1286 (png_uint_32)(png_ptr->zbuf_size - png_ptr->zstream.avail_out

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1287 + 1));

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1288 png_memcpy(text, tmp, text_size);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1289 png_free(png_ptr, tmp);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1290 png_memcpy(text + text_size, png_ptr->zbuf,

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1291 png_ptr->zbuf_size - png_ptr->zstream.avail_out);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1292 text_size += png_ptr->zbuf_size - png_ptr->zstream.avail_out;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1293 *(text + text_size) = '\0';

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1294 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1295 if (ret != Z_STREAM_END)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1296 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1297 png_ptr->zstream.next_out = png_ptr->zbuf;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1298 png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1299 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1300 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1301 else

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1302 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1303 break;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1304 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1305

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1306 if (ret == Z_STREAM_END)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1307 break;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1308 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1309

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1310 inflateReset(&png_ptr->zstream);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1311 png_ptr->zstream.avail_in = 0;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1312

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1313 if (ret != Z_STREAM_END)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1314 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1315 png_ptr->current_text = NULL;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1316 png_free(png_ptr, key);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1317 png_free(png_ptr, text);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1318 return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1319 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1320

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1321 png_ptr->current_text = NULL;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1322 png_free(png_ptr, key);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1323 key = text;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1324 text += key_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1325

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1326 text_ptr = (png_textp)png_malloc(png_ptr,

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1327 (png_uint_32)png_sizeof(png_text));

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1328 text_ptr->compression = PNG_TEXT_COMPRESSION_zTXt;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1329 text_ptr->key = key;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1330 #ifdef PNG_iTXt_SUPPORTED

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1331 text_ptr->lang = NULL;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1332 text_ptr->lang_key = NULL;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1333 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1334 text_ptr->text = text;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1335

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1336 ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1337

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1338 png_free(png_ptr, key);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1339 png_free(png_ptr, text_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1340

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1341 if (ret)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1342 png_warning(png_ptr, "Insufficient memory to store text chunk.");

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1343 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1344 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1345 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1346

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1347 #if defined(PNG_READ_iTXt_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1348 void /* PRIVATE */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1349 png_push_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1350 length)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1351 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1352 if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1353 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1354 png_error(png_ptr, "Out of place iTXt");

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1355 info_ptr = info_ptr; /* to quiet some compiler warnings */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1356 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1357

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1358 #ifdef PNG_MAX_MALLOC_64K

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1359 png_ptr->skip_length = 0; /* This may not be necessary */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1360

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1361 if (length > (png_uint_32)65535L) /* Can't hold entire string in memory */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1362 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1363 png_warning(png_ptr, "iTXt chunk too large to fit in memory");

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1364 png_ptr->skip_length = length - (png_uint_32)65535L;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1365 length = (png_uint_32)65535L;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1366 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1367 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1368

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1369 png_ptr->current_text = (png_charp)png_malloc(png_ptr,

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1370 (png_uint_32)(length+1));

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1371 png_ptr->current_text[length] = '\0';

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1372 png_ptr->current_text_ptr = png_ptr->current_text;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1373 png_ptr->current_text_size = (png_size_t)length;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1374 png_ptr->current_text_left = (png_size_t)length;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1375 png_ptr->process_mode = PNG_READ_iTXt_MODE;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1376 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1377

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1378 void /* PRIVATE */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1379 png_push_read_iTXt(png_structp png_ptr, png_infop info_ptr)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1380 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1381

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1382 if (png_ptr->buffer_size && png_ptr->current_text_left)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1383 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1384 png_size_t text_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1385

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1386 if (png_ptr->buffer_size < png_ptr->current_text_left)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1387 text_size = png_ptr->buffer_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1388 else

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1389 text_size = png_ptr->current_text_left;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1390 png_crc_read(png_ptr, (png_bytep)png_ptr->current_text_ptr, text_size);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1391 png_ptr->current_text_left -= text_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1392 png_ptr->current_text_ptr += text_size;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1393 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1394 if (!(png_ptr->current_text_left))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1395 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1396 png_textp text_ptr;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1397 png_charp key;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1398 int comp_flag;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1399 png_charp lang;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1400 png_charp lang_key;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1401 png_charp text;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1402 int ret;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1403

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1404 if (png_ptr->buffer_size < 4)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1405 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1406 png_push_save_buffer(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1407 return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1408 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1409

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1410 png_push_crc_finish(png_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1411

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1412 #if defined(PNG_MAX_MALLOC_64K)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1413 if (png_ptr->skip_length)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1414 return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1415 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1416

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1417 key = png_ptr->current_text;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1418

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1419 for (lang = key; *lang; lang++)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1420 /* empty loop */ ;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1421

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1422 if (lang < key + png_ptr->current_text_size - 3)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1423 lang++;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1424

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1425 comp_flag = *lang++;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1426 lang++; /* skip comp_type, always zero */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1427

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1428 for (lang_key = lang; *lang_key; lang_key++)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1429 /* empty loop */ ;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1430 lang_key++; /* skip NUL separator */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1431

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1432 text=lang_key;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1433 if (lang_key < key + png_ptr->current_text_size - 1)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1434 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1435 for (; *text; text++)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1436 /* empty loop */ ;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1437 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1438

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1439 if (text < key + png_ptr->current_text_size)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1440 text++;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1441

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1442 text_ptr = (png_textp)png_malloc(png_ptr,

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1443 (png_uint_32)png_sizeof(png_text));

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1444 text_ptr->compression = comp_flag + 2;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1445 text_ptr->key = key;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1446 text_ptr->lang = lang;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1447 text_ptr->lang_key = lang_key;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1448 text_ptr->text = text;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1449 text_ptr->text_length = 0;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1450 text_ptr->itxt_length = png_strlen(text);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1451

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1452 ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1453

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1454 png_ptr->current_text = NULL;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1455

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1456 png_free(png_ptr, text_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1457 if (ret)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1458 png_warning(png_ptr, "Insufficient memory to store iTXt chunk.");

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1459 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1460 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1461 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1462

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1463 /* This function is called when we haven't found a handler for this

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1464 * chunk. If there isn't a problem with the chunk itself (ie a bad chunk

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1465 * name or a critical chunk), the chunk is (currently) silently ignored.

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1466 */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1467 void /* PRIVATE */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1468 png_push_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1469 length)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1470 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1471 png_uint_32 skip=0;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1472 png_check_chunk_name(png_ptr, png_ptr->chunk_name);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1473

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1474 if (!(png_ptr->chunk_name[0] & 0x20))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1475 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1476 #if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1477 if(png_handle_as_unknown(png_ptr, png_ptr->chunk_name) !=

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1478 PNG_HANDLE_CHUNK_ALWAYS

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1479 #if defined(PNG_READ_USER_CHUNKS_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1480 && png_ptr->read_user_chunk_fn == NULL

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1481 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1482 )

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1483 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1484 png_chunk_error(png_ptr, "unknown critical chunk");

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1485

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1486 info_ptr = info_ptr; /* to quiet some compiler warnings */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1487 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1488

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1489 #if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1490 if (png_ptr->flags & PNG_FLAG_KEEP_UNKNOWN_CHUNKS)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1491 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1492 #ifdef PNG_MAX_MALLOC_64K

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1493 if (length > (png_uint_32)65535L)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1494 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1495 png_warning(png_ptr, "unknown chunk too large to fit in memory");

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1496 skip = length - (png_uint_32)65535L;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1497 length = (png_uint_32)65535L;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1498 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1499 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1500 png_memcpy((png_charp)png_ptr->unknown_chunk.name,

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1501 (png_charp)png_ptr->chunk_name,

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1502 png_sizeof(png_ptr->unknown_chunk.name));

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1503 png_ptr->unknown_chunk.name[png_sizeof(png_ptr->unknown_chunk.name)-1]='\0';

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1504

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1505 png_ptr->unknown_chunk.size = (png_size_t)length;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1506 if (length == 0)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1507 png_ptr->unknown_chunk.data = NULL;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1508 else

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1509 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1510 png_ptr->unknown_chunk.data = (png_bytep)png_malloc(png_ptr, length);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1511 png_crc_read(png_ptr, (png_bytep)png_ptr->unknown_chunk.data, length);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1512 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1513 #if defined(PNG_READ_USER_CHUNKS_SUPPORTED)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1514 if(png_ptr->read_user_chunk_fn != NULL)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1515 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1516 /* callback to user unknown chunk handler */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1517 int ret;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1518 ret = (*(png_ptr->read_user_chunk_fn))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1519 (png_ptr, &png_ptr->unknown_chunk);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1520 if (ret < 0)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1521 png_chunk_error(png_ptr, "error in user chunk");

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1522 if (ret == 0)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1523 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1524 if (!(png_ptr->chunk_name[0] & 0x20))

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1525 if(png_handle_as_unknown(png_ptr, png_ptr->chunk_name) !=

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1526 PNG_HANDLE_CHUNK_ALWAYS)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1527 png_chunk_error(png_ptr, "unknown critical chunk");

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1528 png_set_unknown_chunks(png_ptr, info_ptr,

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1529 &png_ptr->unknown_chunk, 1);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1530 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1531 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1532 else

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1533 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1534 png_set_unknown_chunks(png_ptr, info_ptr, &png_ptr->unknown_chunk, 1);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1535 png_free(png_ptr, png_ptr->unknown_chunk.data);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1536 png_ptr->unknown_chunk.data = NULL;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1537 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1538 else

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1539 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1540 skip=length;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1541 png_push_crc_skip(png_ptr, skip);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1542 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1543

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1544 void /* PRIVATE */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1545 png_push_have_info(png_structp png_ptr, png_infop info_ptr)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1546 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1547 if (png_ptr->info_fn != NULL)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1548 (*(png_ptr->info_fn))(png_ptr, info_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1549 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1550

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1551 void /* PRIVATE */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1552 png_push_have_end(png_structp png_ptr, png_infop info_ptr)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1553 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1554 if (png_ptr->end_fn != NULL)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1555 (*(png_ptr->end_fn))(png_ptr, info_ptr);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1556 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1557

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1558 void /* PRIVATE */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1559 png_push_have_row(png_structp png_ptr, png_bytep row)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1560 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1561 if (png_ptr->row_fn != NULL)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1562 (*(png_ptr->row_fn))(png_ptr, row, png_ptr->row_number,

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1563 (int)png_ptr->pass);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1564 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1565

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1566 void PNGAPI

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1567 png_progressive_combine_row (png_structp png_ptr,

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1568 png_bytep old_row, png_bytep new_row)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1569 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1570 #ifdef PNG_USE_LOCAL_ARRAYS

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1571 PNG_CONST int FARDATA png_pass_dsp_mask[7] =

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1572 {0xff, 0x0f, 0xff, 0x33, 0xff, 0x55, 0xff};

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1573 #endif

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1574 if(png_ptr == NULL) return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1575 if (new_row != NULL) /* new_row must == png_ptr->row_buf here. */

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1576 png_combine_row(png_ptr, old_row, png_pass_dsp_mask[png_ptr->pass]);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1577 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1578

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1579 void PNGAPI

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1580 png_set_progressive_read_fn(png_structp png_ptr, png_voidp progressive_ptr,

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1581 png_progressive_info_ptr info_fn, png_progressive_row_ptr row_fn,

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1582 png_progressive_end_ptr end_fn)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1583 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1584 if(png_ptr == NULL) return;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1585 png_ptr->info_fn = info_fn;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1586 png_ptr->row_fn = row_fn;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1587 png_ptr->end_fn = end_fn;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1588

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1589 png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1590 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1591

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1592 png_voidp PNGAPI

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1593 png_get_progressive_ptr(png_structp png_ptr)

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1594 {

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1595 if(png_ptr == NULL) return (NULL);

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1596 return png_ptr->io_ptr;

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1597 }

4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-)

mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222

parents:

diff changeset

1598 #endif /* PNG_PROGRESSIVE_READ_SUPPORTED */

Mercurial > fife-parpg

annotate ext/libpng-1.2.29/pngpread.c @ 0:4a0efb7baf70