Subversion Repositories Kolibri OS

Rev

Rev 1897 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1897 Rev 3928
Line 1... Line 1...
1
/* pngstruct.h - header file for PNG reference library
1
/* pngstruct.h - header file for PNG reference library
2
 *
2
 *
3
 * Copyright (c) 1998-2011 Glenn Randers-Pehrson
3
 * Copyright (c) 1998-2013 Glenn Randers-Pehrson
4
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
4
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
5
 * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
5
 * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
6
 *
6
 *
7
 * Last changed in libpng 1.5.0 [January 6, 2011]
7
 * Last changed in libpng 1.6.1 [March 28, 2013]
8
 *
8
 *
9
 * This code is released under the libpng license.
9
 * This code is released under the libpng license.
10
 * For conditions of distribution and use, see the disclaimer
10
 * For conditions of distribution and use, see the disclaimer
11
 * and license in png.h
11
 * and license in png.h
12
 */
12
 */
Line 22... Line 22...
22
/* zlib.h defines the structure z_stream, an instance of which is included
22
/* zlib.h defines the structure z_stream, an instance of which is included
23
 * in this structure and is required for decompressing the LZ compressed
23
 * in this structure and is required for decompressing the LZ compressed
24
 * data in PNG files.
24
 * data in PNG files.
25
 */
25
 */
26
#include "zlib.h"
26
#ifndef ZLIB_CONST
-
 
27
   /* We must ensure that zlib uses 'const' in declarations. */
-
 
28
#  define ZLIB_CONST
-
 
29
#endif
-
 
30
#include "zlib.h"
27
 
31
#ifdef const
-
 
32
   /* zlib.h sometimes #defines const to nothing, undo this. */
-
 
33
#  undef const
-
 
34
#endif
-
 
35
 
-
 
36
/* zlib.h has mediocre z_const use before 1.2.6, this stuff is for compatibility
-
 
37
 * with older builds.
-
 
38
 */
-
 
39
#if ZLIB_VERNUM < 0x1260
-
 
40
#  define PNGZ_MSG_CAST(s) png_constcast(char*,s)
-
 
41
#  define PNGZ_INPUT_CAST(b) png_constcast(png_bytep,b)
-
 
42
#else
-
 
43
#  define PNGZ_MSG_CAST(s) (s)
-
 
44
#  define PNGZ_INPUT_CAST(b) (b)
-
 
45
#endif
-
 
46
 
-
 
47
/* zlib.h declares a magic type 'uInt' that limits the amount of data that zlib
-
 
48
 * can handle at once.  This type need be no larger than 16 bits (so maximum of
-
 
49
 * 65535), this define allows us to discover how big it is, but limited by the
-
 
50
 * maximuum for png_size_t.  The value can be overriden in a library build
-
 
51
 * (pngusr.h, or set it in CPPFLAGS) and it works to set it to a considerably
-
 
52
 * lower value (e.g. 255 works).  A lower value may help memory usage (slightly)
-
 
53
 * and may even improve performance on some systems (and degrade it on others.)
-
 
54
 */
-
 
55
#ifndef ZLIB_IO_MAX
-
 
56
#  define ZLIB_IO_MAX ((uInt)-1)
-
 
57
#endif
-
 
58
 
-
 
59
#ifdef PNG_WRITE_SUPPORTED
-
 
60
/* The type of a compression buffer list used by the write code. */
-
 
61
typedef struct png_compression_buffer
-
 
62
{
-
 
63
   struct png_compression_buffer *next;
-
 
64
   png_byte                       output[1]; /* actually zbuf_size */
-
 
65
} png_compression_buffer, *png_compression_bufferp;
-
 
66
 
-
 
67
#define PNG_COMPRESSION_BUFFER_SIZE(pp)\
-
 
68
   (offsetof(png_compression_buffer, output) + (pp)->zbuffer_size)
-
 
69
#endif
-
 
70
 
-
 
71
/* Colorspace support; structures used in png_struct, png_info and in internal
-
 
72
 * functions to hold and communicate information about the color space.
-
 
73
 *
-
 
74
 * PNG_COLORSPACE_SUPPORTED is only required if the application will perform
-
 
75
 * colorspace corrections, otherwise all the colorspace information can be
-
 
76
 * skipped and the size of libpng can be reduced (significantly) by compiling
-
 
77
 * out the colorspace support.
-
 
78
 */
-
 
