diff options
| author | John Bowler <jbowler@acm.org> | 2012-08-09 21:17:56 -0500 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2012-08-09 21:17:56 -0500 |
| commit | dff6f4c4f06f655309783673f3ec5ce7d4d03810 (patch) | |
| tree | 5cc6053d5dd64186d37b909c89467ad1fd376a3c /pngstruct.h | |
| parent | 432c174b64198c5d4d7dbc0b5b0048d113663dba (diff) | |
[libpng16Cleanup of png_set_filler(). This function does very different things
on read and write. In libpng 1.6 the two cases can be distinguished and
considerable code cleanup, and extra error checking, is possible. This
makes calls on the write side that have no effect be ignored with a
png_app_error(), which can be disabled in the app using
png_set_benign_errors(), and removes the spurious use of usr_channels
on the read side.
Diffstat (limited to 'pngstruct.h')
| -rw-r--r-- | pngstruct.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pngstruct.h b/pngstruct.h index 8a63ff91f..d1bcf322f 100644 --- a/pngstruct.h +++ b/pngstruct.h @@ -252,7 +252,9 @@ struct png_struct_def png_byte usr_bit_depth; /* bit depth of users row: write only */ png_byte pixel_depth; /* number of bits per pixel */ png_byte channels; /* number of channels in file */ +#ifdef PNG_WRITE_SUPPORTED png_byte usr_channels; /* channels at start of write: write only */ +#endif png_byte sig_bytes; /* magic bytes read/written from start of file */ png_byte maximum_pixel_depth; /* pixel depth used for the row buffers */ |