Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2 | /* pngrtran.c - transforms the data in a row for PNG readers |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 3 | * |
Glenn Randers-Pehrson | 212fd57 | 2014-06-11 21:10:16 -0500 | [diff] [blame] | 4 | * Last changed in libpng 1.6.11 [June 5, 2014] |
Glenn Randers-Pehrson | 95a1973 | 2013-12-31 21:10:13 -0600 | [diff] [blame] | 5 | * Copyright (c) 1998-2014 Glenn Randers-Pehrson |
Glenn Randers-Pehrson | d436672 | 2000-06-04 14:29:29 -0500 | [diff] [blame] | 6 | * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) |
| 7 | * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 8 | * |
Glenn Randers-Pehrson | bfbf865 | 2009-06-26 21:46:52 -0500 | [diff] [blame] | 9 | * This code is released under the libpng license. |
Glenn Randers-Pehrson | c332bbc | 2009-06-25 13:43:50 -0500 | [diff] [blame] | 10 | * For conditions of distribution and use, see the disclaimer |
Glenn Randers-Pehrson | 037023b | 2009-06-24 10:27:36 -0500 | [diff] [blame] | 11 | * and license in png.h |
Glenn Randers-Pehrson | 3e61d79 | 2009-06-24 09:31:28 -0500 | [diff] [blame] | 12 | * |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 13 | * This file contains functions optionally called by an application |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 14 | * in order to tell libpng how to handle data when reading a PNG. |
Glenn Randers-Pehrson | 8686fff | 1998-05-21 09:27:50 -0500 | [diff] [blame] | 15 | * Transformations that are used in both reading and writing are |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 16 | * in pngtrans.c. |
| 17 | */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 18 | |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 19 | #include "pngpriv.h" |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 20 | |
Glenn Randers-Pehrson | c3cd22b | 2010-03-08 21:10:25 -0600 | [diff] [blame] | 21 | #ifdef PNG_READ_SUPPORTED |
| 22 | |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 23 | /* Set the action on getting a CRC error for an ancillary or critical chunk. */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 24 | void PNGAPI |
John Bowler | 5d56786 | 2011-12-24 09:12:00 -0600 | [diff] [blame] | 25 | png_set_crc_action(png_structrp png_ptr, int crit_action, int ancil_action) |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 26 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 27 | png_debug(1, "in png_set_crc_action"); |
Glenn Randers-Pehrson | 821b710 | 2010-06-24 16:16:32 -0500 | [diff] [blame] | 28 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 29 | if (png_ptr == NULL) |
| 30 | return; |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 31 | |
| 32 | /* Tell libpng how we react to CRC errors in critical chunks */ |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 33 | switch (crit_action) |
| 34 | { |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 35 | case PNG_CRC_NO_CHANGE: /* Leave setting as is */ |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 36 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 37 | |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 38 | case PNG_CRC_WARN_USE: /* Warn/use data */ |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 39 | png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK; |
| 40 | png_ptr->flags |= PNG_FLAG_CRC_CRITICAL_USE; |
| 41 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 42 | |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 43 | case PNG_CRC_QUIET_USE: /* Quiet/use data */ |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 44 | png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK; |
| 45 | png_ptr->flags |= PNG_FLAG_CRC_CRITICAL_USE | |
| 46 | PNG_FLAG_CRC_CRITICAL_IGNORE; |
| 47 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 48 | |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 49 | case PNG_CRC_WARN_DISCARD: /* Not a valid action for critical data */ |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 50 | png_warning(png_ptr, |
| 51 | "Can't discard critical data on CRC error"); |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 52 | case PNG_CRC_ERROR_QUIT: /* Error/quit */ |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 53 | |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 54 | case PNG_CRC_DEFAULT: |
| 55 | default: |
| 56 | png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK; |
| 57 | break; |
| 58 | } |
| 59 | |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 60 | /* Tell libpng how we react to CRC errors in ancillary chunks */ |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 61 | switch (ancil_action) |
| 62 | { |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 63 | case PNG_CRC_NO_CHANGE: /* Leave setting as is */ |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 64 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 65 | |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 66 | case PNG_CRC_WARN_USE: /* Warn/use data */ |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 67 | png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK; |
| 68 | png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_USE; |
| 69 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 70 | |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 71 | case PNG_CRC_QUIET_USE: /* Quiet/use data */ |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 72 | png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK; |
| 73 | png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_USE | |
| 74 | PNG_FLAG_CRC_ANCILLARY_NOWARN; |
| 75 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 76 | |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 77 | case PNG_CRC_ERROR_QUIT: /* Error/quit */ |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 78 | png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK; |
| 79 | png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_NOWARN; |
| 80 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 81 | |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 82 | case PNG_CRC_WARN_DISCARD: /* Warn/discard data */ |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 83 | |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 84 | case PNG_CRC_DEFAULT: |
| 85 | default: |
| 86 | png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK; |
| 87 | break; |
| 88 | } |
| 89 | } |
| 90 | |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 91 | #ifdef PNG_READ_TRANSFORMS_SUPPORTED |
| 92 | /* Is it OK to set a transformation now? Only if png_start_read_image or |
| 93 | * png_read_update_info have not been called. It is not necessary for the IHDR |
| 94 | * to have been read in all cases, the parameter allows for this check too. |
| 95 | */ |
| 96 | static int |
| 97 | png_rtran_ok(png_structrp png_ptr, int need_IHDR) |
| 98 | { |
| 99 | if (png_ptr != NULL) |
| 100 | { |
| 101 | if (png_ptr->flags & PNG_FLAG_ROW_INIT) |
| 102 | png_app_error(png_ptr, |
| 103 | "invalid after png_start_read_image or png_read_update_info"); |
| 104 | |
| 105 | else if (need_IHDR && (png_ptr->mode & PNG_HAVE_IHDR) == 0) |
| 106 | png_app_error(png_ptr, "invalid before the PNG header has been read"); |
| 107 | |
| 108 | else |
| 109 | { |
| 110 | /* Turn on failure to initialize correctly for all transforms. */ |
| 111 | png_ptr->flags |= PNG_FLAG_DETECT_UNINITIALIZED; |
| 112 | |
| 113 | return 1; /* Ok */ |
| 114 | } |
| 115 | } |
| 116 | |
| 117 | return 0; /* no png_error possible! */ |
| 118 | } |
| 119 | #endif |
| 120 | |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 121 | #ifdef PNG_READ_BACKGROUND_SUPPORTED |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 122 | /* Handle alpha and tRNS via a background color */ |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 123 | void PNGFAPI |
John Bowler | 5d56786 | 2011-12-24 09:12:00 -0600 | [diff] [blame] | 124 | png_set_background_fixed(png_structrp png_ptr, |
Glenn Randers-Pehrson | e600c51 | 2010-08-18 07:25:46 -0500 | [diff] [blame] | 125 | png_const_color_16p background_color, int background_gamma_code, |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 126 | int need_expand, png_fixed_point background_gamma) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 127 | { |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 128 | png_debug(1, "in png_set_background_fixed"); |
Glenn Randers-Pehrson | 821b710 | 2010-06-24 16:16:32 -0500 | [diff] [blame] | 129 | |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 130 | if (!png_rtran_ok(png_ptr, 0) || background_color == NULL) |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 131 | return; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 132 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 133 | if (background_gamma_code == PNG_BACKGROUND_GAMMA_UNKNOWN) |
| 134 | { |
| 135 | png_warning(png_ptr, "Application must supply a known background gamma"); |
| 136 | return; |
| 137 | } |
| 138 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 139 | png_ptr->transformations |= PNG_COMPOSE | PNG_STRIP_ALPHA; |
| 140 | png_ptr->transformations &= ~PNG_ENCODE_ALPHA; |
| 141 | png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA; |
| 142 | |
John Bowler | fcd301d | 2011-12-28 21:34:27 -0600 | [diff] [blame] | 143 | png_ptr->background = *background_color; |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 144 | png_ptr->background_gamma = background_gamma; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 145 | png_ptr->background_gamma_type = (png_byte)(background_gamma_code); |
Glenn Randers-Pehrson | 0567015 | 2014-03-08 12:39:52 -0600 | [diff] [blame] | 146 | if (need_expand != 0) |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 147 | png_ptr->transformations |= PNG_BACKGROUND_EXPAND; |
| 148 | else |
| 149 | png_ptr->transformations &= ~PNG_BACKGROUND_EXPAND; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 150 | } |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 151 | |
| 152 | # ifdef PNG_FLOATING_POINT_SUPPORTED |
| 153 | void PNGAPI |
John Bowler | 5d56786 | 2011-12-24 09:12:00 -0600 | [diff] [blame] | 154 | png_set_background(png_structrp png_ptr, |
Glenn Randers-Pehrson | e600c51 | 2010-08-18 07:25:46 -0500 | [diff] [blame] | 155 | png_const_color_16p background_color, int background_gamma_code, |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 156 | int need_expand, double background_gamma) |
| 157 | { |
| 158 | png_set_background_fixed(png_ptr, background_color, background_gamma_code, |
| 159 | need_expand, png_fixed(png_ptr, background_gamma, "png_set_background")); |
| 160 | } |
| 161 | # endif /* FLOATING_POINT */ |
| 162 | #endif /* READ_BACKGROUND */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 163 | |
John Bowler | 8d26126 | 2011-06-18 13:37:11 -0500 | [diff] [blame] | 164 | /* Scale 16-bit depth files to 8-bit depth. If both of these are set then the |
| 165 | * one that pngrtran does first (scale) happens. This is necessary to allow the |
| 166 | * TRANSFORM and API behavior to be somewhat consistent, and it's simpler. |
| 167 | */ |
| 168 | #ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 169 | void PNGAPI |
John Bowler | 5d56786 | 2011-12-24 09:12:00 -0600 | [diff] [blame] | 170 | png_set_scale_16(png_structrp png_ptr) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 171 | { |
Glenn Randers-Pehrson | a7428d4 | 2011-06-17 19:07:04 -0500 | [diff] [blame] | 172 | png_debug(1, "in png_set_scale_16"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 173 | |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 174 | if (!png_rtran_ok(png_ptr, 0)) |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 175 | return; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 176 | |
Glenn Randers-Pehrson | ab63dd0 | 2011-06-17 20:04:17 -0500 | [diff] [blame] | 177 | png_ptr->transformations |= PNG_SCALE_16_TO_8; |
Glenn Randers-Pehrson | 413138a | 2011-06-13 22:07:37 -0500 | [diff] [blame] | 178 | } |
John Bowler | 8d26126 | 2011-06-18 13:37:11 -0500 | [diff] [blame] | 179 | #endif |
Glenn Randers-Pehrson | 413138a | 2011-06-13 22:07:37 -0500 | [diff] [blame] | 180 | |
John Bowler | 8d26126 | 2011-06-18 13:37:11 -0500 | [diff] [blame] | 181 | #ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED |
Glenn Randers-Pehrson | 413138a | 2011-06-13 22:07:37 -0500 | [diff] [blame] | 182 | /* Chop 16-bit depth files to 8-bit depth */ |
| 183 | void PNGAPI |
John Bowler | 5d56786 | 2011-12-24 09:12:00 -0600 | [diff] [blame] | 184 | png_set_strip_16(png_structrp png_ptr) |
Glenn Randers-Pehrson | 413138a | 2011-06-13 22:07:37 -0500 | [diff] [blame] | 185 | { |
Glenn Randers-Pehrson | ab63dd0 | 2011-06-17 20:04:17 -0500 | [diff] [blame] | 186 | png_debug(1, "in png_set_strip_16"); |
Glenn Randers-Pehrson | 413138a | 2011-06-13 22:07:37 -0500 | [diff] [blame] | 187 | |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 188 | if (!png_rtran_ok(png_ptr, 0)) |
Glenn Randers-Pehrson | 413138a | 2011-06-13 22:07:37 -0500 | [diff] [blame] | 189 | return; |
| 190 | |
Glenn Randers-Pehrson | ab63dd0 | 2011-06-17 20:04:17 -0500 | [diff] [blame] | 191 | png_ptr->transformations |= PNG_16_TO_8; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 192 | } |
John Bowler | 8d26126 | 2011-06-18 13:37:11 -0500 | [diff] [blame] | 193 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 194 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 195 | #ifdef PNG_READ_STRIP_ALPHA_SUPPORTED |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 196 | void PNGAPI |
John Bowler | 5d56786 | 2011-12-24 09:12:00 -0600 | [diff] [blame] | 197 | png_set_strip_alpha(png_structrp png_ptr) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 198 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 199 | png_debug(1, "in png_set_strip_alpha"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 200 | |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 201 | if (!png_rtran_ok(png_ptr, 0)) |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 202 | return; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 203 | |
John Bowler | 9b872f4 | 2011-02-12 09:00:16 -0600 | [diff] [blame] | 204 | png_ptr->transformations |= PNG_STRIP_ALPHA; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 205 | } |
| 206 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 207 | |
John Bowler | f70c7d0 | 2011-05-10 22:54:37 -0500 | [diff] [blame] | 208 | #if defined(PNG_READ_ALPHA_MODE_SUPPORTED) || defined(PNG_READ_GAMMA_SUPPORTED) |
| 209 | static png_fixed_point |
John Bowler | 5d56786 | 2011-12-24 09:12:00 -0600 | [diff] [blame] | 210 | translate_gamma_flags(png_structrp png_ptr, png_fixed_point output_gamma, |
John Bowler | f70c7d0 | 2011-05-10 22:54:37 -0500 | [diff] [blame] | 211 | int is_screen) |
| 212 | { |
| 213 | /* Check for flag values. The main reason for having the old Mac value as a |
| 214 | * flag is that it is pretty near impossible to work out what the correct |
| 215 | * value is from Apple documentation - a working Mac system is needed to |
| 216 | * discover the value! |
| 217 | */ |
| 218 | if (output_gamma == PNG_DEFAULT_sRGB || |
| 219 | output_gamma == PNG_FP_1 / PNG_DEFAULT_sRGB) |
| 220 | { |
| 221 | /* If there is no sRGB support this just sets the gamma to the standard |
| 222 | * sRGB value. (This is a side effect of using this function!) |
| 223 | */ |
| 224 | # ifdef PNG_READ_sRGB_SUPPORTED |
| 225 | png_ptr->flags |= PNG_FLAG_ASSUME_sRGB; |
John Bowler | e4413a7 | 2013-04-17 21:27:47 -0500 | [diff] [blame] | 226 | # else |
| 227 | PNG_UNUSED(png_ptr) |
John Bowler | f70c7d0 | 2011-05-10 22:54:37 -0500 | [diff] [blame] | 228 | # endif |
Glenn Randers-Pehrson | 0567015 | 2014-03-08 12:39:52 -0600 | [diff] [blame] | 229 | if (is_screen != 0) |
John Bowler | f70c7d0 | 2011-05-10 22:54:37 -0500 | [diff] [blame] | 230 | output_gamma = PNG_GAMMA_sRGB; |
| 231 | else |
| 232 | output_gamma = PNG_GAMMA_sRGB_INVERSE; |
| 233 | } |
| 234 | |
| 235 | else if (output_gamma == PNG_GAMMA_MAC_18 || |
| 236 | output_gamma == PNG_FP_1 / PNG_GAMMA_MAC_18) |
| 237 | { |
Glenn Randers-Pehrson | 0567015 | 2014-03-08 12:39:52 -0600 | [diff] [blame] | 238 | if (is_screen != 0) |
John Bowler | f70c7d0 | 2011-05-10 22:54:37 -0500 | [diff] [blame] | 239 | output_gamma = PNG_GAMMA_MAC_OLD; |
| 240 | else |
| 241 | output_gamma = PNG_GAMMA_MAC_INVERSE; |
| 242 | } |
| 243 | |
| 244 | return output_gamma; |
| 245 | } |
| 246 | |
| 247 | # ifdef PNG_FLOATING_POINT_SUPPORTED |
| 248 | static png_fixed_point |
John Bowler | 5d56786 | 2011-12-24 09:12:00 -0600 | [diff] [blame] | 249 | convert_gamma_value(png_structrp png_ptr, double output_gamma) |
John Bowler | f70c7d0 | 2011-05-10 22:54:37 -0500 | [diff] [blame] | 250 | { |
| 251 | /* The following silently ignores cases where fixed point (times 100,000) |
| 252 | * gamma values are passed to the floating point API. This is safe and it |
| 253 | * means the fixed point constants work just fine with the floating point |
| 254 | * API. The alternative would just lead to undetected errors and spurious |
| 255 | * bug reports. Negative values fail inside the _fixed API unless they |
| 256 | * correspond to the flag values. |
| 257 | */ |
| 258 | if (output_gamma > 0 && output_gamma < 128) |
| 259 | output_gamma *= PNG_FP_1; |
| 260 | |
| 261 | /* This preserves -1 and -2 exactly: */ |
| 262 | output_gamma = floor(output_gamma + .5); |
| 263 | |
| 264 | if (output_gamma > PNG_FP_MAX || output_gamma < PNG_FP_MIN) |
| 265 | png_fixed_error(png_ptr, "gamma value"); |
| 266 | |
| 267 | return (png_fixed_point)output_gamma; |
| 268 | } |
| 269 | # endif |
| 270 | #endif /* READ_ALPHA_MODE || READ_GAMMA */ |
| 271 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 272 | #ifdef PNG_READ_ALPHA_MODE_SUPPORTED |
| 273 | void PNGFAPI |
John Bowler | 5d56786 | 2011-12-24 09:12:00 -0600 | [diff] [blame] | 274 | png_set_alpha_mode_fixed(png_structrp png_ptr, int mode, |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 275 | png_fixed_point output_gamma) |
| 276 | { |
| 277 | int compose = 0; |
| 278 | png_fixed_point file_gamma; |
| 279 | |
| 280 | png_debug(1, "in png_set_alpha_mode"); |
| 281 | |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 282 | if (!png_rtran_ok(png_ptr, 0)) |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 283 | return; |
| 284 | |
John Bowler | f70c7d0 | 2011-05-10 22:54:37 -0500 | [diff] [blame] | 285 | output_gamma = translate_gamma_flags(png_ptr, output_gamma, 1/*screen*/); |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 286 | |
John Bowler | f70c7d0 | 2011-05-10 22:54:37 -0500 | [diff] [blame] | 287 | /* Validate the value to ensure it is in a reasonable range. The value |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 288 | * is expected to be 1 or greater, but this range test allows for some |
| 289 | * viewing correction values. The intent is to weed out users of this API |
| 290 | * who use the inverse of the gamma value accidentally! Since some of these |
| 291 | * values are reasonable this may have to be changed. |
| 292 | */ |
John Bowler | f70c7d0 | 2011-05-10 22:54:37 -0500 | [diff] [blame] | 293 | if (output_gamma < 70000 || output_gamma > 300000) |
Glenn Randers-Pehrson | e9eeb74 | 2011-05-08 19:38:42 -0500 | [diff] [blame] | 294 | png_error(png_ptr, "output gamma out of expected range"); |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 295 | |
Glenn Randers-Pehrson | c782251 | 2011-05-07 21:23:43 -0500 | [diff] [blame] | 296 | /* The default file gamma is the inverse of the output gamma; the output |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 297 | * gamma may be changed below so get the file value first: |
| 298 | */ |
| 299 | file_gamma = png_reciprocal(output_gamma); |
| 300 | |
| 301 | /* There are really 8 possibilities here, composed of any combination |
| 302 | * of: |
| 303 | * |
| 304 | * premultiply the color channels |
| 305 | * do not encode non-opaque pixels |
| 306 | * encode the alpha as well as the color channels |
| 307 | * |
| 308 | * The differences disappear if the input/output ('screen') gamma is 1.0, |
| 309 | * because then the encoding is a no-op and there is only the choice of |
| 310 | * premultiplying the color channels or not. |
| 311 | * |
| 312 | * png_set_alpha_mode and png_set_background interact because both use |
| 313 | * png_compose to do the work. Calling both is only useful when |
| 314 | * png_set_alpha_mode is used to set the default mode - PNG_ALPHA_PNG - along |
| 315 | * with a default gamma value. Otherwise PNG_COMPOSE must not be set. |
| 316 | */ |
| 317 | switch (mode) |
| 318 | { |
| 319 | case PNG_ALPHA_PNG: /* default: png standard */ |
| 320 | /* No compose, but it may be set by png_set_background! */ |
| 321 | png_ptr->transformations &= ~PNG_ENCODE_ALPHA; |
| 322 | png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA; |
| 323 | break; |
| 324 | |
| 325 | case PNG_ALPHA_ASSOCIATED: /* color channels premultiplied */ |
| 326 | compose = 1; |
| 327 | png_ptr->transformations &= ~PNG_ENCODE_ALPHA; |
| 328 | png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA; |
| 329 | /* The output is linear: */ |
| 330 | output_gamma = PNG_FP_1; |
| 331 | break; |
| 332 | |
| 333 | case PNG_ALPHA_OPTIMIZED: /* associated, non-opaque pixels linear */ |
| 334 | compose = 1; |
| 335 | png_ptr->transformations &= ~PNG_ENCODE_ALPHA; |
| 336 | png_ptr->flags |= PNG_FLAG_OPTIMIZE_ALPHA; |
| 337 | /* output_gamma records the encoding of opaque pixels! */ |
| 338 | break; |
| 339 | |
| 340 | case PNG_ALPHA_BROKEN: /* associated, non-linear, alpha encoded */ |
| 341 | compose = 1; |
| 342 | png_ptr->transformations |= PNG_ENCODE_ALPHA; |
| 343 | png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA; |
| 344 | break; |
| 345 | |
| 346 | default: |
| 347 | png_error(png_ptr, "invalid alpha mode"); |
| 348 | } |
| 349 | |
| 350 | /* Only set the default gamma if the file gamma has not been set (this has |
| 351 | * the side effect that the gamma in a second call to png_set_alpha_mode will |
| 352 | * be ignored.) |
| 353 | */ |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 354 | if (png_ptr->colorspace.gamma == 0) |
| 355 | { |
| 356 | png_ptr->colorspace.gamma = file_gamma; |
| 357 | png_ptr->colorspace.flags |= PNG_COLORSPACE_HAVE_GAMMA; |
| 358 | } |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 359 | |
| 360 | /* But always set the output gamma: */ |
| 361 | png_ptr->screen_gamma = output_gamma; |
| 362 | |
Glenn Randers-Pehrson | c782251 | 2011-05-07 21:23:43 -0500 | [diff] [blame] | 363 | /* Finally, if pre-multiplying, set the background fields to achieve the |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 364 | * desired result. |
| 365 | */ |
Glenn Randers-Pehrson | 0567015 | 2014-03-08 12:39:52 -0600 | [diff] [blame] | 366 | if (compose != 0) |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 367 | { |
| 368 | /* And obtain alpha pre-multiplication by composing on black: */ |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 369 | memset(&png_ptr->background, 0, (sizeof png_ptr->background)); |
| 370 | png_ptr->background_gamma = png_ptr->colorspace.gamma; /* just in case */ |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 371 | png_ptr->background_gamma_type = PNG_BACKGROUND_GAMMA_FILE; |
| 372 | png_ptr->transformations &= ~PNG_BACKGROUND_EXPAND; |
| 373 | |
| 374 | if (png_ptr->transformations & PNG_COMPOSE) |
| 375 | png_error(png_ptr, |
| 376 | "conflicting calls to set alpha mode and background"); |
| 377 | |
| 378 | png_ptr->transformations |= PNG_COMPOSE; |
| 379 | } |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 380 | } |
| 381 | |
| 382 | # ifdef PNG_FLOATING_POINT_SUPPORTED |
| 383 | void PNGAPI |
John Bowler | 5d56786 | 2011-12-24 09:12:00 -0600 | [diff] [blame] | 384 | png_set_alpha_mode(png_structrp png_ptr, int mode, double output_gamma) |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 385 | { |
John Bowler | f70c7d0 | 2011-05-10 22:54:37 -0500 | [diff] [blame] | 386 | png_set_alpha_mode_fixed(png_ptr, mode, convert_gamma_value(png_ptr, |
| 387 | output_gamma)); |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 388 | } |
| 389 | # endif |
| 390 | #endif |
| 391 | |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 392 | #ifdef PNG_READ_QUANTIZE_SUPPORTED |
Glenn Randers-Pehrson | 55fbff3 | 2011-05-17 06:49:32 -0500 | [diff] [blame] | 393 | /* Dither file to 8-bit. Supply a palette, the current number |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 394 | * of elements in the palette, the maximum number of elements |
| 395 | * allowed, and a histogram if possible. If the current number |
| 396 | * of colors is greater then the maximum number, the palette will be |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 397 | * modified to fit in the maximum number. "full_quantize" indicates |
| 398 | * whether we need a quantizing cube set up for RGB images, or if we |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 399 | * simply are reducing the number of colors in a paletted image. |
| 400 | */ |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 401 | |
| 402 | typedef struct png_dsort_struct |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 403 | { |
John Bowler | baeb6d1 | 2011-11-26 18:21:02 -0600 | [diff] [blame] | 404 | struct png_dsort_struct * next; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 405 | png_byte left; |
| 406 | png_byte right; |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 407 | } png_dsort; |
John Bowler | baeb6d1 | 2011-11-26 18:21:02 -0600 | [diff] [blame] | 408 | typedef png_dsort * png_dsortp; |
| 409 | typedef png_dsort * * png_dsortpp; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 410 | |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 411 | void PNGAPI |
John Bowler | 5d56786 | 2011-12-24 09:12:00 -0600 | [diff] [blame] | 412 | png_set_quantize(png_structrp png_ptr, png_colorp palette, |
Glenn Randers-Pehrson | e600c51 | 2010-08-18 07:25:46 -0500 | [diff] [blame] | 413 | int num_palette, int maximum_colors, png_const_uint_16p histogram, |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 414 | int full_quantize) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 415 | { |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 416 | png_debug(1, "in png_set_quantize"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 417 | |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 418 | if (!png_rtran_ok(png_ptr, 0)) |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 419 | return; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 420 | |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 421 | png_ptr->transformations |= PNG_QUANTIZE; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 422 | |
Glenn Randers-Pehrson | 0567015 | 2014-03-08 12:39:52 -0600 | [diff] [blame] | 423 | if (full_quantize == 0) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 424 | { |
| 425 | int i; |
| 426 | |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 427 | png_ptr->quantize_index = (png_bytep)png_malloc(png_ptr, |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 428 | (png_uint_32)(num_palette * (sizeof (png_byte)))); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 429 | for (i = 0; i < num_palette; i++) |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 430 | png_ptr->quantize_index[i] = (png_byte)i; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 431 | } |
| 432 | |
| 433 | if (num_palette > maximum_colors) |
| 434 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 435 | if (histogram != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 436 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 437 | /* This is easy enough, just throw out the least used colors. |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 438 | * Perhaps not the best solution, but good enough. |
| 439 | */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 440 | |
| 441 | int i; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 442 | |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 443 | /* Initialize an array to sort colors */ |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 444 | png_ptr->quantize_sort = (png_bytep)png_malloc(png_ptr, |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 445 | (png_uint_32)(num_palette * (sizeof (png_byte)))); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 446 | |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 447 | /* Initialize the quantize_sort array */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 448 | for (i = 0; i < num_palette; i++) |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 449 | png_ptr->quantize_sort[i] = (png_byte)i; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 450 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 451 | /* Find the least used palette entries by starting a |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 452 | * bubble sort, and running it until we have sorted |
| 453 | * out enough colors. Note that we don't care about |
| 454 | * sorting all the colors, just finding which are |
| 455 | * least used. |
| 456 | */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 457 | |
| 458 | for (i = num_palette - 1; i >= maximum_colors; i--) |
| 459 | { |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 460 | int done; /* To stop early if the list is pre-sorted */ |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 461 | int j; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 462 | |
| 463 | done = 1; |
| 464 | for (j = 0; j < i; j++) |
| 465 | { |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 466 | if (histogram[png_ptr->quantize_sort[j]] |
| 467 | < histogram[png_ptr->quantize_sort[j + 1]]) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 468 | { |
| 469 | png_byte t; |
| 470 | |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 471 | t = png_ptr->quantize_sort[j]; |
| 472 | png_ptr->quantize_sort[j] = png_ptr->quantize_sort[j + 1]; |
| 473 | png_ptr->quantize_sort[j + 1] = t; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 474 | done = 0; |
| 475 | } |
| 476 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 477 | |
Glenn Randers-Pehrson | 0567015 | 2014-03-08 12:39:52 -0600 | [diff] [blame] | 478 | if (done != 0) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 479 | break; |
| 480 | } |
| 481 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 482 | /* Swap the palette around, and set up a table, if necessary */ |
Glenn Randers-Pehrson | 0567015 | 2014-03-08 12:39:52 -0600 | [diff] [blame] | 483 | if (full_quantize != 0) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 484 | { |
Glenn Randers-Pehrson | 8686fff | 1998-05-21 09:27:50 -0500 | [diff] [blame] | 485 | int j = num_palette; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 486 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 487 | /* Put all the useful colors within the max, but don't |
| 488 | * move the others. |
| 489 | */ |
Glenn Randers-Pehrson | 8686fff | 1998-05-21 09:27:50 -0500 | [diff] [blame] | 490 | for (i = 0; i < maximum_colors; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 491 | { |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 492 | if ((int)png_ptr->quantize_sort[i] >= maximum_colors) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 493 | { |
| 494 | do |
| 495 | j--; |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 496 | while ((int)png_ptr->quantize_sort[j] >= maximum_colors); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 497 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 498 | palette[i] = palette[j]; |
| 499 | } |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 500 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 501 | } |
| 502 | else |
| 503 | { |
Glenn Randers-Pehrson | 8686fff | 1998-05-21 09:27:50 -0500 | [diff] [blame] | 504 | int j = num_palette; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 505 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 506 | /* Move all the used colors inside the max limit, and |
| 507 | * develop a translation table. |
| 508 | */ |
Glenn Randers-Pehrson | 8686fff | 1998-05-21 09:27:50 -0500 | [diff] [blame] | 509 | for (i = 0; i < maximum_colors; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 510 | { |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 511 | /* Only move the colors we need to */ |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 512 | if ((int)png_ptr->quantize_sort[i] >= maximum_colors) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 513 | { |
| 514 | png_color tmp_color; |
| 515 | |
| 516 | do |
| 517 | j--; |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 518 | while ((int)png_ptr->quantize_sort[j] >= maximum_colors); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 519 | |
| 520 | tmp_color = palette[j]; |
| 521 | palette[j] = palette[i]; |
| 522 | palette[i] = tmp_color; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 523 | /* Indicate where the color went */ |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 524 | png_ptr->quantize_index[j] = (png_byte)i; |
| 525 | png_ptr->quantize_index[i] = (png_byte)j; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 526 | } |
| 527 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 528 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 529 | /* Find closest color for those colors we are not using */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 530 | for (i = 0; i < num_palette; i++) |
| 531 | { |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 532 | if ((int)png_ptr->quantize_index[i] >= maximum_colors) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 533 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 534 | int min_d, k, min_k, d_index; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 535 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 536 | /* Find the closest color to one we threw out */ |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 537 | d_index = png_ptr->quantize_index[i]; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 538 | min_d = PNG_COLOR_DIST(palette[d_index], palette[0]); |
| 539 | for (k = 1, min_k = 0; k < maximum_colors; k++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 540 | { |
| 541 | int d; |
| 542 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 543 | d = PNG_COLOR_DIST(palette[d_index], palette[k]); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 544 | |
| 545 | if (d < min_d) |
| 546 | { |
| 547 | min_d = d; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 548 | min_k = k; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 549 | } |
| 550 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 551 | /* Point to closest color */ |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 552 | png_ptr->quantize_index[i] = (png_byte)min_k; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 553 | } |
| 554 | } |
| 555 | } |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 556 | png_free(png_ptr, png_ptr->quantize_sort); |
| 557 | png_ptr->quantize_sort = NULL; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 558 | } |
| 559 | else |
| 560 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 561 | /* This is much harder to do simply (and quickly). Perhaps |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 562 | * we need to go through a median cut routine, but those |
| 563 | * don't always behave themselves with only a few colors |
| 564 | * as input. So we will just find the closest two colors, |
| 565 | * and throw out one of them (chosen somewhat randomly). |
| 566 | * [We don't understand this at all, so if someone wants to |
| 567 | * work on improving it, be our guest - AED, GRP] |
| 568 | */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 569 | int i; |
| 570 | int max_d; |
| 571 | int num_new_palette; |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 572 | png_dsortp t; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 573 | png_dsortpp hash; |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 574 | |
Glenn Randers-Pehrson | 895a9c9 | 2008-07-25 08:51:18 -0500 | [diff] [blame] | 575 | t = NULL; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 576 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 577 | /* Initialize palette index arrays */ |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 578 | png_ptr->index_to_palette = (png_bytep)png_malloc(png_ptr, |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 579 | (png_uint_32)(num_palette * (sizeof (png_byte)))); |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 580 | png_ptr->palette_to_index = (png_bytep)png_malloc(png_ptr, |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 581 | (png_uint_32)(num_palette * (sizeof (png_byte)))); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 582 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 583 | /* Initialize the sort array */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 584 | for (i = 0; i < num_palette; i++) |
| 585 | { |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 586 | png_ptr->index_to_palette[i] = (png_byte)i; |
| 587 | png_ptr->palette_to_index[i] = (png_byte)i; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 588 | } |
| 589 | |
Glenn Randers-Pehrson | 79134c6 | 2009-02-14 10:32:18 -0600 | [diff] [blame] | 590 | hash = (png_dsortpp)png_calloc(png_ptr, (png_uint_32)(769 * |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 591 | (sizeof (png_dsortp)))); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 592 | |
| 593 | num_new_palette = num_palette; |
| 594 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 595 | /* Initial wild guess at how far apart the farthest pixel |
| 596 | * pair we will be eliminating will be. Larger |
| 597 | * numbers mean more areas will be allocated, Smaller |
| 598 | * numbers run the risk of not saving enough data, and |
| 599 | * having to do this all over again. |
| 600 | * |
| 601 | * I have not done extensive checking on this number. |
| 602 | */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 603 | max_d = 96; |
| 604 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 605 | while (num_new_palette > maximum_colors) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 606 | { |
| 607 | for (i = 0; i < num_new_palette - 1; i++) |
| 608 | { |
| 609 | int j; |
| 610 | |
| 611 | for (j = i + 1; j < num_new_palette; j++) |
| 612 | { |
| 613 | int d; |
| 614 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 615 | d = PNG_COLOR_DIST(palette[i], palette[j]); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 616 | |
| 617 | if (d <= max_d) |
| 618 | { |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 619 | |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 620 | t = (png_dsortp)png_malloc_warn(png_ptr, |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 621 | (png_uint_32)(sizeof (png_dsort))); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 622 | |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 623 | if (t == NULL) |
| 624 | break; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 625 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 626 | t->next = hash[d]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 627 | t->left = (png_byte)i; |
| 628 | t->right = (png_byte)j; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 629 | hash[d] = t; |
| 630 | } |
| 631 | } |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 632 | if (t == NULL) |
| 633 | break; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 634 | } |
| 635 | |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 636 | if (t != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 637 | for (i = 0; i <= max_d; i++) |
| 638 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 639 | if (hash[i] != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 640 | { |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 641 | png_dsortp p; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 642 | |
| 643 | for (p = hash[i]; p; p = p->next) |
| 644 | { |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 645 | if ((int)png_ptr->index_to_palette[p->left] |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 646 | < num_new_palette && |
| 647 | (int)png_ptr->index_to_palette[p->right] |
| 648 | < num_new_palette) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 649 | { |
| 650 | int j, next_j; |
| 651 | |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 652 | if (num_new_palette & 0x01) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 653 | { |
| 654 | j = p->left; |
| 655 | next_j = p->right; |
| 656 | } |
| 657 | else |
| 658 | { |
| 659 | j = p->right; |
| 660 | next_j = p->left; |
| 661 | } |
| 662 | |
| 663 | num_new_palette--; |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 664 | palette[png_ptr->index_to_palette[j]] |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 665 | = palette[num_new_palette]; |
Glenn Randers-Pehrson | 0567015 | 2014-03-08 12:39:52 -0600 | [diff] [blame] | 666 | if (full_quantize == 0) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 667 | { |
| 668 | int k; |
| 669 | |
| 670 | for (k = 0; k < num_palette; k++) |
| 671 | { |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 672 | if (png_ptr->quantize_index[k] == |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 673 | png_ptr->index_to_palette[j]) |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 674 | png_ptr->quantize_index[k] = |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 675 | png_ptr->index_to_palette[next_j]; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 676 | |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 677 | if ((int)png_ptr->quantize_index[k] == |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 678 | num_new_palette) |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 679 | png_ptr->quantize_index[k] = |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 680 | png_ptr->index_to_palette[j]; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 681 | } |
| 682 | } |
| 683 | |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 684 | png_ptr->index_to_palette[png_ptr->palette_to_index |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 685 | [num_new_palette]] = png_ptr->index_to_palette[j]; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 686 | |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 687 | png_ptr->palette_to_index[png_ptr->index_to_palette[j]] |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 688 | = png_ptr->palette_to_index[num_new_palette]; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 689 | |
Glenn Randers-Pehrson | e3f3c4e | 2010-02-07 18:08:50 -0600 | [diff] [blame] | 690 | png_ptr->index_to_palette[j] = |
| 691 | (png_byte)num_new_palette; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 692 | |
Glenn Randers-Pehrson | e3f3c4e | 2010-02-07 18:08:50 -0600 | [diff] [blame] | 693 | png_ptr->palette_to_index[num_new_palette] = |
| 694 | (png_byte)j; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 695 | } |
| 696 | if (num_new_palette <= maximum_colors) |
| 697 | break; |
| 698 | } |
| 699 | if (num_new_palette <= maximum_colors) |
| 700 | break; |
| 701 | } |
| 702 | } |
| 703 | |
| 704 | for (i = 0; i < 769; i++) |
| 705 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 706 | if (hash[i] != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 707 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 708 | png_dsortp p = hash[i]; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 709 | while (p) |
| 710 | { |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 711 | t = p->next; |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 712 | png_free(png_ptr, p); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 713 | p = t; |
| 714 | } |
| 715 | } |
| 716 | hash[i] = 0; |
| 717 | } |
| 718 | max_d += 96; |
| 719 | } |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 720 | png_free(png_ptr, hash); |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 721 | png_free(png_ptr, png_ptr->palette_to_index); |
| 722 | png_free(png_ptr, png_ptr->index_to_palette); |
Glenn Randers-Pehrson | 895a9c9 | 2008-07-25 08:51:18 -0500 | [diff] [blame] | 723 | png_ptr->palette_to_index = NULL; |
| 724 | png_ptr->index_to_palette = NULL; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 725 | } |
| 726 | num_palette = maximum_colors; |
| 727 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 728 | if (png_ptr->palette == NULL) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 729 | { |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 730 | png_ptr->palette = palette; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 731 | } |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 732 | png_ptr->num_palette = (png_uint_16)num_palette; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 733 | |
Glenn Randers-Pehrson | 0567015 | 2014-03-08 12:39:52 -0600 | [diff] [blame] | 734 | if (full_quantize != 0) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 735 | { |
| 736 | int i; |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 737 | png_bytep distance; |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 738 | int total_bits = PNG_QUANTIZE_RED_BITS + PNG_QUANTIZE_GREEN_BITS + |
| 739 | PNG_QUANTIZE_BLUE_BITS; |
| 740 | int num_red = (1 << PNG_QUANTIZE_RED_BITS); |
| 741 | int num_green = (1 << PNG_QUANTIZE_GREEN_BITS); |
| 742 | int num_blue = (1 << PNG_QUANTIZE_BLUE_BITS); |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 743 | png_size_t num_entries = ((png_size_t)1 << total_bits); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 744 | |
Glenn Randers-Pehrson | bc363ec | 2010-10-12 21:17:00 -0500 | [diff] [blame] | 745 | png_ptr->palette_lookup = (png_bytep)png_calloc(png_ptr, |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 746 | (png_uint_32)(num_entries * (sizeof (png_byte)))); |
Glenn Randers-Pehrson | 82ae383 | 2001-04-20 10:32:10 -0500 | [diff] [blame] | 747 | |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 748 | distance = (png_bytep)png_malloc(png_ptr, (png_uint_32)(num_entries * |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 749 | (sizeof (png_byte)))); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 750 | |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 751 | memset(distance, 0xff, num_entries * (sizeof (png_byte))); |
Glenn Randers-Pehrson | 82ae383 | 2001-04-20 10:32:10 -0500 | [diff] [blame] | 752 | |
| 753 | for (i = 0; i < num_palette; i++) |
| 754 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 755 | int ir, ig, ib; |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 756 | int r = (palette[i].red >> (8 - PNG_QUANTIZE_RED_BITS)); |
| 757 | int g = (palette[i].green >> (8 - PNG_QUANTIZE_GREEN_BITS)); |
| 758 | int b = (palette[i].blue >> (8 - PNG_QUANTIZE_BLUE_BITS)); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 759 | |
| 760 | for (ir = 0; ir < num_red; ir++) |
| 761 | { |
Glenn Randers-Pehrson | d029a75 | 2004-08-09 21:50:32 -0500 | [diff] [blame] | 762 | /* int dr = abs(ir - r); */ |
| 763 | int dr = ((ir > r) ? ir - r : r - ir); |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 764 | int index_r = (ir << (PNG_QUANTIZE_BLUE_BITS + |
| 765 | PNG_QUANTIZE_GREEN_BITS)); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 766 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 767 | for (ig = 0; ig < num_green; ig++) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 768 | { |
Glenn Randers-Pehrson | d029a75 | 2004-08-09 21:50:32 -0500 | [diff] [blame] | 769 | /* int dg = abs(ig - g); */ |
| 770 | int dg = ((ig > g) ? ig - g : g - ig); |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 771 | int dt = dr + dg; |
| 772 | int dm = ((dr > dg) ? dr : dg); |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 773 | int index_g = index_r | (ig << PNG_QUANTIZE_BLUE_BITS); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 774 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 775 | for (ib = 0; ib < num_blue; ib++) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 776 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 777 | int d_index = index_g | ib; |
Glenn Randers-Pehrson | d029a75 | 2004-08-09 21:50:32 -0500 | [diff] [blame] | 778 | /* int db = abs(ib - b); */ |
| 779 | int db = ((ib > b) ? ib - b : b - ib); |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 780 | int dmax = ((dm > db) ? dm : db); |
| 781 | int d = dmax + dt + db; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 782 | |
Glenn Randers-Pehrson | 0f881d6 | 1998-02-07 10:20:57 -0600 | [diff] [blame] | 783 | if (d < (int)distance[d_index]) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 784 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 785 | distance[d_index] = (png_byte)d; |
| 786 | png_ptr->palette_lookup[d_index] = (png_byte)i; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 787 | } |
| 788 | } |
Glenn Randers-Pehrson | 82ae383 | 2001-04-20 10:32:10 -0500 | [diff] [blame] | 789 | } |
| 790 | } |
| 791 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 792 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 793 | png_free(png_ptr, distance); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 794 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 795 | } |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 796 | #endif /* PNG_READ_QUANTIZE_SUPPORTED */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 797 | |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 798 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 799 | void PNGFAPI |
John Bowler | 5d56786 | 2011-12-24 09:12:00 -0600 | [diff] [blame] | 800 | png_set_gamma_fixed(png_structrp png_ptr, png_fixed_point scrn_gamma, |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 801 | png_fixed_point file_gamma) |
| 802 | { |
| 803 | png_debug(1, "in png_set_gamma_fixed"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 804 | |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 805 | if (!png_rtran_ok(png_ptr, 0)) |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 806 | return; |
Glenn Randers-Pehrson | b3ce365 | 2009-08-15 21:47:03 -0500 | [diff] [blame] | 807 | |
Glenn Randers-Pehrson | ef217b7 | 2011-06-15 12:58:27 -0500 | [diff] [blame] | 808 | /* New in libpng-1.5.4 - reserve particular negative values as flags. */ |
John Bowler | f70c7d0 | 2011-05-10 22:54:37 -0500 | [diff] [blame] | 809 | scrn_gamma = translate_gamma_flags(png_ptr, scrn_gamma, 1/*screen*/); |
| 810 | file_gamma = translate_gamma_flags(png_ptr, file_gamma, 0/*file*/); |
| 811 | |
Glenn Randers-Pehrson | ef217b7 | 2011-06-15 12:58:27 -0500 | [diff] [blame] | 812 | /* Checking the gamma values for being >0 was added in 1.5.4 along with the |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 813 | * premultiplied alpha support; this actually hides an undocumented feature |
| 814 | * of the previous implementation which allowed gamma processing to be |
| 815 | * disabled in background handling. There is no evidence (so far) that this |
Glenn Randers-Pehrson | e9eeb74 | 2011-05-08 19:38:42 -0500 | [diff] [blame] | 816 | * was being used; however, png_set_background itself accepted and must still |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 817 | * accept '0' for the gamma value it takes, because it isn't always used. |
| 818 | * |
| 819 | * Since this is an API change (albeit a very minor one that removes an |
John Bowler | baeb6d1 | 2011-11-26 18:21:02 -0600 | [diff] [blame] | 820 | * undocumented API feature) the following checks were only enabled in |
| 821 | * libpng-1.6.0. |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 822 | */ |
| 823 | if (file_gamma <= 0) |
Glenn Randers-Pehrson | e9eeb74 | 2011-05-08 19:38:42 -0500 | [diff] [blame] | 824 | png_error(png_ptr, "invalid file gamma in png_set_gamma"); |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 825 | |
| 826 | if (scrn_gamma <= 0) |
Glenn Randers-Pehrson | e9eeb74 | 2011-05-08 19:38:42 -0500 | [diff] [blame] | 827 | png_error(png_ptr, "invalid screen gamma in png_set_gamma"); |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 828 | |
| 829 | /* Set the gamma values unconditionally - this overrides the value in the PNG |
| 830 | * file if a gAMA chunk was present. png_set_alpha_mode provides a |
| 831 | * different, easier, way to default the file gamma. |
| 832 | */ |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 833 | png_ptr->colorspace.gamma = file_gamma; |
| 834 | png_ptr->colorspace.flags |= PNG_COLORSPACE_HAVE_GAMMA; |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 835 | png_ptr->screen_gamma = scrn_gamma; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 836 | } |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 837 | |
| 838 | # ifdef PNG_FLOATING_POINT_SUPPORTED |
| 839 | void PNGAPI |
John Bowler | 5d56786 | 2011-12-24 09:12:00 -0600 | [diff] [blame] | 840 | png_set_gamma(png_structrp png_ptr, double scrn_gamma, double file_gamma) |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 841 | { |
John Bowler | f70c7d0 | 2011-05-10 22:54:37 -0500 | [diff] [blame] | 842 | png_set_gamma_fixed(png_ptr, convert_gamma_value(png_ptr, scrn_gamma), |
| 843 | convert_gamma_value(png_ptr, file_gamma)); |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 844 | } |
| 845 | # endif /* FLOATING_POINT_SUPPORTED */ |
| 846 | #endif /* READ_GAMMA */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 847 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 848 | #ifdef PNG_READ_EXPAND_SUPPORTED |
Glenn Randers-Pehrson | 352ca6b | 1999-09-18 15:49:20 -0500 | [diff] [blame] | 849 | /* Expand paletted images to RGB, expand grayscale images of |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 850 | * less than 8-bit depth to 8-bit depth, and expand tRNS chunks |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 851 | * to alpha channels. |
| 852 | */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 853 | void PNGAPI |
John Bowler | 5d56786 | 2011-12-24 09:12:00 -0600 | [diff] [blame] | 854 | png_set_expand(png_structrp png_ptr) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 855 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 856 | png_debug(1, "in png_set_expand"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 857 | |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 858 | if (!png_rtran_ok(png_ptr, 0)) |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 859 | return; |
Glenn Randers-Pehrson | b3ce365 | 2009-08-15 21:47:03 -0500 | [diff] [blame] | 860 | |
Glenn Randers-Pehrson | 1ce0836 | 2006-03-08 23:35:59 -0600 | [diff] [blame] | 861 | png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 862 | } |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 863 | |
| 864 | /* GRR 19990627: the following three functions currently are identical |
| 865 | * to png_set_expand(). However, it is entirely reasonable that someone |
| 866 | * might wish to expand an indexed image to RGB but *not* expand a single, |
| 867 | * fully transparent palette entry to a full alpha channel--perhaps instead |
| 868 | * convert tRNS to the grayscale/RGB format (16-bit RGB value), or replace |
| 869 | * the transparent color with a particular RGB value, or drop tRNS entirely. |
| 870 | * IOW, a future version of the library may make the transformations flag |
| 871 | * a bit more fine-grained, with separate bits for each of these three |
| 872 | * functions. |
| 873 | * |
| 874 | * More to the point, these functions make it obvious what libpng will be |
| 875 | * doing, whereas "expand" can (and does) mean any number of things. |
Glenn Randers-Pehrson | 1ce0836 | 2006-03-08 23:35:59 -0600 | [diff] [blame] | 876 | * |
Glenn Randers-Pehrson | 17ca340 | 2009-11-09 06:51:16 -0600 | [diff] [blame] | 877 | * GRP 20060307: In libpng-1.2.9, png_set_gray_1_2_4_to_8() was modified |
| 878 | * to expand only the sample depth but not to expand the tRNS to alpha |
| 879 | * and its name was changed to png_set_expand_gray_1_2_4_to_8(). |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 880 | */ |
| 881 | |
| 882 | /* Expand paletted images to RGB. */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 883 | void PNGAPI |
John Bowler | 5d56786 | 2011-12-24 09:12:00 -0600 | [diff] [blame] | 884 | png_set_palette_to_rgb(png_structrp png_ptr) |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 885 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 886 | png_debug(1, "in png_set_palette_to_rgb"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 887 | |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 888 | if (!png_rtran_ok(png_ptr, 0)) |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 889 | return; |
Glenn Randers-Pehrson | b3ce365 | 2009-08-15 21:47:03 -0500 | [diff] [blame] | 890 | |
Glenn Randers-Pehrson | 1ce0836 | 2006-03-08 23:35:59 -0600 | [diff] [blame] | 891 | png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS); |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 892 | } |
| 893 | |
| 894 | /* Expand grayscale images of less than 8-bit depth to 8 bits. */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 895 | void PNGAPI |
John Bowler | 5d56786 | 2011-12-24 09:12:00 -0600 | [diff] [blame] | 896 | png_set_expand_gray_1_2_4_to_8(png_structrp png_ptr) |
Glenn Randers-Pehrson | 1ce0836 | 2006-03-08 23:35:59 -0600 | [diff] [blame] | 897 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 898 | png_debug(1, "in png_set_expand_gray_1_2_4_to_8"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 899 | |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 900 | if (!png_rtran_ok(png_ptr, 0)) |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 901 | return; |
Glenn Randers-Pehrson | b3ce365 | 2009-08-15 21:47:03 -0500 | [diff] [blame] | 902 | |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 903 | png_ptr->transformations |= PNG_EXPAND; |
Glenn Randers-Pehrson | 1ce0836 | 2006-03-08 23:35:59 -0600 | [diff] [blame] | 904 | } |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 905 | |
| 906 | /* Expand tRNS chunks to alpha channels. */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 907 | void PNGAPI |
John Bowler | 5d56786 | 2011-12-24 09:12:00 -0600 | [diff] [blame] | 908 | png_set_tRNS_to_alpha(png_structrp png_ptr) |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 909 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 910 | png_debug(1, "in png_set_tRNS_to_alpha"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 911 | |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 912 | if (!png_rtran_ok(png_ptr, 0)) |
| 913 | return; |
| 914 | |
Glenn Randers-Pehrson | 1ce0836 | 2006-03-08 23:35:59 -0600 | [diff] [blame] | 915 | png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS); |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 916 | } |
| 917 | #endif /* defined(PNG_READ_EXPAND_SUPPORTED) */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 918 | |
John Bowler | 4d56296 | 2011-02-12 09:01:20 -0600 | [diff] [blame] | 919 | #ifdef PNG_READ_EXPAND_16_SUPPORTED |
Glenn Randers-Pehrson | 55fbff3 | 2011-05-17 06:49:32 -0500 | [diff] [blame] | 920 | /* Expand to 16-bit channels, expand the tRNS chunk too (because otherwise |
John Bowler | 4d56296 | 2011-02-12 09:01:20 -0600 | [diff] [blame] | 921 | * it may not work correctly.) |
| 922 | */ |
| 923 | void PNGAPI |
John Bowler | 5d56786 | 2011-12-24 09:12:00 -0600 | [diff] [blame] | 924 | png_set_expand_16(png_structrp png_ptr) |
John Bowler | 4d56296 | 2011-02-12 09:01:20 -0600 | [diff] [blame] | 925 | { |
| 926 | png_debug(1, "in png_set_expand_16"); |
| 927 | |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 928 | if (!png_rtran_ok(png_ptr, 0)) |
John Bowler | 4d56296 | 2011-02-12 09:01:20 -0600 | [diff] [blame] | 929 | return; |
| 930 | |
| 931 | png_ptr->transformations |= (PNG_EXPAND_16 | PNG_EXPAND | PNG_EXPAND_tRNS); |
John Bowler | 4d56296 | 2011-02-12 09:01:20 -0600 | [diff] [blame] | 932 | } |
| 933 | #endif |
| 934 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 935 | #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 936 | void PNGAPI |
John Bowler | 5d56786 | 2011-12-24 09:12:00 -0600 | [diff] [blame] | 937 | png_set_gray_to_rgb(png_structrp png_ptr) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 938 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 939 | png_debug(1, "in png_set_gray_to_rgb"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 940 | |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 941 | if (!png_rtran_ok(png_ptr, 0)) |
| 942 | return; |
| 943 | |
| 944 | /* Because rgb must be 8 bits or more: */ |
| 945 | png_set_expand_gray_1_2_4_to_8(png_ptr); |
| 946 | png_ptr->transformations |= PNG_GRAY_TO_RGB; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 947 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 948 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 949 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 950 | #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 951 | void PNGFAPI |
John Bowler | 5d56786 | 2011-12-24 09:12:00 -0600 | [diff] [blame] | 952 | png_set_rgb_to_gray_fixed(png_structrp png_ptr, int error_action, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 953 | png_fixed_point red, png_fixed_point green) |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 954 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 955 | png_debug(1, "in png_set_rgb_to_gray"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 956 | |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 957 | /* Need the IHDR here because of the check on color_type below. */ |
| 958 | /* TODO: fix this */ |
| 959 | if (!png_rtran_ok(png_ptr, 1)) |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 960 | return; |
Glenn Randers-Pehrson | b3ce365 | 2009-08-15 21:47:03 -0500 | [diff] [blame] | 961 | |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 962 | switch(error_action) |
| 963 | { |
John Bowler | 7875d53 | 2011-11-07 22:33:49 -0600 | [diff] [blame] | 964 | case PNG_ERROR_ACTION_NONE: |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 965 | png_ptr->transformations |= PNG_RGB_TO_GRAY; |
| 966 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 967 | |
John Bowler | 7875d53 | 2011-11-07 22:33:49 -0600 | [diff] [blame] | 968 | case PNG_ERROR_ACTION_WARN: |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 969 | png_ptr->transformations |= PNG_RGB_TO_GRAY_WARN; |
| 970 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 971 | |
John Bowler | 7875d53 | 2011-11-07 22:33:49 -0600 | [diff] [blame] | 972 | case PNG_ERROR_ACTION_ERROR: |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 973 | png_ptr->transformations |= PNG_RGB_TO_GRAY_ERR; |
Glenn Randers-Pehrson | b3edc73 | 2010-11-21 14:06:41 -0600 | [diff] [blame] | 974 | break; |
| 975 | |
| 976 | default: |
Glenn Randers-Pehrson | e9eeb74 | 2011-05-08 19:38:42 -0500 | [diff] [blame] | 977 | png_error(png_ptr, "invalid error action to rgb_to_gray"); |
| 978 | break; |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 979 | } |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 980 | |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 981 | if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 982 | #ifdef PNG_READ_EXPAND_SUPPORTED |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 983 | png_ptr->transformations |= PNG_EXPAND; |
| 984 | #else |
| 985 | { |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 986 | /* Make this an error in 1.6 because otherwise the application may assume |
| 987 | * that it just worked and get a memory overwrite. |
| 988 | */ |
| 989 | png_error(png_ptr, |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 990 | "Cannot do RGB_TO_GRAY without EXPAND_SUPPORTED"); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 991 | |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 992 | /* png_ptr->transformations &= ~PNG_RGB_TO_GRAY; */ |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 993 | } |
| 994 | #endif |
| 995 | { |
John Bowler | cb0b296 | 2011-05-12 21:48:29 -0500 | [diff] [blame] | 996 | if (red >= 0 && green >= 0 && red + green <= PNG_FP_1) |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 997 | { |
John Bowler | cb0b296 | 2011-05-12 21:48:29 -0500 | [diff] [blame] | 998 | png_uint_16 red_int, green_int; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 999 | |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 1000 | /* NOTE: this calculation does not round, but this behavior is retained |
| 1001 | * for consistency, the inaccuracy is very small. The code here always |
| 1002 | * overwrites the coefficients, regardless of whether they have been |
| 1003 | * defaulted or set already. |
| 1004 | */ |
John Bowler | 7515612 | 2011-09-09 17:21:44 -0500 | [diff] [blame] | 1005 | red_int = (png_uint_16)(((png_uint_32)red*32768)/100000); |
| 1006 | green_int = (png_uint_16)(((png_uint_32)green*32768)/100000); |
John Bowler | cb0b296 | 2011-05-12 21:48:29 -0500 | [diff] [blame] | 1007 | |
| 1008 | png_ptr->rgb_to_gray_red_coeff = red_int; |
| 1009 | png_ptr->rgb_to_gray_green_coeff = green_int; |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 1010 | png_ptr->rgb_to_gray_coefficients_set = 1; |
Glenn Randers-Pehrson | 520a764 | 2000-03-21 05:13:06 -0600 | [diff] [blame] | 1011 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 1012 | |
Glenn Randers-Pehrson | 520a764 | 2000-03-21 05:13:06 -0600 | [diff] [blame] | 1013 | else |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 1014 | { |
John Bowler | cb0b296 | 2011-05-12 21:48:29 -0500 | [diff] [blame] | 1015 | if (red >= 0 && green >= 0) |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 1016 | png_app_warning(png_ptr, |
John Bowler | cb0b296 | 2011-05-12 21:48:29 -0500 | [diff] [blame] | 1017 | "ignoring out of range rgb_to_gray coefficients"); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 1018 | |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 1019 | /* Use the defaults, from the cHRM chunk if set, else the historical |
| 1020 | * values which are close to the sRGB/HDTV/ITU-Rec 709 values. See |
| 1021 | * png_do_rgb_to_gray for more discussion of the values. In this case |
| 1022 | * the coefficients are not marked as 'set' and are not overwritten if |
| 1023 | * something has already provided a default. |
John Bowler | cb0b296 | 2011-05-12 21:48:29 -0500 | [diff] [blame] | 1024 | */ |
| 1025 | if (png_ptr->rgb_to_gray_red_coeff == 0 && |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 1026 | png_ptr->rgb_to_gray_green_coeff == 0) |
John Bowler | cb0b296 | 2011-05-12 21:48:29 -0500 | [diff] [blame] | 1027 | { |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 1028 | png_ptr->rgb_to_gray_red_coeff = 6968; |
| 1029 | png_ptr->rgb_to_gray_green_coeff = 23434; |
| 1030 | /* png_ptr->rgb_to_gray_blue_coeff = 2366; */ |
John Bowler | cb0b296 | 2011-05-12 21:48:29 -0500 | [diff] [blame] | 1031 | } |
| 1032 | } |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 1033 | } |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 1034 | } |
Glenn Randers-Pehrson | a272d8f | 2010-06-25 21:45:31 -0500 | [diff] [blame] | 1035 | |
| 1036 | #ifdef PNG_FLOATING_POINT_SUPPORTED |
| 1037 | /* Convert a RGB image to a grayscale of the same width. This allows us, |
| 1038 | * for example, to convert a 24 bpp RGB image into an 8 bpp grayscale image. |
| 1039 | */ |
| 1040 | |
| 1041 | void PNGAPI |
John Bowler | 5d56786 | 2011-12-24 09:12:00 -0600 | [diff] [blame] | 1042 | png_set_rgb_to_gray(png_structrp png_ptr, int error_action, double red, |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 1043 | double green) |
Glenn Randers-Pehrson | a272d8f | 2010-06-25 21:45:31 -0500 | [diff] [blame] | 1044 | { |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 1045 | png_set_rgb_to_gray_fixed(png_ptr, error_action, |
| 1046 | png_fixed(png_ptr, red, "rgb to gray red coefficient"), |
| 1047 | png_fixed(png_ptr, green, "rgb to gray green coefficient")); |
Glenn Randers-Pehrson | a272d8f | 2010-06-25 21:45:31 -0500 | [diff] [blame] | 1048 | } |
| 1049 | #endif /* FLOATING POINT */ |
| 1050 | |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 1051 | #endif /* RGB_TO_GRAY */ |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 1052 | |
Glenn Randers-Pehrson | 6942d53 | 2000-05-01 09:31:54 -0500 | [diff] [blame] | 1053 | #if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \ |
Glenn Randers-Pehrson | 33188ac | 2009-06-16 14:12:35 -0500 | [diff] [blame] | 1054 | defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED) |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 1055 | void PNGAPI |
John Bowler | 5d56786 | 2011-12-24 09:12:00 -0600 | [diff] [blame] | 1056 | png_set_read_user_transform_fn(png_structrp png_ptr, png_user_transform_ptr |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1057 | read_user_transform_fn) |
Glenn Randers-Pehrson | 08a3343 | 1998-03-07 06:06:55 -0600 | [diff] [blame] | 1058 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 1059 | png_debug(1, "in png_set_read_user_transform_fn"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 1060 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1061 | #ifdef PNG_READ_USER_TRANSFORM_SUPPORTED |
Glenn Randers-Pehrson | 08a3343 | 1998-03-07 06:06:55 -0600 | [diff] [blame] | 1062 | png_ptr->transformations |= PNG_USER_TRANSFORM; |
| 1063 | png_ptr->read_user_transform_fn = read_user_transform_fn; |
Glenn Randers-Pehrson | 6942d53 | 2000-05-01 09:31:54 -0500 | [diff] [blame] | 1064 | #endif |
Glenn Randers-Pehrson | 08a3343 | 1998-03-07 06:06:55 -0600 | [diff] [blame] | 1065 | } |
| 1066 | #endif |
| 1067 | |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 1068 | #ifdef PNG_READ_TRANSFORMS_SUPPORTED |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1069 | #ifdef PNG_READ_GAMMA_SUPPORTED |
| 1070 | /* In the case of gamma transformations only do transformations on images where |
| 1071 | * the [file] gamma and screen_gamma are not close reciprocals, otherwise it |
| 1072 | * slows things down slightly, and also needlessly introduces small errors. |
| 1073 | */ |
| 1074 | static int /* PRIVATE */ |
| 1075 | png_gamma_threshold(png_fixed_point screen_gamma, png_fixed_point file_gamma) |
| 1076 | { |
| 1077 | /* PNG_GAMMA_THRESHOLD is the threshold for performing gamma |
| 1078 | * correction as a difference of the overall transform from 1.0 |
| 1079 | * |
| 1080 | * We want to compare the threshold with s*f - 1, if we get |
| 1081 | * overflow here it is because of wacky gamma values so we |
| 1082 | * turn on processing anyway. |
| 1083 | */ |
| 1084 | png_fixed_point gtest; |
| 1085 | return !png_muldiv(>est, screen_gamma, file_gamma, PNG_FP_1) || |
| 1086 | png_gamma_significant(gtest); |
| 1087 | } |
| 1088 | #endif |
| 1089 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1090 | /* Initialize everything needed for the read. This includes modifying |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 1091 | * the palette. |
| 1092 | */ |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 1093 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1094 | /*For the moment 'png_init_palette_transformations' and |
| 1095 | * 'png_init_rgb_transformations' only do some flag canceling optimizations. |
| 1096 | * The intent is that these two routines should have palette or rgb operations |
| 1097 | * extracted from 'png_init_read_transformations'. |
| 1098 | */ |
| 1099 | static void /* PRIVATE */ |
John Bowler | 5d56786 | 2011-12-24 09:12:00 -0600 | [diff] [blame] | 1100 | png_init_palette_transformations(png_structrp png_ptr) |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1101 | { |
| 1102 | /* Called to handle the (input) palette case. In png_do_read_transformations |
| 1103 | * the first step is to expand the palette if requested, so this code must |
| 1104 | * take care to only make changes that are invariant with respect to the |
| 1105 | * palette expansion, or only do them if there is no expansion. |
| 1106 | * |
| 1107 | * STRIP_ALPHA has already been handled in the caller (by setting num_trans |
| 1108 | * to 0.) |
| 1109 | */ |
| 1110 | int input_has_alpha = 0; |
| 1111 | int input_has_transparency = 0; |
| 1112 | |
| 1113 | if (png_ptr->num_trans > 0) |
| 1114 | { |
| 1115 | int i; |
| 1116 | |
| 1117 | /* Ignore if all the entries are opaque (unlikely!) */ |
| 1118 | for (i=0; i<png_ptr->num_trans; ++i) |
Glenn Randers-Pehrson | 492e671 | 2013-08-04 14:03:44 -0500 | [diff] [blame] | 1119 | { |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1120 | if (png_ptr->trans_alpha[i] == 255) |
| 1121 | continue; |
| 1122 | else if (png_ptr->trans_alpha[i] == 0) |
| 1123 | input_has_transparency = 1; |
| 1124 | else |
Glenn Randers-Pehrson | 492e671 | 2013-08-04 14:03:44 -0500 | [diff] [blame] | 1125 | { |
| 1126 | input_has_transparency = 1; |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1127 | input_has_alpha = 1; |
Glenn Randers-Pehrson | 492e671 | 2013-08-04 14:03:44 -0500 | [diff] [blame] | 1128 | break; |
| 1129 | } |
| 1130 | } |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1131 | } |
| 1132 | |
| 1133 | /* If no alpha we can optimize. */ |
Glenn Randers-Pehrson | 0567015 | 2014-03-08 12:39:52 -0600 | [diff] [blame] | 1134 | if (input_has_alpha == 0) |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1135 | { |
| 1136 | /* Any alpha means background and associative alpha processing is |
Glenn Randers-Pehrson | 38f4940 | 2013-12-22 15:00:59 -0600 | [diff] [blame] | 1137 | * required, however if the alpha is 0 or 1 throughout OPTIMIZE_ALPHA |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1138 | * and ENCODE_ALPHA are irrelevant. |
| 1139 | */ |
| 1140 | png_ptr->transformations &= ~PNG_ENCODE_ALPHA; |
| 1141 | png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA; |
| 1142 | |
Glenn Randers-Pehrson | 0567015 | 2014-03-08 12:39:52 -0600 | [diff] [blame] | 1143 | if (input_has_transparency == 0) |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1144 | png_ptr->transformations &= ~(PNG_COMPOSE | PNG_BACKGROUND_EXPAND); |
| 1145 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1146 | |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1147 | #if defined(PNG_READ_EXPAND_SUPPORTED) && defined(PNG_READ_BACKGROUND_SUPPORTED) |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1148 | /* png_set_background handling - deals with the complexity of whether the |
| 1149 | * background color is in the file format or the screen format in the case |
| 1150 | * where an 'expand' will happen. |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 1151 | */ |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 1152 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1153 | /* The following code cannot be entered in the alpha pre-multiplication case |
| 1154 | * because PNG_BACKGROUND_EXPAND is cancelled below. |
| 1155 | */ |
Glenn Randers-Pehrson | a77ef62 | 2000-02-18 13:48:52 -0600 | [diff] [blame] | 1156 | if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) && |
| 1157 | (png_ptr->transformations & PNG_EXPAND)) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1158 | { |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1159 | { |
| 1160 | png_ptr->background.red = |
| 1161 | png_ptr->palette[png_ptr->background.index].red; |
| 1162 | png_ptr->background.green = |
| 1163 | png_ptr->palette[png_ptr->background.index].green; |
| 1164 | png_ptr->background.blue = |
| 1165 | png_ptr->palette[png_ptr->background.index].blue; |
| 1166 | |
| 1167 | #ifdef PNG_READ_INVERT_ALPHA_SUPPORTED |
| 1168 | if (png_ptr->transformations & PNG_INVERT_ALPHA) |
| 1169 | { |
| 1170 | if (!(png_ptr->transformations & PNG_EXPAND_tRNS)) |
| 1171 | { |
| 1172 | /* Invert the alpha channel (in tRNS) unless the pixels are |
| 1173 | * going to be expanded, in which case leave it for later |
| 1174 | */ |
| 1175 | int i, istop = png_ptr->num_trans; |
| 1176 | |
| 1177 | for (i=0; i<istop; i++) |
| 1178 | png_ptr->trans_alpha[i] = (png_byte)(255 - |
| 1179 | png_ptr->trans_alpha[i]); |
| 1180 | } |
| 1181 | } |
| 1182 | #endif /* PNG_READ_INVERT_ALPHA_SUPPORTED */ |
| 1183 | } |
| 1184 | } /* background expand and (therefore) no alpha association. */ |
| 1185 | #endif /* PNG_READ_EXPAND_SUPPORTED && PNG_READ_BACKGROUND_SUPPORTED */ |
| 1186 | } |
| 1187 | |
| 1188 | static void /* PRIVATE */ |
John Bowler | 5d56786 | 2011-12-24 09:12:00 -0600 | [diff] [blame] | 1189 | png_init_rgb_transformations(png_structrp png_ptr) |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1190 | { |
Glenn Randers-Pehrson | ef217b7 | 2011-06-15 12:58:27 -0500 | [diff] [blame] | 1191 | /* Added to libpng-1.5.4: check the color type to determine whether there |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1192 | * is any alpha or transparency in the image and simply cancel the |
| 1193 | * background and alpha mode stuff if there isn't. |
| 1194 | */ |
| 1195 | int input_has_alpha = (png_ptr->color_type & PNG_COLOR_MASK_ALPHA) != 0; |
| 1196 | int input_has_transparency = png_ptr->num_trans > 0; |
| 1197 | |
| 1198 | /* If no alpha we can optimize. */ |
Glenn Randers-Pehrson | 0567015 | 2014-03-08 12:39:52 -0600 | [diff] [blame] | 1199 | if (input_has_alpha == 0) |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1200 | { |
| 1201 | /* Any alpha means background and associative alpha processing is |
Glenn Randers-Pehrson | 38f4940 | 2013-12-22 15:00:59 -0600 | [diff] [blame] | 1202 | * required, however if the alpha is 0 or 1 throughout OPTIMIZE_ALPHA |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1203 | * and ENCODE_ALPHA are irrelevant. |
| 1204 | */ |
| 1205 | # ifdef PNG_READ_ALPHA_MODE_SUPPORTED |
| 1206 | png_ptr->transformations &= ~PNG_ENCODE_ALPHA; |
| 1207 | png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA; |
| 1208 | # endif |
| 1209 | |
Glenn Randers-Pehrson | 0567015 | 2014-03-08 12:39:52 -0600 | [diff] [blame] | 1210 | if (input_has_transparency == 0) |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1211 | png_ptr->transformations &= ~(PNG_COMPOSE | PNG_BACKGROUND_EXPAND); |
| 1212 | } |
| 1213 | |
| 1214 | #if defined(PNG_READ_EXPAND_SUPPORTED) && defined(PNG_READ_BACKGROUND_SUPPORTED) |
| 1215 | /* png_set_background handling - deals with the complexity of whether the |
| 1216 | * background color is in the file format or the screen format in the case |
| 1217 | * where an 'expand' will happen. |
| 1218 | */ |
| 1219 | |
| 1220 | /* The following code cannot be entered in the alpha pre-multiplication case |
| 1221 | * because PNG_BACKGROUND_EXPAND is cancelled below. |
| 1222 | */ |
| 1223 | if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) && |
| 1224 | (png_ptr->transformations & PNG_EXPAND) && |
| 1225 | !(png_ptr->color_type & PNG_COLOR_MASK_COLOR)) |
| 1226 | /* i.e., GRAY or GRAY_ALPHA */ |
| 1227 | { |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1228 | { |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1229 | /* Expand background and tRNS chunks */ |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 1230 | int gray = png_ptr->background.gray; |
| 1231 | int trans_gray = png_ptr->trans_color.gray; |
| 1232 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1233 | switch (png_ptr->bit_depth) |
| 1234 | { |
| 1235 | case 1: |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 1236 | gray *= 0xff; |
| 1237 | trans_gray *= 0xff; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1238 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1239 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1240 | case 2: |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 1241 | gray *= 0x55; |
| 1242 | trans_gray *= 0x55; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1243 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1244 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1245 | case 4: |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 1246 | gray *= 0x11; |
| 1247 | trans_gray *= 0x11; |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1248 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1249 | |
Glenn Randers-Pehrson | b3edc73 | 2010-11-21 14:06:41 -0600 | [diff] [blame] | 1250 | default: |
| 1251 | |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1252 | case 8: |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 1253 | /* FALL THROUGH (Already 8 bits) */ |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1254 | |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1255 | case 16: |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 1256 | /* Already a full 16 bits */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1257 | break; |
| 1258 | } |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 1259 | |
| 1260 | png_ptr->background.red = png_ptr->background.green = |
| 1261 | png_ptr->background.blue = (png_uint_16)gray; |
| 1262 | |
| 1263 | if (!(png_ptr->transformations & PNG_EXPAND_tRNS)) |
| 1264 | { |
| 1265 | png_ptr->trans_color.red = png_ptr->trans_color.green = |
| 1266 | png_ptr->trans_color.blue = (png_uint_16)trans_gray; |
| 1267 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1268 | } |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1269 | } /* background expand and (therefore) no alpha association. */ |
| 1270 | #endif /* PNG_READ_EXPAND_SUPPORTED && PNG_READ_BACKGROUND_SUPPORTED */ |
| 1271 | } |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 1272 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1273 | void /* PRIVATE */ |
John Bowler | 5d56786 | 2011-12-24 09:12:00 -0600 | [diff] [blame] | 1274 | png_init_read_transformations(png_structrp png_ptr) |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1275 | { |
| 1276 | png_debug(1, "in png_init_read_transformations"); |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 1277 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1278 | /* This internal function is called from png_read_start_row in pngrutil.c |
| 1279 | * and it is called before the 'rowbytes' calculation is done, so the code |
| 1280 | * in here can change or update the transformations flags. |
| 1281 | * |
| 1282 | * First do updates that do not depend on the details of the PNG image data |
| 1283 | * being processed. |
| 1284 | */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1285 | |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 1286 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Glenn Randers-Pehrson | ef217b7 | 2011-06-15 12:58:27 -0500 | [diff] [blame] | 1287 | /* Prior to 1.5.4 these tests were performed from png_set_gamma, 1.5.4 adds |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1288 | * png_set_alpha_mode and this is another source for a default file gamma so |
Glenn Randers-Pehrson | ef217b7 | 2011-06-15 12:58:27 -0500 | [diff] [blame] | 1289 | * the test needs to be performed later - here. In addition prior to 1.5.4 |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1290 | * the tests were repeated for the PALETTE color type here - this is no |
| 1291 | * longer necessary (and doesn't seem to have been necessary before.) |
| 1292 | */ |
Glenn Randers-Pehrson | c6de22d | 2002-02-23 18:55:25 -0600 | [diff] [blame] | 1293 | { |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1294 | /* The following temporary indicates if overall gamma correction is |
| 1295 | * required. |
| 1296 | */ |
| 1297 | int gamma_correction = 0; |
| 1298 | |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 1299 | if (png_ptr->colorspace.gamma != 0) /* has been set */ |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1300 | { |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1301 | if (png_ptr->screen_gamma != 0) /* screen set too */ |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 1302 | gamma_correction = png_gamma_threshold(png_ptr->colorspace.gamma, |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1303 | png_ptr->screen_gamma); |
| 1304 | |
| 1305 | else |
| 1306 | /* Assume the output matches the input; a long time default behavior |
| 1307 | * of libpng, although the standard has nothing to say about this. |
| 1308 | */ |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 1309 | png_ptr->screen_gamma = png_reciprocal(png_ptr->colorspace.gamma); |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1310 | } |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1311 | |
| 1312 | else if (png_ptr->screen_gamma != 0) |
| 1313 | /* The converse - assume the file matches the screen, note that this |
Glenn Randers-Pehrson | ef217b7 | 2011-06-15 12:58:27 -0500 | [diff] [blame] | 1314 | * perhaps undesireable default can (from 1.5.4) be changed by calling |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1315 | * png_set_alpha_mode (even if the alpha handling mode isn't required |
| 1316 | * or isn't changed from the default.) |
| 1317 | */ |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 1318 | png_ptr->colorspace.gamma = png_reciprocal(png_ptr->screen_gamma); |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1319 | |
| 1320 | else /* neither are set */ |
| 1321 | /* Just in case the following prevents any processing - file and screen |
| 1322 | * are both assumed to be linear and there is no way to introduce a |
| 1323 | * third gamma value other than png_set_background with 'UNIQUE', and, |
Glenn Randers-Pehrson | ef217b7 | 2011-06-15 12:58:27 -0500 | [diff] [blame] | 1324 | * prior to 1.5.4 |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1325 | */ |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 1326 | png_ptr->screen_gamma = png_ptr->colorspace.gamma = PNG_FP_1; |
| 1327 | |
| 1328 | /* We have a gamma value now. */ |
| 1329 | png_ptr->colorspace.flags |= PNG_COLORSPACE_HAVE_GAMMA; |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1330 | |
| 1331 | /* Now turn the gamma transformation on or off as appropriate. Notice |
| 1332 | * that PNG_GAMMA just refers to the file->screen correction. Alpha |
| 1333 | * composition may independently cause gamma correction because it needs |
| 1334 | * linear data (e.g. if the file has a gAMA chunk but the screen gamma |
| 1335 | * hasn't been specified.) In any case this flag may get turned off in |
| 1336 | * the code immediately below if the transform can be handled outside the |
| 1337 | * row loop. |
| 1338 | */ |
Glenn Randers-Pehrson | 0567015 | 2014-03-08 12:39:52 -0600 | [diff] [blame] | 1339 | if (gamma_correction != 0) |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1340 | png_ptr->transformations |= PNG_GAMMA; |
| 1341 | |
| 1342 | else |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1343 | png_ptr->transformations &= ~PNG_GAMMA; |
Glenn Randers-Pehrson | c6de22d | 2002-02-23 18:55:25 -0600 | [diff] [blame] | 1344 | } |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1345 | #endif |
Glenn Randers-Pehrson | c6de22d | 2002-02-23 18:55:25 -0600 | [diff] [blame] | 1346 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1347 | /* Certain transformations have the effect of preventing other |
| 1348 | * transformations that happen afterward in png_do_read_transformations, |
| 1349 | * resolve the interdependencies here. From the code of |
| 1350 | * png_do_read_transformations the order is: |
| 1351 | * |
| 1352 | * 1) PNG_EXPAND (including PNG_EXPAND_tRNS) |
| 1353 | * 2) PNG_STRIP_ALPHA (if no compose) |
| 1354 | * 3) PNG_RGB_TO_GRAY |
| 1355 | * 4) PNG_GRAY_TO_RGB iff !PNG_BACKGROUND_IS_GRAY |
| 1356 | * 5) PNG_COMPOSE |
| 1357 | * 6) PNG_GAMMA |
| 1358 | * 7) PNG_STRIP_ALPHA (if compose) |
| 1359 | * 8) PNG_ENCODE_ALPHA |
John Bowler | 8d26126 | 2011-06-18 13:37:11 -0500 | [diff] [blame] | 1360 | * 9) PNG_SCALE_16_TO_8 |
| 1361 | * 10) PNG_16_TO_8 |
| 1362 | * 11) PNG_QUANTIZE (converts to palette) |
| 1363 | * 12) PNG_EXPAND_16 |
| 1364 | * 13) PNG_GRAY_TO_RGB iff PNG_BACKGROUND_IS_GRAY |
| 1365 | * 14) PNG_INVERT_MONO |
John Bowler | 414d7b5 | 2014-02-06 11:32:57 -0600 | [diff] [blame] | 1366 | * 15) PNG_INVERT_ALPHA |
| 1367 | * 16) PNG_SHIFT |
| 1368 | * 17) PNG_PACK |
| 1369 | * 18) PNG_BGR |
| 1370 | * 19) PNG_PACKSWAP |
| 1371 | * 20) PNG_FILLER (includes PNG_ADD_ALPHA) |
John Bowler | 8d26126 | 2011-06-18 13:37:11 -0500 | [diff] [blame] | 1372 | * 21) PNG_SWAP_ALPHA |
| 1373 | * 22) PNG_SWAP_BYTES |
| 1374 | * 23) PNG_USER_TRANSFORM [must be last] |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1375 | */ |
| 1376 | #ifdef PNG_READ_STRIP_ALPHA_SUPPORTED |
| 1377 | if ((png_ptr->transformations & PNG_STRIP_ALPHA) && |
| 1378 | !(png_ptr->transformations & PNG_COMPOSE)) |
| 1379 | { |
| 1380 | /* Stripping the alpha channel happens immediately after the 'expand' |
| 1381 | * transformations, before all other transformation, so it cancels out |
| 1382 | * the alpha handling. It has the side effect negating the effect of |
| 1383 | * PNG_EXPAND_tRNS too: |
| 1384 | */ |
| 1385 | png_ptr->transformations &= ~(PNG_BACKGROUND_EXPAND | PNG_ENCODE_ALPHA | |
| 1386 | PNG_EXPAND_tRNS); |
| 1387 | png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA; |
| 1388 | |
Glenn Randers-Pehrson | ef217b7 | 2011-06-15 12:58:27 -0500 | [diff] [blame] | 1389 | /* Kill the tRNS chunk itself too. Prior to 1.5.4 this did not happen |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1390 | * so transparency information would remain just so long as it wasn't |
| 1391 | * expanded. This produces unexpected API changes if the set of things |
| 1392 | * that do PNG_EXPAND_tRNS changes (perfectly possible given the |
| 1393 | * documentation - which says ask for what you want, accept what you |
Glenn Randers-Pehrson | ef217b7 | 2011-06-15 12:58:27 -0500 | [diff] [blame] | 1394 | * get.) This makes the behavior consistent from 1.5.4: |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1395 | */ |
| 1396 | png_ptr->num_trans = 0; |
| 1397 | } |
| 1398 | #endif /* STRIP_ALPHA supported, no COMPOSE */ |
| 1399 | |
| 1400 | #ifdef PNG_READ_ALPHA_MODE_SUPPORTED |
| 1401 | /* If the screen gamma is about 1.0 then the OPTIMIZE_ALPHA and ENCODE_ALPHA |
| 1402 | * settings will have no effect. |
| 1403 | */ |
| 1404 | if (!png_gamma_significant(png_ptr->screen_gamma)) |
| 1405 | { |
| 1406 | png_ptr->transformations &= ~PNG_ENCODE_ALPHA; |
| 1407 | png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA; |
| 1408 | } |
| 1409 | #endif |
| 1410 | |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 1411 | #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED |
| 1412 | /* Make sure the coefficients for the rgb to gray conversion are set |
| 1413 | * appropriately. |
| 1414 | */ |
| 1415 | if (png_ptr->transformations & PNG_RGB_TO_GRAY) |
| 1416 | png_colorspace_set_rgb_coefficients(png_ptr); |
| 1417 | #endif |
| 1418 | |
| 1419 | #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED |
| 1420 | #if defined(PNG_READ_EXPAND_SUPPORTED) && defined(PNG_READ_BACKGROUND_SUPPORTED) |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1421 | /* Detect gray background and attempt to enable optimization for |
| 1422 | * gray --> RGB case. |
| 1423 | * |
| 1424 | * Note: if PNG_BACKGROUND_EXPAND is set and color_type is either RGB or |
| 1425 | * RGB_ALPHA (in which case need_expand is superfluous anyway), the |
| 1426 | * background color might actually be gray yet not be flagged as such. |
| 1427 | * This is not a problem for the current code, which uses |
| 1428 | * PNG_BACKGROUND_IS_GRAY only to decide when to do the |
| 1429 | * png_do_gray_to_rgb() transformation. |
| 1430 | * |
John Bowler | 9994f25 | 2011-05-15 18:52:39 -0500 | [diff] [blame] | 1431 | * TODO: this code needs to be revised to avoid the complexity and |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1432 | * interdependencies. The color type of the background should be recorded in |
| 1433 | * png_set_background, along with the bit depth, then the code has a record |
| 1434 | * of exactly what color space the background is currently in. |
| 1435 | */ |
| 1436 | if (png_ptr->transformations & PNG_BACKGROUND_EXPAND) |
| 1437 | { |
| 1438 | /* PNG_BACKGROUND_EXPAND: the background is in the file color space, so if |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 1439 | * the file was grayscale the background value is gray. |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1440 | */ |
| 1441 | if (!(png_ptr->color_type & PNG_COLOR_MASK_COLOR)) |
| 1442 | png_ptr->mode |= PNG_BACKGROUND_IS_GRAY; |
| 1443 | } |
| 1444 | |
| 1445 | else if (png_ptr->transformations & PNG_COMPOSE) |
| 1446 | { |
| 1447 | /* PNG_COMPOSE: png_set_background was called with need_expand false, |
| 1448 | * so the color is in the color space of the output or png_set_alpha_mode |
| 1449 | * was called and the color is black. Ignore RGB_TO_GRAY because that |
| 1450 | * happens before GRAY_TO_RGB. |
| 1451 | */ |
| 1452 | if (png_ptr->transformations & PNG_GRAY_TO_RGB) |
| 1453 | { |
| 1454 | if (png_ptr->background.red == png_ptr->background.green && |
| 1455 | png_ptr->background.red == png_ptr->background.blue) |
| 1456 | { |
| 1457 | png_ptr->mode |= PNG_BACKGROUND_IS_GRAY; |
| 1458 | png_ptr->background.gray = png_ptr->background.red; |
| 1459 | } |
| 1460 | } |
| 1461 | } |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 1462 | #endif /* PNG_READ_EXPAND_SUPPORTED && PNG_READ_BACKGROUND_SUPPORTED */ |
| 1463 | #endif /* PNG_READ_GRAY_TO_RGB_SUPPORTED */ |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1464 | |
| 1465 | /* For indexed PNG data (PNG_COLOR_TYPE_PALETTE) many of the transformations |
| 1466 | * can be performed directly on the palette, and some (such as rgb to gray) |
| 1467 | * can be optimized inside the palette. This is particularly true of the |
| 1468 | * composite (background and alpha) stuff, which can be pretty much all done |
| 1469 | * in the palette even if the result is expanded to RGB or gray afterward. |
| 1470 | * |
| 1471 | * NOTE: this is Not Yet Implemented, the code behaves as in 1.5.1 and |
| 1472 | * earlier and the palette stuff is actually handled on the first row. This |
| 1473 | * leads to the reported bug that the palette returned by png_get_PLTE is not |
| 1474 | * updated. |
| 1475 | */ |
| 1476 | if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) |
| 1477 | png_init_palette_transformations(png_ptr); |
| 1478 | |
| 1479 | else |
| 1480 | png_init_rgb_transformations(png_ptr); |
| 1481 | |
John Bowler | db0ed3e | 2011-05-18 18:51:24 -0500 | [diff] [blame] | 1482 | #if defined(PNG_READ_BACKGROUND_SUPPORTED) && \ |
| 1483 | defined(PNG_READ_EXPAND_16_SUPPORTED) |
| 1484 | if ((png_ptr->transformations & PNG_EXPAND_16) && |
| 1485 | (png_ptr->transformations & PNG_COMPOSE) && |
| 1486 | !(png_ptr->transformations & PNG_BACKGROUND_EXPAND) && |
| 1487 | png_ptr->bit_depth != 16) |
| 1488 | { |
| 1489 | /* TODO: fix this. Because the expand_16 operation is after the compose |
| 1490 | * handling the background color must be 8, not 16, bits deep, but the |
Glenn Randers-Pehrson | 0a04892 | 2011-05-18 21:44:37 -0500 | [diff] [blame] | 1491 | * application will supply a 16-bit value so reduce it here. |
John Bowler | db0ed3e | 2011-05-18 18:51:24 -0500 | [diff] [blame] | 1492 | * |
| 1493 | * The PNG_BACKGROUND_EXPAND code above does not expand to 16 bits at |
| 1494 | * present, so that case is ok (until do_expand_16 is moved.) |
Glenn Randers-Pehrson | be720ed | 2011-06-15 08:20:37 -0500 | [diff] [blame] | 1495 | * |
| 1496 | * NOTE: this discards the low 16 bits of the user supplied background |
| 1497 | * color, but until expand_16 works properly there is no choice! |
John Bowler | db0ed3e | 2011-05-18 18:51:24 -0500 | [diff] [blame] | 1498 | */ |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 1499 | # define CHOP(x) (x)=((png_uint_16)PNG_DIV257(x)) |
John Bowler | b2bee33 | 2011-06-10 23:24:58 -0500 | [diff] [blame] | 1500 | CHOP(png_ptr->background.red); |
| 1501 | CHOP(png_ptr->background.green); |
| 1502 | CHOP(png_ptr->background.blue); |
| 1503 | CHOP(png_ptr->background.gray); |
John Bowler | db0ed3e | 2011-05-18 18:51:24 -0500 | [diff] [blame] | 1504 | # undef CHOP |
| 1505 | } |
Glenn Randers-Pehrson | 2232baa | 2011-06-14 06:59:46 -0500 | [diff] [blame] | 1506 | #endif /* PNG_READ_BACKGROUND_SUPPORTED && PNG_READ_EXPAND_16_SUPPORTED */ |
John Bowler | db0ed3e | 2011-05-18 18:51:24 -0500 | [diff] [blame] | 1507 | |
John Bowler | 18c5cfa | 2011-11-16 14:26:34 -0600 | [diff] [blame] | 1508 | #if defined(PNG_READ_BACKGROUND_SUPPORTED) && \ |
| 1509 | (defined(PNG_READ_SCALE_16_TO_8_SUPPORTED) || \ |
| 1510 | defined(PNG_READ_STRIP_16_TO_8_SUPPORTED)) |
| 1511 | if ((png_ptr->transformations & (PNG_16_TO_8|PNG_SCALE_16_TO_8)) && |
| 1512 | (png_ptr->transformations & PNG_COMPOSE) && |
| 1513 | !(png_ptr->transformations & PNG_BACKGROUND_EXPAND) && |
| 1514 | png_ptr->bit_depth == 16) |
| 1515 | { |
| 1516 | /* On the other hand, if a 16-bit file is to be reduced to 8-bits per |
| 1517 | * component this will also happen after PNG_COMPOSE and so the background |
| 1518 | * color must be pre-expanded here. |
| 1519 | * |
| 1520 | * TODO: fix this too. |
| 1521 | */ |
| 1522 | png_ptr->background.red = (png_uint_16)(png_ptr->background.red * 257); |
| 1523 | png_ptr->background.green = |
| 1524 | (png_uint_16)(png_ptr->background.green * 257); |
| 1525 | png_ptr->background.blue = (png_uint_16)(png_ptr->background.blue * 257); |
| 1526 | png_ptr->background.gray = (png_uint_16)(png_ptr->background.gray * 257); |
| 1527 | } |
| 1528 | #endif |
| 1529 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1530 | /* NOTE: below 'PNG_READ_ALPHA_MODE_SUPPORTED' is presumed to also enable the |
| 1531 | * background support (see the comments in scripts/pnglibconf.dfa), this |
| 1532 | * allows pre-multiplication of the alpha channel to be implemented as |
| 1533 | * compositing on black. This is probably sub-optimal and has been done in |
Glenn Randers-Pehrson | ef217b7 | 2011-06-15 12:58:27 -0500 | [diff] [blame] | 1534 | * 1.5.4 betas simply to enable external critique and testing (i.e. to |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1535 | * implement the new API quickly, without lots of internal changes.) |
| 1536 | */ |
| 1537 | |
| 1538 | #ifdef PNG_READ_GAMMA_SUPPORTED |
| 1539 | # ifdef PNG_READ_BACKGROUND_SUPPORTED |
| 1540 | /* Includes ALPHA_MODE */ |
| 1541 | png_ptr->background_1 = png_ptr->background; |
| 1542 | # endif |
| 1543 | |
| 1544 | /* This needs to change - in the palette image case a whole set of tables are |
| 1545 | * built when it would be quicker to just calculate the correct value for |
| 1546 | * each palette entry directly. Also, the test is too tricky - why check |
| 1547 | * PNG_RGB_TO_GRAY if PNG_GAMMA is not set? The answer seems to be that |
| 1548 | * PNG_GAMMA is cancelled even if the gamma is known? The test excludes the |
| 1549 | * PNG_COMPOSE case, so apparently if there is no *overall* gamma correction |
| 1550 | * the gamma tables will not be built even if composition is required on a |
| 1551 | * gamma encoded value. |
| 1552 | * |
Glenn Randers-Pehrson | ef217b7 | 2011-06-15 12:58:27 -0500 | [diff] [blame] | 1553 | * In 1.5.4 this is addressed below by an additional check on the individual |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1554 | * file gamma - if it is not 1.0 both RGB_TO_GRAY and COMPOSE need the |
| 1555 | * tables. |
| 1556 | */ |
| 1557 | if ((png_ptr->transformations & PNG_GAMMA) |
| 1558 | || ((png_ptr->transformations & PNG_RGB_TO_GRAY) |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 1559 | && (png_gamma_significant(png_ptr->colorspace.gamma) || |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1560 | png_gamma_significant(png_ptr->screen_gamma))) |
| 1561 | || ((png_ptr->transformations & PNG_COMPOSE) |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 1562 | && (png_gamma_significant(png_ptr->colorspace.gamma) |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1563 | || png_gamma_significant(png_ptr->screen_gamma) |
Glenn Randers-Pehrson | 903c64d | 2011-06-15 11:50:23 -0500 | [diff] [blame] | 1564 | # ifdef PNG_READ_BACKGROUND_SUPPORTED |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1565 | || (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_UNIQUE |
Glenn Randers-Pehrson | 903c64d | 2011-06-15 11:50:23 -0500 | [diff] [blame] | 1566 | && png_gamma_significant(png_ptr->background_gamma)) |
| 1567 | # endif |
| 1568 | )) || ((png_ptr->transformations & PNG_ENCODE_ALPHA) |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1569 | && png_gamma_significant(png_ptr->screen_gamma)) |
| 1570 | ) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1571 | { |
Glenn Randers-Pehrson | f81b50b | 2009-12-29 16:50:15 -0600 | [diff] [blame] | 1572 | png_build_gamma_table(png_ptr, png_ptr->bit_depth); |
Glenn Randers-Pehrson | ffa8924 | 2009-12-13 08:14:40 -0600 | [diff] [blame] | 1573 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1574 | #ifdef PNG_READ_BACKGROUND_SUPPORTED |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1575 | if (png_ptr->transformations & PNG_COMPOSE) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1576 | { |
John Bowler | 18c5cfa | 2011-11-16 14:26:34 -0600 | [diff] [blame] | 1577 | /* Issue a warning about this combination: because RGB_TO_GRAY is |
| 1578 | * optimized to do the gamma transform if present yet do_background has |
| 1579 | * to do the same thing if both options are set a |
| 1580 | * double-gamma-correction happens. This is true in all versions of |
| 1581 | * libpng to date. |
| 1582 | */ |
| 1583 | if (png_ptr->transformations & PNG_RGB_TO_GRAY) |
| 1584 | png_warning(png_ptr, |
| 1585 | "libpng does not support gamma+background+rgb_to_gray"); |
| 1586 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1587 | if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1588 | { |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1589 | /* We don't get to here unless there is a tRNS chunk with non-opaque |
| 1590 | * entries - see the checking code at the start of this function. |
| 1591 | */ |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1592 | png_color back, back_1; |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1593 | png_colorp palette = png_ptr->palette; |
| 1594 | int num_palette = png_ptr->num_palette; |
| 1595 | int i; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1596 | if (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_FILE) |
| 1597 | { |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 1598 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1599 | back.red = png_ptr->gamma_table[png_ptr->background.red]; |
| 1600 | back.green = png_ptr->gamma_table[png_ptr->background.green]; |
| 1601 | back.blue = png_ptr->gamma_table[png_ptr->background.blue]; |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1602 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1603 | back_1.red = png_ptr->gamma_to_1[png_ptr->background.red]; |
| 1604 | back_1.green = png_ptr->gamma_to_1[png_ptr->background.green]; |
| 1605 | back_1.blue = png_ptr->gamma_to_1[png_ptr->background.blue]; |
| 1606 | } |
| 1607 | else |
| 1608 | { |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 1609 | png_fixed_point g, gs; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1610 | |
Glenn Randers-Pehrson | 8f8fb6a | 1998-03-09 23:02:06 -0600 | [diff] [blame] | 1611 | switch (png_ptr->background_gamma_type) |
Glenn Randers-Pehrson | 4922b1b | 1998-03-08 22:55:17 -0600 | [diff] [blame] | 1612 | { |
Glenn Randers-Pehrson | 8f8fb6a | 1998-03-09 23:02:06 -0600 | [diff] [blame] | 1613 | case PNG_BACKGROUND_GAMMA_SCREEN: |
| 1614 | g = (png_ptr->screen_gamma); |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 1615 | gs = PNG_FP_1; |
Glenn Randers-Pehrson | 8f8fb6a | 1998-03-09 23:02:06 -0600 | [diff] [blame] | 1616 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1617 | |
Glenn Randers-Pehrson | 8f8fb6a | 1998-03-09 23:02:06 -0600 | [diff] [blame] | 1618 | case PNG_BACKGROUND_GAMMA_FILE: |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 1619 | g = png_reciprocal(png_ptr->colorspace.gamma); |
| 1620 | gs = png_reciprocal2(png_ptr->colorspace.gamma, |
Glenn Randers-Pehrson | 29034c5 | 2010-07-29 17:58:49 -0500 | [diff] [blame] | 1621 | png_ptr->screen_gamma); |
Glenn Randers-Pehrson | 8f8fb6a | 1998-03-09 23:02:06 -0600 | [diff] [blame] | 1622 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1623 | |
Glenn Randers-Pehrson | 8f8fb6a | 1998-03-09 23:02:06 -0600 | [diff] [blame] | 1624 | case PNG_BACKGROUND_GAMMA_UNIQUE: |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 1625 | g = png_reciprocal(png_ptr->background_gamma); |
| 1626 | gs = png_reciprocal2(png_ptr->background_gamma, |
Glenn Randers-Pehrson | 29034c5 | 2010-07-29 17:58:49 -0500 | [diff] [blame] | 1627 | png_ptr->screen_gamma); |
Glenn Randers-Pehrson | 8f8fb6a | 1998-03-09 23:02:06 -0600 | [diff] [blame] | 1628 | break; |
| 1629 | default: |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 1630 | g = PNG_FP_1; /* back_1 */ |
| 1631 | gs = PNG_FP_1; /* back */ |
Glenn Randers-Pehrson | 29034c5 | 2010-07-29 17:58:49 -0500 | [diff] [blame] | 1632 | break; |
Glenn Randers-Pehrson | 8f8fb6a | 1998-03-09 23:02:06 -0600 | [diff] [blame] | 1633 | } |
| 1634 | |
Glenn Randers-Pehrson | bc363ec | 2010-10-12 21:17:00 -0500 | [diff] [blame] | 1635 | if (png_gamma_significant(gs)) |
Glenn Randers-Pehrson | 8f8fb6a | 1998-03-09 23:02:06 -0600 | [diff] [blame] | 1636 | { |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 1637 | back.red = png_gamma_8bit_correct(png_ptr->background.red, |
| 1638 | gs); |
| 1639 | back.green = png_gamma_8bit_correct(png_ptr->background.green, |
| 1640 | gs); |
| 1641 | back.blue = png_gamma_8bit_correct(png_ptr->background.blue, |
| 1642 | gs); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1643 | } |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1644 | |
| 1645 | else |
| 1646 | { |
| 1647 | back.red = (png_byte)png_ptr->background.red; |
| 1648 | back.green = (png_byte)png_ptr->background.green; |
| 1649 | back.blue = (png_byte)png_ptr->background.blue; |
| 1650 | } |
| 1651 | |
| 1652 | if (png_gamma_significant(g)) |
| 1653 | { |
| 1654 | back_1.red = png_gamma_8bit_correct(png_ptr->background.red, |
| 1655 | g); |
| 1656 | back_1.green = png_gamma_8bit_correct( |
| 1657 | png_ptr->background.green, g); |
| 1658 | back_1.blue = png_gamma_8bit_correct(png_ptr->background.blue, |
| 1659 | g); |
| 1660 | } |
| 1661 | |
| 1662 | else |
| 1663 | { |
| 1664 | back_1.red = (png_byte)png_ptr->background.red; |
| 1665 | back_1.green = (png_byte)png_ptr->background.green; |
| 1666 | back_1.blue = (png_byte)png_ptr->background.blue; |
| 1667 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1668 | } |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1669 | |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1670 | for (i = 0; i < num_palette; i++) |
| 1671 | { |
Glenn Randers-Pehrson | a313751 | 2010-08-18 20:25:36 -0500 | [diff] [blame] | 1672 | if (i < (int)png_ptr->num_trans && |
| 1673 | png_ptr->trans_alpha[i] != 0xff) |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1674 | { |
Glenn Randers-Pehrson | 6abea75 | 2009-08-08 16:52:06 -0500 | [diff] [blame] | 1675 | if (png_ptr->trans_alpha[i] == 0) |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1676 | { |
| 1677 | palette[i] = back; |
| 1678 | } |
Glenn Randers-Pehrson | 6abea75 | 2009-08-08 16:52:06 -0500 | [diff] [blame] | 1679 | else /* if (png_ptr->trans_alpha[i] != 0xff) */ |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1680 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1681 | png_byte v, w; |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1682 | |
| 1683 | v = png_ptr->gamma_to_1[palette[i].red]; |
Glenn Randers-Pehrson | 6abea75 | 2009-08-08 16:52:06 -0500 | [diff] [blame] | 1684 | png_composite(w, v, png_ptr->trans_alpha[i], back_1.red); |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1685 | palette[i].red = png_ptr->gamma_from_1[w]; |
| 1686 | |
| 1687 | v = png_ptr->gamma_to_1[palette[i].green]; |
Glenn Randers-Pehrson | 6abea75 | 2009-08-08 16:52:06 -0500 | [diff] [blame] | 1688 | png_composite(w, v, png_ptr->trans_alpha[i], back_1.green); |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1689 | palette[i].green = png_ptr->gamma_from_1[w]; |
| 1690 | |
| 1691 | v = png_ptr->gamma_to_1[palette[i].blue]; |
Glenn Randers-Pehrson | 6abea75 | 2009-08-08 16:52:06 -0500 | [diff] [blame] | 1692 | png_composite(w, v, png_ptr->trans_alpha[i], back_1.blue); |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1693 | palette[i].blue = png_ptr->gamma_from_1[w]; |
| 1694 | } |
| 1695 | } |
| 1696 | else |
| 1697 | { |
| 1698 | palette[i].red = png_ptr->gamma_table[palette[i].red]; |
| 1699 | palette[i].green = png_ptr->gamma_table[palette[i].green]; |
| 1700 | palette[i].blue = png_ptr->gamma_table[palette[i].blue]; |
| 1701 | } |
| 1702 | } |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1703 | |
| 1704 | /* Prevent the transformations being done again. |
| 1705 | * |
Glenn Randers-Pehrson | 63071ac | 2011-08-29 16:16:26 -0500 | [diff] [blame] | 1706 | * NOTE: this is highly dubious; it removes the transformations in |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1707 | * place. This seems inconsistent with the general treatment of the |
| 1708 | * transformations elsewhere. |
Glenn Randers-Pehrson | 72cbc6e | 2009-09-20 07:28:43 -0500 | [diff] [blame] | 1709 | */ |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1710 | png_ptr->transformations &= ~(PNG_COMPOSE | PNG_GAMMA); |
| 1711 | } /* color_type == PNG_COLOR_TYPE_PALETTE */ |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 1712 | |
Glenn Randers-Pehrson | d1e8c86 | 2002-06-20 06:54:34 -0500 | [diff] [blame] | 1713 | /* if (png_ptr->background_gamma_type!=PNG_BACKGROUND_GAMMA_UNKNOWN) */ |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1714 | else /* color_type != PNG_COLOR_TYPE_PALETTE */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1715 | { |
John Bowler | 07772cb | 2011-10-14 18:19:47 -0500 | [diff] [blame] | 1716 | int gs_sig, g_sig; |
| 1717 | png_fixed_point g = PNG_FP_1; /* Correction to linear */ |
| 1718 | png_fixed_point gs = PNG_FP_1; /* Correction to screen */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1719 | |
| 1720 | switch (png_ptr->background_gamma_type) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 1721 | { |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1722 | case PNG_BACKGROUND_GAMMA_SCREEN: |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 1723 | g = png_ptr->screen_gamma; |
| 1724 | /* gs = PNG_FP_1; */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1725 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1726 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1727 | case PNG_BACKGROUND_GAMMA_FILE: |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 1728 | g = png_reciprocal(png_ptr->colorspace.gamma); |
| 1729 | gs = png_reciprocal2(png_ptr->colorspace.gamma, |
| 1730 | png_ptr->screen_gamma); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1731 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1732 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1733 | case PNG_BACKGROUND_GAMMA_UNIQUE: |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 1734 | g = png_reciprocal(png_ptr->background_gamma); |
| 1735 | gs = png_reciprocal2(png_ptr->background_gamma, |
Glenn Randers-Pehrson | 29034c5 | 2010-07-29 17:58:49 -0500 | [diff] [blame] | 1736 | png_ptr->screen_gamma); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1737 | break; |
Glenn Randers-Pehrson | b3edc73 | 2010-11-21 14:06:41 -0600 | [diff] [blame] | 1738 | |
| 1739 | default: |
Glenn Randers-Pehrson | e9eeb74 | 2011-05-08 19:38:42 -0500 | [diff] [blame] | 1740 | png_error(png_ptr, "invalid background gamma type"); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1741 | } |
| 1742 | |
John Bowler | 07772cb | 2011-10-14 18:19:47 -0500 | [diff] [blame] | 1743 | g_sig = png_gamma_significant(g); |
| 1744 | gs_sig = png_gamma_significant(gs); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 1745 | |
Glenn Randers-Pehrson | 0567015 | 2014-03-08 12:39:52 -0600 | [diff] [blame] | 1746 | if (g_sig != 0) |
John Bowler | 07772cb | 2011-10-14 18:19:47 -0500 | [diff] [blame] | 1747 | png_ptr->background_1.gray = png_gamma_correct(png_ptr, |
| 1748 | png_ptr->background.gray, g); |
| 1749 | |
Glenn Randers-Pehrson | 0567015 | 2014-03-08 12:39:52 -0600 | [diff] [blame] | 1750 | if (gs_sig != 0) |
John Bowler | 07772cb | 2011-10-14 18:19:47 -0500 | [diff] [blame] | 1751 | png_ptr->background.gray = png_gamma_correct(png_ptr, |
| 1752 | png_ptr->background.gray, gs); |
Glenn Randers-Pehrson | 377657d | 2002-03-08 01:31:27 -0600 | [diff] [blame] | 1753 | |
Glenn Randers-Pehrson | 73d57cb | 2002-03-25 18:49:08 -0600 | [diff] [blame] | 1754 | if ((png_ptr->background.red != png_ptr->background.green) || |
| 1755 | (png_ptr->background.red != png_ptr->background.blue) || |
| 1756 | (png_ptr->background.red != png_ptr->background.gray)) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1757 | { |
Glenn Randers-Pehrson | 73d57cb | 2002-03-25 18:49:08 -0600 | [diff] [blame] | 1758 | /* RGB or RGBA with color background */ |
Glenn Randers-Pehrson | 0567015 | 2014-03-08 12:39:52 -0600 | [diff] [blame] | 1759 | if (g_sig != 0) |
John Bowler | 07772cb | 2011-10-14 18:19:47 -0500 | [diff] [blame] | 1760 | { |
| 1761 | png_ptr->background_1.red = png_gamma_correct(png_ptr, |
| 1762 | png_ptr->background.red, g); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 1763 | |
John Bowler | 07772cb | 2011-10-14 18:19:47 -0500 | [diff] [blame] | 1764 | png_ptr->background_1.green = png_gamma_correct(png_ptr, |
| 1765 | png_ptr->background.green, g); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 1766 | |
John Bowler | 07772cb | 2011-10-14 18:19:47 -0500 | [diff] [blame] | 1767 | png_ptr->background_1.blue = png_gamma_correct(png_ptr, |
| 1768 | png_ptr->background.blue, g); |
| 1769 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 1770 | |
Glenn Randers-Pehrson | 0567015 | 2014-03-08 12:39:52 -0600 | [diff] [blame] | 1771 | if (gs_sig != 0) |
John Bowler | 07772cb | 2011-10-14 18:19:47 -0500 | [diff] [blame] | 1772 | { |
| 1773 | png_ptr->background.red = png_gamma_correct(png_ptr, |
| 1774 | png_ptr->background.red, gs); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 1775 | |
John Bowler | 07772cb | 2011-10-14 18:19:47 -0500 | [diff] [blame] | 1776 | png_ptr->background.green = png_gamma_correct(png_ptr, |
| 1777 | png_ptr->background.green, gs); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 1778 | |
John Bowler | 07772cb | 2011-10-14 18:19:47 -0500 | [diff] [blame] | 1779 | png_ptr->background.blue = png_gamma_correct(png_ptr, |
| 1780 | png_ptr->background.blue, gs); |
| 1781 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1782 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 1783 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1784 | else |
| 1785 | { |
Glenn Randers-Pehrson | 73d57cb | 2002-03-25 18:49:08 -0600 | [diff] [blame] | 1786 | /* GRAY, GRAY ALPHA, RGB, or RGBA with gray background */ |
| 1787 | png_ptr->background_1.red = png_ptr->background_1.green |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1788 | = png_ptr->background_1.blue = png_ptr->background_1.gray; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 1789 | |
Glenn Randers-Pehrson | 73d57cb | 2002-03-25 18:49:08 -0600 | [diff] [blame] | 1790 | png_ptr->background.red = png_ptr->background.green |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1791 | = png_ptr->background.blue = png_ptr->background.gray; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1792 | } |
John Bowler | 07772cb | 2011-10-14 18:19:47 -0500 | [diff] [blame] | 1793 | |
| 1794 | /* The background is now in screen gamma: */ |
| 1795 | png_ptr->background_gamma_type = PNG_BACKGROUND_GAMMA_SCREEN; |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1796 | } /* color_type != PNG_COLOR_TYPE_PALETTE */ |
| 1797 | }/* png_ptr->transformations & PNG_BACKGROUND */ |
| 1798 | |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1799 | else |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 1800 | /* Transformation does not include PNG_BACKGROUND */ |
Glenn Randers-Pehrson | 5a0be34 | 2001-10-18 20:55:13 -0500 | [diff] [blame] | 1801 | #endif /* PNG_READ_BACKGROUND_SUPPORTED */ |
John Bowler | 18c5cfa | 2011-11-16 14:26:34 -0600 | [diff] [blame] | 1802 | if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE |
| 1803 | #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED |
| 1804 | /* RGB_TO_GRAY needs to have non-gamma-corrected values! */ |
| 1805 | && ((png_ptr->transformations & PNG_EXPAND) == 0 || |
| 1806 | (png_ptr->transformations & PNG_RGB_TO_GRAY) == 0) |
| 1807 | #endif |
| 1808 | ) |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1809 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1810 | png_colorp palette = png_ptr->palette; |
| 1811 | int num_palette = png_ptr->num_palette; |
| 1812 | int i; |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1813 | |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 1814 | /* NOTE: there are other transformations that should probably be in |
| 1815 | * here too. |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1816 | */ |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1817 | for (i = 0; i < num_palette; i++) |
| 1818 | { |
| 1819 | palette[i].red = png_ptr->gamma_table[palette[i].red]; |
| 1820 | palette[i].green = png_ptr->gamma_table[palette[i].green]; |
| 1821 | palette[i].blue = png_ptr->gamma_table[palette[i].blue]; |
| 1822 | } |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 1823 | |
Glenn Randers-Pehrson | 72cbc6e | 2009-09-20 07:28:43 -0500 | [diff] [blame] | 1824 | /* Done the gamma correction. */ |
| 1825 | png_ptr->transformations &= ~PNG_GAMMA; |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1826 | } /* color_type == PALETTE && !PNG_BACKGROUND transformation */ |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1827 | } |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1828 | #ifdef PNG_READ_BACKGROUND_SUPPORTED |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1829 | else |
| 1830 | #endif |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 1831 | #endif /* PNG_READ_GAMMA_SUPPORTED */ |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1832 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1833 | #ifdef PNG_READ_BACKGROUND_SUPPORTED |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1834 | /* No GAMMA transformation (see the hanging else 4 lines above) */ |
| 1835 | if ((png_ptr->transformations & PNG_COMPOSE) && |
| 1836 | (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)) |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1837 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1838 | int i; |
| 1839 | int istop = (int)png_ptr->num_trans; |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1840 | png_color back; |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1841 | png_colorp palette = png_ptr->palette; |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1842 | |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1843 | back.red = (png_byte)png_ptr->background.red; |
| 1844 | back.green = (png_byte)png_ptr->background.green; |
| 1845 | back.blue = (png_byte)png_ptr->background.blue; |
| 1846 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1847 | for (i = 0; i < istop; i++) |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1848 | { |
Glenn Randers-Pehrson | 6abea75 | 2009-08-08 16:52:06 -0500 | [diff] [blame] | 1849 | if (png_ptr->trans_alpha[i] == 0) |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1850 | { |
| 1851 | palette[i] = back; |
| 1852 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 1853 | |
Glenn Randers-Pehrson | 6abea75 | 2009-08-08 16:52:06 -0500 | [diff] [blame] | 1854 | else if (png_ptr->trans_alpha[i] != 0xff) |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1855 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1856 | /* The png_composite() macro is defined in png.h */ |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1857 | png_composite(palette[i].red, palette[i].red, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1858 | png_ptr->trans_alpha[i], back.red); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 1859 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1860 | png_composite(palette[i].green, palette[i].green, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1861 | png_ptr->trans_alpha[i], back.green); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 1862 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1863 | png_composite(palette[i].blue, palette[i].blue, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1864 | png_ptr->trans_alpha[i], back.blue); |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1865 | } |
| 1866 | } |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 1867 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1868 | png_ptr->transformations &= ~PNG_COMPOSE; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1869 | } |
Glenn Randers-Pehrson | 5a0be34 | 2001-10-18 20:55:13 -0500 | [diff] [blame] | 1870 | #endif /* PNG_READ_BACKGROUND_SUPPORTED */ |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1871 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1872 | #ifdef PNG_READ_SHIFT_SUPPORTED |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1873 | if ((png_ptr->transformations & PNG_SHIFT) && |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 1874 | !(png_ptr->transformations & PNG_EXPAND) && |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1875 | (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)) |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1876 | { |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 1877 | int i; |
| 1878 | int istop = png_ptr->num_palette; |
| 1879 | int shift = 8 - png_ptr->sig_bit.red; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1880 | |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 1881 | png_ptr->transformations &= ~PNG_SHIFT; |
| 1882 | |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 1883 | /* significant bits can be in the range 1 to 7 for a meaninful result, if |
| 1884 | * the number of significant bits is 0 then no shift is done (this is an |
| 1885 | * error condition which is silently ignored.) |
| 1886 | */ |
Glenn Randers-Pehrson | 3244020 | 2013-08-21 18:01:32 -0500 | [diff] [blame] | 1887 | if (shift > 0 && shift < 8) |
| 1888 | for (i=0; i<istop; ++i) |
| 1889 | { |
| 1890 | int component = png_ptr->palette[i].red; |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 1891 | |
Glenn Randers-Pehrson | 3244020 | 2013-08-21 18:01:32 -0500 | [diff] [blame] | 1892 | component >>= shift; |
| 1893 | png_ptr->palette[i].red = (png_byte)component; |
| 1894 | } |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 1895 | |
| 1896 | shift = 8 - png_ptr->sig_bit.green; |
Glenn Randers-Pehrson | 3244020 | 2013-08-21 18:01:32 -0500 | [diff] [blame] | 1897 | if (shift > 0 && shift < 8) |
| 1898 | for (i=0; i<istop; ++i) |
| 1899 | { |
| 1900 | int component = png_ptr->palette[i].green; |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 1901 | |
Glenn Randers-Pehrson | 3244020 | 2013-08-21 18:01:32 -0500 | [diff] [blame] | 1902 | component >>= shift; |
| 1903 | png_ptr->palette[i].green = (png_byte)component; |
| 1904 | } |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 1905 | |
| 1906 | shift = 8 - png_ptr->sig_bit.blue; |
Glenn Randers-Pehrson | 3244020 | 2013-08-21 18:01:32 -0500 | [diff] [blame] | 1907 | if (shift > 0 && shift < 8) |
| 1908 | for (i=0; i<istop; ++i) |
| 1909 | { |
| 1910 | int component = png_ptr->palette[i].blue; |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 1911 | |
Glenn Randers-Pehrson | 3244020 | 2013-08-21 18:01:32 -0500 | [diff] [blame] | 1912 | component >>= shift; |
| 1913 | png_ptr->palette[i].blue = (png_byte)component; |
| 1914 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1915 | } |
Glenn Randers-Pehrson | 5a0be34 | 2001-10-18 20:55:13 -0500 | [diff] [blame] | 1916 | #endif /* PNG_READ_SHIFT_SUPPORTED */ |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1917 | } |
| 1918 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1919 | /* Modify the info structure to reflect the transformations. The |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 1920 | * info should be updated so a PNG file could be written with it, |
| 1921 | * assuming the transformations result in valid PNG data. |
| 1922 | */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 1923 | void /* PRIVATE */ |
John Bowler | 5d56786 | 2011-12-24 09:12:00 -0600 | [diff] [blame] | 1924 | png_read_transform_info(png_structrp png_ptr, png_inforp info_ptr) |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1925 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 1926 | png_debug(1, "in png_read_transform_info"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 1927 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1928 | #ifdef PNG_READ_EXPAND_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1929 | if (png_ptr->transformations & PNG_EXPAND) |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1930 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1931 | if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) |
| 1932 | { |
John Bowler | 9994f25 | 2011-05-15 18:52:39 -0500 | [diff] [blame] | 1933 | /* This check must match what actually happens in |
Glenn Randers-Pehrson | 0e128df | 2011-05-15 19:09:24 -0500 | [diff] [blame] | 1934 | * png_do_expand_palette; if it ever checks the tRNS chunk to see if |
John Bowler | 9994f25 | 2011-05-15 18:52:39 -0500 | [diff] [blame] | 1935 | * it is all opaque we must do the same (at present it does not.) |
| 1936 | */ |
| 1937 | if (png_ptr->num_trans > 0) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1938 | info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 1939 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1940 | else |
| 1941 | info_ptr->color_type = PNG_COLOR_TYPE_RGB; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 1942 | |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1943 | info_ptr->bit_depth = 8; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1944 | info_ptr->num_trans = 0; |
Glenn Randers-Pehrson | 67f101e | 2013-12-14 12:36:28 -0600 | [diff] [blame] | 1945 | |
| 1946 | if (png_ptr->palette == NULL) |
| 1947 | png_error (png_ptr, "Palette is NULL in indexed image"); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1948 | } |
| 1949 | else |
| 1950 | { |
| 1951 | if (png_ptr->num_trans) |
Glenn Randers-Pehrson | 1ce0836 | 2006-03-08 23:35:59 -0600 | [diff] [blame] | 1952 | { |
| 1953 | if (png_ptr->transformations & PNG_EXPAND_tRNS) |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1954 | info_ptr->color_type |= PNG_COLOR_MASK_ALPHA; |
Glenn Randers-Pehrson | 1ce0836 | 2006-03-08 23:35:59 -0600 | [diff] [blame] | 1955 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1956 | if (info_ptr->bit_depth < 8) |
| 1957 | info_ptr->bit_depth = 8; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 1958 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1959 | info_ptr->num_trans = 0; |
| 1960 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1961 | } |
| 1962 | #endif |
| 1963 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1964 | #if defined(PNG_READ_BACKGROUND_SUPPORTED) ||\ |
| 1965 | defined(PNG_READ_ALPHA_MODE_SUPPORTED) |
| 1966 | /* The following is almost certainly wrong unless the background value is in |
| 1967 | * the screen space! |
| 1968 | */ |
| 1969 | if (png_ptr->transformations & PNG_COMPOSE) |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1970 | info_ptr->background = png_ptr->background; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1971 | #endif |
| 1972 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1973 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Glenn Randers-Pehrson | ef217b7 | 2011-06-15 12:58:27 -0500 | [diff] [blame] | 1974 | /* The following used to be conditional on PNG_GAMMA (prior to 1.5.4), |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1975 | * however it seems that the code in png_init_read_transformations, which has |
| 1976 | * been called before this from png_read_update_info->png_read_start_row |
| 1977 | * sometimes does the gamma transform and cancels the flag. |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 1978 | * |
| 1979 | * TODO: this looks wrong; the info_ptr should end up with a gamma equal to |
| 1980 | * the screen_gamma value. The following probably results in weirdness if |
| 1981 | * the info_ptr is used by the app after the rows have been read. |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1982 | */ |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 1983 | info_ptr->colorspace.gamma = png_ptr->colorspace.gamma; |
Glenn Randers-Pehrson | 166c5a3 | 1999-12-10 09:43:02 -0600 | [diff] [blame] | 1984 | #endif |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 1985 | |
Glenn Randers-Pehrson | 4554a54 | 2010-08-27 10:48:45 -0500 | [diff] [blame] | 1986 | if (info_ptr->bit_depth == 16) |
| 1987 | { |
John Bowler | 8d26126 | 2011-06-18 13:37:11 -0500 | [diff] [blame] | 1988 | # ifdef PNG_READ_16BIT_SUPPORTED |
| 1989 | # ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED |
| 1990 | if (png_ptr->transformations & PNG_SCALE_16_TO_8) |
| 1991 | info_ptr->bit_depth = 8; |
| 1992 | # endif |
| 1993 | |
| 1994 | # ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED |
| 1995 | if (png_ptr->transformations & PNG_16_TO_8) |
| 1996 | info_ptr->bit_depth = 8; |
| 1997 | # endif |
| 1998 | |
| 1999 | # else |
| 2000 | /* No 16 bit support: force chopping 16-bit input down to 8, in this case |
| 2001 | * the app program can chose if both APIs are available by setting the |
| 2002 | * correct scaling to use. |
| 2003 | */ |
| 2004 | # ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED |
| 2005 | /* For compatibility with previous versions use the strip method by |
| 2006 | * default. This code works because if PNG_SCALE_16_TO_8 is already |
| 2007 | * set the code below will do that in preference to the chop. |
| 2008 | */ |
| 2009 | png_ptr->transformations |= PNG_16_TO_8; |
| 2010 | info_ptr->bit_depth = 8; |
| 2011 | # else |
| 2012 | |
Glenn Randers-Pehrson | 0b26ac5 | 2011-11-28 10:38:41 -0600 | [diff] [blame] | 2013 | # ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED |
John Bowler | 8d26126 | 2011-06-18 13:37:11 -0500 | [diff] [blame] | 2014 | png_ptr->transformations |= PNG_SCALE_16_TO_8; |
| 2015 | info_ptr->bit_depth = 8; |
| 2016 | # else |
| 2017 | |
| 2018 | CONFIGURATION ERROR: you must enable at least one 16 to 8 method |
| 2019 | # endif |
Glenn Randers-Pehrson | aee83b4 | 2011-06-18 00:19:54 -0500 | [diff] [blame] | 2020 | # endif |
John Bowler | 8d26126 | 2011-06-18 13:37:11 -0500 | [diff] [blame] | 2021 | #endif /* !READ_16BIT_SUPPORTED */ |
Glenn Randers-Pehrson | 4554a54 | 2010-08-27 10:48:45 -0500 | [diff] [blame] | 2022 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2023 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2024 | #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED |
Glenn Randers-Pehrson | ddfebd3 | 2006-02-22 09:19:25 -0600 | [diff] [blame] | 2025 | if (png_ptr->transformations & PNG_GRAY_TO_RGB) |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2026 | info_ptr->color_type = (png_byte)(info_ptr->color_type | |
| 2027 | PNG_COLOR_MASK_COLOR); |
Glenn Randers-Pehrson | ddfebd3 | 2006-02-22 09:19:25 -0600 | [diff] [blame] | 2028 | #endif |
| 2029 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2030 | #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED |
Glenn Randers-Pehrson | ddfebd3 | 2006-02-22 09:19:25 -0600 | [diff] [blame] | 2031 | if (png_ptr->transformations & PNG_RGB_TO_GRAY) |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2032 | info_ptr->color_type = (png_byte)(info_ptr->color_type & |
| 2033 | ~PNG_COLOR_MASK_COLOR); |
Glenn Randers-Pehrson | ddfebd3 | 2006-02-22 09:19:25 -0600 | [diff] [blame] | 2034 | #endif |
| 2035 | |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 2036 | #ifdef PNG_READ_QUANTIZE_SUPPORTED |
| 2037 | if (png_ptr->transformations & PNG_QUANTIZE) |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2038 | { |
| 2039 | if (((info_ptr->color_type == PNG_COLOR_TYPE_RGB) || |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 2040 | (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)) && |
| 2041 | png_ptr->palette_lookup && info_ptr->bit_depth == 8) |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2042 | { |
| 2043 | info_ptr->color_type = PNG_COLOR_TYPE_PALETTE; |
| 2044 | } |
| 2045 | } |
| 2046 | #endif |
| 2047 | |
John Bowler | 1921e6d | 2011-05-16 20:57:54 -0500 | [diff] [blame] | 2048 | #ifdef PNG_READ_EXPAND_16_SUPPORTED |
| 2049 | if (png_ptr->transformations & PNG_EXPAND_16 && info_ptr->bit_depth == 8 && |
| 2050 | info_ptr->color_type != PNG_COLOR_TYPE_PALETTE) |
| 2051 | { |
| 2052 | info_ptr->bit_depth = 16; |
| 2053 | } |
| 2054 | #endif |
| 2055 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2056 | #ifdef PNG_READ_PACK_SUPPORTED |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 2057 | if ((png_ptr->transformations & PNG_PACK) && (info_ptr->bit_depth < 8)) |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2058 | info_ptr->bit_depth = 8; |
| 2059 | #endif |
| 2060 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2061 | if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2062 | info_ptr->channels = 1; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2063 | |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2064 | else if (info_ptr->color_type & PNG_COLOR_MASK_COLOR) |
| 2065 | info_ptr->channels = 3; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2066 | |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2067 | else |
| 2068 | info_ptr->channels = 1; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2069 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2070 | #ifdef PNG_READ_STRIP_ALPHA_SUPPORTED |
John Bowler | 9b872f4 | 2011-02-12 09:00:16 -0600 | [diff] [blame] | 2071 | if (png_ptr->transformations & PNG_STRIP_ALPHA) |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 2072 | { |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2073 | info_ptr->color_type = (png_byte)(info_ptr->color_type & |
| 2074 | ~PNG_COLOR_MASK_ALPHA); |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 2075 | info_ptr->num_trans = 0; |
| 2076 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2077 | #endif |
| 2078 | |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2079 | if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA) |
| 2080 | info_ptr->channels++; |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2081 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2082 | #ifdef PNG_READ_FILLER_SUPPORTED |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2083 | /* STRIP_ALPHA and FILLER allowed: MASK_ALPHA bit stripped above */ |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 2084 | if ((png_ptr->transformations & PNG_FILLER) && |
| 2085 | ((info_ptr->color_type == PNG_COLOR_TYPE_RGB) || |
| 2086 | (info_ptr->color_type == PNG_COLOR_TYPE_GRAY))) |
Glenn Randers-Pehrson | 5e5c1e1 | 2000-11-10 12:26:19 -0600 | [diff] [blame] | 2087 | { |
Glenn Randers-Pehrson | 860ab2b | 1999-10-14 07:43:10 -0500 | [diff] [blame] | 2088 | info_ptr->channels++; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 2089 | /* If adding a true alpha channel not just filler */ |
Glenn Randers-Pehrson | 67864af | 2004-08-28 23:30:07 -0500 | [diff] [blame] | 2090 | if (png_ptr->transformations & PNG_ADD_ALPHA) |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2091 | info_ptr->color_type |= PNG_COLOR_MASK_ALPHA; |
Glenn Randers-Pehrson | 5e5c1e1 | 2000-11-10 12:26:19 -0600 | [diff] [blame] | 2092 | } |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2093 | #endif |
| 2094 | |
Glenn Randers-Pehrson | 6942d53 | 2000-05-01 09:31:54 -0500 | [diff] [blame] | 2095 | #if defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) && \ |
| 2096 | defined(PNG_READ_USER_TRANSFORM_SUPPORTED) |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 2097 | if (png_ptr->transformations & PNG_USER_TRANSFORM) |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2098 | { |
| 2099 | if (info_ptr->bit_depth < png_ptr->user_transform_depth) |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 2100 | info_ptr->bit_depth = png_ptr->user_transform_depth; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2101 | |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2102 | if (info_ptr->channels < png_ptr->user_transform_channels) |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 2103 | info_ptr->channels = png_ptr->user_transform_channels; |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2104 | } |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 2105 | #endif |
| 2106 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2107 | info_ptr->pixel_depth = (png_byte)(info_ptr->channels * |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2108 | info_ptr->bit_depth); |
Glenn Randers-Pehrson | 272489d | 2004-08-04 06:34:52 -0500 | [diff] [blame] | 2109 | |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 2110 | info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, info_ptr->width); |
Glenn Randers-Pehrson | bcfd15d | 1999-10-01 14:22:25 -0500 | [diff] [blame] | 2111 | |
Glenn Randers-Pehrson | ef217b7 | 2011-06-15 12:58:27 -0500 | [diff] [blame] | 2112 | /* Adding in 1.5.4: cache the above value in png_struct so that we can later |
John Bowler | 9994f25 | 2011-05-15 18:52:39 -0500 | [diff] [blame] | 2113 | * check in png_rowbytes that the user buffer won't get overwritten. Note |
| 2114 | * that the field is not always set - if png_read_update_info isn't called |
| 2115 | * the application has to either not do any transforms or get the calculation |
| 2116 | * right itself. |
| 2117 | */ |
| 2118 | png_ptr->info_rowbytes = info_ptr->rowbytes; |
| 2119 | |
Glenn Randers-Pehrson | b2aca21 | 2009-09-23 11:32:37 -0500 | [diff] [blame] | 2120 | #ifndef PNG_READ_EXPAND_SUPPORTED |
Glenn Randers-Pehrson | 0567015 | 2014-03-08 12:39:52 -0600 | [diff] [blame] | 2121 | if (png_ptr != NULL) |
Glenn Randers-Pehrson | 104622b | 2000-05-29 08:58:03 -0500 | [diff] [blame] | 2122 | return; |
| 2123 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2124 | } |
| 2125 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2126 | #ifdef PNG_READ_PACK_SUPPORTED |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 2127 | /* Unpack pixels of 1, 2, or 4 bits per pixel into 1 byte per pixel, |
| 2128 | * without changing the actual values. Thus, if you had a row with |
| 2129 | * a bit depth of 1, you would end up with bytes that only contained |
| 2130 | * the numbers 0 or 1. If you would rather they contain 0 and 255, use |
| 2131 | * png_do_shift() after this. |
| 2132 | */ |
John Bowler | 8f1150e | 2013-12-19 15:33:49 -0600 | [diff] [blame] | 2133 | static void |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 2134 | png_do_unpack(png_row_infop row_info, png_bytep row) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2135 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 2136 | png_debug(1, "in png_do_unpack"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 2137 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2138 | if (row_info->bit_depth < 8) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2139 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2140 | png_uint_32 i; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2141 | png_uint_32 row_width=row_info->width; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2142 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2143 | switch (row_info->bit_depth) |
| 2144 | { |
| 2145 | case 1: |
| 2146 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2147 | png_bytep sp = row + (png_size_t)((row_width - 1) >> 3); |
| 2148 | png_bytep dp = row + (png_size_t)row_width - 1; |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 2149 | png_uint_32 shift = 7 - (int)((row_width + 7) & 0x07); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2150 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2151 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 2152 | *dp = (png_byte)((*sp >> shift) & 0x01); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2153 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2154 | if (shift == 7) |
| 2155 | { |
| 2156 | shift = 0; |
| 2157 | sp--; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2158 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2159 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2160 | else |
| 2161 | shift++; |
| 2162 | |
| 2163 | dp--; |
| 2164 | } |
| 2165 | break; |
| 2166 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 2167 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2168 | case 2: |
| 2169 | { |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2170 | |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2171 | png_bytep sp = row + (png_size_t)((row_width - 1) >> 2); |
| 2172 | png_bytep dp = row + (png_size_t)row_width - 1; |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 2173 | png_uint_32 shift = (int)((3 - ((row_width + 3) & 0x03)) << 1); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2174 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2175 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 2176 | *dp = (png_byte)((*sp >> shift) & 0x03); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2177 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2178 | if (shift == 6) |
| 2179 | { |
| 2180 | shift = 0; |
| 2181 | sp--; |
| 2182 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2183 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2184 | else |
| 2185 | shift += 2; |
| 2186 | |
| 2187 | dp--; |
| 2188 | } |
| 2189 | break; |
| 2190 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 2191 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2192 | case 4: |
| 2193 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2194 | png_bytep sp = row + (png_size_t)((row_width - 1) >> 1); |
| 2195 | png_bytep dp = row + (png_size_t)row_width - 1; |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 2196 | png_uint_32 shift = (int)((1 - ((row_width + 1) & 0x01)) << 2); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2197 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2198 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 2199 | *dp = (png_byte)((*sp >> shift) & 0x0f); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2200 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2201 | if (shift == 4) |
| 2202 | { |
| 2203 | shift = 0; |
| 2204 | sp--; |
| 2205 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2206 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2207 | else |
| 2208 | shift = 4; |
| 2209 | |
| 2210 | dp--; |
| 2211 | } |
| 2212 | break; |
| 2213 | } |
Glenn Randers-Pehrson | b3edc73 | 2010-11-21 14:06:41 -0600 | [diff] [blame] | 2214 | |
| 2215 | default: |
| 2216 | break; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2217 | } |
| 2218 | row_info->bit_depth = 8; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2219 | row_info->pixel_depth = (png_byte)(8 * row_info->channels); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2220 | row_info->rowbytes = row_width * row_info->channels; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2221 | } |
| 2222 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2223 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2224 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2225 | #ifdef PNG_READ_SHIFT_SUPPORTED |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 2226 | /* Reverse the effects of png_do_shift. This routine merely shifts the |
| 2227 | * pixels back to their significant bits values. Thus, if you have |
| 2228 | * a row of bit depth 8, but only 5 are significant, this will shift |
| 2229 | * the values back to 0 through 31. |
| 2230 | */ |
John Bowler | 8f1150e | 2013-12-19 15:33:49 -0600 | [diff] [blame] | 2231 | static void |
Glenn Randers-Pehrson | e600c51 | 2010-08-18 07:25:46 -0500 | [diff] [blame] | 2232 | png_do_unshift(png_row_infop row_info, png_bytep row, |
| 2233 | png_const_color_8p sig_bits) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2234 | { |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2235 | int color_type; |
| 2236 | |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 2237 | png_debug(1, "in png_do_unshift"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 2238 | |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2239 | /* The palette case has already been handled in the _init routine. */ |
| 2240 | color_type = row_info->color_type; |
| 2241 | |
| 2242 | if (color_type != PNG_COLOR_TYPE_PALETTE) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2243 | { |
| 2244 | int shift[4]; |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2245 | int channels = 0; |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2246 | int bit_depth = row_info->bit_depth; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2247 | |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2248 | if (color_type & PNG_COLOR_MASK_COLOR) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2249 | { |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2250 | shift[channels++] = bit_depth - sig_bits->red; |
| 2251 | shift[channels++] = bit_depth - sig_bits->green; |
| 2252 | shift[channels++] = bit_depth - sig_bits->blue; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2253 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2254 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2255 | else |
| 2256 | { |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2257 | shift[channels++] = bit_depth - sig_bits->gray; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2258 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2259 | |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2260 | if (color_type & PNG_COLOR_MASK_ALPHA) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2261 | { |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2262 | shift[channels++] = bit_depth - sig_bits->alpha; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2263 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2264 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2265 | { |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2266 | int c, have_shift; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2267 | |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2268 | for (c = have_shift = 0; c < channels; ++c) |
| 2269 | { |
| 2270 | /* A shift of more than the bit depth is an error condition but it |
| 2271 | * gets ignored here. |
| 2272 | */ |
| 2273 | if (shift[c] <= 0 || shift[c] >= bit_depth) |
| 2274 | shift[c] = 0; |
| 2275 | |
| 2276 | else |
| 2277 | have_shift = 1; |
| 2278 | } |
| 2279 | |
Glenn Randers-Pehrson | 0567015 | 2014-03-08 12:39:52 -0600 | [diff] [blame] | 2280 | if (have_shift == 0) |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2281 | return; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2282 | } |
Guy Schalnat | 0f71645 | 1995-11-28 11:22:13 -0600 | [diff] [blame] | 2283 | |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2284 | switch (bit_depth) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2285 | { |
Glenn Randers-Pehrson | b3edc73 | 2010-11-21 14:06:41 -0600 | [diff] [blame] | 2286 | default: |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2287 | /* Must be 1bpp gray: should not be here! */ |
| 2288 | /* NOTREACHED */ |
Glenn Randers-Pehrson | c36bb79 | 2011-02-12 09:49:07 -0600 | [diff] [blame] | 2289 | break; |
Glenn Randers-Pehrson | b3edc73 | 2010-11-21 14:06:41 -0600 | [diff] [blame] | 2290 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2291 | case 2: |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2292 | /* Must be 2bpp gray */ |
| 2293 | /* assert(channels == 1 && shift[0] == 1) */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2294 | { |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2295 | png_bytep bp = row; |
| 2296 | png_bytep bp_end = bp + row_info->rowbytes; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2297 | |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2298 | while (bp < bp_end) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2299 | { |
John Bowler | 92ef313 | 2011-10-27 19:36:08 -0500 | [diff] [blame] | 2300 | int b = (*bp >> 1) & 0x55; |
| 2301 | *bp++ = (png_byte)b; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2302 | } |
| 2303 | break; |
| 2304 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 2305 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2306 | case 4: |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2307 | /* Must be 4bpp gray */ |
| 2308 | /* assert(channels == 1) */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2309 | { |
Glenn Randers-Pehrson | 8686fff | 1998-05-21 09:27:50 -0500 | [diff] [blame] | 2310 | png_bytep bp = row; |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2311 | png_bytep bp_end = bp + row_info->rowbytes; |
| 2312 | int gray_shift = shift[0]; |
| 2313 | int mask = 0xf >> gray_shift; |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2314 | |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2315 | mask |= mask << 4; |
| 2316 | |
| 2317 | while (bp < bp_end) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2318 | { |
John Bowler | 92ef313 | 2011-10-27 19:36:08 -0500 | [diff] [blame] | 2319 | int b = (*bp >> gray_shift) & mask; |
| 2320 | *bp++ = (png_byte)b; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2321 | } |
| 2322 | break; |
| 2323 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 2324 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2325 | case 8: |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2326 | /* Single byte components, G, GA, RGB, RGBA */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2327 | { |
Glenn Randers-Pehrson | d0dce40 | 1998-05-09 10:02:29 -0500 | [diff] [blame] | 2328 | png_bytep bp = row; |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2329 | png_bytep bp_end = bp + row_info->rowbytes; |
| 2330 | int channel = 0; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2331 | |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2332 | while (bp < bp_end) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2333 | { |
John Bowler | 92ef313 | 2011-10-27 19:36:08 -0500 | [diff] [blame] | 2334 | int b = *bp >> shift[channel]; |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2335 | if (++channel >= channels) |
| 2336 | channel = 0; |
John Bowler | 92ef313 | 2011-10-27 19:36:08 -0500 | [diff] [blame] | 2337 | *bp++ = (png_byte)b; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2338 | } |
| 2339 | break; |
| 2340 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 2341 | |
Glenn Randers-Pehrson | 925d23b | 2010-08-26 21:43:18 -0500 | [diff] [blame] | 2342 | #ifdef PNG_READ_16BIT_SUPPORTED |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2343 | case 16: |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2344 | /* Double byte components, G, GA, RGB, RGBA */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2345 | { |
Glenn Randers-Pehrson | d0dce40 | 1998-05-09 10:02:29 -0500 | [diff] [blame] | 2346 | png_bytep bp = row; |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2347 | png_bytep bp_end = bp + row_info->rowbytes; |
| 2348 | int channel = 0; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2349 | |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2350 | while (bp < bp_end) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2351 | { |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2352 | int value = (bp[0] << 8) + bp[1]; |
| 2353 | |
| 2354 | value >>= shift[channel]; |
| 2355 | if (++channel >= channels) |
| 2356 | channel = 0; |
Glenn Randers-Pehrson | d0dce40 | 1998-05-09 10:02:29 -0500 | [diff] [blame] | 2357 | *bp++ = (png_byte)(value >> 8); |
| 2358 | *bp++ = (png_byte)(value & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2359 | } |
| 2360 | break; |
| 2361 | } |
Glenn Randers-Pehrson | 925d23b | 2010-08-26 21:43:18 -0500 | [diff] [blame] | 2362 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2363 | } |
| 2364 | } |
| 2365 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2366 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2367 | |
Glenn Randers-Pehrson | e6a8060 | 2011-06-17 22:28:23 -0500 | [diff] [blame] | 2368 | #ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED |
Glenn Randers-Pehrson | 413138a | 2011-06-13 22:07:37 -0500 | [diff] [blame] | 2369 | /* Scale rows of bit depth 16 down to 8 accurately */ |
John Bowler | 8f1150e | 2013-12-19 15:33:49 -0600 | [diff] [blame] | 2370 | static void |
Glenn Randers-Pehrson | 413138a | 2011-06-13 22:07:37 -0500 | [diff] [blame] | 2371 | png_do_scale_16_to_8(png_row_infop row_info, png_bytep row) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2372 | { |
Glenn Randers-Pehrson | 413138a | 2011-06-13 22:07:37 -0500 | [diff] [blame] | 2373 | png_debug(1, "in png_do_scale_16_to_8"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 2374 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2375 | if (row_info->bit_depth == 16) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2376 | { |
John Bowler | b2bee33 | 2011-06-10 23:24:58 -0500 | [diff] [blame] | 2377 | png_bytep sp = row; /* source */ |
Glenn Randers-Pehrson | efc4b69 | 2011-11-07 23:31:34 -0600 | [diff] [blame] | 2378 | png_bytep dp = row; /* destination */ |
John Bowler | b2bee33 | 2011-06-10 23:24:58 -0500 | [diff] [blame] | 2379 | png_bytep ep = sp + row_info->rowbytes; /* end+1 */ |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2380 | |
John Bowler | b2bee33 | 2011-06-10 23:24:58 -0500 | [diff] [blame] | 2381 | while (sp < ep) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2382 | { |
John Bowler | b2bee33 | 2011-06-10 23:24:58 -0500 | [diff] [blame] | 2383 | /* The input is an array of 16 bit components, these must be scaled to |
| 2384 | * 8 bits each. For a 16 bit value V the required value (from the PNG |
| 2385 | * specification) is: |
| 2386 | * |
| 2387 | * (V * 255) / 65535 |
| 2388 | * |
| 2389 | * This reduces to round(V / 257), or floor((V + 128.5)/257) |
| 2390 | * |
| 2391 | * Represent V as the two byte value vhi.vlo. Make a guess that the |
| 2392 | * result is the top byte of V, vhi, then the correction to this value |
| 2393 | * is: |
| 2394 | * |
| 2395 | * error = floor(((V-vhi.vhi) + 128.5) / 257) |
| 2396 | * = floor(((vlo-vhi) + 128.5) / 257) |
| 2397 | * |
| 2398 | * This can be approximated using integer arithmetic (and a signed |
| 2399 | * shift): |
| 2400 | * |
| 2401 | * error = (vlo-vhi+128) >> 8; |
| 2402 | * |
| 2403 | * The approximate differs from the exact answer only when (vlo-vhi) is |
| 2404 | * 128; it then gives a correction of +1 when the exact correction is |
| 2405 | * 0. This gives 128 errors. The exact answer (correct for all 16 bit |
| 2406 | * input values) is: |
| 2407 | * |
| 2408 | * error = (vlo-vhi+128)*65535 >> 24; |
| 2409 | * |
| 2410 | * An alternative arithmetic calculation which also gives no errors is: |
| 2411 | * |
| 2412 | * (V * 255 + 32895) >> 16 |
| 2413 | */ |
Glenn Randers-Pehrson | 141d9e3 | 2011-06-13 11:47:00 -0500 | [diff] [blame] | 2414 | |
John Bowler | b2bee33 | 2011-06-10 23:24:58 -0500 | [diff] [blame] | 2415 | png_int_32 tmp = *sp++; /* must be signed! */ |
| 2416 | tmp += (((int)*sp++ - tmp + 128) * 65535) >> 24; |
John Bowler | 74945f2 | 2011-06-13 20:50:42 -0500 | [diff] [blame] | 2417 | *dp++ = (png_byte)tmp; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2418 | } |
John Bowler | b2bee33 | 2011-06-10 23:24:58 -0500 | [diff] [blame] | 2419 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2420 | row_info->bit_depth = 8; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2421 | row_info->pixel_depth = (png_byte)(8 * row_info->channels); |
Glenn Randers-Pehrson | 0f881d6 | 1998-02-07 10:20:57 -0600 | [diff] [blame] | 2422 | row_info->rowbytes = row_info->width * row_info->channels; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2423 | } |
| 2424 | } |
Glenn Randers-Pehrson | e6a8060 | 2011-06-17 22:28:23 -0500 | [diff] [blame] | 2425 | #endif |
Glenn Randers-Pehrson | 413138a | 2011-06-13 22:07:37 -0500 | [diff] [blame] | 2426 | |
Glenn Randers-Pehrson | e6a8060 | 2011-06-17 22:28:23 -0500 | [diff] [blame] | 2427 | #ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED |
John Bowler | 8f1150e | 2013-12-19 15:33:49 -0600 | [diff] [blame] | 2428 | static void |
Glenn Randers-Pehrson | 413138a | 2011-06-13 22:07:37 -0500 | [diff] [blame] | 2429 | /* Simply discard the low byte. This was the default behavior prior |
| 2430 | * to libpng-1.5.4. |
| 2431 | */ |
| 2432 | png_do_chop(png_row_infop row_info, png_bytep row) |
| 2433 | { |
| 2434 | png_debug(1, "in png_do_chop"); |
| 2435 | |
| 2436 | if (row_info->bit_depth == 16) |
| 2437 | { |
| 2438 | png_bytep sp = row; /* source */ |
Glenn Randers-Pehrson | efc4b69 | 2011-11-07 23:31:34 -0600 | [diff] [blame] | 2439 | png_bytep dp = row; /* destination */ |
Glenn Randers-Pehrson | 413138a | 2011-06-13 22:07:37 -0500 | [diff] [blame] | 2440 | png_bytep ep = sp + row_info->rowbytes; /* end+1 */ |
| 2441 | |
| 2442 | while (sp < ep) |
| 2443 | { |
John Bowler | 8d26126 | 2011-06-18 13:37:11 -0500 | [diff] [blame] | 2444 | *dp++ = *sp; |
| 2445 | sp += 2; /* skip low byte */ |
Glenn Randers-Pehrson | 413138a | 2011-06-13 22:07:37 -0500 | [diff] [blame] | 2446 | } |
| 2447 | |
| 2448 | row_info->bit_depth = 8; |
| 2449 | row_info->pixel_depth = (png_byte)(8 * row_info->channels); |
| 2450 | row_info->rowbytes = row_info->width * row_info->channels; |
| 2451 | } |
| 2452 | } |
Glenn Randers-Pehrson | e6a8060 | 2011-06-17 22:28:23 -0500 | [diff] [blame] | 2453 | #endif |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2454 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2455 | #ifdef PNG_READ_SWAP_ALPHA_SUPPORTED |
John Bowler | 8f1150e | 2013-12-19 15:33:49 -0600 | [diff] [blame] | 2456 | static void |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2457 | png_do_read_swap_alpha(png_row_infop row_info, png_bytep row) |
| 2458 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 2459 | png_debug(1, "in png_do_read_swap_alpha"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 2460 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2461 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2462 | png_uint_32 row_width = row_info->width; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2463 | if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA) |
| 2464 | { |
| 2465 | /* This converts from RGBA to ARGB */ |
| 2466 | if (row_info->bit_depth == 8) |
| 2467 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2468 | png_bytep sp = row + row_info->rowbytes; |
| 2469 | png_bytep dp = sp; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2470 | png_byte save; |
| 2471 | png_uint_32 i; |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2472 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2473 | for (i = 0; i < row_width; i++) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2474 | { |
| 2475 | save = *(--sp); |
| 2476 | *(--dp) = *(--sp); |
| 2477 | *(--dp) = *(--sp); |
| 2478 | *(--dp) = *(--sp); |
| 2479 | *(--dp) = save; |
| 2480 | } |
| 2481 | } |
Glenn Randers-Pehrson | 925d23b | 2010-08-26 21:43:18 -0500 | [diff] [blame] | 2482 | |
| 2483 | #ifdef PNG_READ_16BIT_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2484 | /* This converts from RRGGBBAA to AARRGGBB */ |
| 2485 | else |
| 2486 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2487 | png_bytep sp = row + row_info->rowbytes; |
| 2488 | png_bytep dp = sp; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2489 | png_byte save[2]; |
| 2490 | png_uint_32 i; |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2491 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2492 | for (i = 0; i < row_width; i++) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2493 | { |
| 2494 | save[0] = *(--sp); |
| 2495 | save[1] = *(--sp); |
| 2496 | *(--dp) = *(--sp); |
| 2497 | *(--dp) = *(--sp); |
| 2498 | *(--dp) = *(--sp); |
| 2499 | *(--dp) = *(--sp); |
| 2500 | *(--dp) = *(--sp); |
| 2501 | *(--dp) = *(--sp); |
| 2502 | *(--dp) = save[0]; |
| 2503 | *(--dp) = save[1]; |
| 2504 | } |
| 2505 | } |
Glenn Randers-Pehrson | 925d23b | 2010-08-26 21:43:18 -0500 | [diff] [blame] | 2506 | #endif |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2507 | } |
Glenn Randers-Pehrson | 925d23b | 2010-08-26 21:43:18 -0500 | [diff] [blame] | 2508 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2509 | else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) |
| 2510 | { |
| 2511 | /* This converts from GA to AG */ |
| 2512 | if (row_info->bit_depth == 8) |
| 2513 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2514 | png_bytep sp = row + row_info->rowbytes; |
| 2515 | png_bytep dp = sp; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2516 | png_byte save; |
| 2517 | png_uint_32 i; |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2518 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2519 | for (i = 0; i < row_width; i++) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2520 | { |
| 2521 | save = *(--sp); |
| 2522 | *(--dp) = *(--sp); |
| 2523 | *(--dp) = save; |
| 2524 | } |
| 2525 | } |
Glenn Randers-Pehrson | 925d23b | 2010-08-26 21:43:18 -0500 | [diff] [blame] | 2526 | |
| 2527 | #ifdef PNG_READ_16BIT_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2528 | /* This converts from GGAA to AAGG */ |
| 2529 | else |
| 2530 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2531 | png_bytep sp = row + row_info->rowbytes; |
| 2532 | png_bytep dp = sp; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2533 | png_byte save[2]; |
| 2534 | png_uint_32 i; |
| 2535 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2536 | for (i = 0; i < row_width; i++) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2537 | { |
| 2538 | save[0] = *(--sp); |
| 2539 | save[1] = *(--sp); |
| 2540 | *(--dp) = *(--sp); |
| 2541 | *(--dp) = *(--sp); |
| 2542 | *(--dp) = save[0]; |
| 2543 | *(--dp) = save[1]; |
| 2544 | } |
| 2545 | } |
Glenn Randers-Pehrson | 925d23b | 2010-08-26 21:43:18 -0500 | [diff] [blame] | 2546 | #endif |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2547 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2548 | } |
| 2549 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2550 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2551 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2552 | #ifdef PNG_READ_INVERT_ALPHA_SUPPORTED |
John Bowler | 8f1150e | 2013-12-19 15:33:49 -0600 | [diff] [blame] | 2553 | static void |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 2554 | png_do_read_invert_alpha(png_row_infop row_info, png_bytep row) |
| 2555 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2556 | png_uint_32 row_width; |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 2557 | png_debug(1, "in png_do_read_invert_alpha"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 2558 | |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2559 | row_width = row_info->width; |
| 2560 | if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA) |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 2561 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2562 | if (row_info->bit_depth == 8) |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 2563 | { |
| 2564 | /* This inverts the alpha channel in RGBA */ |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2565 | png_bytep sp = row + row_info->rowbytes; |
| 2566 | png_bytep dp = sp; |
| 2567 | png_uint_32 i; |
| 2568 | |
| 2569 | for (i = 0; i < row_width; i++) |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 2570 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2571 | *(--dp) = (png_byte)(255 - *(--sp)); |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 2572 | |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2573 | /* This does nothing: |
| 2574 | *(--dp) = *(--sp); |
| 2575 | *(--dp) = *(--sp); |
| 2576 | *(--dp) = *(--sp); |
| 2577 | We can replace it with: |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 2578 | */ |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2579 | sp-=3; |
| 2580 | dp=sp; |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 2581 | } |
| 2582 | } |
Glenn Randers-Pehrson | 925d23b | 2010-08-26 21:43:18 -0500 | [diff] [blame] | 2583 | |
| 2584 | #ifdef PNG_READ_16BIT_SUPPORTED |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2585 | /* This inverts the alpha channel in RRGGBBAA */ |
| 2586 | else |
| 2587 | { |
| 2588 | png_bytep sp = row + row_info->rowbytes; |
| 2589 | png_bytep dp = sp; |
| 2590 | png_uint_32 i; |
| 2591 | |
| 2592 | for (i = 0; i < row_width; i++) |
| 2593 | { |
| 2594 | *(--dp) = (png_byte)(255 - *(--sp)); |
| 2595 | *(--dp) = (png_byte)(255 - *(--sp)); |
| 2596 | |
| 2597 | /* This does nothing: |
| 2598 | *(--dp) = *(--sp); |
| 2599 | *(--dp) = *(--sp); |
| 2600 | *(--dp) = *(--sp); |
| 2601 | *(--dp) = *(--sp); |
| 2602 | *(--dp) = *(--sp); |
| 2603 | *(--dp) = *(--sp); |
| 2604 | We can replace it with: |
| 2605 | */ |
| 2606 | sp-=6; |
| 2607 | dp=sp; |
| 2608 | } |
| 2609 | } |
Glenn Randers-Pehrson | 925d23b | 2010-08-26 21:43:18 -0500 | [diff] [blame] | 2610 | #endif |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2611 | } |
| 2612 | else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) |
| 2613 | { |
| 2614 | if (row_info->bit_depth == 8) |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 2615 | { |
Glenn Randers-Pehrson | cbe52d8 | 1998-02-28 07:00:24 -0600 | [diff] [blame] | 2616 | /* This inverts the alpha channel in GA */ |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2617 | png_bytep sp = row + row_info->rowbytes; |
| 2618 | png_bytep dp = sp; |
| 2619 | png_uint_32 i; |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 2620 | |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2621 | for (i = 0; i < row_width; i++) |
| 2622 | { |
| 2623 | *(--dp) = (png_byte)(255 - *(--sp)); |
| 2624 | *(--dp) = *(--sp); |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 2625 | } |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2626 | } |
Glenn Randers-Pehrson | 925d23b | 2010-08-26 21:43:18 -0500 | [diff] [blame] | 2627 | |
| 2628 | #ifdef PNG_READ_16BIT_SUPPORTED |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2629 | else |
| 2630 | { |
Glenn Randers-Pehrson | cbe52d8 | 1998-02-28 07:00:24 -0600 | [diff] [blame] | 2631 | /* This inverts the alpha channel in GGAA */ |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2632 | png_bytep sp = row + row_info->rowbytes; |
| 2633 | png_bytep dp = sp; |
| 2634 | png_uint_32 i; |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 2635 | |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2636 | for (i = 0; i < row_width; i++) |
| 2637 | { |
| 2638 | *(--dp) = (png_byte)(255 - *(--sp)); |
| 2639 | *(--dp) = (png_byte)(255 - *(--sp)); |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 2640 | /* |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2641 | *(--dp) = *(--sp); |
| 2642 | *(--dp) = *(--sp); |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 2643 | */ |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2644 | sp-=2; |
| 2645 | dp=sp; |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 2646 | } |
| 2647 | } |
Glenn Randers-Pehrson | 925d23b | 2010-08-26 21:43:18 -0500 | [diff] [blame] | 2648 | #endif |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 2649 | } |
| 2650 | } |
| 2651 | #endif |
| 2652 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2653 | #ifdef PNG_READ_FILLER_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2654 | /* Add filler channel if we have RGB color */ |
John Bowler | 8f1150e | 2013-12-19 15:33:49 -0600 | [diff] [blame] | 2655 | static void |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 2656 | png_do_read_filler(png_row_infop row_info, png_bytep row, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2657 | png_uint_32 filler, png_uint_32 flags) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2658 | { |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2659 | png_uint_32 i; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2660 | png_uint_32 row_width = row_info->width; |
| 2661 | |
Glenn Randers-Pehrson | 4554a54 | 2010-08-27 10:48:45 -0500 | [diff] [blame] | 2662 | #ifdef PNG_READ_16BIT_SUPPORTED |
Glenn Randers-Pehrson | d0dce40 | 1998-05-09 10:02:29 -0500 | [diff] [blame] | 2663 | png_byte hi_filler = (png_byte)((filler>>8) & 0xff); |
Glenn Randers-Pehrson | 4554a54 | 2010-08-27 10:48:45 -0500 | [diff] [blame] | 2664 | #endif |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2665 | png_byte lo_filler = (png_byte)(filler & 0xff); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2666 | |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 2667 | png_debug(1, "in png_do_read_filler"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 2668 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2669 | if ( |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2670 | row_info->color_type == PNG_COLOR_TYPE_GRAY) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2671 | { |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 2672 | if (row_info->bit_depth == 8) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2673 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2674 | if (flags & PNG_FLAG_FILLER_AFTER) |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2675 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2676 | /* This changes the data from G to GX */ |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2677 | png_bytep sp = row + (png_size_t)row_width; |
| 2678 | png_bytep dp = sp + (png_size_t)row_width; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2679 | for (i = 1; i < row_width; i++) |
| 2680 | { |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2681 | *(--dp) = lo_filler; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2682 | *(--dp) = *(--sp); |
| 2683 | } |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2684 | *(--dp) = lo_filler; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2685 | row_info->channels = 2; |
| 2686 | row_info->pixel_depth = 16; |
| 2687 | row_info->rowbytes = row_width * 2; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2688 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2689 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2690 | else |
| 2691 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2692 | /* This changes the data from G to XG */ |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2693 | png_bytep sp = row + (png_size_t)row_width; |
| 2694 | png_bytep dp = sp + (png_size_t)row_width; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2695 | for (i = 0; i < row_width; i++) |
| 2696 | { |
| 2697 | *(--dp) = *(--sp); |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2698 | *(--dp) = lo_filler; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2699 | } |
| 2700 | row_info->channels = 2; |
| 2701 | row_info->pixel_depth = 16; |
| 2702 | row_info->rowbytes = row_width * 2; |
| 2703 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2704 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2705 | |
Glenn Randers-Pehrson | 925d23b | 2010-08-26 21:43:18 -0500 | [diff] [blame] | 2706 | #ifdef PNG_READ_16BIT_SUPPORTED |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 2707 | else if (row_info->bit_depth == 16) |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2708 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2709 | if (flags & PNG_FLAG_FILLER_AFTER) |
| 2710 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2711 | /* This changes the data from GG to GGXX */ |
Glenn Randers-Pehrson | 5b5dcf8 | 2004-07-17 22:45:44 -0500 | [diff] [blame] | 2712 | png_bytep sp = row + (png_size_t)row_width * 2; |
| 2713 | png_bytep dp = sp + (png_size_t)row_width * 2; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2714 | for (i = 1; i < row_width; i++) |
| 2715 | { |
| 2716 | *(--dp) = hi_filler; |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2717 | *(--dp) = lo_filler; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2718 | *(--dp) = *(--sp); |
| 2719 | *(--dp) = *(--sp); |
| 2720 | } |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2721 | *(--dp) = hi_filler; |
| 2722 | *(--dp) = lo_filler; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2723 | row_info->channels = 2; |
| 2724 | row_info->pixel_depth = 32; |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 2725 | row_info->rowbytes = row_width * 4; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2726 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2727 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2728 | else |
| 2729 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2730 | /* This changes the data from GG to XXGG */ |
Glenn Randers-Pehrson | 5b5dcf8 | 2004-07-17 22:45:44 -0500 | [diff] [blame] | 2731 | png_bytep sp = row + (png_size_t)row_width * 2; |
| 2732 | png_bytep dp = sp + (png_size_t)row_width * 2; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2733 | for (i = 0; i < row_width; i++) |
| 2734 | { |
| 2735 | *(--dp) = *(--sp); |
| 2736 | *(--dp) = *(--sp); |
| 2737 | *(--dp) = hi_filler; |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2738 | *(--dp) = lo_filler; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2739 | } |
| 2740 | row_info->channels = 2; |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 2741 | row_info->pixel_depth = 32; |
| 2742 | row_info->rowbytes = row_width * 4; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2743 | } |
| 2744 | } |
Glenn Randers-Pehrson | 925d23b | 2010-08-26 21:43:18 -0500 | [diff] [blame] | 2745 | #endif |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2746 | } /* COLOR_TYPE == GRAY */ |
| 2747 | else if (row_info->color_type == PNG_COLOR_TYPE_RGB) |
| 2748 | { |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 2749 | if (row_info->bit_depth == 8) |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2750 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2751 | if (flags & PNG_FLAG_FILLER_AFTER) |
| 2752 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2753 | /* This changes the data from RGB to RGBX */ |
Glenn Randers-Pehrson | dff799e | 2004-08-07 21:42:49 -0500 | [diff] [blame] | 2754 | png_bytep sp = row + (png_size_t)row_width * 3; |
| 2755 | png_bytep dp = sp + (png_size_t)row_width; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2756 | for (i = 1; i < row_width; i++) |
| 2757 | { |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2758 | *(--dp) = lo_filler; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2759 | *(--dp) = *(--sp); |
| 2760 | *(--dp) = *(--sp); |
| 2761 | *(--dp) = *(--sp); |
| 2762 | } |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2763 | *(--dp) = lo_filler; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2764 | row_info->channels = 4; |
| 2765 | row_info->pixel_depth = 32; |
| 2766 | row_info->rowbytes = row_width * 4; |
| 2767 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2768 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2769 | else |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2770 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2771 | /* This changes the data from RGB to XRGB */ |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2772 | png_bytep sp = row + (png_size_t)row_width * 3; |
| 2773 | png_bytep dp = sp + (png_size_t)row_width; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2774 | for (i = 0; i < row_width; i++) |
| 2775 | { |
| 2776 | *(--dp) = *(--sp); |
| 2777 | *(--dp) = *(--sp); |
| 2778 | *(--dp) = *(--sp); |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2779 | *(--dp) = lo_filler; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2780 | } |
| 2781 | row_info->channels = 4; |
| 2782 | row_info->pixel_depth = 32; |
| 2783 | row_info->rowbytes = row_width * 4; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2784 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2785 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2786 | |
Glenn Randers-Pehrson | 925d23b | 2010-08-26 21:43:18 -0500 | [diff] [blame] | 2787 | #ifdef PNG_READ_16BIT_SUPPORTED |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 2788 | else if (row_info->bit_depth == 16) |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2789 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2790 | if (flags & PNG_FLAG_FILLER_AFTER) |
| 2791 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2792 | /* This changes the data from RRGGBB to RRGGBBXX */ |
Glenn Randers-Pehrson | 5b5dcf8 | 2004-07-17 22:45:44 -0500 | [diff] [blame] | 2793 | png_bytep sp = row + (png_size_t)row_width * 6; |
| 2794 | png_bytep dp = sp + (png_size_t)row_width * 2; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2795 | for (i = 1; i < row_width; i++) |
| 2796 | { |
| 2797 | *(--dp) = hi_filler; |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2798 | *(--dp) = lo_filler; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2799 | *(--dp) = *(--sp); |
| 2800 | *(--dp) = *(--sp); |
| 2801 | *(--dp) = *(--sp); |
| 2802 | *(--dp) = *(--sp); |
| 2803 | *(--dp) = *(--sp); |
| 2804 | *(--dp) = *(--sp); |
| 2805 | } |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2806 | *(--dp) = hi_filler; |
| 2807 | *(--dp) = lo_filler; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2808 | row_info->channels = 4; |
| 2809 | row_info->pixel_depth = 64; |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 2810 | row_info->rowbytes = row_width * 8; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2811 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2812 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2813 | else |
| 2814 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2815 | /* This changes the data from RRGGBB to XXRRGGBB */ |
Glenn Randers-Pehrson | 5b5dcf8 | 2004-07-17 22:45:44 -0500 | [diff] [blame] | 2816 | png_bytep sp = row + (png_size_t)row_width * 6; |
| 2817 | png_bytep dp = sp + (png_size_t)row_width * 2; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2818 | for (i = 0; i < row_width; i++) |
| 2819 | { |
| 2820 | *(--dp) = *(--sp); |
| 2821 | *(--dp) = *(--sp); |
| 2822 | *(--dp) = *(--sp); |
| 2823 | *(--dp) = *(--sp); |
| 2824 | *(--dp) = *(--sp); |
| 2825 | *(--dp) = *(--sp); |
| 2826 | *(--dp) = hi_filler; |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2827 | *(--dp) = lo_filler; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2828 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2829 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2830 | row_info->channels = 4; |
| 2831 | row_info->pixel_depth = 64; |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 2832 | row_info->rowbytes = row_width * 8; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2833 | } |
| 2834 | } |
Glenn Randers-Pehrson | 925d23b | 2010-08-26 21:43:18 -0500 | [diff] [blame] | 2835 | #endif |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2836 | } /* COLOR_TYPE == RGB */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2837 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2838 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2839 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2840 | #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 2841 | /* Expand grayscale files to RGB, with or without alpha */ |
John Bowler | 8f1150e | 2013-12-19 15:33:49 -0600 | [diff] [blame] | 2842 | static void |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 2843 | png_do_gray_to_rgb(png_row_infop row_info, png_bytep row) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2844 | { |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2845 | png_uint_32 i; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2846 | png_uint_32 row_width = row_info->width; |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 2847 | |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 2848 | png_debug(1, "in png_do_gray_to_rgb"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 2849 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2850 | if (row_info->bit_depth >= 8 && |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2851 | !(row_info->color_type & PNG_COLOR_MASK_COLOR)) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2852 | { |
| 2853 | if (row_info->color_type == PNG_COLOR_TYPE_GRAY) |
| 2854 | { |
| 2855 | if (row_info->bit_depth == 8) |
| 2856 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2857 | /* This changes G to RGB */ |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2858 | png_bytep sp = row + (png_size_t)row_width - 1; |
| 2859 | png_bytep dp = sp + (png_size_t)row_width * 2; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2860 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2861 | { |
| 2862 | *(dp--) = *sp; |
| 2863 | *(dp--) = *sp; |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 2864 | *(dp--) = *(sp--); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2865 | } |
| 2866 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2867 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2868 | else |
| 2869 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2870 | /* This changes GG to RRGGBB */ |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2871 | png_bytep sp = row + (png_size_t)row_width * 2 - 1; |
| 2872 | png_bytep dp = sp + (png_size_t)row_width * 4; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2873 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2874 | { |
| 2875 | *(dp--) = *sp; |
| 2876 | *(dp--) = *(sp - 1); |
| 2877 | *(dp--) = *sp; |
| 2878 | *(dp--) = *(sp - 1); |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 2879 | *(dp--) = *(sp--); |
| 2880 | *(dp--) = *(sp--); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2881 | } |
| 2882 | } |
| 2883 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2884 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2885 | else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) |
| 2886 | { |
| 2887 | if (row_info->bit_depth == 8) |
| 2888 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2889 | /* This changes GA to RGBA */ |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2890 | png_bytep sp = row + (png_size_t)row_width * 2 - 1; |
| 2891 | png_bytep dp = sp + (png_size_t)row_width * 2; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2892 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2893 | { |
| 2894 | *(dp--) = *(sp--); |
| 2895 | *(dp--) = *sp; |
| 2896 | *(dp--) = *sp; |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 2897 | *(dp--) = *(sp--); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2898 | } |
| 2899 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2900 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2901 | else |
| 2902 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2903 | /* This changes GGAA to RRGGBBAA */ |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2904 | png_bytep sp = row + (png_size_t)row_width * 4 - 1; |
| 2905 | png_bytep dp = sp + (png_size_t)row_width * 4; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2906 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2907 | { |
| 2908 | *(dp--) = *(sp--); |
| 2909 | *(dp--) = *(sp--); |
| 2910 | *(dp--) = *sp; |
| 2911 | *(dp--) = *(sp - 1); |
| 2912 | *(dp--) = *sp; |
| 2913 | *(dp--) = *(sp - 1); |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 2914 | *(dp--) = *(sp--); |
| 2915 | *(dp--) = *(sp--); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2916 | } |
| 2917 | } |
| 2918 | } |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2919 | row_info->channels = (png_byte)(row_info->channels + 2); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2920 | row_info->color_type |= PNG_COLOR_MASK_COLOR; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2921 | row_info->pixel_depth = (png_byte)(row_info->channels * |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2922 | row_info->bit_depth); |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 2923 | row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2924 | } |
| 2925 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2926 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2927 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2928 | #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 2929 | /* Reduce RGB files to grayscale, with or without alpha |
Glenn Randers-Pehrson | 99ffac0 | 2011-07-29 12:22:38 -0500 | [diff] [blame] | 2930 | * using the equation given in Poynton's ColorFAQ of 1998-01-04 at |
| 2931 | * <http://www.inforamp.net/~poynton/> (THIS LINK IS DEAD June 2008 but |
| 2932 | * versions dated 1998 through November 2002 have been archived at |
| 2933 | * http://web.archive.org/web/20000816232553/http://www.inforamp.net/ |
| 2934 | * ~poynton/notes/colour_and_gamma/ColorFAQ.txt ) |
Glenn Randers-Pehrson | 895a9c9 | 2008-07-25 08:51:18 -0500 | [diff] [blame] | 2935 | * Charles Poynton poynton at poynton.com |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2936 | * |
| 2937 | * Y = 0.212671 * R + 0.715160 * G + 0.072169 * B |
| 2938 | * |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2939 | * which can be expressed with integers as |
| 2940 | * |
Glenn Randers-Pehrson | 520a764 | 2000-03-21 05:13:06 -0600 | [diff] [blame] | 2941 | * Y = (6969 * R + 23434 * G + 2365 * B)/32768 |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2942 | * |
Glenn Randers-Pehrson | 99ffac0 | 2011-07-29 12:22:38 -0500 | [diff] [blame] | 2943 | * Poynton's current link (as of January 2003 through July 2011): |
| 2944 | * <http://www.poynton.com/notes/colour_and_gamma/> |
| 2945 | * has changed the numbers slightly: |
| 2946 | * |
| 2947 | * Y = 0.2126*R + 0.7152*G + 0.0722*B |
| 2948 | * |
| 2949 | * which can be expressed with integers as |
| 2950 | * |
| 2951 | * Y = (6966 * R + 23436 * G + 2366 * B)/32768 |
| 2952 | * |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 2953 | * Historically, however, libpng uses numbers derived from the ITU-R Rec 709 |
| 2954 | * end point chromaticities and the D65 white point. Depending on the |
| 2955 | * precision used for the D65 white point this produces a variety of different |
| 2956 | * numbers, however if the four decimal place value used in ITU-R Rec 709 is |
| 2957 | * used (0.3127,0.3290) the Y calculation would be: |
| 2958 | * |
| 2959 | * Y = (6968 * R + 23435 * G + 2366 * B)/32768 |
| 2960 | * |
| 2961 | * While this is correct the rounding results in an overflow for white, because |
| 2962 | * the sum of the rounded coefficients is 32769, not 32768. Consequently |
| 2963 | * libpng uses, instead, the closest non-overflowing approximation: |
Glenn Randers-Pehrson | 99ffac0 | 2011-07-29 12:22:38 -0500 | [diff] [blame] | 2964 | * |
| 2965 | * Y = (6968 * R + 23434 * G + 2366 * B)/32768 |
| 2966 | * |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 2967 | * Starting with libpng-1.5.5, if the image being converted has a cHRM chunk |
| 2968 | * (including an sRGB chunk) then the chromaticities are used to calculate the |
| 2969 | * coefficients. See the chunk handling in pngrutil.c for more information. |
Glenn Randers-Pehrson | 0bc7977 | 2011-08-11 09:01:57 -0500 | [diff] [blame] | 2970 | * |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 2971 | * In all cases the calculation is to be done in a linear colorspace. If no |
| 2972 | * gamma information is available to correct the encoding of the original RGB |
| 2973 | * values this results in an implicit assumption that the original PNG RGB |
| 2974 | * values were linear. |
Glenn Randers-Pehrson | 0bc7977 | 2011-08-11 09:01:57 -0500 | [diff] [blame] | 2975 | * |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 2976 | * Other integer coefficents can be used via png_set_rgb_to_gray(). Because |
| 2977 | * the API takes just red and green coefficients the blue coefficient is |
| 2978 | * calculated to make the sum 32768. This will result in different rounding |
| 2979 | * to that used above. |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2980 | */ |
John Bowler | 8f1150e | 2013-12-19 15:33:49 -0600 | [diff] [blame] | 2981 | static int |
John Bowler | 5d56786 | 2011-12-24 09:12:00 -0600 | [diff] [blame] | 2982 | png_do_rgb_to_gray(png_structrp png_ptr, png_row_infop row_info, png_bytep row) |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2983 | |
| 2984 | { |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2985 | int rgb_error = 0; |
| 2986 | |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 2987 | png_debug(1, "in png_do_rgb_to_gray"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 2988 | |
John Bowler | a96117f | 2011-01-08 14:41:25 -0600 | [diff] [blame] | 2989 | if (!(row_info->color_type & PNG_COLOR_MASK_PALETTE) && |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2990 | (row_info->color_type & PNG_COLOR_MASK_COLOR)) |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2991 | { |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 2992 | PNG_CONST png_uint_32 rc = png_ptr->rgb_to_gray_red_coeff; |
| 2993 | PNG_CONST png_uint_32 gc = png_ptr->rgb_to_gray_green_coeff; |
| 2994 | PNG_CONST png_uint_32 bc = 32768 - rc - gc; |
| 2995 | PNG_CONST png_uint_32 row_width = row_info->width; |
| 2996 | PNG_CONST int have_alpha = |
| 2997 | (row_info->color_type & PNG_COLOR_MASK_ALPHA) != 0; |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2998 | |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 2999 | if (row_info->bit_depth == 8) |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3000 | { |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 3001 | #ifdef PNG_READ_GAMMA_SUPPORTED |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3002 | /* Notice that gamma to/from 1 are not necessarily inverses (if |
| 3003 | * there is an overall gamma correction). Prior to 1.5.5 this code |
| 3004 | * checked the linearized values for equality; this doesn't match |
| 3005 | * the documentation, the original values must be checked. |
| 3006 | */ |
| 3007 | if (png_ptr->gamma_from_1 != NULL && png_ptr->gamma_to_1 != NULL) |
| 3008 | { |
| 3009 | png_bytep sp = row; |
| 3010 | png_bytep dp = row; |
| 3011 | png_uint_32 i; |
| 3012 | |
| 3013 | for (i = 0; i < row_width; i++) |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3014 | { |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3015 | png_byte red = *(sp++); |
| 3016 | png_byte green = *(sp++); |
| 3017 | png_byte blue = *(sp++); |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3018 | |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3019 | if (red != green || red != blue) |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3020 | { |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3021 | red = png_ptr->gamma_to_1[red]; |
| 3022 | green = png_ptr->gamma_to_1[green]; |
| 3023 | blue = png_ptr->gamma_to_1[blue]; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3024 | |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3025 | rgb_error |= 1; |
| 3026 | *(dp++) = png_ptr->gamma_from_1[ |
| 3027 | (rc*red + gc*green + bc*blue + 16384)>>15]; |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3028 | } |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3029 | |
| 3030 | else |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3031 | { |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3032 | /* If there is no overall correction the table will not be |
| 3033 | * set. |
| 3034 | */ |
| 3035 | if (png_ptr->gamma_table != NULL) |
| 3036 | red = png_ptr->gamma_table[red]; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3037 | |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3038 | *(dp++) = red; |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3039 | } |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3040 | |
Glenn Randers-Pehrson | 0567015 | 2014-03-08 12:39:52 -0600 | [diff] [blame] | 3041 | if (have_alpha != 0) |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3042 | *(dp++) = *(sp++); |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3043 | } |
| 3044 | } |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3045 | else |
| 3046 | #endif |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3047 | { |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3048 | png_bytep sp = row; |
| 3049 | png_bytep dp = row; |
| 3050 | png_uint_32 i; |
| 3051 | |
| 3052 | for (i = 0; i < row_width; i++) |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3053 | { |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3054 | png_byte red = *(sp++); |
| 3055 | png_byte green = *(sp++); |
| 3056 | png_byte blue = *(sp++); |
| 3057 | |
| 3058 | if (red != green || red != blue) |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3059 | { |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3060 | rgb_error |= 1; |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 3061 | /* NOTE: this is the historical approach which simply |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3062 | * truncates the results. |
| 3063 | */ |
| 3064 | *(dp++) = (png_byte)((rc*red + gc*green + bc*blue)>>15); |
| 3065 | } |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3066 | |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3067 | else |
| 3068 | *(dp++) = red; |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3069 | |
Glenn Randers-Pehrson | 0567015 | 2014-03-08 12:39:52 -0600 | [diff] [blame] | 3070 | if (have_alpha != 0) |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3071 | *(dp++) = *(sp++); |
| 3072 | } |
| 3073 | } |
| 3074 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3075 | |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3076 | else /* RGB bit_depth == 16 */ |
| 3077 | { |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 3078 | #ifdef PNG_READ_GAMMA_SUPPORTED |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3079 | if (png_ptr->gamma_16_to_1 != NULL && png_ptr->gamma_16_from_1 != NULL) |
| 3080 | { |
| 3081 | png_bytep sp = row; |
| 3082 | png_bytep dp = row; |
| 3083 | png_uint_32 i; |
| 3084 | |
| 3085 | for (i = 0; i < row_width; i++) |
| 3086 | { |
| 3087 | png_uint_16 red, green, blue, w; |
| 3088 | |
| 3089 | red = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2; |
| 3090 | green = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2; |
| 3091 | blue = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2; |
| 3092 | |
| 3093 | if (red == green && red == blue) |
| 3094 | { |
| 3095 | if (png_ptr->gamma_16_table != NULL) |
| 3096 | w = png_ptr->gamma_16_table[(red&0xff) |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3097 | >> png_ptr->gamma_shift][red>>8]; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3098 | |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3099 | else |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3100 | w = red; |
| 3101 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3102 | |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3103 | else |
| 3104 | { |
| 3105 | png_uint_16 red_1 = png_ptr->gamma_16_to_1[(red&0xff) |
| 3106 | >> png_ptr->gamma_shift][red>>8]; |
| 3107 | png_uint_16 green_1 = |
| 3108 | png_ptr->gamma_16_to_1[(green&0xff) >> |
| 3109 | png_ptr->gamma_shift][green>>8]; |
| 3110 | png_uint_16 blue_1 = png_ptr->gamma_16_to_1[(blue&0xff) |
| 3111 | >> png_ptr->gamma_shift][blue>>8]; |
| 3112 | png_uint_16 gray16 = (png_uint_16)((rc*red_1 + gc*green_1 |
| 3113 | + bc*blue_1 + 16384)>>15); |
| 3114 | w = png_ptr->gamma_16_from_1[(gray16&0xff) >> |
| 3115 | png_ptr->gamma_shift][gray16 >> 8]; |
| 3116 | rgb_error |= 1; |
| 3117 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3118 | |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3119 | *(dp++) = (png_byte)((w>>8) & 0xff); |
| 3120 | *(dp++) = (png_byte)(w & 0xff); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3121 | |
Glenn Randers-Pehrson | 0567015 | 2014-03-08 12:39:52 -0600 | [diff] [blame] | 3122 | if (have_alpha != 0) |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3123 | { |
| 3124 | *(dp++) = *(sp++); |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3125 | *(dp++) = *(sp++); |
| 3126 | } |
| 3127 | } |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3128 | } |
| 3129 | else |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3130 | #endif |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3131 | { |
| 3132 | png_bytep sp = row; |
| 3133 | png_bytep dp = row; |
| 3134 | png_uint_32 i; |
| 3135 | |
| 3136 | for (i = 0; i < row_width; i++) |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3137 | { |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3138 | png_uint_16 red, green, blue, gray16; |
| 3139 | |
| 3140 | red = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2; |
| 3141 | green = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2; |
| 3142 | blue = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2; |
| 3143 | |
| 3144 | if (red != green || red != blue) |
| 3145 | rgb_error |= 1; |
| 3146 | |
Glenn Randers-Pehrson | efc4b69 | 2011-11-07 23:31:34 -0600 | [diff] [blame] | 3147 | /* From 1.5.5 in the 16 bit case do the accurate conversion even |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3148 | * in the 'fast' case - this is because this is where the code |
| 3149 | * ends up when handling linear 16 bit data. |
| 3150 | */ |
| 3151 | gray16 = (png_uint_16)((rc*red + gc*green + bc*blue + 16384) >> |
| 3152 | 15); |
| 3153 | *(dp++) = (png_byte)((gray16>>8) & 0xff); |
| 3154 | *(dp++) = (png_byte)(gray16 & 0xff); |
| 3155 | |
Glenn Randers-Pehrson | 0567015 | 2014-03-08 12:39:52 -0600 | [diff] [blame] | 3156 | if (have_alpha != 0) |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3157 | { |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3158 | *(dp++) = *(sp++); |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3159 | *(dp++) = *(sp++); |
| 3160 | } |
| 3161 | } |
| 3162 | } |
| 3163 | } |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3164 | |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 3165 | row_info->channels = (png_byte)(row_info->channels - 2); |
Glenn Randers-Pehrson | 67439c4 | 2010-08-19 07:01:09 -0500 | [diff] [blame] | 3166 | row_info->color_type = (png_byte)(row_info->color_type & |
| 3167 | ~PNG_COLOR_MASK_COLOR); |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3168 | row_info->pixel_depth = (png_byte)(row_info->channels * |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3169 | row_info->bit_depth); |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 3170 | row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width); |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3171 | } |
| 3172 | return rgb_error; |
| 3173 | } |
| 3174 | #endif |
| 3175 | |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 3176 | #if defined(PNG_READ_BACKGROUND_SUPPORTED) ||\ |
| 3177 | defined(PNG_READ_ALPHA_MODE_SUPPORTED) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3178 | /* Replace any alpha or transparency with the supplied background color. |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 3179 | * "background" is already in the screen gamma, while "background_1" is |
| 3180 | * at a gamma of 1.0. Paletted files have already been taken care of. |
| 3181 | */ |
John Bowler | 8f1150e | 2013-12-19 15:33:49 -0600 | [diff] [blame] | 3182 | static void |
John Bowler | 5d56786 | 2011-12-24 09:12:00 -0600 | [diff] [blame] | 3183 | png_do_compose(png_row_infop row_info, png_bytep row, png_structrp png_ptr) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3184 | { |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3185 | #ifdef PNG_READ_GAMMA_SUPPORTED |
| 3186 | png_const_bytep gamma_table = png_ptr->gamma_table; |
| 3187 | png_const_bytep gamma_from_1 = png_ptr->gamma_from_1; |
| 3188 | png_const_bytep gamma_to_1 = png_ptr->gamma_to_1; |
| 3189 | png_const_uint_16pp gamma_16 = png_ptr->gamma_16_table; |
| 3190 | png_const_uint_16pp gamma_16_from_1 = png_ptr->gamma_16_from_1; |
| 3191 | png_const_uint_16pp gamma_16_to_1 = png_ptr->gamma_16_to_1; |
| 3192 | int gamma_shift = png_ptr->gamma_shift; |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 3193 | int optimize = (png_ptr->flags & PNG_FLAG_OPTIMIZE_ALPHA) != 0; |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3194 | #endif |
| 3195 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3196 | png_bytep sp; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3197 | png_uint_32 i; |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3198 | png_uint_32 row_width = row_info->width; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3199 | int shift; |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 3200 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3201 | png_debug(1, "in png_do_compose"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 3202 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3203 | { |
| 3204 | switch (row_info->color_type) |
| 3205 | { |
| 3206 | case PNG_COLOR_TYPE_GRAY: |
| 3207 | { |
| 3208 | switch (row_info->bit_depth) |
| 3209 | { |
| 3210 | case 1: |
| 3211 | { |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3212 | sp = row; |
| 3213 | shift = 7; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3214 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3215 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 3216 | if ((png_uint_16)((*sp >> shift) & 0x01) |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3217 | == png_ptr->trans_color.gray) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3218 | { |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 3219 | unsigned int tmp = *sp & (0x7f7f >> (7 - shift)); |
| 3220 | tmp |= png_ptr->background.gray << shift; |
| 3221 | *sp = (png_byte)(tmp & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3222 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3223 | |
Glenn Randers-Pehrson | 0567015 | 2014-03-08 12:39:52 -0600 | [diff] [blame] | 3224 | if (shift == 0) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3225 | { |
| 3226 | shift = 7; |
| 3227 | sp++; |
| 3228 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3229 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3230 | else |
| 3231 | shift--; |
| 3232 | } |
| 3233 | break; |
| 3234 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3235 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3236 | case 2: |
| 3237 | { |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 3238 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3239 | if (gamma_table != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3240 | { |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3241 | sp = row; |
| 3242 | shift = 6; |
| 3243 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3244 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 3245 | if ((png_uint_16)((*sp >> shift) & 0x03) |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3246 | == png_ptr->trans_color.gray) |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3247 | { |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 3248 | unsigned int tmp = *sp & (0x3f3f >> (6 - shift)); |
| 3249 | tmp |= png_ptr->background.gray << shift; |
| 3250 | *sp = (png_byte)(tmp & 0xff); |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3251 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3252 | |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3253 | else |
| 3254 | { |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 3255 | unsigned int p = (*sp >> shift) & 0x03; |
| 3256 | unsigned int g = (gamma_table [p | (p << 2) | |
| 3257 | (p << 4) | (p << 6)] >> 6) & 0x03; |
| 3258 | unsigned int tmp = *sp & (0x3f3f >> (6 - shift)); |
| 3259 | tmp |= g << shift; |
| 3260 | *sp = (png_byte)(tmp & 0xff); |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3261 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3262 | |
Glenn Randers-Pehrson | 0567015 | 2014-03-08 12:39:52 -0600 | [diff] [blame] | 3263 | if (shift == 0) |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3264 | { |
| 3265 | shift = 6; |
| 3266 | sp++; |
| 3267 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3268 | |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3269 | else |
| 3270 | shift -= 2; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3271 | } |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3272 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3273 | |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3274 | else |
| 3275 | #endif |
| 3276 | { |
| 3277 | sp = row; |
| 3278 | shift = 6; |
| 3279 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3280 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 3281 | if ((png_uint_16)((*sp >> shift) & 0x03) |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3282 | == png_ptr->trans_color.gray) |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3283 | { |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 3284 | unsigned int tmp = *sp & (0x3f3f >> (6 - shift)); |
| 3285 | tmp |= png_ptr->background.gray << shift; |
| 3286 | *sp = (png_byte)(tmp & 0xff); |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3287 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3288 | |
Glenn Randers-Pehrson | 0567015 | 2014-03-08 12:39:52 -0600 | [diff] [blame] | 3289 | if (shift == 0) |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3290 | { |
| 3291 | shift = 6; |
| 3292 | sp++; |
| 3293 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3294 | |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3295 | else |
| 3296 | shift -= 2; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3297 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3298 | } |
| 3299 | break; |
| 3300 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3301 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3302 | case 4: |
| 3303 | { |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 3304 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3305 | if (gamma_table != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3306 | { |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3307 | sp = row; |
| 3308 | shift = 4; |
| 3309 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3310 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 3311 | if ((png_uint_16)((*sp >> shift) & 0x0f) |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3312 | == png_ptr->trans_color.gray) |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3313 | { |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 3314 | unsigned int tmp = *sp & (0xf0f >> (4 - shift)); |
| 3315 | tmp |= png_ptr->background.gray << shift; |
| 3316 | *sp = (png_byte)(tmp & 0xff); |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3317 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3318 | |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3319 | else |
| 3320 | { |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 3321 | unsigned int p = (*sp >> shift) & 0x0f; |
| 3322 | unsigned int g = (gamma_table[p | (p << 4)] >> 4) & |
| 3323 | 0x0f; |
| 3324 | unsigned int tmp = *sp & (0xf0f >> (4 - shift)); |
| 3325 | tmp |= g << shift; |
| 3326 | *sp = (png_byte)(tmp & 0xff); |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3327 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3328 | |
Glenn Randers-Pehrson | 0567015 | 2014-03-08 12:39:52 -0600 | [diff] [blame] | 3329 | if (shift == 0) |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3330 | { |
| 3331 | shift = 4; |
| 3332 | sp++; |
| 3333 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3334 | |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3335 | else |
| 3336 | shift -= 4; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3337 | } |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3338 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3339 | |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3340 | else |
| 3341 | #endif |
| 3342 | { |
| 3343 | sp = row; |
| 3344 | shift = 4; |
| 3345 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3346 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 3347 | if ((png_uint_16)((*sp >> shift) & 0x0f) |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3348 | == png_ptr->trans_color.gray) |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3349 | { |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 3350 | unsigned int tmp = *sp & (0xf0f >> (4 - shift)); |
| 3351 | tmp |= png_ptr->background.gray << shift; |
| 3352 | *sp = (png_byte)(tmp & 0xff); |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3353 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3354 | |
Glenn Randers-Pehrson | 0567015 | 2014-03-08 12:39:52 -0600 | [diff] [blame] | 3355 | if (shift == 0) |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3356 | { |
| 3357 | shift = 4; |
| 3358 | sp++; |
| 3359 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3360 | |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3361 | else |
| 3362 | shift -= 4; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3363 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3364 | } |
| 3365 | break; |
| 3366 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3367 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3368 | case 8: |
| 3369 | { |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 3370 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3371 | if (gamma_table != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3372 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3373 | sp = row; |
| 3374 | for (i = 0; i < row_width; i++, sp++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3375 | { |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3376 | if (*sp == png_ptr->trans_color.gray) |
| 3377 | *sp = (png_byte)png_ptr->background.gray; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 3378 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3379 | else |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3380 | *sp = gamma_table[*sp]; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3381 | } |
| 3382 | } |
| 3383 | else |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3384 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3385 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3386 | sp = row; |
| 3387 | for (i = 0; i < row_width; i++, sp++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3388 | { |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3389 | if (*sp == png_ptr->trans_color.gray) |
| 3390 | *sp = (png_byte)png_ptr->background.gray; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3391 | } |
| 3392 | } |
| 3393 | break; |
| 3394 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3395 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3396 | case 16: |
| 3397 | { |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 3398 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3399 | if (gamma_16 != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3400 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3401 | sp = row; |
| 3402 | for (i = 0; i < row_width; i++, sp += 2) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3403 | { |
| 3404 | png_uint_16 v; |
| 3405 | |
Glenn Randers-Pehrson | 860ab2b | 1999-10-14 07:43:10 -0500 | [diff] [blame] | 3406 | v = (png_uint_16)(((*sp) << 8) + *(sp + 1)); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3407 | |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3408 | if (v == png_ptr->trans_color.gray) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3409 | { |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3410 | /* Background is already in screen gamma */ |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 3411 | *sp = (png_byte)((png_ptr->background.gray >> 8) |
| 3412 | & 0xff); |
| 3413 | *(sp + 1) = (png_byte)(png_ptr->background.gray |
| 3414 | & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3415 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3416 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3417 | else |
| 3418 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3419 | v = gamma_16[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3420 | *sp = (png_byte)((v >> 8) & 0xff); |
Guy Schalnat | 4ee97b0 | 1996-01-16 01:51:56 -0600 | [diff] [blame] | 3421 | *(sp + 1) = (png_byte)(v & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3422 | } |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3423 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3424 | } |
| 3425 | else |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3426 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3427 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3428 | sp = row; |
| 3429 | for (i = 0; i < row_width; i++, sp += 2) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3430 | { |
| 3431 | png_uint_16 v; |
| 3432 | |
Glenn Randers-Pehrson | 860ab2b | 1999-10-14 07:43:10 -0500 | [diff] [blame] | 3433 | v = (png_uint_16)(((*sp) << 8) + *(sp + 1)); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3434 | |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3435 | if (v == png_ptr->trans_color.gray) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3436 | { |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 3437 | *sp = (png_byte)((png_ptr->background.gray >> 8) |
| 3438 | & 0xff); |
| 3439 | *(sp + 1) = (png_byte)(png_ptr->background.gray |
| 3440 | & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3441 | } |
| 3442 | } |
| 3443 | } |
| 3444 | break; |
| 3445 | } |
Glenn Randers-Pehrson | b3edc73 | 2010-11-21 14:06:41 -0600 | [diff] [blame] | 3446 | |
| 3447 | default: |
| 3448 | break; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3449 | } |
| 3450 | break; |
| 3451 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3452 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3453 | case PNG_COLOR_TYPE_RGB: |
| 3454 | { |
| 3455 | if (row_info->bit_depth == 8) |
| 3456 | { |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 3457 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3458 | if (gamma_table != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3459 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3460 | sp = row; |
| 3461 | for (i = 0; i < row_width; i++, sp += 3) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3462 | { |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3463 | if (*sp == png_ptr->trans_color.red && |
| 3464 | *(sp + 1) == png_ptr->trans_color.green && |
| 3465 | *(sp + 2) == png_ptr->trans_color.blue) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3466 | { |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3467 | *sp = (png_byte)png_ptr->background.red; |
| 3468 | *(sp + 1) = (png_byte)png_ptr->background.green; |
| 3469 | *(sp + 2) = (png_byte)png_ptr->background.blue; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3470 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3471 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3472 | else |
| 3473 | { |
| 3474 | *sp = gamma_table[*sp]; |
| 3475 | *(sp + 1) = gamma_table[*(sp + 1)]; |
| 3476 | *(sp + 2) = gamma_table[*(sp + 2)]; |
| 3477 | } |
| 3478 | } |
| 3479 | } |
| 3480 | else |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3481 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3482 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3483 | sp = row; |
| 3484 | for (i = 0; i < row_width; i++, sp += 3) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3485 | { |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3486 | if (*sp == png_ptr->trans_color.red && |
| 3487 | *(sp + 1) == png_ptr->trans_color.green && |
| 3488 | *(sp + 2) == png_ptr->trans_color.blue) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3489 | { |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3490 | *sp = (png_byte)png_ptr->background.red; |
| 3491 | *(sp + 1) = (png_byte)png_ptr->background.green; |
| 3492 | *(sp + 2) = (png_byte)png_ptr->background.blue; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3493 | } |
| 3494 | } |
| 3495 | } |
| 3496 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3497 | else /* if (row_info->bit_depth == 16) */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3498 | { |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 3499 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3500 | if (gamma_16 != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3501 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3502 | sp = row; |
| 3503 | for (i = 0; i < row_width; i++, sp += 6) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3504 | { |
Glenn Randers-Pehrson | 860ab2b | 1999-10-14 07:43:10 -0500 | [diff] [blame] | 3505 | png_uint_16 r = (png_uint_16)(((*sp) << 8) + *(sp + 1)); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3506 | |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3507 | png_uint_16 g = (png_uint_16)(((*(sp + 2)) << 8) |
| 3508 | + *(sp + 3)); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3509 | |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3510 | png_uint_16 b = (png_uint_16)(((*(sp + 4)) << 8) |
| 3511 | + *(sp + 5)); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3512 | |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3513 | if (r == png_ptr->trans_color.red && |
| 3514 | g == png_ptr->trans_color.green && |
| 3515 | b == png_ptr->trans_color.blue) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3516 | { |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3517 | /* Background is already in screen gamma */ |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3518 | *sp = (png_byte)((png_ptr->background.red >> 8) & 0xff); |
| 3519 | *(sp + 1) = (png_byte)(png_ptr->background.red & 0xff); |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 3520 | *(sp + 2) = (png_byte)((png_ptr->background.green >> 8) |
| 3521 | & 0xff); |
| 3522 | *(sp + 3) = (png_byte)(png_ptr->background.green |
| 3523 | & 0xff); |
| 3524 | *(sp + 4) = (png_byte)((png_ptr->background.blue >> 8) |
| 3525 | & 0xff); |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3526 | *(sp + 5) = (png_byte)(png_ptr->background.blue & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3527 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3528 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3529 | else |
| 3530 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 3531 | png_uint_16 v = gamma_16[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3532 | *sp = (png_byte)((v >> 8) & 0xff); |
Guy Schalnat | 4ee97b0 | 1996-01-16 01:51:56 -0600 | [diff] [blame] | 3533 | *(sp + 1) = (png_byte)(v & 0xff); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3534 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3535 | v = gamma_16[*(sp + 3) >> gamma_shift][*(sp + 2)]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3536 | *(sp + 2) = (png_byte)((v >> 8) & 0xff); |
| 3537 | *(sp + 3) = (png_byte)(v & 0xff); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3538 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3539 | v = gamma_16[*(sp + 5) >> gamma_shift][*(sp + 4)]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3540 | *(sp + 4) = (png_byte)((v >> 8) & 0xff); |
| 3541 | *(sp + 5) = (png_byte)(v & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3542 | } |
| 3543 | } |
| 3544 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3545 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3546 | else |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3547 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3548 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3549 | sp = row; |
| 3550 | for (i = 0; i < row_width; i++, sp += 6) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3551 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3552 | png_uint_16 r = (png_uint_16)(((*sp) << 8) + *(sp + 1)); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3553 | |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3554 | png_uint_16 g = (png_uint_16)(((*(sp + 2)) << 8) |
| 3555 | + *(sp + 3)); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3556 | |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3557 | png_uint_16 b = (png_uint_16)(((*(sp + 4)) << 8) |
| 3558 | + *(sp + 5)); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3559 | |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3560 | if (r == png_ptr->trans_color.red && |
| 3561 | g == png_ptr->trans_color.green && |
| 3562 | b == png_ptr->trans_color.blue) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3563 | { |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3564 | *sp = (png_byte)((png_ptr->background.red >> 8) & 0xff); |
| 3565 | *(sp + 1) = (png_byte)(png_ptr->background.red & 0xff); |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 3566 | *(sp + 2) = (png_byte)((png_ptr->background.green >> 8) |
| 3567 | & 0xff); |
| 3568 | *(sp + 3) = (png_byte)(png_ptr->background.green |
| 3569 | & 0xff); |
| 3570 | *(sp + 4) = (png_byte)((png_ptr->background.blue >> 8) |
| 3571 | & 0xff); |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3572 | *(sp + 5) = (png_byte)(png_ptr->background.blue & 0xff); |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3573 | } |
| 3574 | } |
| 3575 | } |
| 3576 | } |
| 3577 | break; |
| 3578 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3579 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3580 | case PNG_COLOR_TYPE_GRAY_ALPHA: |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3581 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3582 | if (row_info->bit_depth == 8) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3583 | { |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 3584 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3585 | if (gamma_to_1 != NULL && gamma_from_1 != NULL && |
| 3586 | gamma_table != NULL) |
| 3587 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3588 | sp = row; |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3589 | for (i = 0; i < row_width; i++, sp += 2) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3590 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 3591 | png_uint_16 a = *(sp + 1); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3592 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3593 | if (a == 0xff) |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3594 | *sp = gamma_table[*sp]; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 3595 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3596 | else if (a == 0) |
| 3597 | { |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3598 | /* Background is already in screen gamma */ |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3599 | *sp = (png_byte)png_ptr->background.gray; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3600 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3601 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3602 | else |
| 3603 | { |
| 3604 | png_byte v, w; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3605 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3606 | v = gamma_to_1[*sp]; |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3607 | png_composite(w, v, a, png_ptr->background_1.gray); |
Glenn Randers-Pehrson | 0567015 | 2014-03-08 12:39:52 -0600 | [diff] [blame] | 3608 | if (optimize == 0) |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3609 | w = gamma_from_1[w]; |
| 3610 | *sp = w; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3611 | } |
| 3612 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3613 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3614 | else |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3615 | #endif |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3616 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3617 | sp = row; |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3618 | for (i = 0; i < row_width; i++, sp += 2) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3619 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 3620 | png_byte a = *(sp + 1); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3621 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3622 | if (a == 0) |
| 3623 | *sp = (png_byte)png_ptr->background.gray; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 3624 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3625 | else if (a < 0xff) |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 3626 | png_composite(*sp, *sp, a, png_ptr->background.gray); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3627 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3628 | } |
| 3629 | } |
| 3630 | else /* if (png_ptr->bit_depth == 16) */ |
| 3631 | { |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 3632 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3633 | if (gamma_16 != NULL && gamma_16_from_1 != NULL && |
| 3634 | gamma_16_to_1 != NULL) |
| 3635 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3636 | sp = row; |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3637 | for (i = 0; i < row_width; i++, sp += 4) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3638 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3639 | png_uint_16 a = (png_uint_16)(((*(sp + 2)) << 8) |
| 3640 | + *(sp + 3)); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3641 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3642 | if (a == (png_uint_16)0xffff) |
| 3643 | { |
| 3644 | png_uint_16 v; |
| 3645 | |
| 3646 | v = gamma_16[*(sp + 1) >> gamma_shift][*sp]; |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3647 | *sp = (png_byte)((v >> 8) & 0xff); |
| 3648 | *(sp + 1) = (png_byte)(v & 0xff); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3649 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3650 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3651 | else if (a == 0) |
| 3652 | { |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3653 | /* Background is already in screen gamma */ |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 3654 | *sp = (png_byte)((png_ptr->background.gray >> 8) |
| 3655 | & 0xff); |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3656 | *(sp + 1) = (png_byte)(png_ptr->background.gray & 0xff); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3657 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3658 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3659 | else |
| 3660 | { |
| 3661 | png_uint_16 g, v, w; |
| 3662 | |
| 3663 | g = gamma_16_to_1[*(sp + 1) >> gamma_shift][*sp]; |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3664 | png_composite_16(v, g, a, png_ptr->background_1.gray); |
Glenn Randers-Pehrson | 0567015 | 2014-03-08 12:39:52 -0600 | [diff] [blame] | 3665 | if (optimize != 0) |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3666 | w = v; |
| 3667 | else |
| 3668 | w = gamma_16_from_1[(v&0xff) >> gamma_shift][v >> 8]; |
| 3669 | *sp = (png_byte)((w >> 8) & 0xff); |
| 3670 | *(sp + 1) = (png_byte)(w & 0xff); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3671 | } |
| 3672 | } |
| 3673 | } |
| 3674 | else |
| 3675 | #endif |
| 3676 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3677 | sp = row; |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3678 | for (i = 0; i < row_width; i++, sp += 4) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3679 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3680 | png_uint_16 a = (png_uint_16)(((*(sp + 2)) << 8) |
| 3681 | + *(sp + 3)); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3682 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3683 | if (a == 0) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3684 | { |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 3685 | *sp = (png_byte)((png_ptr->background.gray >> 8) |
| 3686 | & 0xff); |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3687 | *(sp + 1) = (png_byte)(png_ptr->background.gray & 0xff); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3688 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3689 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3690 | else if (a < 0xffff) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3691 | { |
| 3692 | png_uint_16 g, v; |
| 3693 | |
Glenn Randers-Pehrson | 860ab2b | 1999-10-14 07:43:10 -0500 | [diff] [blame] | 3694 | g = (png_uint_16)(((*sp) << 8) + *(sp + 1)); |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 3695 | png_composite_16(v, g, a, png_ptr->background.gray); |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3696 | *sp = (png_byte)((v >> 8) & 0xff); |
| 3697 | *(sp + 1) = (png_byte)(v & 0xff); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3698 | } |
| 3699 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3700 | } |
| 3701 | } |
| 3702 | break; |
| 3703 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3704 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3705 | case PNG_COLOR_TYPE_RGB_ALPHA: |
| 3706 | { |
| 3707 | if (row_info->bit_depth == 8) |
| 3708 | { |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 3709 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3710 | if (gamma_to_1 != NULL && gamma_from_1 != NULL && |
| 3711 | gamma_table != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3712 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3713 | sp = row; |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3714 | for (i = 0; i < row_width; i++, sp += 4) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3715 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 3716 | png_byte a = *(sp + 3); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3717 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3718 | if (a == 0xff) |
| 3719 | { |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3720 | *sp = gamma_table[*sp]; |
| 3721 | *(sp + 1) = gamma_table[*(sp + 1)]; |
| 3722 | *(sp + 2) = gamma_table[*(sp + 2)]; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3723 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3724 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3725 | else if (a == 0) |
| 3726 | { |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3727 | /* Background is already in screen gamma */ |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3728 | *sp = (png_byte)png_ptr->background.red; |
| 3729 | *(sp + 1) = (png_byte)png_ptr->background.green; |
| 3730 | *(sp + 2) = (png_byte)png_ptr->background.blue; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3731 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3732 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3733 | else |
| 3734 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3735 | png_byte v, w; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3736 | |
| 3737 | v = gamma_to_1[*sp]; |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3738 | png_composite(w, v, a, png_ptr->background_1.red); |
Glenn Randers-Pehrson | 0567015 | 2014-03-08 12:39:52 -0600 | [diff] [blame] | 3739 | if (optimize == 0) w = gamma_from_1[w]; |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3740 | *sp = w; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3741 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3742 | v = gamma_to_1[*(sp + 1)]; |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3743 | png_composite(w, v, a, png_ptr->background_1.green); |
Glenn Randers-Pehrson | 0567015 | 2014-03-08 12:39:52 -0600 | [diff] [blame] | 3744 | if (optimize == 0) w = gamma_from_1[w]; |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3745 | *(sp + 1) = w; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3746 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3747 | v = gamma_to_1[*(sp + 2)]; |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3748 | png_composite(w, v, a, png_ptr->background_1.blue); |
Glenn Randers-Pehrson | 0567015 | 2014-03-08 12:39:52 -0600 | [diff] [blame] | 3749 | if (optimize == 0) w = gamma_from_1[w]; |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3750 | *(sp + 2) = w; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3751 | } |
| 3752 | } |
| 3753 | } |
| 3754 | else |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3755 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3756 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3757 | sp = row; |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3758 | for (i = 0; i < row_width; i++, sp += 4) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3759 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 3760 | png_byte a = *(sp + 3); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3761 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3762 | if (a == 0) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3763 | { |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3764 | *sp = (png_byte)png_ptr->background.red; |
| 3765 | *(sp + 1) = (png_byte)png_ptr->background.green; |
| 3766 | *(sp + 2) = (png_byte)png_ptr->background.blue; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3767 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3768 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3769 | else if (a < 0xff) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3770 | { |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3771 | png_composite(*sp, *sp, a, png_ptr->background.red); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3772 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3773 | png_composite(*(sp + 1), *(sp + 1), a, |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3774 | png_ptr->background.green); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3775 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3776 | png_composite(*(sp + 2), *(sp + 2), a, |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3777 | png_ptr->background.blue); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3778 | } |
| 3779 | } |
| 3780 | } |
| 3781 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3782 | else /* if (row_info->bit_depth == 16) */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3783 | { |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 3784 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3785 | if (gamma_16 != NULL && gamma_16_from_1 != NULL && |
| 3786 | gamma_16_to_1 != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3787 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3788 | sp = row; |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3789 | for (i = 0; i < row_width; i++, sp += 8) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3790 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 3791 | png_uint_16 a = (png_uint_16)(((png_uint_16)(*(sp + 6)) |
| 3792 | << 8) + (png_uint_16)(*(sp + 7))); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3793 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3794 | if (a == (png_uint_16)0xffff) |
| 3795 | { |
| 3796 | png_uint_16 v; |
| 3797 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3798 | v = gamma_16[*(sp + 1) >> gamma_shift][*sp]; |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3799 | *sp = (png_byte)((v >> 8) & 0xff); |
| 3800 | *(sp + 1) = (png_byte)(v & 0xff); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3801 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3802 | v = gamma_16[*(sp + 3) >> gamma_shift][*(sp + 2)]; |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3803 | *(sp + 2) = (png_byte)((v >> 8) & 0xff); |
| 3804 | *(sp + 3) = (png_byte)(v & 0xff); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3805 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3806 | v = gamma_16[*(sp + 5) >> gamma_shift][*(sp + 4)]; |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3807 | *(sp + 4) = (png_byte)((v >> 8) & 0xff); |
| 3808 | *(sp + 5) = (png_byte)(v & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3809 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3810 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3811 | else if (a == 0) |
| 3812 | { |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3813 | /* Background is already in screen gamma */ |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3814 | *sp = (png_byte)((png_ptr->background.red >> 8) & 0xff); |
| 3815 | *(sp + 1) = (png_byte)(png_ptr->background.red & 0xff); |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 3816 | *(sp + 2) = (png_byte)((png_ptr->background.green >> 8) |
| 3817 | & 0xff); |
| 3818 | *(sp + 3) = (png_byte)(png_ptr->background.green |
| 3819 | & 0xff); |
| 3820 | *(sp + 4) = (png_byte)((png_ptr->background.blue >> 8) |
| 3821 | & 0xff); |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3822 | *(sp + 5) = (png_byte)(png_ptr->background.blue & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3823 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3824 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3825 | else |
| 3826 | { |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3827 | png_uint_16 v, w; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3828 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3829 | v = gamma_16_to_1[*(sp + 1) >> gamma_shift][*sp]; |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3830 | png_composite_16(w, v, a, png_ptr->background_1.red); |
Glenn Randers-Pehrson | 0567015 | 2014-03-08 12:39:52 -0600 | [diff] [blame] | 3831 | if (optimize == 0) |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 3832 | w = gamma_16_from_1[((w&0xff) >> gamma_shift)][w >> |
| 3833 | 8]; |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3834 | *sp = (png_byte)((w >> 8) & 0xff); |
| 3835 | *(sp + 1) = (png_byte)(w & 0xff); |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 3836 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3837 | v = gamma_16_to_1[*(sp + 3) >> gamma_shift][*(sp + 2)]; |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3838 | png_composite_16(w, v, a, png_ptr->background_1.green); |
Glenn Randers-Pehrson | 0567015 | 2014-03-08 12:39:52 -0600 | [diff] [blame] | 3839 | if (optimize == 0) |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 3840 | w = gamma_16_from_1[((w&0xff) >> gamma_shift)][w >> |
| 3841 | 8]; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3842 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3843 | *(sp + 2) = (png_byte)((w >> 8) & 0xff); |
| 3844 | *(sp + 3) = (png_byte)(w & 0xff); |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 3845 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3846 | v = gamma_16_to_1[*(sp + 5) >> gamma_shift][*(sp + 4)]; |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3847 | png_composite_16(w, v, a, png_ptr->background_1.blue); |
Glenn Randers-Pehrson | 0567015 | 2014-03-08 12:39:52 -0600 | [diff] [blame] | 3848 | if (optimize == 0) |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 3849 | w = gamma_16_from_1[((w&0xff) >> gamma_shift)][w >> |
| 3850 | 8]; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3851 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3852 | *(sp + 4) = (png_byte)((w >> 8) & 0xff); |
| 3853 | *(sp + 5) = (png_byte)(w & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3854 | } |
| 3855 | } |
| 3856 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3857 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3858 | else |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3859 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3860 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3861 | sp = row; |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3862 | for (i = 0; i < row_width; i++, sp += 8) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3863 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 3864 | png_uint_16 a = (png_uint_16)(((png_uint_16)(*(sp + 6)) |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3865 | << 8) + (png_uint_16)(*(sp + 7))); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3866 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3867 | if (a == 0) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3868 | { |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3869 | *sp = (png_byte)((png_ptr->background.red >> 8) & 0xff); |
| 3870 | *(sp + 1) = (png_byte)(png_ptr->background.red & 0xff); |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 3871 | *(sp + 2) = (png_byte)((png_ptr->background.green >> 8) |
| 3872 | & 0xff); |
| 3873 | *(sp + 3) = (png_byte)(png_ptr->background.green |
| 3874 | & 0xff); |
| 3875 | *(sp + 4) = (png_byte)((png_ptr->background.blue >> 8) |
| 3876 | & 0xff); |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3877 | *(sp + 5) = (png_byte)(png_ptr->background.blue & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3878 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3879 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3880 | else if (a < 0xffff) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3881 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 3882 | png_uint_16 v; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3883 | |
Glenn Randers-Pehrson | 860ab2b | 1999-10-14 07:43:10 -0500 | [diff] [blame] | 3884 | png_uint_16 r = (png_uint_16)(((*sp) << 8) + *(sp + 1)); |
| 3885 | png_uint_16 g = (png_uint_16)(((*(sp + 2)) << 8) |
| 3886 | + *(sp + 3)); |
| 3887 | png_uint_16 b = (png_uint_16)(((*(sp + 4)) << 8) |
| 3888 | + *(sp + 5)); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3889 | |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3890 | png_composite_16(v, r, a, png_ptr->background.red); |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3891 | *sp = (png_byte)((v >> 8) & 0xff); |
| 3892 | *(sp + 1) = (png_byte)(v & 0xff); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3893 | |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3894 | png_composite_16(v, g, a, png_ptr->background.green); |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3895 | *(sp + 2) = (png_byte)((v >> 8) & 0xff); |
| 3896 | *(sp + 3) = (png_byte)(v & 0xff); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3897 | |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3898 | png_composite_16(v, b, a, png_ptr->background.blue); |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3899 | *(sp + 4) = (png_byte)((v >> 8) & 0xff); |
| 3900 | *(sp + 5) = (png_byte)(v & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3901 | } |
| 3902 | } |
| 3903 | } |
| 3904 | } |
| 3905 | break; |
| 3906 | } |
Glenn Randers-Pehrson | b3edc73 | 2010-11-21 14:06:41 -0600 | [diff] [blame] | 3907 | |
| 3908 | default: |
| 3909 | break; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3910 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3911 | } |
| 3912 | } |
John Bowler | 07772cb | 2011-10-14 18:19:47 -0500 | [diff] [blame] | 3913 | #endif /* PNG_READ_BACKGROUND_SUPPORTED || PNG_READ_ALPHA_MODE_SUPPORTED */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3914 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 3915 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3916 | /* Gamma correct the image, avoiding the alpha channel. Make sure |
Glenn Randers-Pehrson | 345bc27 | 1998-06-14 14:43:31 -0500 | [diff] [blame] | 3917 | * you do this after you deal with the transparency issue on grayscale |
Glenn Randers-Pehrson | 352ca6b | 1999-09-18 15:49:20 -0500 | [diff] [blame] | 3918 | * or RGB images. If your bit depth is 8, use gamma_table, if it |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 3919 | * is 16, use gamma_16_table and gamma_shift. Build these with |
| 3920 | * build_gamma_table(). |
| 3921 | */ |
John Bowler | 8f1150e | 2013-12-19 15:33:49 -0600 | [diff] [blame] | 3922 | static void |
John Bowler | 5d56786 | 2011-12-24 09:12:00 -0600 | [diff] [blame] | 3923 | png_do_gamma(png_row_infop row_info, png_bytep row, png_structrp png_ptr) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3924 | { |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3925 | png_const_bytep gamma_table = png_ptr->gamma_table; |
| 3926 | png_const_uint_16pp gamma_16_table = png_ptr->gamma_16_table; |
| 3927 | int gamma_shift = png_ptr->gamma_shift; |
| 3928 | |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 3929 | png_bytep sp; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3930 | png_uint_32 i; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3931 | png_uint_32 row_width=row_info->width; |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 3932 | |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 3933 | png_debug(1, "in png_do_gamma"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 3934 | |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3935 | if (((row_info->bit_depth <= 8 && gamma_table != NULL) || |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3936 | (row_info->bit_depth == 16 && gamma_16_table != NULL))) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3937 | { |
| 3938 | switch (row_info->color_type) |
| 3939 | { |
| 3940 | case PNG_COLOR_TYPE_RGB: |
| 3941 | { |
| 3942 | if (row_info->bit_depth == 8) |
| 3943 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3944 | sp = row; |
| 3945 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3946 | { |
| 3947 | *sp = gamma_table[*sp]; |
| 3948 | sp++; |
| 3949 | *sp = gamma_table[*sp]; |
| 3950 | sp++; |
| 3951 | *sp = gamma_table[*sp]; |
| 3952 | sp++; |
| 3953 | } |
| 3954 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3955 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3956 | else /* if (row_info->bit_depth == 16) */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3957 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3958 | sp = row; |
| 3959 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3960 | { |
| 3961 | png_uint_16 v; |
| 3962 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3963 | v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3964 | *sp = (png_byte)((v >> 8) & 0xff); |
| 3965 | *(sp + 1) = (png_byte)(v & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3966 | sp += 2; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 3967 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3968 | v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3969 | *sp = (png_byte)((v >> 8) & 0xff); |
| 3970 | *(sp + 1) = (png_byte)(v & 0xff); |
| 3971 | sp += 2; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 3972 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3973 | v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3974 | *sp = (png_byte)((v >> 8) & 0xff); |
| 3975 | *(sp + 1) = (png_byte)(v & 0xff); |
| 3976 | sp += 2; |
| 3977 | } |
| 3978 | } |
| 3979 | break; |
| 3980 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3981 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3982 | case PNG_COLOR_TYPE_RGB_ALPHA: |
| 3983 | { |
| 3984 | if (row_info->bit_depth == 8) |
| 3985 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3986 | sp = row; |
| 3987 | for (i = 0; i < row_width; i++) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3988 | { |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3989 | *sp = gamma_table[*sp]; |
| 3990 | sp++; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 3991 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3992 | *sp = gamma_table[*sp]; |
| 3993 | sp++; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 3994 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3995 | *sp = gamma_table[*sp]; |
| 3996 | sp++; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 3997 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3998 | sp++; |
| 3999 | } |
| 4000 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4001 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 4002 | else /* if (row_info->bit_depth == 16) */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4003 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4004 | sp = row; |
| 4005 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4006 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 4007 | png_uint_16 v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 4008 | *sp = (png_byte)((v >> 8) & 0xff); |
| 4009 | *(sp + 1) = (png_byte)(v & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4010 | sp += 2; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 4011 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 4012 | v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 4013 | *sp = (png_byte)((v >> 8) & 0xff); |
| 4014 | *(sp + 1) = (png_byte)(v & 0xff); |
| 4015 | sp += 2; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 4016 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 4017 | v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 4018 | *sp = (png_byte)((v >> 8) & 0xff); |
| 4019 | *(sp + 1) = (png_byte)(v & 0xff); |
| 4020 | sp += 4; |
| 4021 | } |
| 4022 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4023 | break; |
| 4024 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4025 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4026 | case PNG_COLOR_TYPE_GRAY_ALPHA: |
| 4027 | { |
| 4028 | if (row_info->bit_depth == 8) |
| 4029 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4030 | sp = row; |
| 4031 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4032 | { |
| 4033 | *sp = gamma_table[*sp]; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 4034 | sp += 2; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4035 | } |
| 4036 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4037 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 4038 | else /* if (row_info->bit_depth == 16) */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4039 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4040 | sp = row; |
| 4041 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4042 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 4043 | png_uint_16 v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 4044 | *sp = (png_byte)((v >> 8) & 0xff); |
| 4045 | *(sp + 1) = (png_byte)(v & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4046 | sp += 4; |
| 4047 | } |
| 4048 | } |
| 4049 | break; |
| 4050 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4051 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4052 | case PNG_COLOR_TYPE_GRAY: |
| 4053 | { |
Glenn Randers-Pehrson | 2687fcc | 1998-01-07 20:54:20 -0600 | [diff] [blame] | 4054 | if (row_info->bit_depth == 2) |
| 4055 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4056 | sp = row; |
| 4057 | for (i = 0; i < row_width; i += 4) |
Glenn Randers-Pehrson | 2687fcc | 1998-01-07 20:54:20 -0600 | [diff] [blame] | 4058 | { |
| 4059 | int a = *sp & 0xc0; |
| 4060 | int b = *sp & 0x30; |
| 4061 | int c = *sp & 0x0c; |
| 4062 | int d = *sp & 0x03; |
| 4063 | |
Glenn Randers-Pehrson | 860ab2b | 1999-10-14 07:43:10 -0500 | [diff] [blame] | 4064 | *sp = (png_byte)( |
Glenn Randers-Pehrson | e3f3c4e | 2010-02-07 18:08:50 -0600 | [diff] [blame] | 4065 | ((((int)gamma_table[a|(a>>2)|(a>>4)|(a>>6)]) ) & 0xc0)| |
| 4066 | ((((int)gamma_table[(b<<2)|b|(b>>2)|(b>>4)])>>2) & 0x30)| |
| 4067 | ((((int)gamma_table[(c<<4)|(c<<2)|c|(c>>2)])>>4) & 0x0c)| |
| 4068 | ((((int)gamma_table[(d<<6)|(d<<4)|(d<<2)|d])>>6) )); |
Glenn Randers-Pehrson | 2687fcc | 1998-01-07 20:54:20 -0600 | [diff] [blame] | 4069 | sp++; |
| 4070 | } |
| 4071 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4072 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 4073 | if (row_info->bit_depth == 4) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4074 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4075 | sp = row; |
| 4076 | for (i = 0; i < row_width; i += 2) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 4077 | { |
| 4078 | int msb = *sp & 0xf0; |
| 4079 | int lsb = *sp & 0x0f; |
| 4080 | |
Glenn Randers-Pehrson | 860ab2b | 1999-10-14 07:43:10 -0500 | [diff] [blame] | 4081 | *sp = (png_byte)((((int)gamma_table[msb | (msb >> 4)]) & 0xf0) |
Glenn Randers-Pehrson | e3f3c4e | 2010-02-07 18:08:50 -0600 | [diff] [blame] | 4082 | | (((int)gamma_table[(lsb << 4) | lsb]) >> 4)); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 4083 | sp++; |
| 4084 | } |
| 4085 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4086 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 4087 | else if (row_info->bit_depth == 8) |
| 4088 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4089 | sp = row; |
| 4090 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4091 | { |
| 4092 | *sp = gamma_table[*sp]; |
| 4093 | sp++; |
| 4094 | } |
| 4095 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4096 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4097 | else if (row_info->bit_depth == 16) |
| 4098 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4099 | sp = row; |
| 4100 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4101 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 4102 | png_uint_16 v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 4103 | *sp = (png_byte)((v >> 8) & 0xff); |
| 4104 | *(sp + 1) = (png_byte)(v & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4105 | sp += 2; |
| 4106 | } |
| 4107 | } |
| 4108 | break; |
| 4109 | } |
Glenn Randers-Pehrson | b3edc73 | 2010-11-21 14:06:41 -0600 | [diff] [blame] | 4110 | |
| 4111 | default: |
| 4112 | break; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4113 | } |
| 4114 | } |
| 4115 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 4116 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4117 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 4118 | #ifdef PNG_READ_ALPHA_MODE_SUPPORTED |
| 4119 | /* Encode the alpha channel to the output gamma (the input channel is always |
| 4120 | * linear.) Called only with color types that have an alpha channel. Needs the |
| 4121 | * from_1 tables. |
| 4122 | */ |
John Bowler | 8f1150e | 2013-12-19 15:33:49 -0600 | [diff] [blame] | 4123 | static void |
John Bowler | 5d56786 | 2011-12-24 09:12:00 -0600 | [diff] [blame] | 4124 | png_do_encode_alpha(png_row_infop row_info, png_bytep row, png_structrp png_ptr) |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 4125 | { |
| 4126 | png_uint_32 row_width = row_info->width; |
| 4127 | |
| 4128 | png_debug(1, "in png_do_encode_alpha"); |
| 4129 | |
| 4130 | if (row_info->color_type & PNG_COLOR_MASK_ALPHA) |
| 4131 | { |
| 4132 | if (row_info->bit_depth == 8) |
| 4133 | { |
| 4134 | PNG_CONST png_bytep table = png_ptr->gamma_from_1; |
| 4135 | |
| 4136 | if (table != NULL) |
| 4137 | { |
| 4138 | PNG_CONST int step = |
| 4139 | (row_info->color_type & PNG_COLOR_MASK_COLOR) ? 4 : 2; |
| 4140 | |
| 4141 | /* The alpha channel is the last component: */ |
| 4142 | row += step - 1; |
| 4143 | |
| 4144 | for (; row_width > 0; --row_width, row += step) |
| 4145 | *row = table[*row]; |
| 4146 | |
| 4147 | return; |
| 4148 | } |
| 4149 | } |
| 4150 | |
| 4151 | else if (row_info->bit_depth == 16) |
| 4152 | { |
| 4153 | PNG_CONST png_uint_16pp table = png_ptr->gamma_16_from_1; |
| 4154 | PNG_CONST int gamma_shift = png_ptr->gamma_shift; |
| 4155 | |
| 4156 | if (table != NULL) |
| 4157 | { |
| 4158 | PNG_CONST int step = |
| 4159 | (row_info->color_type & PNG_COLOR_MASK_COLOR) ? 8 : 4; |
| 4160 | |
| 4161 | /* The alpha channel is the last component: */ |
| 4162 | row += step - 2; |
| 4163 | |
| 4164 | for (; row_width > 0; --row_width, row += step) |
| 4165 | { |
| 4166 | png_uint_16 v; |
| 4167 | |
| 4168 | v = table[*(row + 1) >> gamma_shift][*row]; |
| 4169 | *row = (png_byte)((v >> 8) & 0xff); |
| 4170 | *(row + 1) = (png_byte)(v & 0xff); |
| 4171 | } |
| 4172 | |
| 4173 | return; |
| 4174 | } |
| 4175 | } |
| 4176 | } |
| 4177 | |
| 4178 | /* Only get to here if called with a weird row_info; no harm has been done, |
| 4179 | * so just issue a warning. |
| 4180 | */ |
| 4181 | png_warning(png_ptr, "png_do_encode_alpha: unexpected call"); |
| 4182 | } |
| 4183 | #endif |
| 4184 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 4185 | #ifdef PNG_READ_EXPAND_SUPPORTED |
Glenn Randers-Pehrson | 352ca6b | 1999-09-18 15:49:20 -0500 | [diff] [blame] | 4186 | /* Expands a palette row to an RGB or RGBA row depending |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 4187 | * upon whether you supply trans and num_trans. |
| 4188 | */ |
John Bowler | 8f1150e | 2013-12-19 15:33:49 -0600 | [diff] [blame] | 4189 | static void |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 4190 | png_do_expand_palette(png_row_infop row_info, png_bytep row, |
Glenn Randers-Pehrson | e600c51 | 2010-08-18 07:25:46 -0500 | [diff] [blame] | 4191 | png_const_colorp palette, png_const_bytep trans_alpha, int num_trans) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4192 | { |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 4193 | int shift, value; |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 4194 | png_bytep sp, dp; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 4195 | png_uint_32 i; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4196 | png_uint_32 row_width=row_info->width; |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 4197 | |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 4198 | png_debug(1, "in png_do_expand_palette"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 4199 | |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4200 | if (row_info->color_type == PNG_COLOR_TYPE_PALETTE) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4201 | { |
| 4202 | if (row_info->bit_depth < 8) |
| 4203 | { |
| 4204 | switch (row_info->bit_depth) |
| 4205 | { |
| 4206 | case 1: |
| 4207 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4208 | sp = row + (png_size_t)((row_width - 1) >> 3); |
| 4209 | dp = row + (png_size_t)row_width - 1; |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 4210 | shift = 7 - (int)((row_width + 7) & 0x07); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4211 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4212 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 4213 | if ((*sp >> shift) & 0x01) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4214 | *dp = 1; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 4215 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4216 | else |
| 4217 | *dp = 0; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 4218 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4219 | if (shift == 7) |
| 4220 | { |
| 4221 | shift = 0; |
| 4222 | sp--; |
| 4223 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4224 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4225 | else |
| 4226 | shift++; |
| 4227 | |
| 4228 | dp--; |
| 4229 | } |
| 4230 | break; |
| 4231 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4232 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4233 | case 2: |
| 4234 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4235 | sp = row + (png_size_t)((row_width - 1) >> 2); |
| 4236 | dp = row + (png_size_t)row_width - 1; |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 4237 | shift = (int)((3 - ((row_width + 3) & 0x03)) << 1); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4238 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4239 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 4240 | value = (*sp >> shift) & 0x03; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 4241 | *dp = (png_byte)value; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4242 | if (shift == 6) |
| 4243 | { |
| 4244 | shift = 0; |
| 4245 | sp--; |
| 4246 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4247 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4248 | else |
| 4249 | shift += 2; |
| 4250 | |
| 4251 | dp--; |
| 4252 | } |
| 4253 | break; |
| 4254 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4255 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4256 | case 4: |
| 4257 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4258 | sp = row + (png_size_t)((row_width - 1) >> 1); |
| 4259 | dp = row + (png_size_t)row_width - 1; |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 4260 | shift = (int)((row_width & 0x01) << 2); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4261 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4262 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 4263 | value = (*sp >> shift) & 0x0f; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 4264 | *dp = (png_byte)value; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4265 | if (shift == 4) |
| 4266 | { |
| 4267 | shift = 0; |
| 4268 | sp--; |
| 4269 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4270 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4271 | else |
| 4272 | shift += 4; |
| 4273 | |
| 4274 | dp--; |
| 4275 | } |
| 4276 | break; |
| 4277 | } |
Glenn Randers-Pehrson | b3edc73 | 2010-11-21 14:06:41 -0600 | [diff] [blame] | 4278 | |
| 4279 | default: |
| 4280 | break; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4281 | } |
| 4282 | row_info->bit_depth = 8; |
| 4283 | row_info->pixel_depth = 8; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4284 | row_info->rowbytes = row_width; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4285 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4286 | |
John Bowler | 4e230b0 | 2011-01-08 14:49:25 -0600 | [diff] [blame] | 4287 | if (row_info->bit_depth == 8) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4288 | { |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4289 | { |
John Bowler | cd3b0cc | 2011-06-14 23:01:07 -0500 | [diff] [blame] | 4290 | if (num_trans > 0) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4291 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4292 | sp = row + (png_size_t)row_width - 1; |
| 4293 | dp = row + (png_size_t)(row_width << 2) - 1; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4294 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4295 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4296 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 4297 | if ((int)(*sp) >= num_trans) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4298 | *dp-- = 0xff; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 4299 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4300 | else |
Glenn Randers-Pehrson | 6abea75 | 2009-08-08 16:52:06 -0500 | [diff] [blame] | 4301 | *dp-- = trans_alpha[*sp]; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 4302 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4303 | *dp-- = palette[*sp].blue; |
| 4304 | *dp-- = palette[*sp].green; |
| 4305 | *dp-- = palette[*sp].red; |
| 4306 | sp--; |
| 4307 | } |
| 4308 | row_info->bit_depth = 8; |
| 4309 | row_info->pixel_depth = 32; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4310 | row_info->rowbytes = row_width * 4; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4311 | row_info->color_type = 6; |
| 4312 | row_info->channels = 4; |
| 4313 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4314 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4315 | else |
| 4316 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4317 | sp = row + (png_size_t)row_width - 1; |
| 4318 | dp = row + (png_size_t)(row_width * 3) - 1; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4319 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4320 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4321 | { |
| 4322 | *dp-- = palette[*sp].blue; |
| 4323 | *dp-- = palette[*sp].green; |
| 4324 | *dp-- = palette[*sp].red; |
| 4325 | sp--; |
| 4326 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4327 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4328 | row_info->bit_depth = 8; |
| 4329 | row_info->pixel_depth = 24; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4330 | row_info->rowbytes = row_width * 3; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4331 | row_info->color_type = 2; |
| 4332 | row_info->channels = 3; |
| 4333 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4334 | } |
| 4335 | } |
| 4336 | } |
| 4337 | } |
| 4338 | |
Glenn Randers-Pehrson | 1ce0836 | 2006-03-08 23:35:59 -0600 | [diff] [blame] | 4339 | /* If the bit depth < 8, it is expanded to 8. Also, if the already |
| 4340 | * expanded transparency value is supplied, an alpha channel is built. |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 4341 | */ |
John Bowler | 8f1150e | 2013-12-19 15:33:49 -0600 | [diff] [blame] | 4342 | static void |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 4343 | png_do_expand(png_row_infop row_info, png_bytep row, |
John Bowler | cd3b0cc | 2011-06-14 23:01:07 -0500 | [diff] [blame] | 4344 | png_const_color_16p trans_color) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4345 | { |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 4346 | int shift, value; |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 4347 | png_bytep sp, dp; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 4348 | png_uint_32 i; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4349 | png_uint_32 row_width=row_info->width; |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 4350 | |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 4351 | png_debug(1, "in png_do_expand"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 4352 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4353 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 4354 | if (row_info->color_type == PNG_COLOR_TYPE_GRAY) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4355 | { |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 4356 | unsigned int gray = trans_color ? trans_color->gray : 0; |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4357 | |
| 4358 | if (row_info->bit_depth < 8) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4359 | { |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4360 | switch (row_info->bit_depth) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4361 | { |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4362 | case 1: |
| 4363 | { |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 4364 | gray = (gray & 0x01) * 0xff; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4365 | sp = row + (png_size_t)((row_width - 1) >> 3); |
| 4366 | dp = row + (png_size_t)row_width - 1; |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 4367 | shift = 7 - (int)((row_width + 7) & 0x07); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4368 | for (i = 0; i < row_width; i++) |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4369 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 4370 | if ((*sp >> shift) & 0x01) |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4371 | *dp = 0xff; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 4372 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4373 | else |
| 4374 | *dp = 0; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 4375 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4376 | if (shift == 7) |
| 4377 | { |
| 4378 | shift = 0; |
| 4379 | sp--; |
| 4380 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4381 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4382 | else |
| 4383 | shift++; |
| 4384 | |
| 4385 | dp--; |
| 4386 | } |
| 4387 | break; |
| 4388 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4389 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4390 | case 2: |
| 4391 | { |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 4392 | gray = (gray & 0x03) * 0x55; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4393 | sp = row + (png_size_t)((row_width - 1) >> 2); |
| 4394 | dp = row + (png_size_t)row_width - 1; |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 4395 | shift = (int)((3 - ((row_width + 3) & 0x03)) << 1); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4396 | for (i = 0; i < row_width; i++) |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4397 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 4398 | value = (*sp >> shift) & 0x03; |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4399 | *dp = (png_byte)(value | (value << 2) | (value << 4) | |
| 4400 | (value << 6)); |
| 4401 | if (shift == 6) |
| 4402 | { |
| 4403 | shift = 0; |
| 4404 | sp--; |
| 4405 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4406 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4407 | else |
| 4408 | shift += 2; |
| 4409 | |
| 4410 | dp--; |
| 4411 | } |
| 4412 | break; |
| 4413 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4414 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4415 | case 4: |
| 4416 | { |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 4417 | gray = (gray & 0x0f) * 0x11; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4418 | sp = row + (png_size_t)((row_width - 1) >> 1); |
| 4419 | dp = row + (png_size_t)row_width - 1; |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 4420 | shift = (int)((1 - ((row_width + 1) & 0x01)) << 2); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4421 | for (i = 0; i < row_width; i++) |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4422 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 4423 | value = (*sp >> shift) & 0x0f; |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4424 | *dp = (png_byte)(value | (value << 4)); |
| 4425 | if (shift == 4) |
| 4426 | { |
| 4427 | shift = 0; |
| 4428 | sp--; |
| 4429 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4430 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4431 | else |
| 4432 | shift = 4; |
| 4433 | |
| 4434 | dp--; |
| 4435 | } |
| 4436 | break; |
| 4437 | } |
Glenn Randers-Pehrson | b3edc73 | 2010-11-21 14:06:41 -0600 | [diff] [blame] | 4438 | |
| 4439 | default: |
| 4440 | break; |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4441 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4442 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4443 | row_info->bit_depth = 8; |
| 4444 | row_info->pixel_depth = 8; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4445 | row_info->rowbytes = row_width; |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4446 | } |
| 4447 | |
John Bowler | cd3b0cc | 2011-06-14 23:01:07 -0500 | [diff] [blame] | 4448 | if (trans_color != NULL) |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4449 | { |
| 4450 | if (row_info->bit_depth == 8) |
| 4451 | { |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 4452 | gray = gray & 0xff; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4453 | sp = row + (png_size_t)row_width - 1; |
| 4454 | dp = row + (png_size_t)(row_width << 1) - 1; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4455 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4456 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4457 | { |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4458 | if (*sp == gray) |
| 4459 | *dp-- = 0; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4460 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4461 | else |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4462 | *dp-- = 0xff; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4463 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4464 | *dp-- = *sp--; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4465 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4466 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4467 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4468 | else if (row_info->bit_depth == 16) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4469 | { |
Glenn Randers-Pehrson | 871b1d0 | 2013-03-02 14:58:22 -0600 | [diff] [blame] | 4470 | unsigned int gray_high = (gray >> 8) & 0xff; |
| 4471 | unsigned int gray_low = gray & 0xff; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 4472 | sp = row + row_info->rowbytes - 1; |
| 4473 | dp = row + (row_info->rowbytes << 1) - 1; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4474 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4475 | { |
Glenn Randers-Pehrson | 79134c6 | 2009-02-14 10:32:18 -0600 | [diff] [blame] | 4476 | if (*(sp - 1) == gray_high && *(sp) == gray_low) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4477 | { |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4478 | *dp-- = 0; |
| 4479 | *dp-- = 0; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4480 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4481 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4482 | else |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4483 | { |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4484 | *dp-- = 0xff; |
| 4485 | *dp-- = 0xff; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4486 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4487 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4488 | *dp-- = *sp--; |
| 4489 | *dp-- = *sp--; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4490 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4491 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4492 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4493 | row_info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA; |
| 4494 | row_info->channels = 2; |
| 4495 | row_info->pixel_depth = (png_byte)(row_info->bit_depth << 1); |
Glenn Randers-Pehrson | 272489d | 2004-08-04 06:34:52 -0500 | [diff] [blame] | 4496 | row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, |
| 4497 | row_width); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4498 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4499 | } |
John Bowler | cd3b0cc | 2011-06-14 23:01:07 -0500 | [diff] [blame] | 4500 | else if (row_info->color_type == PNG_COLOR_TYPE_RGB && trans_color) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4501 | { |
| 4502 | if (row_info->bit_depth == 8) |
| 4503 | { |
John Bowler | cd3b0cc | 2011-06-14 23:01:07 -0500 | [diff] [blame] | 4504 | png_byte red = (png_byte)(trans_color->red & 0xff); |
| 4505 | png_byte green = (png_byte)(trans_color->green & 0xff); |
| 4506 | png_byte blue = (png_byte)(trans_color->blue & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4507 | sp = row + (png_size_t)row_info->rowbytes - 1; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4508 | dp = row + (png_size_t)(row_width << 2) - 1; |
| 4509 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4510 | { |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 4511 | if (*(sp - 2) == red && *(sp - 1) == green && *(sp) == blue) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4512 | *dp-- = 0; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4513 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4514 | else |
| 4515 | *dp-- = 0xff; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4516 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4517 | *dp-- = *sp--; |
| 4518 | *dp-- = *sp--; |
| 4519 | *dp-- = *sp--; |
| 4520 | } |
| 4521 | } |
| 4522 | else if (row_info->bit_depth == 16) |
| 4523 | { |
John Bowler | cd3b0cc | 2011-06-14 23:01:07 -0500 | [diff] [blame] | 4524 | png_byte red_high = (png_byte)((trans_color->red >> 8) & 0xff); |
| 4525 | png_byte green_high = (png_byte)((trans_color->green >> 8) & 0xff); |
| 4526 | png_byte blue_high = (png_byte)((trans_color->blue >> 8) & 0xff); |
| 4527 | png_byte red_low = (png_byte)(trans_color->red & 0xff); |
| 4528 | png_byte green_low = (png_byte)(trans_color->green & 0xff); |
| 4529 | png_byte blue_low = (png_byte)(trans_color->blue & 0xff); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 4530 | sp = row + row_info->rowbytes - 1; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4531 | dp = row + (png_size_t)(row_width << 3) - 1; |
| 4532 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4533 | { |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 4534 | if (*(sp - 5) == red_high && |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 4535 | *(sp - 4) == red_low && |
| 4536 | *(sp - 3) == green_high && |
| 4537 | *(sp - 2) == green_low && |
| 4538 | *(sp - 1) == blue_high && |
| 4539 | *(sp ) == blue_low) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4540 | { |
| 4541 | *dp-- = 0; |
| 4542 | *dp-- = 0; |
| 4543 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4544 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4545 | else |
| 4546 | { |
| 4547 | *dp-- = 0xff; |
| 4548 | *dp-- = 0xff; |
| 4549 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4550 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4551 | *dp-- = *sp--; |
| 4552 | *dp-- = *sp--; |
| 4553 | *dp-- = *sp--; |
| 4554 | *dp-- = *sp--; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 4555 | *dp-- = *sp--; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4556 | *dp-- = *sp--; |
| 4557 | } |
| 4558 | } |
| 4559 | row_info->color_type = PNG_COLOR_TYPE_RGB_ALPHA; |
| 4560 | row_info->channels = 4; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 4561 | row_info->pixel_depth = (png_byte)(row_info->bit_depth << 2); |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 4562 | row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4563 | } |
| 4564 | } |
| 4565 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 4566 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4567 | |
John Bowler | 4d56296 | 2011-02-12 09:01:20 -0600 | [diff] [blame] | 4568 | #ifdef PNG_READ_EXPAND_16_SUPPORTED |
Glenn Randers-Pehrson | 8b8aacd | 2011-08-25 18:10:50 -0500 | [diff] [blame] | 4569 | /* If the bit depth is 8 and the color type is not a palette type expand the |
John Bowler | 4d56296 | 2011-02-12 09:01:20 -0600 | [diff] [blame] | 4570 | * whole row to 16 bits. Has no effect otherwise. |
| 4571 | */ |
John Bowler | 8f1150e | 2013-12-19 15:33:49 -0600 | [diff] [blame] | 4572 | static void |
John Bowler | 4d56296 | 2011-02-12 09:01:20 -0600 | [diff] [blame] | 4573 | png_do_expand_16(png_row_infop row_info, png_bytep row) |
| 4574 | { |
| 4575 | if (row_info->bit_depth == 8 && |
| 4576 | row_info->color_type != PNG_COLOR_TYPE_PALETTE) |
| 4577 | { |
| 4578 | /* The row have a sequence of bytes containing [0..255] and we need |
| 4579 | * to turn it into another row containing [0..65535], to do this we |
| 4580 | * calculate: |
| 4581 | * |
| 4582 | * (input / 255) * 65535 |
| 4583 | * |
| 4584 | * Which happens to be exactly input * 257 and this can be achieved |
| 4585 | * simply by byte replication in place (copying backwards). |
| 4586 | */ |
| 4587 | png_byte *sp = row + row_info->rowbytes; /* source, last byte + 1 */ |
| 4588 | png_byte *dp = sp + row_info->rowbytes; /* destination, end + 1 */ |
| 4589 | while (dp > sp) |
| 4590 | dp[-2] = dp[-1] = *--sp, dp -= 2; |
| 4591 | |
| 4592 | row_info->rowbytes *= 2; |
| 4593 | row_info->bit_depth = 16; |
| 4594 | row_info->pixel_depth = (png_byte)(row_info->channels * 16); |
| 4595 | } |
| 4596 | } |
| 4597 | #endif |
| 4598 | |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 4599 | #ifdef PNG_READ_QUANTIZE_SUPPORTED |
John Bowler | 8f1150e | 2013-12-19 15:33:49 -0600 | [diff] [blame] | 4600 | static void |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 4601 | png_do_quantize(png_row_infop row_info, png_bytep row, |
Glenn Randers-Pehrson | e600c51 | 2010-08-18 07:25:46 -0500 | [diff] [blame] | 4602 | png_const_bytep palette_lookup, png_const_bytep quantize_lookup) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4603 | { |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 4604 | png_bytep sp, dp; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 4605 | png_uint_32 i; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4606 | png_uint_32 row_width=row_info->width; |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 4607 | |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 4608 | png_debug(1, "in png_do_quantize"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 4609 | |
Glenn Randers-Pehrson | 925d23b | 2010-08-26 21:43:18 -0500 | [diff] [blame] | 4610 | if (row_info->bit_depth == 8) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4611 | { |
Glenn Randers-Pehrson | 925d23b | 2010-08-26 21:43:18 -0500 | [diff] [blame] | 4612 | if (row_info->color_type == PNG_COLOR_TYPE_RGB && palette_lookup) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4613 | { |
| 4614 | int r, g, b, p; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4615 | sp = row; |
| 4616 | dp = row; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4617 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4618 | { |
| 4619 | r = *sp++; |
| 4620 | g = *sp++; |
| 4621 | b = *sp++; |
| 4622 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4623 | /* This looks real messy, but the compiler will reduce |
| 4624 | * it down to a reasonable formula. For example, with |
| 4625 | * 5 bits per color, we get: |
| 4626 | * p = (((r >> 3) & 0x1f) << 10) | |
| 4627 | * (((g >> 3) & 0x1f) << 5) | |
| 4628 | * ((b >> 3) & 0x1f); |
| 4629 | */ |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 4630 | p = (((r >> (8 - PNG_QUANTIZE_RED_BITS)) & |
| 4631 | ((1 << PNG_QUANTIZE_RED_BITS) - 1)) << |
| 4632 | (PNG_QUANTIZE_GREEN_BITS + PNG_QUANTIZE_BLUE_BITS)) | |
| 4633 | (((g >> (8 - PNG_QUANTIZE_GREEN_BITS)) & |
| 4634 | ((1 << PNG_QUANTIZE_GREEN_BITS) - 1)) << |
| 4635 | (PNG_QUANTIZE_BLUE_BITS)) | |
| 4636 | ((b >> (8 - PNG_QUANTIZE_BLUE_BITS)) & |
| 4637 | ((1 << PNG_QUANTIZE_BLUE_BITS) - 1)); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4638 | |
| 4639 | *dp++ = palette_lookup[p]; |
| 4640 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4641 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4642 | row_info->color_type = PNG_COLOR_TYPE_PALETTE; |
| 4643 | row_info->channels = 1; |
| 4644 | row_info->pixel_depth = row_info->bit_depth; |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 4645 | row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4646 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4647 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4648 | else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA && |
Glenn Randers-Pehrson | 925d23b | 2010-08-26 21:43:18 -0500 | [diff] [blame] | 4649 | palette_lookup != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4650 | { |
| 4651 | int r, g, b, p; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4652 | sp = row; |
| 4653 | dp = row; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4654 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4655 | { |
| 4656 | r = *sp++; |
| 4657 | g = *sp++; |
| 4658 | b = *sp++; |
| 4659 | sp++; |
| 4660 | |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 4661 | p = (((r >> (8 - PNG_QUANTIZE_RED_BITS)) & |
| 4662 | ((1 << PNG_QUANTIZE_RED_BITS) - 1)) << |
| 4663 | (PNG_QUANTIZE_GREEN_BITS + PNG_QUANTIZE_BLUE_BITS)) | |
| 4664 | (((g >> (8 - PNG_QUANTIZE_GREEN_BITS)) & |
| 4665 | ((1 << PNG_QUANTIZE_GREEN_BITS) - 1)) << |
| 4666 | (PNG_QUANTIZE_BLUE_BITS)) | |
| 4667 | ((b >> (8 - PNG_QUANTIZE_BLUE_BITS)) & |
| 4668 | ((1 << PNG_QUANTIZE_BLUE_BITS) - 1)); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4669 | |
| 4670 | *dp++ = palette_lookup[p]; |
| 4671 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4672 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4673 | row_info->color_type = PNG_COLOR_TYPE_PALETTE; |
| 4674 | row_info->channels = 1; |
| 4675 | row_info->pixel_depth = row_info->bit_depth; |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 4676 | row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4677 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4678 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4679 | else if (row_info->color_type == PNG_COLOR_TYPE_PALETTE && |
Glenn Randers-Pehrson | 925d23b | 2010-08-26 21:43:18 -0500 | [diff] [blame] | 4680 | quantize_lookup) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 4681 | { |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4682 | sp = row; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4683 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4684 | for (i = 0; i < row_width; i++, sp++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4685 | { |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 4686 | *sp = quantize_lookup[*sp]; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4687 | } |
| 4688 | } |
| 4689 | } |
| 4690 | } |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 4691 | #endif /* PNG_READ_QUANTIZE_SUPPORTED */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4692 | |
John Bowler | c10930a | 2013-12-19 15:24:06 -0600 | [diff] [blame] | 4693 | /* Transform the row. The order of transformations is significant, |
| 4694 | * and is very touchy. If you add a transformation, take care to |
| 4695 | * decide how it fits in with the other transformations here. |
| 4696 | */ |
Glenn Randers-Pehrson | 2ad31ae | 2000-12-15 08:54:42 -0600 | [diff] [blame] | 4697 | void /* PRIVATE */ |
John Bowler | c10930a | 2013-12-19 15:24:06 -0600 | [diff] [blame] | 4698 | png_do_read_transformations(png_structrp png_ptr, png_row_infop row_info) |
Glenn Randers-Pehrson | 2ad31ae | 2000-12-15 08:54:42 -0600 | [diff] [blame] | 4699 | { |
John Bowler | c10930a | 2013-12-19 15:24:06 -0600 | [diff] [blame] | 4700 | png_debug(1, "in png_do_read_transformations"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 4701 | |
John Bowler | c10930a | 2013-12-19 15:24:06 -0600 | [diff] [blame] | 4702 | if (png_ptr->row_buf == NULL) |
Glenn Randers-Pehrson | 2ad31ae | 2000-12-15 08:54:42 -0600 | [diff] [blame] | 4703 | { |
John Bowler | c10930a | 2013-12-19 15:24:06 -0600 | [diff] [blame] | 4704 | /* Prior to 1.5.4 this output row/pass where the NULL pointer is, but this |
| 4705 | * error is incredibly rare and incredibly easy to debug without this |
| 4706 | * information. |
| 4707 | */ |
| 4708 | png_error(png_ptr, "NULL row buffer"); |
| 4709 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4710 | |
John Bowler | c10930a | 2013-12-19 15:24:06 -0600 | [diff] [blame] | 4711 | /* The following is debugging; prior to 1.5.4 the code was never compiled in; |
| 4712 | * in 1.5.4 PNG_FLAG_DETECT_UNINITIALIZED was added and the macro |
| 4713 | * PNG_WARN_UNINITIALIZED_ROW removed. In 1.6 the new flag is set only for |
| 4714 | * all transformations, however in practice the ROW_INIT always gets done on |
| 4715 | * demand, if necessary. |
| 4716 | */ |
| 4717 | if ((png_ptr->flags & PNG_FLAG_DETECT_UNINITIALIZED) != 0 && |
| 4718 | !(png_ptr->flags & PNG_FLAG_ROW_INIT)) |
| 4719 | { |
| 4720 | /* Application has failed to call either png_read_start_image() or |
| 4721 | * png_read_update_info() after setting transforms that expand pixels. |
| 4722 | * This check added to libpng-1.2.19 (but not enabled until 1.5.4). |
| 4723 | */ |
| 4724 | png_error(png_ptr, "Uninitialized row"); |
| 4725 | } |
| 4726 | |
| 4727 | #ifdef PNG_READ_EXPAND_SUPPORTED |
| 4728 | if (png_ptr->transformations & PNG_EXPAND) |
| 4729 | { |
| 4730 | if (row_info->color_type == PNG_COLOR_TYPE_PALETTE) |
Glenn Randers-Pehrson | 2ad31ae | 2000-12-15 08:54:42 -0600 | [diff] [blame] | 4731 | { |
John Bowler | c10930a | 2013-12-19 15:24:06 -0600 | [diff] [blame] | 4732 | png_do_expand_palette(row_info, png_ptr->row_buf + 1, |
| 4733 | png_ptr->palette, png_ptr->trans_alpha, png_ptr->num_trans); |
Glenn Randers-Pehrson | 2ad31ae | 2000-12-15 08:54:42 -0600 | [diff] [blame] | 4734 | } |
John Bowler | c10930a | 2013-12-19 15:24:06 -0600 | [diff] [blame] | 4735 | |
| 4736 | else |
Glenn Randers-Pehrson | 2ad31ae | 2000-12-15 08:54:42 -0600 | [diff] [blame] | 4737 | { |
John Bowler | c10930a | 2013-12-19 15:24:06 -0600 | [diff] [blame] | 4738 | if (png_ptr->num_trans && |
| 4739 | (png_ptr->transformations & PNG_EXPAND_tRNS)) |
| 4740 | png_do_expand(row_info, png_ptr->row_buf + 1, |
| 4741 | &(png_ptr->trans_color)); |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4742 | |
Glenn Randers-Pehrson | 2ad31ae | 2000-12-15 08:54:42 -0600 | [diff] [blame] | 4743 | else |
John Bowler | c10930a | 2013-12-19 15:24:06 -0600 | [diff] [blame] | 4744 | png_do_expand(row_info, png_ptr->row_buf + 1, |
| 4745 | NULL); |
Glenn Randers-Pehrson | 2ad31ae | 2000-12-15 08:54:42 -0600 | [diff] [blame] | 4746 | } |
| 4747 | } |
John Bowler | c10930a | 2013-12-19 15:24:06 -0600 | [diff] [blame] | 4748 | #endif |
| 4749 | |
| 4750 | #ifdef PNG_READ_STRIP_ALPHA_SUPPORTED |
| 4751 | if ((png_ptr->transformations & PNG_STRIP_ALPHA) && |
| 4752 | !(png_ptr->transformations & PNG_COMPOSE) && |
| 4753 | (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA || |
| 4754 | row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)) |
| 4755 | png_do_strip_channel(row_info, png_ptr->row_buf + 1, |
| 4756 | 0 /* at_start == false, because SWAP_ALPHA happens later */); |
| 4757 | #endif |
| 4758 | |
| 4759 | #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED |
| 4760 | if (png_ptr->transformations & PNG_RGB_TO_GRAY) |
| 4761 | { |
| 4762 | int rgb_error = |
| 4763 | png_do_rgb_to_gray(png_ptr, row_info, |
| 4764 | png_ptr->row_buf + 1); |
| 4765 | |
Glenn Randers-Pehrson | 0567015 | 2014-03-08 12:39:52 -0600 | [diff] [blame] | 4766 | if (rgb_error != 0) |
John Bowler | c10930a | 2013-12-19 15:24:06 -0600 | [diff] [blame] | 4767 | { |
| 4768 | png_ptr->rgb_to_gray_status=1; |
| 4769 | if ((png_ptr->transformations & PNG_RGB_TO_GRAY) == |
| 4770 | PNG_RGB_TO_GRAY_WARN) |
| 4771 | png_warning(png_ptr, "png_do_rgb_to_gray found nongray pixel"); |
| 4772 | |
| 4773 | if ((png_ptr->transformations & PNG_RGB_TO_GRAY) == |
| 4774 | PNG_RGB_TO_GRAY_ERR) |
| 4775 | png_error(png_ptr, "png_do_rgb_to_gray found nongray pixel"); |
| 4776 | } |
| 4777 | } |
| 4778 | #endif |
| 4779 | |
| 4780 | /* From Andreas Dilger e-mail to png-implement, 26 March 1998: |
| 4781 | * |
| 4782 | * In most cases, the "simple transparency" should be done prior to doing |
| 4783 | * gray-to-RGB, or you will have to test 3x as many bytes to check if a |
| 4784 | * pixel is transparent. You would also need to make sure that the |
| 4785 | * transparency information is upgraded to RGB. |
| 4786 | * |
| 4787 | * To summarize, the current flow is: |
| 4788 | * - Gray + simple transparency -> compare 1 or 2 gray bytes and composite |
| 4789 | * with background "in place" if transparent, |
| 4790 | * convert to RGB if necessary |
| 4791 | * - Gray + alpha -> composite with gray background and remove alpha bytes, |
| 4792 | * convert to RGB if necessary |
| 4793 | * |
| 4794 | * To support RGB backgrounds for gray images we need: |
| 4795 | * - Gray + simple transparency -> convert to RGB + simple transparency, |
| 4796 | * compare 3 or 6 bytes and composite with |
| 4797 | * background "in place" if transparent |
| 4798 | * (3x compare/pixel compared to doing |
| 4799 | * composite with gray bkgrnd) |
| 4800 | * - Gray + alpha -> convert to RGB + alpha, composite with background and |
| 4801 | * remove alpha bytes (3x float |
| 4802 | * operations/pixel compared with composite |
| 4803 | * on gray background) |
| 4804 | * |
| 4805 | * Greg's change will do this. The reason it wasn't done before is for |
| 4806 | * performance, as this increases the per-pixel operations. If we would check |
| 4807 | * in advance if the background was gray or RGB, and position the gray-to-RGB |
| 4808 | * transform appropriately, then it would save a lot of work/time. |
| 4809 | */ |
| 4810 | |
| 4811 | #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED |
| 4812 | /* If gray -> RGB, do so now only if background is non-gray; else do later |
| 4813 | * for performance reasons |
| 4814 | */ |
| 4815 | if ((png_ptr->transformations & PNG_GRAY_TO_RGB) && |
| 4816 | !(png_ptr->mode & PNG_BACKGROUND_IS_GRAY)) |
| 4817 | png_do_gray_to_rgb(row_info, png_ptr->row_buf + 1); |
| 4818 | #endif |
| 4819 | |
| 4820 | #if defined(PNG_READ_BACKGROUND_SUPPORTED) ||\ |
| 4821 | defined(PNG_READ_ALPHA_MODE_SUPPORTED) |
| 4822 | if (png_ptr->transformations & PNG_COMPOSE) |
| 4823 | png_do_compose(row_info, png_ptr->row_buf + 1, png_ptr); |
| 4824 | #endif |
| 4825 | |
| 4826 | #ifdef PNG_READ_GAMMA_SUPPORTED |
| 4827 | if ((png_ptr->transformations & PNG_GAMMA) && |
| 4828 | #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED |
| 4829 | /* Because RGB_TO_GRAY does the gamma transform. */ |
| 4830 | !(png_ptr->transformations & PNG_RGB_TO_GRAY) && |
| 4831 | #endif |
| 4832 | #if defined(PNG_READ_BACKGROUND_SUPPORTED) ||\ |
| 4833 | defined(PNG_READ_ALPHA_MODE_SUPPORTED) |
| 4834 | /* Because PNG_COMPOSE does the gamma transform if there is something to |
| 4835 | * do (if there is an alpha channel or transparency.) |
| 4836 | */ |
| 4837 | !((png_ptr->transformations & PNG_COMPOSE) && |
| 4838 | ((png_ptr->num_trans != 0) || |
| 4839 | (png_ptr->color_type & PNG_COLOR_MASK_ALPHA))) && |
| 4840 | #endif |
| 4841 | /* Because png_init_read_transformations transforms the palette, unless |
| 4842 | * RGB_TO_GRAY will do the transform. |
| 4843 | */ |
| 4844 | (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE)) |
| 4845 | png_do_gamma(row_info, png_ptr->row_buf + 1, png_ptr); |
| 4846 | #endif |
| 4847 | |
| 4848 | #ifdef PNG_READ_STRIP_ALPHA_SUPPORTED |
| 4849 | if ((png_ptr->transformations & PNG_STRIP_ALPHA) && |
| 4850 | (png_ptr->transformations & PNG_COMPOSE) && |
| 4851 | (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA || |
| 4852 | row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)) |
| 4853 | png_do_strip_channel(row_info, png_ptr->row_buf + 1, |
| 4854 | 0 /* at_start == false, because SWAP_ALPHA happens later */); |
| 4855 | #endif |
| 4856 | |
| 4857 | #ifdef PNG_READ_ALPHA_MODE_SUPPORTED |
| 4858 | if ((png_ptr->transformations & PNG_ENCODE_ALPHA) && |
| 4859 | (row_info->color_type & PNG_COLOR_MASK_ALPHA)) |
| 4860 | png_do_encode_alpha(row_info, png_ptr->row_buf + 1, png_ptr); |
| 4861 | #endif |
| 4862 | |
| 4863 | #ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED |
| 4864 | if (png_ptr->transformations & PNG_SCALE_16_TO_8) |
| 4865 | png_do_scale_16_to_8(row_info, png_ptr->row_buf + 1); |
| 4866 | #endif |
| 4867 | |
| 4868 | #ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED |
| 4869 | /* There is no harm in doing both of these because only one has any effect, |
| 4870 | * by putting the 'scale' option first if the app asks for scale (either by |
| 4871 | * calling the API or in a TRANSFORM flag) this is what happens. |
| 4872 | */ |
| 4873 | if (png_ptr->transformations & PNG_16_TO_8) |
| 4874 | png_do_chop(row_info, png_ptr->row_buf + 1); |
| 4875 | #endif |
| 4876 | |
| 4877 | #ifdef PNG_READ_QUANTIZE_SUPPORTED |
| 4878 | if (png_ptr->transformations & PNG_QUANTIZE) |
| 4879 | { |
| 4880 | png_do_quantize(row_info, png_ptr->row_buf + 1, |
| 4881 | png_ptr->palette_lookup, png_ptr->quantize_index); |
| 4882 | |
| 4883 | if (row_info->rowbytes == 0) |
| 4884 | png_error(png_ptr, "png_do_quantize returned rowbytes=0"); |
| 4885 | } |
| 4886 | #endif /* PNG_READ_QUANTIZE_SUPPORTED */ |
| 4887 | |
| 4888 | #ifdef PNG_READ_EXPAND_16_SUPPORTED |
| 4889 | /* Do the expansion now, after all the arithmetic has been done. Notice |
| 4890 | * that previous transformations can handle the PNG_EXPAND_16 flag if this |
| 4891 | * is efficient (particularly true in the case of gamma correction, where |
| 4892 | * better accuracy results faster!) |
| 4893 | */ |
| 4894 | if (png_ptr->transformations & PNG_EXPAND_16) |
| 4895 | png_do_expand_16(row_info, png_ptr->row_buf + 1); |
| 4896 | #endif |
| 4897 | |
| 4898 | #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED |
| 4899 | /* NOTE: moved here in 1.5.4 (from much later in this list.) */ |
| 4900 | if ((png_ptr->transformations & PNG_GRAY_TO_RGB) && |
| 4901 | (png_ptr->mode & PNG_BACKGROUND_IS_GRAY)) |
| 4902 | png_do_gray_to_rgb(row_info, png_ptr->row_buf + 1); |
| 4903 | #endif |
| 4904 | |
| 4905 | #ifdef PNG_READ_INVERT_SUPPORTED |
| 4906 | if (png_ptr->transformations & PNG_INVERT_MONO) |
| 4907 | png_do_invert(row_info, png_ptr->row_buf + 1); |
| 4908 | #endif |
| 4909 | |
John Bowler | 414d7b5 | 2014-02-06 11:32:57 -0600 | [diff] [blame] | 4910 | #ifdef PNG_READ_INVERT_ALPHA_SUPPORTED |
| 4911 | if (png_ptr->transformations & PNG_INVERT_ALPHA) |
| 4912 | png_do_read_invert_alpha(row_info, png_ptr->row_buf + 1); |
| 4913 | #endif |
| 4914 | |
John Bowler | c10930a | 2013-12-19 15:24:06 -0600 | [diff] [blame] | 4915 | #ifdef PNG_READ_SHIFT_SUPPORTED |
| 4916 | if (png_ptr->transformations & PNG_SHIFT) |
| 4917 | png_do_unshift(row_info, png_ptr->row_buf + 1, |
| 4918 | &(png_ptr->shift)); |
| 4919 | #endif |
| 4920 | |
| 4921 | #ifdef PNG_READ_PACK_SUPPORTED |
| 4922 | if (png_ptr->transformations & PNG_PACK) |
| 4923 | png_do_unpack(row_info, png_ptr->row_buf + 1); |
| 4924 | #endif |
| 4925 | |
| 4926 | #ifdef PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED |
| 4927 | /* Added at libpng-1.5.10 */ |
| 4928 | if (row_info->color_type == PNG_COLOR_TYPE_PALETTE && |
| 4929 | png_ptr->num_palette_max >= 0) |
| 4930 | png_do_check_palette_indexes(png_ptr, row_info); |
| 4931 | #endif |
| 4932 | |
| 4933 | #ifdef PNG_READ_BGR_SUPPORTED |
| 4934 | if (png_ptr->transformations & PNG_BGR) |
| 4935 | png_do_bgr(row_info, png_ptr->row_buf + 1); |
| 4936 | #endif |
| 4937 | |
| 4938 | #ifdef PNG_READ_PACKSWAP_SUPPORTED |
| 4939 | if (png_ptr->transformations & PNG_PACKSWAP) |
| 4940 | png_do_packswap(row_info, png_ptr->row_buf + 1); |
| 4941 | #endif |
| 4942 | |
| 4943 | #ifdef PNG_READ_FILLER_SUPPORTED |
| 4944 | if (png_ptr->transformations & PNG_FILLER) |
| 4945 | png_do_read_filler(row_info, png_ptr->row_buf + 1, |
| 4946 | (png_uint_32)png_ptr->filler, png_ptr->flags); |
| 4947 | #endif |
| 4948 | |
John Bowler | c10930a | 2013-12-19 15:24:06 -0600 | [diff] [blame] | 4949 | #ifdef PNG_READ_SWAP_ALPHA_SUPPORTED |
| 4950 | if (png_ptr->transformations & PNG_SWAP_ALPHA) |
| 4951 | png_do_read_swap_alpha(row_info, png_ptr->row_buf + 1); |
| 4952 | #endif |
| 4953 | |
| 4954 | #ifdef PNG_READ_16BIT_SUPPORTED |
| 4955 | #ifdef PNG_READ_SWAP_SUPPORTED |
| 4956 | if (png_ptr->transformations & PNG_SWAP_BYTES) |
| 4957 | png_do_swap(row_info, png_ptr->row_buf + 1); |
| 4958 | #endif |
| 4959 | #endif |
| 4960 | |
| 4961 | #ifdef PNG_READ_USER_TRANSFORM_SUPPORTED |
| 4962 | if (png_ptr->transformations & PNG_USER_TRANSFORM) |
| 4963 | { |
| 4964 | if (png_ptr->read_user_transform_fn != NULL) |
| 4965 | (*(png_ptr->read_user_transform_fn)) /* User read transform function */ |
| 4966 | (png_ptr, /* png_ptr */ |
| 4967 | row_info, /* row_info: */ |
| 4968 | /* png_uint_32 width; width of row */ |
| 4969 | /* png_size_t rowbytes; number of bytes in row */ |
| 4970 | /* png_byte color_type; color type of pixels */ |
| 4971 | /* png_byte bit_depth; bit depth of samples */ |
| 4972 | /* png_byte channels; number of channels (1-4) */ |
| 4973 | /* png_byte pixel_depth; bits per pixel (depth*channels) */ |
| 4974 | png_ptr->row_buf + 1); /* start of pixel data for row */ |
| 4975 | #ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED |
| 4976 | if (png_ptr->user_transform_depth) |
| 4977 | row_info->bit_depth = png_ptr->user_transform_depth; |
| 4978 | |
| 4979 | if (png_ptr->user_transform_channels) |
| 4980 | row_info->channels = png_ptr->user_transform_channels; |
| 4981 | #endif |
| 4982 | row_info->pixel_depth = (png_byte)(row_info->bit_depth * |
| 4983 | row_info->channels); |
| 4984 | |
| 4985 | row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_info->width); |
| 4986 | } |
| 4987 | #endif |
Glenn Randers-Pehrson | 2ad31ae | 2000-12-15 08:54:42 -0600 | [diff] [blame] | 4988 | } |
John Bowler | c10930a | 2013-12-19 15:24:06 -0600 | [diff] [blame] | 4989 | |
| 4990 | #endif /* PNG_READ_TRANSFORMS_SUPPORTED */ |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4991 | #endif /* PNG_READ_SUPPORTED */ |