79
#ifdef PNG_COLORSPACE_SUPPORTED
-
 
80
/* The chromaticities of the red, green and blue colorants and the chromaticity
-
 
81
 * of the corresponding white point (i.e. of rgb(1.0,1.0,1.0)).
-
 
82
 */
-
 
83
typedef struct png_xy
-
 
84
{
-
 
85
   png_fixed_point redx, redy;
-
 
86
   png_fixed_point greenx, greeny;
-
 
87
   png_fixed_point bluex, bluey;
-
 
88
   png_fixed_point whitex, whitey;
-
 
89
} png_xy;
-
 
90
 
-
 
91
/* The same data as above but encoded as CIE XYZ values.  When this data comes
-
 
92
 * from chromaticities the sum of the Y values is assumed to be 1.0
-
 
93
 */
-
 
94
typedef struct png_XYZ
-
 
95
{
-
 
96
   png_fixed_point red_X, red_Y, red_Z;
-
 
97
   png_fixed_point green_X, green_Y, green_Z;
-
 
98
   png_fixed_point blue_X, blue_Y, blue_Z;
-
 
99
} png_XYZ;
-
 
100
#endif /* COLORSPACE */
-
 
101
 
-
 
102
#if defined(PNG_COLORSPACE_SUPPORTED) || defined(PNG_GAMMA_SUPPORTED)
-
 
103
/* A colorspace is all the above plus, potentially, profile information,
-
 
104
 * however at present libpng does not use the profile internally so it is only
-
 
105
 * stored in the png_info struct (if iCCP is supported.)  The rendering intent
-
 
106
 * is retained here and is checked.
-
 
107
 *
-
 
108
 * The file gamma encoding information is also stored here and gamma correction
-
 
109
 * is done by libpng, whereas color correction must currently be done by the
-
 
110
 * application.
-
 
111
 */
-
 
112
typedef struct png_colorspace
-
 
113
{
-
 
114
#ifdef PNG_GAMMA_SUPPORTED
-
 
115
   png_fixed_point gamma;        /* File gamma */
-
 
116
#endif
-
 
117
 
-
 
118
#ifdef PNG_COLORSPACE_SUPPORTED
-
 
119
   png_xy      end_points_xy;    /* End points as chromaticities */
-
 
120
   png_XYZ     end_points_XYZ;   /* End points as CIE XYZ colorant values */
-
 
121
   png_uint_16 rendering_intent; /* Rendering intent of a profile */
-
 
122
#endif
-
 
123
 
-
 
124
   /* Flags are always defined to simplify the code. */
-
 
125
   png_uint_16 flags;            /* As defined below */
-
 
126
} png_colorspace, * PNG_RESTRICT png_colorspacerp;
-
 
127
 
-
 
128
typedef const png_colorspace * PNG_RESTRICT png_const_colorspacerp;
-
 
129
 
-
 
130
/* General flags for the 'flags' field */
-
 
131
#define PNG_COLORSPACE_HAVE_GAMMA           0x0001
-
 
132
#define PNG_COLORSPACE_HAVE_ENDPOINTS       0x0002
-
 
133
#define PNG_COLORSPACE_HAVE_INTENT          0x0004
-
 
134
#define PNG_COLORSPACE_FROM_gAMA            0x0008
-
 
135
#define PNG_COLORSPACE_FROM_cHRM            0x0010
-
 
136
#define PNG_COLORSPACE_FROM_sRGB            0x0020
-
 
137
#define PNG_COLORSPACE_ENDPOINTS_MATCH_sRGB 0x0040
-
 
138
#define PNG_COLORSPACE_MATCHES_sRGB         0x0080 /* exact match on profile */
-
 
139
#define PNG_COLORSPACE_INVALID              0x8000
-
 
140
#define PNG_COLORSPACE_CANCEL(flags)        (0xffff ^ (flags))
-
 
141
#endif /* COLORSPACE || GAMMA */
-
 
142
 
Line 28... Line 143...
28
struct png_struct_def
143
struct png_struct_def
29
{
144
{
30
#ifdef PNG_SETJMP_SUPPORTED
145
#ifdef PNG_SETJMP_SUPPORTED
31
   jmp_buf png_jmpbuf;            /* used in png_error */
146
   jmp_buf jmp_buf_local;     /* New name in 1.6.0 for jmp_buf in png_struct */
32
   png_longjmp_ptr longjmp_fn;/* setjmp non-local goto function. */
147
   png_longjmp_ptr longjmp_fn;/* setjmp non-local goto function. */
-
 
148
   jmp_buf *jmp_buf_ptr;      /* passed to longjmp_fn */
-
 
149
   size_t jmp_buf_size;       /* size of the above, if allocated */
33
#endif
150
#endif
34
   png_error_ptr error_fn;    /* function for printing errors and aborting */
151
   png_error_ptr error_fn;    /* function for printing errors and aborting */
-
 
152
#ifdef PNG_WARNINGS_SUPPORTED
35
   png_error_ptr warning_fn;  /* function for printing warnings */
153
   png_error_ptr warning_fn;  /* function for printing warnings */
-
 
154
#endif
36
   png_voidp error_ptr;       /* user supplied struct for error functions */
155
   png_voidp error_ptr;       /* user supplied struct for error functions */
37
   png_rw_ptr write_data_fn;  /* function for writing output data */
156
   png_rw_ptr write_data_fn;  /* function for writing output data */
38
   png_rw_ptr read_data_fn;   /* function for reading input data */
157
   png_rw_ptr read_data_fn;   /* function for reading input data */
39
   png_voidp io_ptr;          /* ptr to application struct for I/O functions */
158
   png_voidp io_ptr;          /* ptr to application struct for I/O functions */
Line 59... Line 178...
59
   png_uint_32 mode;          /* tells us where we are in the PNG file */
178
   png_uint_32 mode;          /* tells us where we are in the PNG file */
60
   png_uint_32 flags;         /* flags indicating various things to libpng */
179
   png_uint_32 flags;         /* flags indicating various things to libpng */
61
   png_uint_32 transformations; /* which transformations to perform */
180
   png_uint_32 transformations; /* which transformations to perform */
Line -... Line 181...
-
 
181
 
62
 
182
   png_uint_32 zowner;        /* ID (chunk type) of zstream owner, 0 if none */
-
 
183
   z_stream    zstream;       /* decompression structure */
-
 
184
 
63
   z_stream zstream;          /* pointer to decompression structure (below) */
185
#ifdef PNG_WRITE_SUPPORTED
64
   png_bytep zbuf;            /* buffer for zlib */
186
   png_compression_bufferp zbuffer_list; /* Created on demand during write */
-
 
187
   uInt                    zbuffer_size; /* size of the actual buffer */
65
   uInt zbuf_size;            /* size of zbuf (typically 65536) */
188
 
66
   int zlib_level;            /* holds zlib compression level */
189
   int zlib_level;            /* holds zlib compression level */
67
   int zlib_method;           /* holds zlib compression method */
190
   int zlib_method;           /* holds zlib compression method */
68
   int zlib_window_bits;      /* holds zlib compression window bits */
191
   int zlib_window_bits;      /* holds zlib compression window bits */
69
   int zlib_mem_level;        /* holds zlib compression memory level */
192
   int zlib_mem_level;        /* holds zlib compression memory level */
-
 
193
   int zlib_strategy;         /* holds zlib compression strategy */
-
 
194
#endif
-
 
195
/* Added at libpng 1.5.4 */
-
 
196
#ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
-
 
197
   int zlib_text_level;            /* holds zlib compression level */
-
 
198
   int zlib_text_method;           /* holds zlib compression method */
-
 
199
   int zlib_text_window_bits;      /* holds zlib compression window bits */
-
 
200
   int zlib_text_mem_level;        /* holds zlib compression memory level */
-
 
201
   int zlib_text_strategy;         /* holds zlib compression strategy */
-
 
202
#endif
-
 
203
/* End of material added at libpng 1.5.4 */
-
 
204
/* Added at libpng 1.6.0 */
-
 
205
#ifdef PNG_WRITE_SUPPORTED
-
 
206
   int zlib_set_level;        /* Actual values set into the zstream on write */
-
 
207
   int zlib_set_method;
-
 
208
   int zlib_set_window_bits;
-
 
209
   int zlib_set_mem_level;
-
 
210
   int zlib_set_strategy;
Line 70... Line 211...
70
   int zlib_strategy;         /* holds zlib compression strategy */
211
#endif
71
 
212
 
72
   png_uint_32 width;         /* width of image in pixels */
213
   png_uint_32 width;         /* width of image in pixels */
73
   png_uint_32 height;        /* height of image in pixels */
214
   png_uint_32 height;        /* height of image in pixels */
74
   png_uint_32 num_rows;      /* number of rows in current pass */
215
   png_uint_32 num_rows;      /* number of rows in current pass */
75
   png_uint_32 usr_width;     /* width of row at start of write */
216
   png_uint_32 usr_width;     /* width of row at start of write */
76
   png_size_t rowbytes;       /* size of row in bytes */
217
   png_size_t rowbytes;       /* size of row in bytes */
-
 
218
   png_uint_32 iwidth;        /* width of current interlaced row in pixels */
77
   png_uint_32 iwidth;        /* width of current interlaced row in pixels */
219
   png_uint_32 row_number;    /* current row in interlace pass */
-
 
220
   png_uint_32 chunk_name;    /* PNG_CHUNK() id of current chunk */
-
 
221
   png_bytep prev_row;        /* buffer to save previous (unfiltered) row.
78
   png_uint_32 row_number;    /* current row in interlace pass */
222
                               * This is a pointer into big_prev_row
-
 
223
                               */
-
 
224
   png_bytep row_buf;         /* buffer to save current (unfiltered) row.
-
 
225
                               * This is a pointer into big_row_buf
79
   png_bytep prev_row;        /* buffer to save previous (unfiltered) row */
226
                               */
80
   png_bytep row_buf;         /* buffer to save current (unfiltered) row */
227
#ifdef PNG_WRITE_SUPPORTED
81
   png_bytep sub_row;         /* buffer to save "sub" row when filtering */
228
   png_bytep sub_row;         /* buffer to save "sub" row when filtering */
82
   png_bytep up_row;          /* buffer to save "up" row when filtering */
229
   png_bytep up_row;          /* buffer to save "up" row when filtering */
-
 
230
   png_bytep avg_row;         /* buffer to save "avg" row when filtering */
83
   png_bytep avg_row;         /* buffer to save "avg" row when filtering */
231
   png_bytep paeth_row;       /* buffer to save "Paeth" row when filtering */
Line 84... Line 232...
84
   png_bytep paeth_row;       /* buffer to save "Paeth" row when filtering */
232
#endif
85
   png_row_info row_info;     /* used for transformation routines */
233
   png_size_t info_rowbytes;  /* Added in 1.5.4: cache of updated row bytes */
86
 
234
 
87
   png_uint_32 idat_size;     /* current IDAT size for read */
235
   png_uint_32 idat_size;     /* current IDAT size for read */
-
 
236
   png_uint_32 crc;           /* current chunk CRC value */
-
 
237
   png_colorp palette;        /* palette from the input file */
-
 
238
   png_uint_16 num_palette;   /* number of color entries in palette */
-
 
239
 
-
 
240
/* Added at libpng-1.5.10 */
-
 
241
#ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
88
   png_uint_32 crc;           /* current chunk CRC value */
242
   int num_palette_max;       /* maximum palette index found in IDAT */
89
   png_colorp palette;        /* palette from the input file */
-
 
90
   png_uint_16 num_palette;   /* number of color entries in palette */
243
#endif
91
   png_uint_16 num_trans;     /* number of transparency values */
244
 
92
   png_byte chunk_name[5];    /* null-terminated name of current chunk */
245
   png_uint_16 num_trans;     /* number of transparency values */
93
   png_byte compression;      /* file compression type (always 0) */
246
   png_byte compression;      /* file compression type (always 0) */
94
   png_byte filter;           /* file filter type (always 0) */
247
   png_byte filter;           /* file filter type (always 0) */
95
   png_byte interlaced;       /* PNG_INTERLACE_NONE, PNG_INTERLACE_ADAM7 */
248
   png_byte interlaced;       /* PNG_INTERLACE_NONE, PNG_INTERLACE_ADAM7 */
96
   png_byte pass;             /* current interlace pass (0 - 6) */
249
   png_byte pass;             /* current interlace pass (0 - 6) */
97
   png_byte do_filter;        /* row filter flags (see PNG_FILTER_ below ) */
250
   png_byte do_filter;        /* row filter flags (see PNG_FILTER_ below ) */
98
   png_byte color_type;       /* color type of file */
251
   png_byte color_type;       /* color type of file */
99
   png_byte bit_depth;        /* bit depth of file */
252
   png_byte bit_depth;        /* bit depth of file */
-
 
253
   png_byte usr_bit_depth;    /* bit depth of users row: write only */
100
   png_byte usr_bit_depth;    /* bit depth of users row */
254
   png_byte pixel_depth;      /* number of bits per pixel */
-
 
255
   png_byte channels;         /* number of channels in file */
101
   png_byte pixel_depth;      /* number of bits per pixel */
256
#ifdef PNG_WRITE_SUPPORTED
102
   png_byte channels;         /* number of channels in file */
-
 
-
 
257
   png_byte usr_channels;     /* channels at start of write: write only */
-
 
258
#endif
-
 
259
   png_byte sig_bytes;        /* magic bytes read/written from start of file */
-
 
260
   png_byte maximum_pixel_depth;
103
   png_byte usr_channels;     /* channels at start of write */
261
                              /* pixel depth used for the row buffers */
104
   png_byte sig_bytes;        /* magic bytes read/written from start of file */
262
   png_byte transformed_pixel_depth;
105
 
263
                              /* pixel depth after read/write transforms */
Line -... Line 264...
-
 
264
#if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)
106
#if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)
265
   png_uint_16 filler;           /* filler bytes for pixel expansion */
107
   png_uint_16 filler;           /* filler bytes for pixel expansion */
266
#endif
108
#endif
267
 
109
 
268
#if defined(PNG_bKGD_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED) ||\
110
#ifdef PNG_bKGD_SUPPORTED
269
   defined(PNG_READ_ALPHA_MODE_SUPPORTED)
111
   png_byte background_gamma_type;
270
   png_byte background_gamma_type;
Line 121... Line 280...
121
   png_uint_32 flush_dist;    /* how many rows apart to flush, 0 - no flush */
280
   png_uint_32 flush_dist;    /* how many rows apart to flush, 0 - no flush */
122
   png_uint_32 flush_rows;    /* number of rows written since last flush */
281
   png_uint_32 flush_rows;    /* number of rows written since last flush */
123
#endif
282
#endif
124
 
283
 
Line 125... Line 284...
125
#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
284
#ifdef PNG_READ_GAMMA_SUPPORTED
126
   int gamma_shift;      /* number of "insignificant" bits in 16-bit gamma */
285
   int gamma_shift;      /* number of "insignificant" bits in 16-bit gamma */
127
   png_fixed_point gamma;        /* file gamma value */
-
 
128
   png_fixed_point screen_gamma; /* screen gamma value (display_exponent) */
286
   png_fixed_point screen_gamma; /* screen gamma value (display_exponent) */
129
#endif
-
 
Line 130... Line -...
130
 
-
 
131
#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
287
 
-
 
288
   png_bytep gamma_table;     /* gamma table for 8-bit depth files */
-
 
289
   png_uint_16pp gamma_16_table; /* gamma table for 16-bit depth files */
-
 
290
#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
-
 
291
   defined(PNG_READ_ALPHA_MODE_SUPPORTED) || \
132
   png_bytep gamma_table;     /* gamma table for 8-bit depth files */
292
   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
133
   png_bytep gamma_from_1;    /* converts from 1.0 to screen */
293
   png_bytep gamma_from_1;    /* converts from 1.0 to screen */
134
   png_bytep gamma_to_1;      /* converts from file to 1.0 */
-
 
135
   png_uint_16pp gamma_16_table; /* gamma table for 16-bit depth files */
294
   png_bytep gamma_to_1;      /* converts from file to 1.0 */
136
   png_uint_16pp gamma_16_from_1; /* converts from 1.0 to screen */
295
   png_uint_16pp gamma_16_from_1; /* converts from 1.0 to screen */
-
 
296
   png_uint_16pp gamma_16_to_1; /* converts from file to 1.0 */
137
   png_uint_16pp gamma_16_to_1; /* converts from file to 1.0 */
297
#endif /* READ_BACKGROUND || READ_ALPHA_MODE || RGB_TO_GRAY */
Line 138... Line 298...
138
#endif
298
#endif
139
 
299
 
140
#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_sBIT_SUPPORTED)
300
#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_sBIT_SUPPORTED)
Line 169... Line 329...
169
   png_size_t current_buffer_size;   /* amount of data now in current_buffer */
329
   png_size_t current_buffer_size;   /* amount of data now in current_buffer */
170
   int process_mode;                 /* what push library is currently doing */
330
   int process_mode;                 /* what push library is currently doing */
171
   int cur_palette;                  /* current push library palette index */
331
   int cur_palette;                  /* current push library palette index */
172
 
332
 
Line 173... Line -...
173
#  ifdef PNG_TEXT_SUPPORTED
-
 
174
     png_size_t current_text_size;   /* current size of text input data */
-
 
175
     png_size_t current_text_left;   /* how much text left to read in input */
-
 
176
     png_charp current_text;         /* current text chunk buffer */
-
 
177
     png_charp current_text_ptr;     /* current location in current_text */
-
 
178
#  endif /* PNG_PROGRESSIVE_READ_SUPPORTED && PNG_TEXT_SUPPORTED */
-
 
179
 
-
 
180
#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
333
#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
Line 181... Line 334...
181
 
334
 
182
#if defined(__TURBOC__) && !defined(_Windows) && !defined(__FLAT__)
335
#if defined(__TURBOC__) && !defined(_Windows) && !defined(__FLAT__)
183
/* For the Borland special 64K segment handler */
336
/* For the Borland special 64K segment handler */
Line 192... Line 345...
192
   png_bytep palette_lookup; /* lookup table for quantizing */
345
   png_bytep palette_lookup; /* lookup table for quantizing */
193
   png_bytep quantize_index; /* index translation for palette files */
346
   png_bytep quantize_index; /* index translation for palette files */
194
#endif
347
#endif
195
 
348
 
Line 196... Line -...
196
#if defined(PNG_READ_QUANTIZE_SUPPORTED) || defined(PNG_hIST_SUPPORTED)
-
 
197
   png_uint_16p hist;                /* histogram */
-
 
198
#endif
-
 
199
 
-
 
200
#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
349
#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
201
   png_byte heuristic_method;        /* heuristic for row filter selection */
350
   png_byte heuristic_method;        /* heuristic for row filter selection */
202
   png_byte num_prev_filters;        /* number of weights for previous rows */
351
   png_byte num_prev_filters;        /* number of weights for previous rows */
203
   png_bytep prev_filters;           /* filter type(s) of previous row(s) */
352
   png_bytep prev_filters;           /* filter type(s) of previous row(s) */
204
   png_uint_16p filter_weights;      /* weight(s) for previous line(s) */
353
   png_uint_16p filter_weights;      /* weight(s) for previous line(s) */
205
   png_uint_16p inv_filter_weights;  /* 1/weight(s) for previous line(s) */
354
   png_uint_16p inv_filter_weights;  /* 1/weight(s) for previous line(s) */
206
   png_uint_16p filter_costs;        /* relative filter calculation cost */
355
   png_uint_16p filter_costs;        /* relative filter calculation cost */
207
   png_uint_16p inv_filter_costs;    /* 1/relative filter calculation cost */
356
   png_uint_16p inv_filter_costs;    /* 1/relative filter calculation cost */
208
#endif
357
#endif
Line -... Line 358...
-
 
358
 
-
 
359
   /* Options */
-
 
360
#ifdef PNG_SET_OPTION_SUPPORTED
-
 
361
   png_byte options;           /* On/off state (up to 4 options) */
-
 
362
#endif
-
 
363
 
-
 
364
#if PNG_LIBPNG_VER < 10700
209
 
365
/* To do: remove this from libpng-1.7 */
210
#ifdef PNG_TIME_RFC1123_SUPPORTED
366
#ifdef PNG_TIME_RFC1123_SUPPORTED
-
 
367
   char time_buffer[29]; /* String to hold RFC 1123 time text */
211
   png_charp time_buffer; /* String to hold RFC 1123 time text */
368
#endif
Line 212... Line 369...
212
#endif
369
#endif
Line 213... Line 370...
213
 
370
 
Line 214... Line 371...
214
/* New members added in libpng-1.0.6 */
371
/* New members added in libpng-1.0.6 */
215
 
372
 
-
 
373
   png_uint_32 free_me;    /* flags items libpng is responsible for freeing */
216
   png_uint_32 free_me;    /* flags items libpng is responsible for freeing */
374
 
217
 
375
#ifdef PNG_USER_CHUNKS_SUPPORTED
-
 
376
   png_voidp user_chunk_ptr;
Line 218... Line 377...
218
#ifdef PNG_USER_CHUNKS_SUPPORTED
377
#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
-
 
378
   png_user_chunk_ptr read_user_chunk_fn; /* user read chunk handler */
219
   png_voidp user_chunk_ptr;
379
#endif
220
   png_user_chunk_ptr read_user_chunk_fn; /* user read chunk handler */
380
#endif
-
 
381
 
221
#endif
382
#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
Line 222... Line 383...
222
 
383
   int          unknown_default; /* As PNG_HANDLE_* */
223
#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
384
   unsigned int num_chunk_list;  /* Number of entries in the list */
224
   int num_chunk_list;
385
   png_bytep    chunk_list;      /* List of png_byte[5]; the textual chunk name
-
 
386
                                  * followed by a PNG_HANDLE_* byte */
-
 
387
#endif
225
   png_bytep chunk_list;
388
 
226
#endif
389
/* New members added in libpng-1.0.3 */
227
 
390
#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
228
/* New members added in libpng-1.0.3 */
391
   png_byte rgb_to_gray_status;
229
#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
392
   /* Added in libpng 1.5.5 to record setting of coefficients: */
Line 230... Line 393...
230
   png_byte rgb_to_gray_status;
393
   png_byte rgb_to_gray_coefficients_set;
231
   /* These were changed from png_byte in libpng-1.0.6 */
394
   /* These were changed from png_byte in libpng-1.0.6 */
232
   png_uint_16 rgb_to_gray_red_coeff;
-
 
233
   png_uint_16 rgb_to_gray_green_coeff;
-
 
234
   png_uint_16 rgb_to_gray_blue_coeff;
395
   png_uint_16 rgb_to_gray_red_coeff;
235
#endif
396
   png_uint_16 rgb_to_gray_green_coeff;
236
 
397
   /* deleted in 1.5.5: rgb_to_gray_blue_coeff; */
Line 237... Line 398...
237
/* New member added in libpng-1.0.4 (renamed in 1.0.9) */
398
#endif
Line 286... Line 447...
286
   png_alloc_size_t user_chunk_malloc_max;
447
   png_alloc_size_t user_chunk_malloc_max;
287
#endif
448
#endif
288
 
449
 
Line 289... Line 450...
289
/* New member added in libpng-1.0.25 and 1.2.17 */
450
/* New member added in libpng-1.0.25 and 1.2.17 */
290
#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
451
#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
291
   /* Storage for unknown chunk that the library doesn't recognize. */
452
   /* Temporary storage for unknown chunk that the library doesn't recognize,
-
 
453
    * used while reading the chunk.
-
 
454
    */
292
   png_unknown_chunk unknown_chunk;
455
   png_unknown_chunk unknown_chunk;
293
#endif
456
#endif
Line 294... Line 457...
294
 
457
 
295
/* New members added in libpng-1.2.26 */
458
/* New member added in libpng-1.2.26 */
296
  png_size_t old_big_row_buf_size;
-
 
Line -... Line 459...
-
 
459
  png_size_t old_big_row_buf_size;
297
  png_size_t old_prev_row_size;
460
 
298
 
461
#ifdef PNG_READ_SUPPORTED
-
 
462
/* New member added in libpng-1.2.30 */
-
 
463
  png_bytep        read_buffer;      /* buffer for reading chunk data */
-
 
464
  png_alloc_size_t read_buffer_size; /* current size of the buffer */
-
 
465
#endif
-
 
466
#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
Line 299... Line 467...
299
/* New member added in libpng-1.2.30 */
467
  uInt             IDAT_read_size;   /* limit on read buffer size for IDAT */
300
  png_charp chunkdata;  /* buffer for reading chunk data */
468
#endif
301
 
469
 
302
#ifdef PNG_IO_STATE_SUPPORTED
470
#ifdef PNG_IO_STATE_SUPPORTED
-
 
471
/* New member added in libpng-1.4.0 */
-
 
472
   png_uint_32 io_state;
-
 
473
#endif
-
 
474
 
-
 
475
/* New member added in libpng-1.5.6 */
-
 
476
   png_bytep big_prev_row;
-
 
477
 
-
 
478
/* New member added in libpng-1.5.7 */
-
 
479
   void (*read_filter[PNG_FILTER_VALUE_LAST-1])(png_row_infop row_info,
-
 
480
      png_bytep row, png_const_bytep prev_row);
-
 
481
 
-
 
482
#ifdef PNG_READ_SUPPORTED
-
 
483
#if defined(PNG_COLORSPACE_SUPPORTED) || defined(PNG_GAMMA_SUPPORTED)
303
/* New member added in libpng-1.4.0 */
484
   png_colorspace   colorspace;
304
   png_uint_32 io_state;
485
#endif