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 | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 4 | * Last changed in libpng 1.5.6 [(PENDING RELEASE)] |
Glenn Randers-Pehrson | 64b863c | 2011-01-04 09:57:06 -0600 | [diff] [blame] | 5 | * Copyright (c) 1998-2011 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 |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 25 | png_set_crc_action(png_structp png_ptr, int crit_action, int ancil_action) |
| 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 | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 91 | #ifdef PNG_READ_BACKGROUND_SUPPORTED |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 92 | /* Handle alpha and tRNS via a background color */ |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 93 | void PNGFAPI |
| 94 | png_set_background_fixed(png_structp png_ptr, |
Glenn Randers-Pehrson | e600c51 | 2010-08-18 07:25:46 -0500 | [diff] [blame] | 95 | png_const_color_16p background_color, int background_gamma_code, |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 96 | int need_expand, png_fixed_point background_gamma) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 97 | { |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 98 | png_debug(1, "in png_set_background_fixed"); |
Glenn Randers-Pehrson | 821b710 | 2010-06-24 16:16:32 -0500 | [diff] [blame] | 99 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 100 | if (png_ptr == NULL) |
| 101 | return; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 102 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 103 | if (background_gamma_code == PNG_BACKGROUND_GAMMA_UNKNOWN) |
| 104 | { |
| 105 | png_warning(png_ptr, "Application must supply a known background gamma"); |
| 106 | return; |
| 107 | } |
| 108 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 109 | png_ptr->transformations |= PNG_COMPOSE | PNG_STRIP_ALPHA; |
| 110 | png_ptr->transformations &= ~PNG_ENCODE_ALPHA; |
| 111 | png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA; |
| 112 | |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 113 | png_memcpy(&(png_ptr->background), background_color, |
| 114 | png_sizeof(png_color_16)); |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 115 | png_ptr->background_gamma = background_gamma; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 116 | png_ptr->background_gamma_type = (png_byte)(background_gamma_code); |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 117 | if (need_expand) |
| 118 | png_ptr->transformations |= PNG_BACKGROUND_EXPAND; |
| 119 | else |
| 120 | png_ptr->transformations &= ~PNG_BACKGROUND_EXPAND; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 121 | } |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 122 | |
| 123 | # ifdef PNG_FLOATING_POINT_SUPPORTED |
| 124 | void PNGAPI |
| 125 | png_set_background(png_structp png_ptr, |
Glenn Randers-Pehrson | e600c51 | 2010-08-18 07:25:46 -0500 | [diff] [blame] | 126 | png_const_color_16p background_color, int background_gamma_code, |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 127 | int need_expand, double background_gamma) |
| 128 | { |
| 129 | png_set_background_fixed(png_ptr, background_color, background_gamma_code, |
| 130 | need_expand, png_fixed(png_ptr, background_gamma, "png_set_background")); |
| 131 | } |
| 132 | # endif /* FLOATING_POINT */ |
| 133 | #endif /* READ_BACKGROUND */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 134 | |
John Bowler | 8d26126 | 2011-06-18 13:37:11 -0500 | [diff] [blame] | 135 | /* Scale 16-bit depth files to 8-bit depth. If both of these are set then the |
| 136 | * one that pngrtran does first (scale) happens. This is necessary to allow the |
| 137 | * TRANSFORM and API behavior to be somewhat consistent, and it's simpler. |
| 138 | */ |
| 139 | #ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 140 | void PNGAPI |
Glenn Randers-Pehrson | a7428d4 | 2011-06-17 19:07:04 -0500 | [diff] [blame] | 141 | png_set_scale_16(png_structp png_ptr) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 142 | { |
Glenn Randers-Pehrson | a7428d4 | 2011-06-17 19:07:04 -0500 | [diff] [blame] | 143 | png_debug(1, "in png_set_scale_16"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 144 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 145 | if (png_ptr == NULL) |
| 146 | return; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 147 | |
Glenn Randers-Pehrson | ab63dd0 | 2011-06-17 20:04:17 -0500 | [diff] [blame] | 148 | png_ptr->transformations |= PNG_SCALE_16_TO_8; |
Glenn Randers-Pehrson | 413138a | 2011-06-13 22:07:37 -0500 | [diff] [blame] | 149 | } |
John Bowler | 8d26126 | 2011-06-18 13:37:11 -0500 | [diff] [blame] | 150 | #endif |
Glenn Randers-Pehrson | 413138a | 2011-06-13 22:07:37 -0500 | [diff] [blame] | 151 | |
John Bowler | 8d26126 | 2011-06-18 13:37:11 -0500 | [diff] [blame] | 152 | #ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED |
Glenn Randers-Pehrson | 413138a | 2011-06-13 22:07:37 -0500 | [diff] [blame] | 153 | /* Chop 16-bit depth files to 8-bit depth */ |
| 154 | void PNGAPI |
Glenn Randers-Pehrson | ab63dd0 | 2011-06-17 20:04:17 -0500 | [diff] [blame] | 155 | png_set_strip_16(png_structp png_ptr) |
Glenn Randers-Pehrson | 413138a | 2011-06-13 22:07:37 -0500 | [diff] [blame] | 156 | { |
Glenn Randers-Pehrson | ab63dd0 | 2011-06-17 20:04:17 -0500 | [diff] [blame] | 157 | png_debug(1, "in png_set_strip_16"); |
Glenn Randers-Pehrson | 413138a | 2011-06-13 22:07:37 -0500 | [diff] [blame] | 158 | |
| 159 | if (png_ptr == NULL) |
| 160 | return; |
| 161 | |
Glenn Randers-Pehrson | ab63dd0 | 2011-06-17 20:04:17 -0500 | [diff] [blame] | 162 | png_ptr->transformations |= PNG_16_TO_8; |
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 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 165 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 166 | #ifdef PNG_READ_STRIP_ALPHA_SUPPORTED |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 167 | void PNGAPI |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 168 | png_set_strip_alpha(png_structp png_ptr) |
| 169 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 170 | png_debug(1, "in png_set_strip_alpha"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 171 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 172 | if (png_ptr == NULL) |
| 173 | return; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 174 | |
John Bowler | 9b872f4 | 2011-02-12 09:00:16 -0600 | [diff] [blame] | 175 | png_ptr->transformations |= PNG_STRIP_ALPHA; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 176 | } |
| 177 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 178 | |
John Bowler | f70c7d0 | 2011-05-10 22:54:37 -0500 | [diff] [blame] | 179 | #if defined(PNG_READ_ALPHA_MODE_SUPPORTED) || defined(PNG_READ_GAMMA_SUPPORTED) |
| 180 | static png_fixed_point |
| 181 | translate_gamma_flags(png_structp png_ptr, png_fixed_point output_gamma, |
| 182 | int is_screen) |
| 183 | { |
| 184 | /* Check for flag values. The main reason for having the old Mac value as a |
| 185 | * flag is that it is pretty near impossible to work out what the correct |
| 186 | * value is from Apple documentation - a working Mac system is needed to |
| 187 | * discover the value! |
| 188 | */ |
| 189 | if (output_gamma == PNG_DEFAULT_sRGB || |
| 190 | output_gamma == PNG_FP_1 / PNG_DEFAULT_sRGB) |
| 191 | { |
| 192 | /* If there is no sRGB support this just sets the gamma to the standard |
| 193 | * sRGB value. (This is a side effect of using this function!) |
| 194 | */ |
| 195 | # ifdef PNG_READ_sRGB_SUPPORTED |
| 196 | png_ptr->flags |= PNG_FLAG_ASSUME_sRGB; |
| 197 | # endif |
| 198 | if (is_screen) |
| 199 | output_gamma = PNG_GAMMA_sRGB; |
| 200 | else |
| 201 | output_gamma = PNG_GAMMA_sRGB_INVERSE; |
| 202 | } |
| 203 | |
| 204 | else if (output_gamma == PNG_GAMMA_MAC_18 || |
| 205 | output_gamma == PNG_FP_1 / PNG_GAMMA_MAC_18) |
| 206 | { |
| 207 | if (is_screen) |
| 208 | output_gamma = PNG_GAMMA_MAC_OLD; |
| 209 | else |
| 210 | output_gamma = PNG_GAMMA_MAC_INVERSE; |
| 211 | } |
| 212 | |
| 213 | return output_gamma; |
| 214 | } |
| 215 | |
| 216 | # ifdef PNG_FLOATING_POINT_SUPPORTED |
| 217 | static png_fixed_point |
| 218 | convert_gamma_value(png_structp png_ptr, double output_gamma) |
| 219 | { |
| 220 | /* The following silently ignores cases where fixed point (times 100,000) |
| 221 | * gamma values are passed to the floating point API. This is safe and it |
| 222 | * means the fixed point constants work just fine with the floating point |
| 223 | * API. The alternative would just lead to undetected errors and spurious |
| 224 | * bug reports. Negative values fail inside the _fixed API unless they |
| 225 | * correspond to the flag values. |
| 226 | */ |
| 227 | if (output_gamma > 0 && output_gamma < 128) |
| 228 | output_gamma *= PNG_FP_1; |
| 229 | |
| 230 | /* This preserves -1 and -2 exactly: */ |
| 231 | output_gamma = floor(output_gamma + .5); |
| 232 | |
| 233 | if (output_gamma > PNG_FP_MAX || output_gamma < PNG_FP_MIN) |
| 234 | png_fixed_error(png_ptr, "gamma value"); |
| 235 | |
| 236 | return (png_fixed_point)output_gamma; |
| 237 | } |
| 238 | # endif |
| 239 | #endif /* READ_ALPHA_MODE || READ_GAMMA */ |
| 240 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 241 | #ifdef PNG_READ_ALPHA_MODE_SUPPORTED |
| 242 | void PNGFAPI |
| 243 | png_set_alpha_mode_fixed(png_structp png_ptr, int mode, |
| 244 | png_fixed_point output_gamma) |
| 245 | { |
| 246 | int compose = 0; |
| 247 | png_fixed_point file_gamma; |
| 248 | |
| 249 | png_debug(1, "in png_set_alpha_mode"); |
| 250 | |
| 251 | if (png_ptr == NULL) |
| 252 | return; |
| 253 | |
John Bowler | f70c7d0 | 2011-05-10 22:54:37 -0500 | [diff] [blame] | 254 | output_gamma = translate_gamma_flags(png_ptr, output_gamma, 1/*screen*/); |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 255 | |
John Bowler | f70c7d0 | 2011-05-10 22:54:37 -0500 | [diff] [blame] | 256 | /* 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] | 257 | * is expected to be 1 or greater, but this range test allows for some |
| 258 | * viewing correction values. The intent is to weed out users of this API |
| 259 | * who use the inverse of the gamma value accidentally! Since some of these |
| 260 | * values are reasonable this may have to be changed. |
| 261 | */ |
John Bowler | f70c7d0 | 2011-05-10 22:54:37 -0500 | [diff] [blame] | 262 | if (output_gamma < 70000 || output_gamma > 300000) |
Glenn Randers-Pehrson | e9eeb74 | 2011-05-08 19:38:42 -0500 | [diff] [blame] | 263 | png_error(png_ptr, "output gamma out of expected range"); |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 264 | |
Glenn Randers-Pehrson | c782251 | 2011-05-07 21:23:43 -0500 | [diff] [blame] | 265 | /* 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] | 266 | * gamma may be changed below so get the file value first: |
| 267 | */ |
| 268 | file_gamma = png_reciprocal(output_gamma); |
| 269 | |
| 270 | /* There are really 8 possibilities here, composed of any combination |
| 271 | * of: |
| 272 | * |
| 273 | * premultiply the color channels |
| 274 | * do not encode non-opaque pixels |
| 275 | * encode the alpha as well as the color channels |
| 276 | * |
| 277 | * The differences disappear if the input/output ('screen') gamma is 1.0, |
| 278 | * because then the encoding is a no-op and there is only the choice of |
| 279 | * premultiplying the color channels or not. |
| 280 | * |
| 281 | * png_set_alpha_mode and png_set_background interact because both use |
| 282 | * png_compose to do the work. Calling both is only useful when |
| 283 | * png_set_alpha_mode is used to set the default mode - PNG_ALPHA_PNG - along |
| 284 | * with a default gamma value. Otherwise PNG_COMPOSE must not be set. |
| 285 | */ |
| 286 | switch (mode) |
| 287 | { |
| 288 | case PNG_ALPHA_PNG: /* default: png standard */ |
| 289 | /* No compose, but it may be set by png_set_background! */ |
| 290 | png_ptr->transformations &= ~PNG_ENCODE_ALPHA; |
| 291 | png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA; |
| 292 | break; |
| 293 | |
| 294 | case PNG_ALPHA_ASSOCIATED: /* color channels premultiplied */ |
| 295 | compose = 1; |
| 296 | png_ptr->transformations &= ~PNG_ENCODE_ALPHA; |
| 297 | png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA; |
| 298 | /* The output is linear: */ |
| 299 | output_gamma = PNG_FP_1; |
| 300 | break; |
| 301 | |
| 302 | case PNG_ALPHA_OPTIMIZED: /* associated, non-opaque pixels linear */ |
| 303 | compose = 1; |
| 304 | png_ptr->transformations &= ~PNG_ENCODE_ALPHA; |
| 305 | png_ptr->flags |= PNG_FLAG_OPTIMIZE_ALPHA; |
| 306 | /* output_gamma records the encoding of opaque pixels! */ |
| 307 | break; |
| 308 | |
| 309 | case PNG_ALPHA_BROKEN: /* associated, non-linear, alpha encoded */ |
| 310 | compose = 1; |
| 311 | png_ptr->transformations |= PNG_ENCODE_ALPHA; |
| 312 | png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA; |
| 313 | break; |
| 314 | |
| 315 | default: |
| 316 | png_error(png_ptr, "invalid alpha mode"); |
| 317 | } |
| 318 | |
| 319 | /* Only set the default gamma if the file gamma has not been set (this has |
| 320 | * the side effect that the gamma in a second call to png_set_alpha_mode will |
| 321 | * be ignored.) |
| 322 | */ |
| 323 | if (png_ptr->gamma == 0) |
| 324 | png_ptr->gamma = file_gamma; |
| 325 | |
| 326 | /* But always set the output gamma: */ |
| 327 | png_ptr->screen_gamma = output_gamma; |
| 328 | |
Glenn Randers-Pehrson | c782251 | 2011-05-07 21:23:43 -0500 | [diff] [blame] | 329 | /* Finally, if pre-multiplying, set the background fields to achieve the |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 330 | * desired result. |
| 331 | */ |
| 332 | if (compose) |
| 333 | { |
| 334 | /* And obtain alpha pre-multiplication by composing on black: */ |
| 335 | png_memset(&png_ptr->background, 0, sizeof png_ptr->background); |
| 336 | png_ptr->background_gamma = png_ptr->gamma; /* just in case */ |
| 337 | png_ptr->background_gamma_type = PNG_BACKGROUND_GAMMA_FILE; |
| 338 | png_ptr->transformations &= ~PNG_BACKGROUND_EXPAND; |
| 339 | |
| 340 | if (png_ptr->transformations & PNG_COMPOSE) |
| 341 | png_error(png_ptr, |
| 342 | "conflicting calls to set alpha mode and background"); |
| 343 | |
| 344 | png_ptr->transformations |= PNG_COMPOSE; |
| 345 | } |
| 346 | |
| 347 | /* New API, make sure apps call the correct initializers: */ |
| 348 | png_ptr->flags |= PNG_FLAG_DETECT_UNINITIALIZED; |
| 349 | } |
| 350 | |
| 351 | # ifdef PNG_FLOATING_POINT_SUPPORTED |
| 352 | void PNGAPI |
| 353 | png_set_alpha_mode(png_structp png_ptr, int mode, double output_gamma) |
| 354 | { |
John Bowler | f70c7d0 | 2011-05-10 22:54:37 -0500 | [diff] [blame] | 355 | png_set_alpha_mode_fixed(png_ptr, mode, convert_gamma_value(png_ptr, |
| 356 | output_gamma)); |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 357 | } |
| 358 | # endif |
| 359 | #endif |
| 360 | |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 361 | #ifdef PNG_READ_QUANTIZE_SUPPORTED |
Glenn Randers-Pehrson | 55fbff3 | 2011-05-17 06:49:32 -0500 | [diff] [blame] | 362 | /* Dither file to 8-bit. Supply a palette, the current number |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 363 | * of elements in the palette, the maximum number of elements |
| 364 | * allowed, and a histogram if possible. If the current number |
| 365 | * 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] | 366 | * modified to fit in the maximum number. "full_quantize" indicates |
| 367 | * 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] | 368 | * simply are reducing the number of colors in a paletted image. |
| 369 | */ |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 370 | |
| 371 | typedef struct png_dsort_struct |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 372 | { |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 373 | struct png_dsort_struct FAR * next; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 374 | png_byte left; |
| 375 | png_byte right; |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 376 | } png_dsort; |
| 377 | typedef png_dsort FAR * png_dsortp; |
| 378 | typedef png_dsort FAR * FAR * png_dsortpp; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 379 | |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 380 | void PNGAPI |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 381 | png_set_quantize(png_structp png_ptr, png_colorp palette, |
Glenn Randers-Pehrson | e600c51 | 2010-08-18 07:25:46 -0500 | [diff] [blame] | 382 | int num_palette, int maximum_colors, png_const_uint_16p histogram, |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 383 | int full_quantize) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 384 | { |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 385 | png_debug(1, "in png_set_quantize"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 386 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 387 | if (png_ptr == NULL) |
| 388 | return; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 389 | |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 390 | png_ptr->transformations |= PNG_QUANTIZE; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 391 | |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 392 | if (!full_quantize) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 393 | { |
| 394 | int i; |
| 395 | |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 396 | png_ptr->quantize_index = (png_bytep)png_malloc(png_ptr, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 397 | (png_uint_32)(num_palette * png_sizeof(png_byte))); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 398 | for (i = 0; i < num_palette; i++) |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 399 | png_ptr->quantize_index[i] = (png_byte)i; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 400 | } |
| 401 | |
| 402 | if (num_palette > maximum_colors) |
| 403 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 404 | if (histogram != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 405 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 406 | /* 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] | 407 | * Perhaps not the best solution, but good enough. |
| 408 | */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 409 | |
| 410 | int i; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 411 | |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 412 | /* Initialize an array to sort colors */ |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 413 | png_ptr->quantize_sort = (png_bytep)png_malloc(png_ptr, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 414 | (png_uint_32)(num_palette * png_sizeof(png_byte))); |
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 | /* Initialize the quantize_sort array */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 417 | for (i = 0; i < num_palette; i++) |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 418 | png_ptr->quantize_sort[i] = (png_byte)i; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 419 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 420 | /* 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] | 421 | * bubble sort, and running it until we have sorted |
| 422 | * out enough colors. Note that we don't care about |
| 423 | * sorting all the colors, just finding which are |
| 424 | * least used. |
| 425 | */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 426 | |
| 427 | for (i = num_palette - 1; i >= maximum_colors; i--) |
| 428 | { |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 429 | int done; /* To stop early if the list is pre-sorted */ |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 430 | int j; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 431 | |
| 432 | done = 1; |
| 433 | for (j = 0; j < i; j++) |
| 434 | { |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 435 | if (histogram[png_ptr->quantize_sort[j]] |
| 436 | < histogram[png_ptr->quantize_sort[j + 1]]) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 437 | { |
| 438 | png_byte t; |
| 439 | |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 440 | t = png_ptr->quantize_sort[j]; |
| 441 | png_ptr->quantize_sort[j] = png_ptr->quantize_sort[j + 1]; |
| 442 | png_ptr->quantize_sort[j + 1] = t; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 443 | done = 0; |
| 444 | } |
| 445 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 446 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 447 | if (done) |
| 448 | break; |
| 449 | } |
| 450 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 451 | /* Swap the palette around, and set up a table, if necessary */ |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 452 | if (full_quantize) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 453 | { |
Glenn Randers-Pehrson | 8686fff | 1998-05-21 09:27:50 -0500 | [diff] [blame] | 454 | int j = num_palette; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 455 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 456 | /* Put all the useful colors within the max, but don't |
| 457 | * move the others. |
| 458 | */ |
Glenn Randers-Pehrson | 8686fff | 1998-05-21 09:27:50 -0500 | [diff] [blame] | 459 | for (i = 0; i < maximum_colors; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 460 | { |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 461 | if ((int)png_ptr->quantize_sort[i] >= maximum_colors) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 462 | { |
| 463 | do |
| 464 | j--; |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 465 | while ((int)png_ptr->quantize_sort[j] >= maximum_colors); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 466 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 467 | palette[i] = palette[j]; |
| 468 | } |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 469 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 470 | } |
| 471 | else |
| 472 | { |
Glenn Randers-Pehrson | 8686fff | 1998-05-21 09:27:50 -0500 | [diff] [blame] | 473 | int j = num_palette; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 474 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 475 | /* Move all the used colors inside the max limit, and |
| 476 | * develop a translation table. |
| 477 | */ |
Glenn Randers-Pehrson | 8686fff | 1998-05-21 09:27:50 -0500 | [diff] [blame] | 478 | for (i = 0; i < maximum_colors; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 479 | { |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 480 | /* Only move the colors we need to */ |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 481 | if ((int)png_ptr->quantize_sort[i] >= maximum_colors) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 482 | { |
| 483 | png_color tmp_color; |
| 484 | |
| 485 | do |
| 486 | j--; |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 487 | while ((int)png_ptr->quantize_sort[j] >= maximum_colors); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 488 | |
| 489 | tmp_color = palette[j]; |
| 490 | palette[j] = palette[i]; |
| 491 | palette[i] = tmp_color; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 492 | /* Indicate where the color went */ |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 493 | png_ptr->quantize_index[j] = (png_byte)i; |
| 494 | png_ptr->quantize_index[i] = (png_byte)j; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 495 | } |
| 496 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 497 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 498 | /* Find closest color for those colors we are not using */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 499 | for (i = 0; i < num_palette; i++) |
| 500 | { |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 501 | if ((int)png_ptr->quantize_index[i] >= maximum_colors) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 502 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 503 | int min_d, k, min_k, d_index; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 504 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 505 | /* Find the closest color to one we threw out */ |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 506 | d_index = png_ptr->quantize_index[i]; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 507 | min_d = PNG_COLOR_DIST(palette[d_index], palette[0]); |
| 508 | for (k = 1, min_k = 0; k < maximum_colors; k++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 509 | { |
| 510 | int d; |
| 511 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 512 | d = PNG_COLOR_DIST(palette[d_index], palette[k]); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 513 | |
| 514 | if (d < min_d) |
| 515 | { |
| 516 | min_d = d; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 517 | min_k = k; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 518 | } |
| 519 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 520 | /* Point to closest color */ |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 521 | png_ptr->quantize_index[i] = (png_byte)min_k; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 522 | } |
| 523 | } |
| 524 | } |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 525 | png_free(png_ptr, png_ptr->quantize_sort); |
| 526 | png_ptr->quantize_sort = NULL; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 527 | } |
| 528 | else |
| 529 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 530 | /* 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] | 531 | * we need to go through a median cut routine, but those |
| 532 | * don't always behave themselves with only a few colors |
| 533 | * as input. So we will just find the closest two colors, |
| 534 | * and throw out one of them (chosen somewhat randomly). |
| 535 | * [We don't understand this at all, so if someone wants to |
| 536 | * work on improving it, be our guest - AED, GRP] |
| 537 | */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 538 | int i; |
| 539 | int max_d; |
| 540 | int num_new_palette; |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 541 | png_dsortp t; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 542 | png_dsortpp hash; |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 543 | |
Glenn Randers-Pehrson | 895a9c9 | 2008-07-25 08:51:18 -0500 | [diff] [blame] | 544 | t = NULL; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 545 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 546 | /* Initialize palette index arrays */ |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 547 | png_ptr->index_to_palette = (png_bytep)png_malloc(png_ptr, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 548 | (png_uint_32)(num_palette * png_sizeof(png_byte))); |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 549 | png_ptr->palette_to_index = (png_bytep)png_malloc(png_ptr, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 550 | (png_uint_32)(num_palette * png_sizeof(png_byte))); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 551 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 552 | /* Initialize the sort array */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 553 | for (i = 0; i < num_palette; i++) |
| 554 | { |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 555 | png_ptr->index_to_palette[i] = (png_byte)i; |
| 556 | png_ptr->palette_to_index[i] = (png_byte)i; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 557 | } |
| 558 | |
Glenn Randers-Pehrson | 79134c6 | 2009-02-14 10:32:18 -0600 | [diff] [blame] | 559 | hash = (png_dsortpp)png_calloc(png_ptr, (png_uint_32)(769 * |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 560 | png_sizeof(png_dsortp))); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 561 | |
| 562 | num_new_palette = num_palette; |
| 563 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 564 | /* Initial wild guess at how far apart the farthest pixel |
| 565 | * pair we will be eliminating will be. Larger |
| 566 | * numbers mean more areas will be allocated, Smaller |
| 567 | * numbers run the risk of not saving enough data, and |
| 568 | * having to do this all over again. |
| 569 | * |
| 570 | * I have not done extensive checking on this number. |
| 571 | */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 572 | max_d = 96; |
| 573 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 574 | while (num_new_palette > maximum_colors) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 575 | { |
| 576 | for (i = 0; i < num_new_palette - 1; i++) |
| 577 | { |
| 578 | int j; |
| 579 | |
| 580 | for (j = i + 1; j < num_new_palette; j++) |
| 581 | { |
| 582 | int d; |
| 583 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 584 | d = PNG_COLOR_DIST(palette[i], palette[j]); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 585 | |
| 586 | if (d <= max_d) |
| 587 | { |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 588 | |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 589 | t = (png_dsortp)png_malloc_warn(png_ptr, |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 590 | (png_uint_32)(png_sizeof(png_dsort))); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 591 | |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 592 | if (t == NULL) |
| 593 | break; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 594 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 595 | t->next = hash[d]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 596 | t->left = (png_byte)i; |
| 597 | t->right = (png_byte)j; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 598 | hash[d] = t; |
| 599 | } |
| 600 | } |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 601 | if (t == NULL) |
| 602 | break; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 603 | } |
| 604 | |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 605 | if (t != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 606 | for (i = 0; i <= max_d; i++) |
| 607 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 608 | if (hash[i] != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 609 | { |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 610 | png_dsortp p; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 611 | |
| 612 | for (p = hash[i]; p; p = p->next) |
| 613 | { |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 614 | if ((int)png_ptr->index_to_palette[p->left] |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 615 | < num_new_palette && |
| 616 | (int)png_ptr->index_to_palette[p->right] |
| 617 | < num_new_palette) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 618 | { |
| 619 | int j, next_j; |
| 620 | |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 621 | if (num_new_palette & 0x01) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 622 | { |
| 623 | j = p->left; |
| 624 | next_j = p->right; |
| 625 | } |
| 626 | else |
| 627 | { |
| 628 | j = p->right; |
| 629 | next_j = p->left; |
| 630 | } |
| 631 | |
| 632 | num_new_palette--; |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 633 | palette[png_ptr->index_to_palette[j]] |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 634 | = palette[num_new_palette]; |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 635 | if (!full_quantize) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 636 | { |
| 637 | int k; |
| 638 | |
| 639 | for (k = 0; k < num_palette; k++) |
| 640 | { |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 641 | if (png_ptr->quantize_index[k] == |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 642 | png_ptr->index_to_palette[j]) |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 643 | png_ptr->quantize_index[k] = |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 644 | png_ptr->index_to_palette[next_j]; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 645 | |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 646 | if ((int)png_ptr->quantize_index[k] == |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 647 | num_new_palette) |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 648 | png_ptr->quantize_index[k] = |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 649 | png_ptr->index_to_palette[j]; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 650 | } |
| 651 | } |
| 652 | |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 653 | png_ptr->index_to_palette[png_ptr->palette_to_index |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 654 | [num_new_palette]] = png_ptr->index_to_palette[j]; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 655 | |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 656 | png_ptr->palette_to_index[png_ptr->index_to_palette[j]] |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 657 | = png_ptr->palette_to_index[num_new_palette]; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 658 | |
Glenn Randers-Pehrson | e3f3c4e | 2010-02-07 18:08:50 -0600 | [diff] [blame] | 659 | png_ptr->index_to_palette[j] = |
| 660 | (png_byte)num_new_palette; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 661 | |
Glenn Randers-Pehrson | e3f3c4e | 2010-02-07 18:08:50 -0600 | [diff] [blame] | 662 | png_ptr->palette_to_index[num_new_palette] = |
| 663 | (png_byte)j; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 664 | } |
| 665 | if (num_new_palette <= maximum_colors) |
| 666 | break; |
| 667 | } |
| 668 | if (num_new_palette <= maximum_colors) |
| 669 | break; |
| 670 | } |
| 671 | } |
| 672 | |
| 673 | for (i = 0; i < 769; i++) |
| 674 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 675 | if (hash[i] != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 676 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 677 | png_dsortp p = hash[i]; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 678 | while (p) |
| 679 | { |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 680 | t = p->next; |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 681 | png_free(png_ptr, p); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 682 | p = t; |
| 683 | } |
| 684 | } |
| 685 | hash[i] = 0; |
| 686 | } |
| 687 | max_d += 96; |
| 688 | } |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 689 | png_free(png_ptr, hash); |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 690 | png_free(png_ptr, png_ptr->palette_to_index); |
| 691 | png_free(png_ptr, png_ptr->index_to_palette); |
Glenn Randers-Pehrson | 895a9c9 | 2008-07-25 08:51:18 -0500 | [diff] [blame] | 692 | png_ptr->palette_to_index = NULL; |
| 693 | png_ptr->index_to_palette = NULL; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 694 | } |
| 695 | num_palette = maximum_colors; |
| 696 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 697 | if (png_ptr->palette == NULL) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 698 | { |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 699 | png_ptr->palette = palette; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 700 | } |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 701 | png_ptr->num_palette = (png_uint_16)num_palette; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 702 | |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 703 | if (full_quantize) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 704 | { |
| 705 | int i; |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 706 | png_bytep distance; |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 707 | int total_bits = PNG_QUANTIZE_RED_BITS + PNG_QUANTIZE_GREEN_BITS + |
| 708 | PNG_QUANTIZE_BLUE_BITS; |
| 709 | int num_red = (1 << PNG_QUANTIZE_RED_BITS); |
| 710 | int num_green = (1 << PNG_QUANTIZE_GREEN_BITS); |
| 711 | int num_blue = (1 << PNG_QUANTIZE_BLUE_BITS); |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 712 | png_size_t num_entries = ((png_size_t)1 << total_bits); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 713 | |
Glenn Randers-Pehrson | bc363ec | 2010-10-12 21:17:00 -0500 | [diff] [blame] | 714 | png_ptr->palette_lookup = (png_bytep)png_calloc(png_ptr, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 715 | (png_uint_32)(num_entries * png_sizeof(png_byte))); |
Glenn Randers-Pehrson | 82ae383 | 2001-04-20 10:32:10 -0500 | [diff] [blame] | 716 | |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 717 | distance = (png_bytep)png_malloc(png_ptr, (png_uint_32)(num_entries * |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 718 | png_sizeof(png_byte))); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 719 | |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 720 | png_memset(distance, 0xff, num_entries * png_sizeof(png_byte)); |
Glenn Randers-Pehrson | 82ae383 | 2001-04-20 10:32:10 -0500 | [diff] [blame] | 721 | |
| 722 | for (i = 0; i < num_palette; i++) |
| 723 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 724 | int ir, ig, ib; |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 725 | int r = (palette[i].red >> (8 - PNG_QUANTIZE_RED_BITS)); |
| 726 | int g = (palette[i].green >> (8 - PNG_QUANTIZE_GREEN_BITS)); |
| 727 | int b = (palette[i].blue >> (8 - PNG_QUANTIZE_BLUE_BITS)); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 728 | |
| 729 | for (ir = 0; ir < num_red; ir++) |
| 730 | { |
Glenn Randers-Pehrson | d029a75 | 2004-08-09 21:50:32 -0500 | [diff] [blame] | 731 | /* int dr = abs(ir - r); */ |
| 732 | int dr = ((ir > r) ? ir - r : r - ir); |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 733 | int index_r = (ir << (PNG_QUANTIZE_BLUE_BITS + |
| 734 | PNG_QUANTIZE_GREEN_BITS)); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 735 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 736 | for (ig = 0; ig < num_green; ig++) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 737 | { |
Glenn Randers-Pehrson | d029a75 | 2004-08-09 21:50:32 -0500 | [diff] [blame] | 738 | /* int dg = abs(ig - g); */ |
| 739 | int dg = ((ig > g) ? ig - g : g - ig); |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 740 | int dt = dr + dg; |
| 741 | int dm = ((dr > dg) ? dr : dg); |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 742 | int index_g = index_r | (ig << PNG_QUANTIZE_BLUE_BITS); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 743 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 744 | for (ib = 0; ib < num_blue; ib++) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 745 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 746 | int d_index = index_g | ib; |
Glenn Randers-Pehrson | d029a75 | 2004-08-09 21:50:32 -0500 | [diff] [blame] | 747 | /* int db = abs(ib - b); */ |
| 748 | int db = ((ib > b) ? ib - b : b - ib); |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 749 | int dmax = ((dm > db) ? dm : db); |
| 750 | int d = dmax + dt + db; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 751 | |
Glenn Randers-Pehrson | 0f881d6 | 1998-02-07 10:20:57 -0600 | [diff] [blame] | 752 | if (d < (int)distance[d_index]) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 753 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 754 | distance[d_index] = (png_byte)d; |
| 755 | png_ptr->palette_lookup[d_index] = (png_byte)i; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 756 | } |
| 757 | } |
Glenn Randers-Pehrson | 82ae383 | 2001-04-20 10:32:10 -0500 | [diff] [blame] | 758 | } |
| 759 | } |
| 760 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 761 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 762 | png_free(png_ptr, distance); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 763 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 764 | } |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 765 | #endif /* PNG_READ_QUANTIZE_SUPPORTED */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 766 | |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 767 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 768 | void PNGFAPI |
| 769 | png_set_gamma_fixed(png_structp png_ptr, png_fixed_point scrn_gamma, |
| 770 | png_fixed_point file_gamma) |
| 771 | { |
| 772 | png_debug(1, "in png_set_gamma_fixed"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 773 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 774 | if (png_ptr == NULL) |
| 775 | return; |
Glenn Randers-Pehrson | b3ce365 | 2009-08-15 21:47:03 -0500 | [diff] [blame] | 776 | |
Glenn Randers-Pehrson | ef217b7 | 2011-06-15 12:58:27 -0500 | [diff] [blame] | 777 | /* New in libpng-1.5.4 - reserve particular negative values as flags. */ |
John Bowler | f70c7d0 | 2011-05-10 22:54:37 -0500 | [diff] [blame] | 778 | scrn_gamma = translate_gamma_flags(png_ptr, scrn_gamma, 1/*screen*/); |
| 779 | file_gamma = translate_gamma_flags(png_ptr, file_gamma, 0/*file*/); |
| 780 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 781 | #if PNG_LIBPNG_VER >= 10600 |
Glenn Randers-Pehrson | ef217b7 | 2011-06-15 12:58:27 -0500 | [diff] [blame] | 782 | /* 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] | 783 | * premultiplied alpha support; this actually hides an undocumented feature |
| 784 | * of the previous implementation which allowed gamma processing to be |
| 785 | * 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] | 786 | * was being used; however, png_set_background itself accepted and must still |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 787 | * accept '0' for the gamma value it takes, because it isn't always used. |
| 788 | * |
| 789 | * Since this is an API change (albeit a very minor one that removes an |
Glenn Randers-Pehrson | e9eeb74 | 2011-05-08 19:38:42 -0500 | [diff] [blame] | 790 | * undocumented API feature) it will not be made until libpng-1.6.0. |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 791 | */ |
| 792 | if (file_gamma <= 0) |
Glenn Randers-Pehrson | e9eeb74 | 2011-05-08 19:38:42 -0500 | [diff] [blame] | 793 | png_error(png_ptr, "invalid file gamma in png_set_gamma"); |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 794 | |
| 795 | if (scrn_gamma <= 0) |
Glenn Randers-Pehrson | e9eeb74 | 2011-05-08 19:38:42 -0500 | [diff] [blame] | 796 | png_error(png_ptr, "invalid screen gamma in png_set_gamma"); |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 797 | #endif |
| 798 | |
| 799 | /* Set the gamma values unconditionally - this overrides the value in the PNG |
| 800 | * file if a gAMA chunk was present. png_set_alpha_mode provides a |
| 801 | * different, easier, way to default the file gamma. |
| 802 | */ |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 803 | png_ptr->gamma = file_gamma; |
| 804 | png_ptr->screen_gamma = scrn_gamma; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 805 | } |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 806 | |
| 807 | # ifdef PNG_FLOATING_POINT_SUPPORTED |
| 808 | void PNGAPI |
| 809 | png_set_gamma(png_structp png_ptr, double scrn_gamma, double file_gamma) |
| 810 | { |
John Bowler | f70c7d0 | 2011-05-10 22:54:37 -0500 | [diff] [blame] | 811 | png_set_gamma_fixed(png_ptr, convert_gamma_value(png_ptr, scrn_gamma), |
| 812 | convert_gamma_value(png_ptr, file_gamma)); |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 813 | } |
| 814 | # endif /* FLOATING_POINT_SUPPORTED */ |
| 815 | #endif /* READ_GAMMA */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 816 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 817 | #ifdef PNG_READ_EXPAND_SUPPORTED |
Glenn Randers-Pehrson | 352ca6b | 1999-09-18 15:49:20 -0500 | [diff] [blame] | 818 | /* Expand paletted images to RGB, expand grayscale images of |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 819 | * 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] | 820 | * to alpha channels. |
| 821 | */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 822 | void PNGAPI |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 823 | png_set_expand(png_structp png_ptr) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 824 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 825 | png_debug(1, "in png_set_expand"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 826 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 827 | if (png_ptr == NULL) |
| 828 | return; |
Glenn Randers-Pehrson | b3ce365 | 2009-08-15 21:47:03 -0500 | [diff] [blame] | 829 | |
Glenn Randers-Pehrson | 1ce0836 | 2006-03-08 23:35:59 -0600 | [diff] [blame] | 830 | png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS); |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 831 | png_ptr->flags &= ~PNG_FLAG_ROW_INIT; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 832 | } |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 833 | |
| 834 | /* GRR 19990627: the following three functions currently are identical |
| 835 | * to png_set_expand(). However, it is entirely reasonable that someone |
| 836 | * might wish to expand an indexed image to RGB but *not* expand a single, |
| 837 | * fully transparent palette entry to a full alpha channel--perhaps instead |
| 838 | * convert tRNS to the grayscale/RGB format (16-bit RGB value), or replace |
| 839 | * the transparent color with a particular RGB value, or drop tRNS entirely. |
| 840 | * IOW, a future version of the library may make the transformations flag |
| 841 | * a bit more fine-grained, with separate bits for each of these three |
| 842 | * functions. |
| 843 | * |
| 844 | * More to the point, these functions make it obvious what libpng will be |
| 845 | * doing, whereas "expand" can (and does) mean any number of things. |
Glenn Randers-Pehrson | 1ce0836 | 2006-03-08 23:35:59 -0600 | [diff] [blame] | 846 | * |
Glenn Randers-Pehrson | 17ca340 | 2009-11-09 06:51:16 -0600 | [diff] [blame] | 847 | * GRP 20060307: In libpng-1.2.9, png_set_gray_1_2_4_to_8() was modified |
| 848 | * to expand only the sample depth but not to expand the tRNS to alpha |
| 849 | * 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] | 850 | */ |
| 851 | |
| 852 | /* Expand paletted images to RGB. */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 853 | void PNGAPI |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 854 | png_set_palette_to_rgb(png_structp png_ptr) |
| 855 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 856 | png_debug(1, "in png_set_palette_to_rgb"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 857 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 858 | if (png_ptr == NULL) |
| 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); |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 862 | png_ptr->flags &= ~PNG_FLAG_ROW_INIT; |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 863 | } |
| 864 | |
| 865 | /* 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] | 866 | void PNGAPI |
Glenn Randers-Pehrson | 1ce0836 | 2006-03-08 23:35:59 -0600 | [diff] [blame] | 867 | png_set_expand_gray_1_2_4_to_8(png_structp png_ptr) |
| 868 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 869 | 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] | 870 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 871 | if (png_ptr == NULL) |
| 872 | return; |
Glenn Randers-Pehrson | b3ce365 | 2009-08-15 21:47:03 -0500 | [diff] [blame] | 873 | |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 874 | png_ptr->transformations |= PNG_EXPAND; |
| 875 | png_ptr->flags &= ~PNG_FLAG_ROW_INIT; |
Glenn Randers-Pehrson | 1ce0836 | 2006-03-08 23:35:59 -0600 | [diff] [blame] | 876 | } |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 877 | |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 878 | |
| 879 | |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 880 | /* Expand tRNS chunks to alpha channels. */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 881 | void PNGAPI |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 882 | png_set_tRNS_to_alpha(png_structp png_ptr) |
| 883 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 884 | png_debug(1, "in png_set_tRNS_to_alpha"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 885 | |
Glenn Randers-Pehrson | 1ce0836 | 2006-03-08 23:35:59 -0600 | [diff] [blame] | 886 | png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS); |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 887 | png_ptr->flags &= ~PNG_FLAG_ROW_INIT; |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 888 | } |
| 889 | #endif /* defined(PNG_READ_EXPAND_SUPPORTED) */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 890 | |
John Bowler | 4d56296 | 2011-02-12 09:01:20 -0600 | [diff] [blame] | 891 | #ifdef PNG_READ_EXPAND_16_SUPPORTED |
Glenn Randers-Pehrson | 55fbff3 | 2011-05-17 06:49:32 -0500 | [diff] [blame] | 892 | /* Expand to 16-bit channels, expand the tRNS chunk too (because otherwise |
John Bowler | 4d56296 | 2011-02-12 09:01:20 -0600 | [diff] [blame] | 893 | * it may not work correctly.) |
| 894 | */ |
| 895 | void PNGAPI |
| 896 | png_set_expand_16(png_structp png_ptr) |
| 897 | { |
| 898 | png_debug(1, "in png_set_expand_16"); |
| 899 | |
| 900 | if (png_ptr == NULL) |
| 901 | return; |
| 902 | |
| 903 | png_ptr->transformations |= (PNG_EXPAND_16 | PNG_EXPAND | PNG_EXPAND_tRNS); |
John Bowler | 4d56296 | 2011-02-12 09:01:20 -0600 | [diff] [blame] | 904 | png_ptr->flags &= ~PNG_FLAG_ROW_INIT; |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 905 | |
| 906 | /* New API, make sure apps call the correct initializers: */ |
| 907 | png_ptr->flags |= PNG_FLAG_DETECT_UNINITIALIZED; |
John Bowler | 4d56296 | 2011-02-12 09:01:20 -0600 | [diff] [blame] | 908 | } |
| 909 | #endif |
| 910 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 911 | #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 912 | void PNGAPI |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 913 | png_set_gray_to_rgb(png_structp png_ptr) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 914 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 915 | png_debug(1, "in png_set_gray_to_rgb"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 916 | |
John Bowler | f21a0d0 | 2011-01-23 23:55:19 -0600 | [diff] [blame] | 917 | if (png_ptr != NULL) |
| 918 | { |
| 919 | /* Because rgb must be 8 bits or more: */ |
| 920 | png_set_expand_gray_1_2_4_to_8(png_ptr); |
| 921 | png_ptr->transformations |= PNG_GRAY_TO_RGB; |
| 922 | png_ptr->flags &= ~PNG_FLAG_ROW_INIT; |
| 923 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 924 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 925 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 926 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 927 | #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 928 | void PNGFAPI |
Glenn Randers-Pehrson | 520a764 | 2000-03-21 05:13:06 -0600 | [diff] [blame] | 929 | png_set_rgb_to_gray_fixed(png_structp png_ptr, int error_action, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 930 | png_fixed_point red, png_fixed_point green) |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 931 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 932 | png_debug(1, "in png_set_rgb_to_gray"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 933 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 934 | if (png_ptr == NULL) |
| 935 | return; |
Glenn Randers-Pehrson | b3ce365 | 2009-08-15 21:47:03 -0500 | [diff] [blame] | 936 | |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 937 | switch(error_action) |
| 938 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 939 | case 1: |
| 940 | png_ptr->transformations |= PNG_RGB_TO_GRAY; |
| 941 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 942 | |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 943 | case 2: |
| 944 | png_ptr->transformations |= PNG_RGB_TO_GRAY_WARN; |
| 945 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 946 | |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 947 | case 3: |
| 948 | png_ptr->transformations |= PNG_RGB_TO_GRAY_ERR; |
Glenn Randers-Pehrson | b3edc73 | 2010-11-21 14:06:41 -0600 | [diff] [blame] | 949 | break; |
| 950 | |
| 951 | default: |
Glenn Randers-Pehrson | e9eeb74 | 2011-05-08 19:38:42 -0500 | [diff] [blame] | 952 | png_error(png_ptr, "invalid error action to rgb_to_gray"); |
| 953 | break; |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 954 | } |
| 955 | if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 956 | #ifdef PNG_READ_EXPAND_SUPPORTED |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 957 | png_ptr->transformations |= PNG_EXPAND; |
| 958 | #else |
| 959 | { |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 960 | png_warning(png_ptr, |
| 961 | "Cannot do RGB_TO_GRAY without EXPAND_SUPPORTED"); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 962 | |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 963 | png_ptr->transformations &= ~PNG_RGB_TO_GRAY; |
| 964 | } |
| 965 | #endif |
| 966 | { |
John Bowler | cb0b296 | 2011-05-12 21:48:29 -0500 | [diff] [blame] | 967 | if (red >= 0 && green >= 0 && red + green <= PNG_FP_1) |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 968 | { |
John Bowler | cb0b296 | 2011-05-12 21:48:29 -0500 | [diff] [blame] | 969 | png_uint_16 red_int, green_int; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 970 | |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 971 | /* NOTE: this calculation does not round, but this behavior is retained |
| 972 | * for consistency, the inaccuracy is very small. The code here always |
| 973 | * overwrites the coefficients, regardless of whether they have been |
| 974 | * defaulted or set already. |
| 975 | */ |
John Bowler | 7515612 | 2011-09-09 17:21:44 -0500 | [diff] [blame] | 976 | red_int = (png_uint_16)(((png_uint_32)red*32768)/100000); |
| 977 | green_int = (png_uint_16)(((png_uint_32)green*32768)/100000); |
John Bowler | cb0b296 | 2011-05-12 21:48:29 -0500 | [diff] [blame] | 978 | |
| 979 | png_ptr->rgb_to_gray_red_coeff = red_int; |
| 980 | png_ptr->rgb_to_gray_green_coeff = green_int; |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 981 | png_ptr->rgb_to_gray_coefficients_set = 1; |
Glenn Randers-Pehrson | 520a764 | 2000-03-21 05:13:06 -0600 | [diff] [blame] | 982 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 983 | |
Glenn Randers-Pehrson | 520a764 | 2000-03-21 05:13:06 -0600 | [diff] [blame] | 984 | else |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 985 | { |
John Bowler | cb0b296 | 2011-05-12 21:48:29 -0500 | [diff] [blame] | 986 | if (red >= 0 && green >= 0) |
| 987 | png_warning(png_ptr, |
| 988 | "ignoring out of range rgb_to_gray coefficients"); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 989 | |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 990 | /* Use the defaults, from the cHRM chunk if set, else the historical |
| 991 | * values which are close to the sRGB/HDTV/ITU-Rec 709 values. See |
| 992 | * png_do_rgb_to_gray for more discussion of the values. In this case |
| 993 | * the coefficients are not marked as 'set' and are not overwritten if |
| 994 | * something has already provided a default. |
John Bowler | cb0b296 | 2011-05-12 21:48:29 -0500 | [diff] [blame] | 995 | */ |
| 996 | if (png_ptr->rgb_to_gray_red_coeff == 0 && |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 997 | png_ptr->rgb_to_gray_green_coeff == 0) |
John Bowler | cb0b296 | 2011-05-12 21:48:29 -0500 | [diff] [blame] | 998 | { |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 999 | png_ptr->rgb_to_gray_red_coeff = 6968; |
| 1000 | png_ptr->rgb_to_gray_green_coeff = 23434; |
| 1001 | /* png_ptr->rgb_to_gray_blue_coeff = 2366; */ |
John Bowler | cb0b296 | 2011-05-12 21:48:29 -0500 | [diff] [blame] | 1002 | } |
| 1003 | } |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 1004 | } |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 1005 | } |
Glenn Randers-Pehrson | a272d8f | 2010-06-25 21:45:31 -0500 | [diff] [blame] | 1006 | |
| 1007 | #ifdef PNG_FLOATING_POINT_SUPPORTED |
| 1008 | /* Convert a RGB image to a grayscale of the same width. This allows us, |
| 1009 | * for example, to convert a 24 bpp RGB image into an 8 bpp grayscale image. |
| 1010 | */ |
| 1011 | |
| 1012 | void PNGAPI |
| 1013 | png_set_rgb_to_gray(png_structp png_ptr, int error_action, double red, |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 1014 | double green) |
Glenn Randers-Pehrson | a272d8f | 2010-06-25 21:45:31 -0500 | [diff] [blame] | 1015 | { |
Glenn Randers-Pehrson | a272d8f | 2010-06-25 21:45:31 -0500 | [diff] [blame] | 1016 | if (png_ptr == NULL) |
| 1017 | return; |
| 1018 | |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 1019 | png_set_rgb_to_gray_fixed(png_ptr, error_action, |
| 1020 | png_fixed(png_ptr, red, "rgb to gray red coefficient"), |
| 1021 | png_fixed(png_ptr, green, "rgb to gray green coefficient")); |
Glenn Randers-Pehrson | a272d8f | 2010-06-25 21:45:31 -0500 | [diff] [blame] | 1022 | } |
| 1023 | #endif /* FLOATING POINT */ |
| 1024 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 1025 | #endif |
| 1026 | |
Glenn Randers-Pehrson | 6942d53 | 2000-05-01 09:31:54 -0500 | [diff] [blame] | 1027 | #if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \ |
Glenn Randers-Pehrson | 33188ac | 2009-06-16 14:12:35 -0500 | [diff] [blame] | 1028 | defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED) |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 1029 | void PNGAPI |
Glenn Randers-Pehrson | 08a3343 | 1998-03-07 06:06:55 -0600 | [diff] [blame] | 1030 | png_set_read_user_transform_fn(png_structp png_ptr, png_user_transform_ptr |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1031 | read_user_transform_fn) |
Glenn Randers-Pehrson | 08a3343 | 1998-03-07 06:06:55 -0600 | [diff] [blame] | 1032 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 1033 | png_debug(1, "in png_set_read_user_transform_fn"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 1034 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1035 | if (png_ptr == NULL) |
| 1036 | return; |
Glenn Randers-Pehrson | b3ce365 | 2009-08-15 21:47:03 -0500 | [diff] [blame] | 1037 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1038 | #ifdef PNG_READ_USER_TRANSFORM_SUPPORTED |
Glenn Randers-Pehrson | 08a3343 | 1998-03-07 06:06:55 -0600 | [diff] [blame] | 1039 | png_ptr->transformations |= PNG_USER_TRANSFORM; |
| 1040 | png_ptr->read_user_transform_fn = read_user_transform_fn; |
Glenn Randers-Pehrson | 6942d53 | 2000-05-01 09:31:54 -0500 | [diff] [blame] | 1041 | #endif |
Glenn Randers-Pehrson | 08a3343 | 1998-03-07 06:06:55 -0600 | [diff] [blame] | 1042 | } |
| 1043 | #endif |
| 1044 | |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 1045 | #ifdef PNG_READ_TRANSFORMS_SUPPORTED |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1046 | #ifdef PNG_READ_GAMMA_SUPPORTED |
| 1047 | /* In the case of gamma transformations only do transformations on images where |
| 1048 | * the [file] gamma and screen_gamma are not close reciprocals, otherwise it |
| 1049 | * slows things down slightly, and also needlessly introduces small errors. |
| 1050 | */ |
| 1051 | static int /* PRIVATE */ |
| 1052 | png_gamma_threshold(png_fixed_point screen_gamma, png_fixed_point file_gamma) |
| 1053 | { |
| 1054 | /* PNG_GAMMA_THRESHOLD is the threshold for performing gamma |
| 1055 | * correction as a difference of the overall transform from 1.0 |
| 1056 | * |
| 1057 | * We want to compare the threshold with s*f - 1, if we get |
| 1058 | * overflow here it is because of wacky gamma values so we |
| 1059 | * turn on processing anyway. |
| 1060 | */ |
| 1061 | png_fixed_point gtest; |
| 1062 | return !png_muldiv(>est, screen_gamma, file_gamma, PNG_FP_1) || |
| 1063 | png_gamma_significant(gtest); |
| 1064 | } |
| 1065 | #endif |
| 1066 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1067 | /* Initialize everything needed for the read. This includes modifying |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 1068 | * the palette. |
| 1069 | */ |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 1070 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1071 | /*For the moment 'png_init_palette_transformations' and |
| 1072 | * 'png_init_rgb_transformations' only do some flag canceling optimizations. |
| 1073 | * The intent is that these two routines should have palette or rgb operations |
| 1074 | * extracted from 'png_init_read_transformations'. |
| 1075 | */ |
| 1076 | static void /* PRIVATE */ |
| 1077 | png_init_palette_transformations(png_structp png_ptr) |
| 1078 | { |
| 1079 | /* Called to handle the (input) palette case. In png_do_read_transformations |
| 1080 | * the first step is to expand the palette if requested, so this code must |
| 1081 | * take care to only make changes that are invariant with respect to the |
| 1082 | * palette expansion, or only do them if there is no expansion. |
| 1083 | * |
| 1084 | * STRIP_ALPHA has already been handled in the caller (by setting num_trans |
| 1085 | * to 0.) |
| 1086 | */ |
| 1087 | int input_has_alpha = 0; |
| 1088 | int input_has_transparency = 0; |
| 1089 | |
| 1090 | if (png_ptr->num_trans > 0) |
| 1091 | { |
| 1092 | int i; |
| 1093 | |
| 1094 | /* Ignore if all the entries are opaque (unlikely!) */ |
| 1095 | for (i=0; i<png_ptr->num_trans; ++i) |
| 1096 | if (png_ptr->trans_alpha[i] == 255) |
| 1097 | continue; |
| 1098 | else if (png_ptr->trans_alpha[i] == 0) |
| 1099 | input_has_transparency = 1; |
| 1100 | else |
| 1101 | input_has_alpha = 1; |
| 1102 | } |
| 1103 | |
| 1104 | /* If no alpha we can optimize. */ |
| 1105 | if (!input_has_alpha) |
| 1106 | { |
| 1107 | /* Any alpha means background and associative alpha processing is |
| 1108 | * required, however if the alpha is 0 or 1 throughout OPTIIMIZE_ALPHA |
| 1109 | * and ENCODE_ALPHA are irrelevant. |
| 1110 | */ |
| 1111 | png_ptr->transformations &= ~PNG_ENCODE_ALPHA; |
| 1112 | png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA; |
| 1113 | |
| 1114 | if (!input_has_transparency) |
| 1115 | png_ptr->transformations &= ~(PNG_COMPOSE | PNG_BACKGROUND_EXPAND); |
| 1116 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1117 | |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1118 | #if defined(PNG_READ_EXPAND_SUPPORTED) && defined(PNG_READ_BACKGROUND_SUPPORTED) |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1119 | /* png_set_background handling - deals with the complexity of whether the |
| 1120 | * background color is in the file format or the screen format in the case |
| 1121 | * where an 'expand' will happen. |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 1122 | */ |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 1123 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1124 | /* The following code cannot be entered in the alpha pre-multiplication case |
| 1125 | * because PNG_BACKGROUND_EXPAND is cancelled below. |
| 1126 | */ |
Glenn Randers-Pehrson | a77ef62 | 2000-02-18 13:48:52 -0600 | [diff] [blame] | 1127 | if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) && |
| 1128 | (png_ptr->transformations & PNG_EXPAND)) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1129 | { |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1130 | { |
| 1131 | png_ptr->background.red = |
| 1132 | png_ptr->palette[png_ptr->background.index].red; |
| 1133 | png_ptr->background.green = |
| 1134 | png_ptr->palette[png_ptr->background.index].green; |
| 1135 | png_ptr->background.blue = |
| 1136 | png_ptr->palette[png_ptr->background.index].blue; |
| 1137 | |
| 1138 | #ifdef PNG_READ_INVERT_ALPHA_SUPPORTED |
| 1139 | if (png_ptr->transformations & PNG_INVERT_ALPHA) |
| 1140 | { |
| 1141 | if (!(png_ptr->transformations & PNG_EXPAND_tRNS)) |
| 1142 | { |
| 1143 | /* Invert the alpha channel (in tRNS) unless the pixels are |
| 1144 | * going to be expanded, in which case leave it for later |
| 1145 | */ |
| 1146 | int i, istop = png_ptr->num_trans; |
| 1147 | |
| 1148 | for (i=0; i<istop; i++) |
| 1149 | png_ptr->trans_alpha[i] = (png_byte)(255 - |
| 1150 | png_ptr->trans_alpha[i]); |
| 1151 | } |
| 1152 | } |
| 1153 | #endif /* PNG_READ_INVERT_ALPHA_SUPPORTED */ |
| 1154 | } |
| 1155 | } /* background expand and (therefore) no alpha association. */ |
| 1156 | #endif /* PNG_READ_EXPAND_SUPPORTED && PNG_READ_BACKGROUND_SUPPORTED */ |
| 1157 | } |
| 1158 | |
| 1159 | static void /* PRIVATE */ |
| 1160 | png_init_rgb_transformations(png_structp png_ptr) |
| 1161 | { |
Glenn Randers-Pehrson | ef217b7 | 2011-06-15 12:58:27 -0500 | [diff] [blame] | 1162 | /* 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] | 1163 | * is any alpha or transparency in the image and simply cancel the |
| 1164 | * background and alpha mode stuff if there isn't. |
| 1165 | */ |
| 1166 | int input_has_alpha = (png_ptr->color_type & PNG_COLOR_MASK_ALPHA) != 0; |
| 1167 | int input_has_transparency = png_ptr->num_trans > 0; |
| 1168 | |
| 1169 | /* If no alpha we can optimize. */ |
| 1170 | if (!input_has_alpha) |
| 1171 | { |
| 1172 | /* Any alpha means background and associative alpha processing is |
| 1173 | * required, however if the alpha is 0 or 1 throughout OPTIIMIZE_ALPHA |
| 1174 | * and ENCODE_ALPHA are irrelevant. |
| 1175 | */ |
| 1176 | # ifdef PNG_READ_ALPHA_MODE_SUPPORTED |
| 1177 | png_ptr->transformations &= ~PNG_ENCODE_ALPHA; |
| 1178 | png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA; |
| 1179 | # endif |
| 1180 | |
| 1181 | if (!input_has_transparency) |
| 1182 | png_ptr->transformations &= ~(PNG_COMPOSE | PNG_BACKGROUND_EXPAND); |
| 1183 | } |
| 1184 | |
| 1185 | #if defined(PNG_READ_EXPAND_SUPPORTED) && defined(PNG_READ_BACKGROUND_SUPPORTED) |
| 1186 | /* png_set_background handling - deals with the complexity of whether the |
| 1187 | * background color is in the file format or the screen format in the case |
| 1188 | * where an 'expand' will happen. |
| 1189 | */ |
| 1190 | |
| 1191 | /* The following code cannot be entered in the alpha pre-multiplication case |
| 1192 | * because PNG_BACKGROUND_EXPAND is cancelled below. |
| 1193 | */ |
| 1194 | if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) && |
| 1195 | (png_ptr->transformations & PNG_EXPAND) && |
| 1196 | !(png_ptr->color_type & PNG_COLOR_MASK_COLOR)) |
| 1197 | /* i.e., GRAY or GRAY_ALPHA */ |
| 1198 | { |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1199 | { |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1200 | /* Expand background and tRNS chunks */ |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 1201 | int gray = png_ptr->background.gray; |
| 1202 | int trans_gray = png_ptr->trans_color.gray; |
| 1203 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1204 | switch (png_ptr->bit_depth) |
| 1205 | { |
| 1206 | case 1: |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 1207 | gray *= 0xff; |
| 1208 | trans_gray *= 0xff; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1209 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1210 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1211 | case 2: |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 1212 | gray *= 0x55; |
| 1213 | trans_gray *= 0x55; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1214 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1215 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1216 | case 4: |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 1217 | gray *= 0x11; |
| 1218 | trans_gray *= 0x11; |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1219 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1220 | |
Glenn Randers-Pehrson | b3edc73 | 2010-11-21 14:06:41 -0600 | [diff] [blame] | 1221 | default: |
| 1222 | |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1223 | case 8: |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 1224 | /* Already 8 bits, fall through */ |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1225 | |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1226 | case 16: |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 1227 | /* Already a full 16 bits */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1228 | break; |
| 1229 | } |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 1230 | |
| 1231 | png_ptr->background.red = png_ptr->background.green = |
| 1232 | png_ptr->background.blue = (png_uint_16)gray; |
| 1233 | |
| 1234 | if (!(png_ptr->transformations & PNG_EXPAND_tRNS)) |
| 1235 | { |
| 1236 | png_ptr->trans_color.red = png_ptr->trans_color.green = |
| 1237 | png_ptr->trans_color.blue = (png_uint_16)trans_gray; |
| 1238 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1239 | } |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1240 | } /* background expand and (therefore) no alpha association. */ |
| 1241 | #endif /* PNG_READ_EXPAND_SUPPORTED && PNG_READ_BACKGROUND_SUPPORTED */ |
| 1242 | } |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 1243 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1244 | void /* PRIVATE */ |
| 1245 | png_init_read_transformations(png_structp png_ptr) |
| 1246 | { |
| 1247 | png_debug(1, "in png_init_read_transformations"); |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 1248 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1249 | /* This internal function is called from png_read_start_row in pngrutil.c |
| 1250 | * and it is called before the 'rowbytes' calculation is done, so the code |
| 1251 | * in here can change or update the transformations flags. |
| 1252 | * |
| 1253 | * First do updates that do not depend on the details of the PNG image data |
| 1254 | * being processed. |
| 1255 | */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1256 | |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 1257 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Glenn Randers-Pehrson | ef217b7 | 2011-06-15 12:58:27 -0500 | [diff] [blame] | 1258 | /* 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] | 1259 | * 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] | 1260 | * 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] | 1261 | * the tests were repeated for the PALETTE color type here - this is no |
| 1262 | * longer necessary (and doesn't seem to have been necessary before.) |
| 1263 | */ |
Glenn Randers-Pehrson | c6de22d | 2002-02-23 18:55:25 -0600 | [diff] [blame] | 1264 | { |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1265 | /* The following temporary indicates if overall gamma correction is |
| 1266 | * required. |
| 1267 | */ |
| 1268 | int gamma_correction = 0; |
| 1269 | |
| 1270 | if (png_ptr->gamma != 0) /* has been set */ |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1271 | { |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1272 | if (png_ptr->screen_gamma != 0) /* screen set too */ |
| 1273 | gamma_correction = png_gamma_threshold(png_ptr->gamma, |
| 1274 | png_ptr->screen_gamma); |
| 1275 | |
| 1276 | else |
| 1277 | /* Assume the output matches the input; a long time default behavior |
| 1278 | * of libpng, although the standard has nothing to say about this. |
| 1279 | */ |
| 1280 | png_ptr->screen_gamma = png_reciprocal(png_ptr->gamma); |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1281 | } |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1282 | |
| 1283 | else if (png_ptr->screen_gamma != 0) |
| 1284 | /* The converse - assume the file matches the screen, note that this |
Glenn Randers-Pehrson | ef217b7 | 2011-06-15 12:58:27 -0500 | [diff] [blame] | 1285 | * perhaps undesireable default can (from 1.5.4) be changed by calling |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1286 | * png_set_alpha_mode (even if the alpha handling mode isn't required |
| 1287 | * or isn't changed from the default.) |
| 1288 | */ |
| 1289 | png_ptr->gamma = png_reciprocal(png_ptr->screen_gamma); |
| 1290 | |
| 1291 | else /* neither are set */ |
| 1292 | /* Just in case the following prevents any processing - file and screen |
| 1293 | * are both assumed to be linear and there is no way to introduce a |
| 1294 | * third gamma value other than png_set_background with 'UNIQUE', and, |
Glenn Randers-Pehrson | ef217b7 | 2011-06-15 12:58:27 -0500 | [diff] [blame] | 1295 | * prior to 1.5.4 |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1296 | */ |
| 1297 | png_ptr->screen_gamma = png_ptr->gamma = PNG_FP_1; |
| 1298 | |
| 1299 | /* Now turn the gamma transformation on or off as appropriate. Notice |
| 1300 | * that PNG_GAMMA just refers to the file->screen correction. Alpha |
| 1301 | * composition may independently cause gamma correction because it needs |
| 1302 | * linear data (e.g. if the file has a gAMA chunk but the screen gamma |
| 1303 | * hasn't been specified.) In any case this flag may get turned off in |
| 1304 | * the code immediately below if the transform can be handled outside the |
| 1305 | * row loop. |
| 1306 | */ |
| 1307 | if (gamma_correction) |
| 1308 | png_ptr->transformations |= PNG_GAMMA; |
| 1309 | |
| 1310 | else |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1311 | png_ptr->transformations &= ~PNG_GAMMA; |
Glenn Randers-Pehrson | c6de22d | 2002-02-23 18:55:25 -0600 | [diff] [blame] | 1312 | } |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1313 | #endif |
Glenn Randers-Pehrson | c6de22d | 2002-02-23 18:55:25 -0600 | [diff] [blame] | 1314 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1315 | /* Certain transformations have the effect of preventing other |
| 1316 | * transformations that happen afterward in png_do_read_transformations, |
| 1317 | * resolve the interdependencies here. From the code of |
| 1318 | * png_do_read_transformations the order is: |
| 1319 | * |
| 1320 | * 1) PNG_EXPAND (including PNG_EXPAND_tRNS) |
| 1321 | * 2) PNG_STRIP_ALPHA (if no compose) |
| 1322 | * 3) PNG_RGB_TO_GRAY |
| 1323 | * 4) PNG_GRAY_TO_RGB iff !PNG_BACKGROUND_IS_GRAY |
| 1324 | * 5) PNG_COMPOSE |
| 1325 | * 6) PNG_GAMMA |
| 1326 | * 7) PNG_STRIP_ALPHA (if compose) |
| 1327 | * 8) PNG_ENCODE_ALPHA |
John Bowler | 8d26126 | 2011-06-18 13:37:11 -0500 | [diff] [blame] | 1328 | * 9) PNG_SCALE_16_TO_8 |
| 1329 | * 10) PNG_16_TO_8 |
| 1330 | * 11) PNG_QUANTIZE (converts to palette) |
| 1331 | * 12) PNG_EXPAND_16 |
| 1332 | * 13) PNG_GRAY_TO_RGB iff PNG_BACKGROUND_IS_GRAY |
| 1333 | * 14) PNG_INVERT_MONO |
| 1334 | * 15) PNG_SHIFT |
| 1335 | * 16) PNG_PACK |
| 1336 | * 17) PNG_BGR |
| 1337 | * 18) PNG_PACKSWAP |
| 1338 | * 19) PNG_FILLER (includes PNG_ADD_ALPHA) |
| 1339 | * 20) PNG_INVERT_ALPHA |
| 1340 | * 21) PNG_SWAP_ALPHA |
| 1341 | * 22) PNG_SWAP_BYTES |
| 1342 | * 23) PNG_USER_TRANSFORM [must be last] |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1343 | */ |
| 1344 | #ifdef PNG_READ_STRIP_ALPHA_SUPPORTED |
| 1345 | if ((png_ptr->transformations & PNG_STRIP_ALPHA) && |
| 1346 | !(png_ptr->transformations & PNG_COMPOSE)) |
| 1347 | { |
| 1348 | /* Stripping the alpha channel happens immediately after the 'expand' |
| 1349 | * transformations, before all other transformation, so it cancels out |
| 1350 | * the alpha handling. It has the side effect negating the effect of |
| 1351 | * PNG_EXPAND_tRNS too: |
| 1352 | */ |
| 1353 | png_ptr->transformations &= ~(PNG_BACKGROUND_EXPAND | PNG_ENCODE_ALPHA | |
| 1354 | PNG_EXPAND_tRNS); |
| 1355 | png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA; |
| 1356 | |
Glenn Randers-Pehrson | ef217b7 | 2011-06-15 12:58:27 -0500 | [diff] [blame] | 1357 | /* 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] | 1358 | * so transparency information would remain just so long as it wasn't |
| 1359 | * expanded. This produces unexpected API changes if the set of things |
| 1360 | * that do PNG_EXPAND_tRNS changes (perfectly possible given the |
| 1361 | * documentation - which says ask for what you want, accept what you |
Glenn Randers-Pehrson | ef217b7 | 2011-06-15 12:58:27 -0500 | [diff] [blame] | 1362 | * get.) This makes the behavior consistent from 1.5.4: |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1363 | */ |
| 1364 | png_ptr->num_trans = 0; |
| 1365 | } |
| 1366 | #endif /* STRIP_ALPHA supported, no COMPOSE */ |
| 1367 | |
| 1368 | #ifdef PNG_READ_ALPHA_MODE_SUPPORTED |
| 1369 | /* If the screen gamma is about 1.0 then the OPTIMIZE_ALPHA and ENCODE_ALPHA |
| 1370 | * settings will have no effect. |
| 1371 | */ |
| 1372 | if (!png_gamma_significant(png_ptr->screen_gamma)) |
| 1373 | { |
| 1374 | png_ptr->transformations &= ~PNG_ENCODE_ALPHA; |
| 1375 | png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA; |
| 1376 | } |
| 1377 | #endif |
| 1378 | |
| 1379 | #if defined(PNG_READ_EXPAND_SUPPORTED) && \ |
| 1380 | defined(PNG_READ_BACKGROUND_SUPPORTED) && \ |
| 1381 | defined(PNG_READ_GRAY_TO_RGB_SUPPORTED) |
| 1382 | /* Detect gray background and attempt to enable optimization for |
| 1383 | * gray --> RGB case. |
| 1384 | * |
| 1385 | * Note: if PNG_BACKGROUND_EXPAND is set and color_type is either RGB or |
| 1386 | * RGB_ALPHA (in which case need_expand is superfluous anyway), the |
| 1387 | * background color might actually be gray yet not be flagged as such. |
| 1388 | * This is not a problem for the current code, which uses |
| 1389 | * PNG_BACKGROUND_IS_GRAY only to decide when to do the |
| 1390 | * png_do_gray_to_rgb() transformation. |
| 1391 | * |
John Bowler | 9994f25 | 2011-05-15 18:52:39 -0500 | [diff] [blame] | 1392 | * TODO: this code needs to be revised to avoid the complexity and |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1393 | * interdependencies. The color type of the background should be recorded in |
| 1394 | * png_set_background, along with the bit depth, then the code has a record |
| 1395 | * of exactly what color space the background is currently in. |
| 1396 | */ |
| 1397 | if (png_ptr->transformations & PNG_BACKGROUND_EXPAND) |
| 1398 | { |
| 1399 | /* 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] | 1400 | * the file was grayscale the background value is gray. |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1401 | */ |
| 1402 | if (!(png_ptr->color_type & PNG_COLOR_MASK_COLOR)) |
| 1403 | png_ptr->mode |= PNG_BACKGROUND_IS_GRAY; |
| 1404 | } |
| 1405 | |
| 1406 | else if (png_ptr->transformations & PNG_COMPOSE) |
| 1407 | { |
| 1408 | /* PNG_COMPOSE: png_set_background was called with need_expand false, |
| 1409 | * so the color is in the color space of the output or png_set_alpha_mode |
| 1410 | * was called and the color is black. Ignore RGB_TO_GRAY because that |
| 1411 | * happens before GRAY_TO_RGB. |
| 1412 | */ |
| 1413 | if (png_ptr->transformations & PNG_GRAY_TO_RGB) |
| 1414 | { |
| 1415 | if (png_ptr->background.red == png_ptr->background.green && |
| 1416 | png_ptr->background.red == png_ptr->background.blue) |
| 1417 | { |
| 1418 | png_ptr->mode |= PNG_BACKGROUND_IS_GRAY; |
| 1419 | png_ptr->background.gray = png_ptr->background.red; |
| 1420 | } |
| 1421 | } |
| 1422 | } |
| 1423 | #endif /* PNG_READ_GRAY_TO_RGB_SUPPORTED (etc) */ |
| 1424 | |
| 1425 | /* For indexed PNG data (PNG_COLOR_TYPE_PALETTE) many of the transformations |
| 1426 | * can be performed directly on the palette, and some (such as rgb to gray) |
| 1427 | * can be optimized inside the palette. This is particularly true of the |
| 1428 | * composite (background and alpha) stuff, which can be pretty much all done |
| 1429 | * in the palette even if the result is expanded to RGB or gray afterward. |
| 1430 | * |
| 1431 | * NOTE: this is Not Yet Implemented, the code behaves as in 1.5.1 and |
| 1432 | * earlier and the palette stuff is actually handled on the first row. This |
| 1433 | * leads to the reported bug that the palette returned by png_get_PLTE is not |
| 1434 | * updated. |
| 1435 | */ |
| 1436 | if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) |
| 1437 | png_init_palette_transformations(png_ptr); |
| 1438 | |
| 1439 | else |
| 1440 | png_init_rgb_transformations(png_ptr); |
| 1441 | |
John Bowler | db0ed3e | 2011-05-18 18:51:24 -0500 | [diff] [blame] | 1442 | #if defined(PNG_READ_BACKGROUND_SUPPORTED) && \ |
| 1443 | defined(PNG_READ_EXPAND_16_SUPPORTED) |
| 1444 | if ((png_ptr->transformations & PNG_EXPAND_16) && |
| 1445 | (png_ptr->transformations & PNG_COMPOSE) && |
| 1446 | !(png_ptr->transformations & PNG_BACKGROUND_EXPAND) && |
| 1447 | png_ptr->bit_depth != 16) |
| 1448 | { |
| 1449 | /* TODO: fix this. Because the expand_16 operation is after the compose |
| 1450 | * 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] | 1451 | * application will supply a 16-bit value so reduce it here. |
John Bowler | db0ed3e | 2011-05-18 18:51:24 -0500 | [diff] [blame] | 1452 | * |
| 1453 | * The PNG_BACKGROUND_EXPAND code above does not expand to 16 bits at |
| 1454 | * 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] | 1455 | * |
| 1456 | * NOTE: this discards the low 16 bits of the user supplied background |
| 1457 | * color, but until expand_16 works properly there is no choice! |
John Bowler | db0ed3e | 2011-05-18 18:51:24 -0500 | [diff] [blame] | 1458 | */ |
John Bowler | b2bee33 | 2011-06-10 23:24:58 -0500 | [diff] [blame] | 1459 | # define CHOP(x) (x)=((png_uint_16)(((png_uint_32)(x)*255+32895) >> 16)) |
| 1460 | CHOP(png_ptr->background.red); |
| 1461 | CHOP(png_ptr->background.green); |
| 1462 | CHOP(png_ptr->background.blue); |
| 1463 | CHOP(png_ptr->background.gray); |
John Bowler | db0ed3e | 2011-05-18 18:51:24 -0500 | [diff] [blame] | 1464 | # undef CHOP |
| 1465 | } |
Glenn Randers-Pehrson | 2232baa | 2011-06-14 06:59:46 -0500 | [diff] [blame] | 1466 | #endif /* PNG_READ_BACKGROUND_SUPPORTED && PNG_READ_EXPAND_16_SUPPORTED */ |
John Bowler | db0ed3e | 2011-05-18 18:51:24 -0500 | [diff] [blame] | 1467 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1468 | /* NOTE: below 'PNG_READ_ALPHA_MODE_SUPPORTED' is presumed to also enable the |
| 1469 | * background support (see the comments in scripts/pnglibconf.dfa), this |
| 1470 | * allows pre-multiplication of the alpha channel to be implemented as |
| 1471 | * 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] | 1472 | * 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] | 1473 | * implement the new API quickly, without lots of internal changes.) |
| 1474 | */ |
| 1475 | |
| 1476 | #ifdef PNG_READ_GAMMA_SUPPORTED |
| 1477 | # ifdef PNG_READ_BACKGROUND_SUPPORTED |
| 1478 | /* Includes ALPHA_MODE */ |
| 1479 | png_ptr->background_1 = png_ptr->background; |
| 1480 | # endif |
| 1481 | |
| 1482 | /* This needs to change - in the palette image case a whole set of tables are |
| 1483 | * built when it would be quicker to just calculate the correct value for |
| 1484 | * each palette entry directly. Also, the test is too tricky - why check |
| 1485 | * PNG_RGB_TO_GRAY if PNG_GAMMA is not set? The answer seems to be that |
| 1486 | * PNG_GAMMA is cancelled even if the gamma is known? The test excludes the |
| 1487 | * PNG_COMPOSE case, so apparently if there is no *overall* gamma correction |
| 1488 | * the gamma tables will not be built even if composition is required on a |
| 1489 | * gamma encoded value. |
| 1490 | * |
Glenn Randers-Pehrson | ef217b7 | 2011-06-15 12:58:27 -0500 | [diff] [blame] | 1491 | * 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] | 1492 | * file gamma - if it is not 1.0 both RGB_TO_GRAY and COMPOSE need the |
| 1493 | * tables. |
| 1494 | */ |
| 1495 | if ((png_ptr->transformations & PNG_GAMMA) |
| 1496 | || ((png_ptr->transformations & PNG_RGB_TO_GRAY) |
| 1497 | && (png_gamma_significant(png_ptr->gamma) || |
| 1498 | png_gamma_significant(png_ptr->screen_gamma))) |
| 1499 | || ((png_ptr->transformations & PNG_COMPOSE) |
| 1500 | && (png_gamma_significant(png_ptr->gamma) |
| 1501 | || png_gamma_significant(png_ptr->screen_gamma) |
Glenn Randers-Pehrson | 903c64d | 2011-06-15 11:50:23 -0500 | [diff] [blame] | 1502 | # ifdef PNG_READ_BACKGROUND_SUPPORTED |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1503 | || (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_UNIQUE |
Glenn Randers-Pehrson | 903c64d | 2011-06-15 11:50:23 -0500 | [diff] [blame] | 1504 | && png_gamma_significant(png_ptr->background_gamma)) |
| 1505 | # endif |
| 1506 | )) || ((png_ptr->transformations & PNG_ENCODE_ALPHA) |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1507 | && png_gamma_significant(png_ptr->screen_gamma)) |
| 1508 | ) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1509 | { |
Glenn Randers-Pehrson | f81b50b | 2009-12-29 16:50:15 -0600 | [diff] [blame] | 1510 | png_build_gamma_table(png_ptr, png_ptr->bit_depth); |
Glenn Randers-Pehrson | ffa8924 | 2009-12-13 08:14:40 -0600 | [diff] [blame] | 1511 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1512 | #ifdef PNG_READ_BACKGROUND_SUPPORTED |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1513 | if (png_ptr->transformations & PNG_COMPOSE) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1514 | { |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1515 | if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1516 | { |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1517 | /* We don't get to here unless there is a tRNS chunk with non-opaque |
| 1518 | * entries - see the checking code at the start of this function. |
| 1519 | */ |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1520 | png_color back, back_1; |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1521 | png_colorp palette = png_ptr->palette; |
| 1522 | int num_palette = png_ptr->num_palette; |
| 1523 | int i; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1524 | if (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_FILE) |
| 1525 | { |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 1526 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1527 | back.red = png_ptr->gamma_table[png_ptr->background.red]; |
| 1528 | back.green = png_ptr->gamma_table[png_ptr->background.green]; |
| 1529 | back.blue = png_ptr->gamma_table[png_ptr->background.blue]; |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1530 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1531 | back_1.red = png_ptr->gamma_to_1[png_ptr->background.red]; |
| 1532 | back_1.green = png_ptr->gamma_to_1[png_ptr->background.green]; |
| 1533 | back_1.blue = png_ptr->gamma_to_1[png_ptr->background.blue]; |
| 1534 | } |
| 1535 | else |
| 1536 | { |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 1537 | png_fixed_point g, gs; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1538 | |
Glenn Randers-Pehrson | 8f8fb6a | 1998-03-09 23:02:06 -0600 | [diff] [blame] | 1539 | switch (png_ptr->background_gamma_type) |
Glenn Randers-Pehrson | 4922b1b | 1998-03-08 22:55:17 -0600 | [diff] [blame] | 1540 | { |
Glenn Randers-Pehrson | 8f8fb6a | 1998-03-09 23:02:06 -0600 | [diff] [blame] | 1541 | case PNG_BACKGROUND_GAMMA_SCREEN: |
| 1542 | g = (png_ptr->screen_gamma); |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 1543 | gs = PNG_FP_1; |
Glenn Randers-Pehrson | 8f8fb6a | 1998-03-09 23:02:06 -0600 | [diff] [blame] | 1544 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1545 | |
Glenn Randers-Pehrson | 8f8fb6a | 1998-03-09 23:02:06 -0600 | [diff] [blame] | 1546 | case PNG_BACKGROUND_GAMMA_FILE: |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 1547 | g = png_reciprocal(png_ptr->gamma); |
| 1548 | gs = png_reciprocal2(png_ptr->gamma, |
Glenn Randers-Pehrson | 29034c5 | 2010-07-29 17:58:49 -0500 | [diff] [blame] | 1549 | png_ptr->screen_gamma); |
Glenn Randers-Pehrson | 8f8fb6a | 1998-03-09 23:02:06 -0600 | [diff] [blame] | 1550 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1551 | |
Glenn Randers-Pehrson | 8f8fb6a | 1998-03-09 23:02:06 -0600 | [diff] [blame] | 1552 | case PNG_BACKGROUND_GAMMA_UNIQUE: |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 1553 | g = png_reciprocal(png_ptr->background_gamma); |
| 1554 | gs = png_reciprocal2(png_ptr->background_gamma, |
Glenn Randers-Pehrson | 29034c5 | 2010-07-29 17:58:49 -0500 | [diff] [blame] | 1555 | png_ptr->screen_gamma); |
Glenn Randers-Pehrson | 8f8fb6a | 1998-03-09 23:02:06 -0600 | [diff] [blame] | 1556 | break; |
| 1557 | default: |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 1558 | g = PNG_FP_1; /* back_1 */ |
| 1559 | gs = PNG_FP_1; /* back */ |
Glenn Randers-Pehrson | 29034c5 | 2010-07-29 17:58:49 -0500 | [diff] [blame] | 1560 | break; |
Glenn Randers-Pehrson | 8f8fb6a | 1998-03-09 23:02:06 -0600 | [diff] [blame] | 1561 | } |
| 1562 | |
Glenn Randers-Pehrson | bc363ec | 2010-10-12 21:17:00 -0500 | [diff] [blame] | 1563 | if (png_gamma_significant(gs)) |
Glenn Randers-Pehrson | 8f8fb6a | 1998-03-09 23:02:06 -0600 | [diff] [blame] | 1564 | { |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 1565 | back.red = png_gamma_8bit_correct(png_ptr->background.red, |
| 1566 | gs); |
| 1567 | back.green = png_gamma_8bit_correct(png_ptr->background.green, |
| 1568 | gs); |
| 1569 | back.blue = png_gamma_8bit_correct(png_ptr->background.blue, |
| 1570 | gs); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1571 | } |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1572 | |
| 1573 | else |
| 1574 | { |
| 1575 | back.red = (png_byte)png_ptr->background.red; |
| 1576 | back.green = (png_byte)png_ptr->background.green; |
| 1577 | back.blue = (png_byte)png_ptr->background.blue; |
| 1578 | } |
| 1579 | |
| 1580 | if (png_gamma_significant(g)) |
| 1581 | { |
| 1582 | back_1.red = png_gamma_8bit_correct(png_ptr->background.red, |
| 1583 | g); |
| 1584 | back_1.green = png_gamma_8bit_correct( |
| 1585 | png_ptr->background.green, g); |
| 1586 | back_1.blue = png_gamma_8bit_correct(png_ptr->background.blue, |
| 1587 | g); |
| 1588 | } |
| 1589 | |
| 1590 | else |
| 1591 | { |
| 1592 | back_1.red = (png_byte)png_ptr->background.red; |
| 1593 | back_1.green = (png_byte)png_ptr->background.green; |
| 1594 | back_1.blue = (png_byte)png_ptr->background.blue; |
| 1595 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1596 | } |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1597 | |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1598 | for (i = 0; i < num_palette; i++) |
| 1599 | { |
Glenn Randers-Pehrson | a313751 | 2010-08-18 20:25:36 -0500 | [diff] [blame] | 1600 | if (i < (int)png_ptr->num_trans && |
| 1601 | png_ptr->trans_alpha[i] != 0xff) |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1602 | { |
Glenn Randers-Pehrson | 6abea75 | 2009-08-08 16:52:06 -0500 | [diff] [blame] | 1603 | if (png_ptr->trans_alpha[i] == 0) |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1604 | { |
| 1605 | palette[i] = back; |
| 1606 | } |
Glenn Randers-Pehrson | 6abea75 | 2009-08-08 16:52:06 -0500 | [diff] [blame] | 1607 | else /* if (png_ptr->trans_alpha[i] != 0xff) */ |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1608 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1609 | png_byte v, w; |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1610 | |
| 1611 | v = png_ptr->gamma_to_1[palette[i].red]; |
Glenn Randers-Pehrson | 6abea75 | 2009-08-08 16:52:06 -0500 | [diff] [blame] | 1612 | png_composite(w, v, png_ptr->trans_alpha[i], back_1.red); |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1613 | palette[i].red = png_ptr->gamma_from_1[w]; |
| 1614 | |
| 1615 | v = png_ptr->gamma_to_1[palette[i].green]; |
Glenn Randers-Pehrson | 6abea75 | 2009-08-08 16:52:06 -0500 | [diff] [blame] | 1616 | png_composite(w, v, png_ptr->trans_alpha[i], back_1.green); |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1617 | palette[i].green = png_ptr->gamma_from_1[w]; |
| 1618 | |
| 1619 | v = png_ptr->gamma_to_1[palette[i].blue]; |
Glenn Randers-Pehrson | 6abea75 | 2009-08-08 16:52:06 -0500 | [diff] [blame] | 1620 | png_composite(w, v, png_ptr->trans_alpha[i], back_1.blue); |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1621 | palette[i].blue = png_ptr->gamma_from_1[w]; |
| 1622 | } |
| 1623 | } |
| 1624 | else |
| 1625 | { |
| 1626 | palette[i].red = png_ptr->gamma_table[palette[i].red]; |
| 1627 | palette[i].green = png_ptr->gamma_table[palette[i].green]; |
| 1628 | palette[i].blue = png_ptr->gamma_table[palette[i].blue]; |
| 1629 | } |
| 1630 | } |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1631 | |
| 1632 | /* Prevent the transformations being done again. |
| 1633 | * |
Glenn Randers-Pehrson | 63071ac | 2011-08-29 16:16:26 -0500 | [diff] [blame] | 1634 | * NOTE: this is highly dubious; it removes the transformations in |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1635 | * place. This seems inconsistent with the general treatment of the |
| 1636 | * transformations elsewhere. |
Glenn Randers-Pehrson | 72cbc6e | 2009-09-20 07:28:43 -0500 | [diff] [blame] | 1637 | */ |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1638 | png_ptr->transformations &= ~(PNG_COMPOSE | PNG_GAMMA); |
| 1639 | } /* color_type == PNG_COLOR_TYPE_PALETTE */ |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 1640 | |
Glenn Randers-Pehrson | d1e8c86 | 2002-06-20 06:54:34 -0500 | [diff] [blame] | 1641 | /* if (png_ptr->background_gamma_type!=PNG_BACKGROUND_GAMMA_UNKNOWN) */ |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1642 | else /* color_type != PNG_COLOR_TYPE_PALETTE */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1643 | { |
Glenn Randers-Pehrson | 29034c5 | 2010-07-29 17:58:49 -0500 | [diff] [blame] | 1644 | png_fixed_point g = PNG_FP_1; |
| 1645 | png_fixed_point gs = PNG_FP_1; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1646 | |
| 1647 | switch (png_ptr->background_gamma_type) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 1648 | { |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1649 | case PNG_BACKGROUND_GAMMA_SCREEN: |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 1650 | g = png_ptr->screen_gamma; |
| 1651 | /* gs = PNG_FP_1; */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1652 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1653 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1654 | case PNG_BACKGROUND_GAMMA_FILE: |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 1655 | g = png_reciprocal(png_ptr->gamma); |
| 1656 | gs = png_reciprocal2(png_ptr->gamma, png_ptr->screen_gamma); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1657 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1658 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1659 | case PNG_BACKGROUND_GAMMA_UNIQUE: |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 1660 | g = png_reciprocal(png_ptr->background_gamma); |
| 1661 | gs = png_reciprocal2(png_ptr->background_gamma, |
Glenn Randers-Pehrson | 29034c5 | 2010-07-29 17:58:49 -0500 | [diff] [blame] | 1662 | png_ptr->screen_gamma); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1663 | break; |
Glenn Randers-Pehrson | b3edc73 | 2010-11-21 14:06:41 -0600 | [diff] [blame] | 1664 | |
| 1665 | default: |
Glenn Randers-Pehrson | e9eeb74 | 2011-05-08 19:38:42 -0500 | [diff] [blame] | 1666 | png_error(png_ptr, "invalid background gamma type"); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1667 | } |
| 1668 | |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 1669 | png_ptr->background_1.gray = png_gamma_correct(png_ptr, |
Glenn Randers-Pehrson | 29034c5 | 2010-07-29 17:58:49 -0500 | [diff] [blame] | 1670 | png_ptr->background.gray, g); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 1671 | |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 1672 | png_ptr->background.gray = png_gamma_correct(png_ptr, |
| 1673 | png_ptr->background.gray, gs); |
Glenn Randers-Pehrson | 377657d | 2002-03-08 01:31:27 -0600 | [diff] [blame] | 1674 | |
Glenn Randers-Pehrson | 73d57cb | 2002-03-25 18:49:08 -0600 | [diff] [blame] | 1675 | if ((png_ptr->background.red != png_ptr->background.green) || |
| 1676 | (png_ptr->background.red != png_ptr->background.blue) || |
| 1677 | (png_ptr->background.red != png_ptr->background.gray)) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1678 | { |
Glenn Randers-Pehrson | 73d57cb | 2002-03-25 18:49:08 -0600 | [diff] [blame] | 1679 | /* RGB or RGBA with color background */ |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 1680 | png_ptr->background_1.red = png_gamma_correct(png_ptr, |
| 1681 | png_ptr->background.red, g); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 1682 | |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 1683 | png_ptr->background_1.green = png_gamma_correct(png_ptr, |
| 1684 | png_ptr->background.green, g); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 1685 | |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 1686 | png_ptr->background_1.blue = png_gamma_correct(png_ptr, |
| 1687 | png_ptr->background.blue, g); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 1688 | |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 1689 | png_ptr->background.red = png_gamma_correct(png_ptr, |
| 1690 | png_ptr->background.red, gs); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 1691 | |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 1692 | png_ptr->background.green = png_gamma_correct(png_ptr, |
| 1693 | png_ptr->background.green, gs); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 1694 | |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 1695 | png_ptr->background.blue = png_gamma_correct(png_ptr, |
| 1696 | png_ptr->background.blue, gs); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1697 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 1698 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1699 | else |
| 1700 | { |
Glenn Randers-Pehrson | 73d57cb | 2002-03-25 18:49:08 -0600 | [diff] [blame] | 1701 | /* GRAY, GRAY ALPHA, RGB, or RGBA with gray background */ |
| 1702 | png_ptr->background_1.red = png_ptr->background_1.green |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1703 | = png_ptr->background_1.blue = png_ptr->background_1.gray; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 1704 | |
Glenn Randers-Pehrson | 73d57cb | 2002-03-25 18:49:08 -0600 | [diff] [blame] | 1705 | png_ptr->background.red = png_ptr->background.green |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1706 | = png_ptr->background.blue = png_ptr->background.gray; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1707 | } |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1708 | } /* color_type != PNG_COLOR_TYPE_PALETTE */ |
| 1709 | }/* png_ptr->transformations & PNG_BACKGROUND */ |
| 1710 | |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1711 | else |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 1712 | /* Transformation does not include PNG_BACKGROUND */ |
Glenn Randers-Pehrson | 5a0be34 | 2001-10-18 20:55:13 -0500 | [diff] [blame] | 1713 | #endif /* PNG_READ_BACKGROUND_SUPPORTED */ |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1714 | if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1715 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1716 | png_colorp palette = png_ptr->palette; |
| 1717 | int num_palette = png_ptr->num_palette; |
| 1718 | int i; |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1719 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1720 | /*NOTE: there are other transformations that should probably be in here |
| 1721 | * too. |
| 1722 | */ |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1723 | for (i = 0; i < num_palette; i++) |
| 1724 | { |
| 1725 | palette[i].red = png_ptr->gamma_table[palette[i].red]; |
| 1726 | palette[i].green = png_ptr->gamma_table[palette[i].green]; |
| 1727 | palette[i].blue = png_ptr->gamma_table[palette[i].blue]; |
| 1728 | } |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 1729 | |
Glenn Randers-Pehrson | 72cbc6e | 2009-09-20 07:28:43 -0500 | [diff] [blame] | 1730 | /* Done the gamma correction. */ |
| 1731 | png_ptr->transformations &= ~PNG_GAMMA; |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1732 | } /* color_type == PALETTE && !PNG_BACKGROUND transformation */ |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1733 | } |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1734 | #ifdef PNG_READ_BACKGROUND_SUPPORTED |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1735 | else |
| 1736 | #endif |
Glenn Randers-Pehrson | 31aee0d | 2010-07-29 17:39:14 -0500 | [diff] [blame] | 1737 | #endif /* PNG_READ_GAMMA_SUPPORTED */ |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1738 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1739 | #ifdef PNG_READ_BACKGROUND_SUPPORTED |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1740 | /* No GAMMA transformation (see the hanging else 4 lines above) */ |
| 1741 | if ((png_ptr->transformations & PNG_COMPOSE) && |
| 1742 | (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)) |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1743 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1744 | int i; |
| 1745 | int istop = (int)png_ptr->num_trans; |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1746 | png_color back; |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1747 | png_colorp palette = png_ptr->palette; |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1748 | |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1749 | back.red = (png_byte)png_ptr->background.red; |
| 1750 | back.green = (png_byte)png_ptr->background.green; |
| 1751 | back.blue = (png_byte)png_ptr->background.blue; |
| 1752 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1753 | for (i = 0; i < istop; i++) |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1754 | { |
Glenn Randers-Pehrson | 6abea75 | 2009-08-08 16:52:06 -0500 | [diff] [blame] | 1755 | if (png_ptr->trans_alpha[i] == 0) |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1756 | { |
| 1757 | palette[i] = back; |
| 1758 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 1759 | |
Glenn Randers-Pehrson | 6abea75 | 2009-08-08 16:52:06 -0500 | [diff] [blame] | 1760 | else if (png_ptr->trans_alpha[i] != 0xff) |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1761 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1762 | /* The png_composite() macro is defined in png.h */ |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1763 | png_composite(palette[i].red, palette[i].red, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1764 | png_ptr->trans_alpha[i], back.red); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 1765 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1766 | png_composite(palette[i].green, palette[i].green, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1767 | png_ptr->trans_alpha[i], back.green); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 1768 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1769 | png_composite(palette[i].blue, palette[i].blue, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1770 | png_ptr->trans_alpha[i], back.blue); |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1771 | } |
| 1772 | } |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 1773 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1774 | png_ptr->transformations &= ~PNG_COMPOSE; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1775 | } |
Glenn Randers-Pehrson | 5a0be34 | 2001-10-18 20:55:13 -0500 | [diff] [blame] | 1776 | #endif /* PNG_READ_BACKGROUND_SUPPORTED */ |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1777 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1778 | #ifdef PNG_READ_SHIFT_SUPPORTED |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1779 | if ((png_ptr->transformations & PNG_SHIFT) && |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1780 | (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)) |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1781 | { |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 1782 | int i; |
| 1783 | int istop = png_ptr->num_palette; |
| 1784 | int shift = 8 - png_ptr->sig_bit.red; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1785 | |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 1786 | /* significant bits can be in the range 1 to 7 for a meaninful result, if |
| 1787 | * the number of significant bits is 0 then no shift is done (this is an |
| 1788 | * error condition which is silently ignored.) |
| 1789 | */ |
| 1790 | if (shift > 0 && shift < 8) for (i=0; i<istop; ++i) |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1791 | { |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 1792 | int component = png_ptr->palette[i].red; |
| 1793 | |
| 1794 | component >>= shift; |
| 1795 | png_ptr->palette[i].red = (png_byte)component; |
| 1796 | } |
| 1797 | |
| 1798 | shift = 8 - png_ptr->sig_bit.green; |
| 1799 | if (shift > 0 && shift < 8) for (i=0; i<istop; ++i) |
| 1800 | { |
| 1801 | int component = png_ptr->palette[i].green; |
| 1802 | |
| 1803 | component >>= shift; |
| 1804 | png_ptr->palette[i].green = (png_byte)component; |
| 1805 | } |
| 1806 | |
| 1807 | shift = 8 - png_ptr->sig_bit.blue; |
| 1808 | if (shift > 0 && shift < 8) for (i=0; i<istop; ++i) |
| 1809 | { |
| 1810 | int component = png_ptr->palette[i].blue; |
| 1811 | |
| 1812 | component >>= shift; |
| 1813 | png_ptr->palette[i].blue = (png_byte)component; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1814 | } |
| 1815 | } |
Glenn Randers-Pehrson | 5a0be34 | 2001-10-18 20:55:13 -0500 | [diff] [blame] | 1816 | #endif /* PNG_READ_SHIFT_SUPPORTED */ |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1817 | } |
| 1818 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1819 | /* Modify the info structure to reflect the transformations. The |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 1820 | * info should be updated so a PNG file could be written with it, |
| 1821 | * assuming the transformations result in valid PNG data. |
| 1822 | */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 1823 | void /* PRIVATE */ |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 1824 | png_read_transform_info(png_structp png_ptr, png_infop info_ptr) |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1825 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 1826 | png_debug(1, "in png_read_transform_info"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 1827 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1828 | #ifdef PNG_READ_EXPAND_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1829 | if (png_ptr->transformations & PNG_EXPAND) |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1830 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1831 | if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) |
| 1832 | { |
John Bowler | 9994f25 | 2011-05-15 18:52:39 -0500 | [diff] [blame] | 1833 | /* This check must match what actually happens in |
Glenn Randers-Pehrson | 0e128df | 2011-05-15 19:09:24 -0500 | [diff] [blame] | 1834 | * 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] | 1835 | * it is all opaque we must do the same (at present it does not.) |
| 1836 | */ |
| 1837 | if (png_ptr->num_trans > 0) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1838 | info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 1839 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1840 | else |
| 1841 | info_ptr->color_type = PNG_COLOR_TYPE_RGB; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 1842 | |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1843 | info_ptr->bit_depth = 8; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1844 | info_ptr->num_trans = 0; |
| 1845 | } |
| 1846 | else |
| 1847 | { |
| 1848 | if (png_ptr->num_trans) |
Glenn Randers-Pehrson | 1ce0836 | 2006-03-08 23:35:59 -0600 | [diff] [blame] | 1849 | { |
| 1850 | if (png_ptr->transformations & PNG_EXPAND_tRNS) |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1851 | info_ptr->color_type |= PNG_COLOR_MASK_ALPHA; |
Glenn Randers-Pehrson | 1ce0836 | 2006-03-08 23:35:59 -0600 | [diff] [blame] | 1852 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1853 | if (info_ptr->bit_depth < 8) |
| 1854 | info_ptr->bit_depth = 8; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 1855 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1856 | info_ptr->num_trans = 0; |
| 1857 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1858 | } |
| 1859 | #endif |
| 1860 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1861 | #if defined(PNG_READ_BACKGROUND_SUPPORTED) ||\ |
| 1862 | defined(PNG_READ_ALPHA_MODE_SUPPORTED) |
| 1863 | /* The following is almost certainly wrong unless the background value is in |
| 1864 | * the screen space! |
| 1865 | */ |
| 1866 | if (png_ptr->transformations & PNG_COMPOSE) |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1867 | info_ptr->background = png_ptr->background; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1868 | #endif |
| 1869 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1870 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Glenn Randers-Pehrson | ef217b7 | 2011-06-15 12:58:27 -0500 | [diff] [blame] | 1871 | /* 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] | 1872 | * however it seems that the code in png_init_read_transformations, which has |
| 1873 | * been called before this from png_read_update_info->png_read_start_row |
| 1874 | * sometimes does the gamma transform and cancels the flag. |
| 1875 | */ |
| 1876 | info_ptr->gamma = png_ptr->gamma; |
Glenn Randers-Pehrson | 166c5a3 | 1999-12-10 09:43:02 -0600 | [diff] [blame] | 1877 | #endif |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 1878 | |
Glenn Randers-Pehrson | 4554a54 | 2010-08-27 10:48:45 -0500 | [diff] [blame] | 1879 | if (info_ptr->bit_depth == 16) |
| 1880 | { |
John Bowler | 8d26126 | 2011-06-18 13:37:11 -0500 | [diff] [blame] | 1881 | # ifdef PNG_READ_16BIT_SUPPORTED |
| 1882 | # ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED |
| 1883 | if (png_ptr->transformations & PNG_SCALE_16_TO_8) |
| 1884 | info_ptr->bit_depth = 8; |
| 1885 | # endif |
| 1886 | |
| 1887 | # ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED |
| 1888 | if (png_ptr->transformations & PNG_16_TO_8) |
| 1889 | info_ptr->bit_depth = 8; |
| 1890 | # endif |
| 1891 | |
| 1892 | # else |
| 1893 | /* No 16 bit support: force chopping 16-bit input down to 8, in this case |
| 1894 | * the app program can chose if both APIs are available by setting the |
| 1895 | * correct scaling to use. |
| 1896 | */ |
| 1897 | # ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED |
| 1898 | /* For compatibility with previous versions use the strip method by |
| 1899 | * default. This code works because if PNG_SCALE_16_TO_8 is already |
| 1900 | * set the code below will do that in preference to the chop. |
| 1901 | */ |
| 1902 | png_ptr->transformations |= PNG_16_TO_8; |
| 1903 | info_ptr->bit_depth = 8; |
| 1904 | # else |
| 1905 | |
| 1906 | # if PNG_READ_SCALE_16_TO_8_SUPPORTED |
| 1907 | png_ptr->transformations |= PNG_SCALE_16_TO_8; |
| 1908 | info_ptr->bit_depth = 8; |
| 1909 | # else |
| 1910 | |
| 1911 | CONFIGURATION ERROR: you must enable at least one 16 to 8 method |
| 1912 | # endif |
Glenn Randers-Pehrson | aee83b4 | 2011-06-18 00:19:54 -0500 | [diff] [blame] | 1913 | # endif |
John Bowler | 8d26126 | 2011-06-18 13:37:11 -0500 | [diff] [blame] | 1914 | #endif /* !READ_16BIT_SUPPORTED */ |
Glenn Randers-Pehrson | 4554a54 | 2010-08-27 10:48:45 -0500 | [diff] [blame] | 1915 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1916 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1917 | #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED |
Glenn Randers-Pehrson | ddfebd3 | 2006-02-22 09:19:25 -0600 | [diff] [blame] | 1918 | if (png_ptr->transformations & PNG_GRAY_TO_RGB) |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 1919 | info_ptr->color_type = (png_byte)(info_ptr->color_type | |
| 1920 | PNG_COLOR_MASK_COLOR); |
Glenn Randers-Pehrson | ddfebd3 | 2006-02-22 09:19:25 -0600 | [diff] [blame] | 1921 | #endif |
| 1922 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1923 | #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED |
Glenn Randers-Pehrson | ddfebd3 | 2006-02-22 09:19:25 -0600 | [diff] [blame] | 1924 | if (png_ptr->transformations & PNG_RGB_TO_GRAY) |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 1925 | info_ptr->color_type = (png_byte)(info_ptr->color_type & |
| 1926 | ~PNG_COLOR_MASK_COLOR); |
Glenn Randers-Pehrson | ddfebd3 | 2006-02-22 09:19:25 -0600 | [diff] [blame] | 1927 | #endif |
| 1928 | |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 1929 | #ifdef PNG_READ_QUANTIZE_SUPPORTED |
| 1930 | if (png_ptr->transformations & PNG_QUANTIZE) |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1931 | { |
| 1932 | 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] | 1933 | (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)) && |
| 1934 | png_ptr->palette_lookup && info_ptr->bit_depth == 8) |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1935 | { |
| 1936 | info_ptr->color_type = PNG_COLOR_TYPE_PALETTE; |
| 1937 | } |
| 1938 | } |
| 1939 | #endif |
| 1940 | |
John Bowler | 1921e6d | 2011-05-16 20:57:54 -0500 | [diff] [blame] | 1941 | #ifdef PNG_READ_EXPAND_16_SUPPORTED |
| 1942 | if (png_ptr->transformations & PNG_EXPAND_16 && info_ptr->bit_depth == 8 && |
| 1943 | info_ptr->color_type != PNG_COLOR_TYPE_PALETTE) |
| 1944 | { |
| 1945 | info_ptr->bit_depth = 16; |
| 1946 | } |
| 1947 | #endif |
| 1948 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1949 | #ifdef PNG_READ_PACK_SUPPORTED |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 1950 | if ((png_ptr->transformations & PNG_PACK) && (info_ptr->bit_depth < 8)) |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1951 | info_ptr->bit_depth = 8; |
| 1952 | #endif |
| 1953 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 1954 | if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1955 | info_ptr->channels = 1; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 1956 | |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1957 | else if (info_ptr->color_type & PNG_COLOR_MASK_COLOR) |
| 1958 | info_ptr->channels = 3; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 1959 | |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1960 | else |
| 1961 | info_ptr->channels = 1; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1962 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1963 | #ifdef PNG_READ_STRIP_ALPHA_SUPPORTED |
John Bowler | 9b872f4 | 2011-02-12 09:00:16 -0600 | [diff] [blame] | 1964 | if (png_ptr->transformations & PNG_STRIP_ALPHA) |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1965 | { |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 1966 | info_ptr->color_type = (png_byte)(info_ptr->color_type & |
| 1967 | ~PNG_COLOR_MASK_ALPHA); |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 1968 | info_ptr->num_trans = 0; |
| 1969 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1970 | #endif |
| 1971 | |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1972 | if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA) |
| 1973 | info_ptr->channels++; |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1974 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1975 | #ifdef PNG_READ_FILLER_SUPPORTED |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1976 | /* STRIP_ALPHA and FILLER allowed: MASK_ALPHA bit stripped above */ |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 1977 | if ((png_ptr->transformations & PNG_FILLER) && |
| 1978 | ((info_ptr->color_type == PNG_COLOR_TYPE_RGB) || |
| 1979 | (info_ptr->color_type == PNG_COLOR_TYPE_GRAY))) |
Glenn Randers-Pehrson | 5e5c1e1 | 2000-11-10 12:26:19 -0600 | [diff] [blame] | 1980 | { |
Glenn Randers-Pehrson | 860ab2b | 1999-10-14 07:43:10 -0500 | [diff] [blame] | 1981 | info_ptr->channels++; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1982 | /* If adding a true alpha channel not just filler */ |
Glenn Randers-Pehrson | 67864af | 2004-08-28 23:30:07 -0500 | [diff] [blame] | 1983 | if (png_ptr->transformations & PNG_ADD_ALPHA) |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1984 | info_ptr->color_type |= PNG_COLOR_MASK_ALPHA; |
Glenn Randers-Pehrson | 5e5c1e1 | 2000-11-10 12:26:19 -0600 | [diff] [blame] | 1985 | } |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1986 | #endif |
| 1987 | |
Glenn Randers-Pehrson | 6942d53 | 2000-05-01 09:31:54 -0500 | [diff] [blame] | 1988 | #if defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) && \ |
| 1989 | defined(PNG_READ_USER_TRANSFORM_SUPPORTED) |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 1990 | if (png_ptr->transformations & PNG_USER_TRANSFORM) |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1991 | { |
| 1992 | if (info_ptr->bit_depth < png_ptr->user_transform_depth) |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 1993 | info_ptr->bit_depth = png_ptr->user_transform_depth; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 1994 | |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1995 | if (info_ptr->channels < png_ptr->user_transform_channels) |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 1996 | info_ptr->channels = png_ptr->user_transform_channels; |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1997 | } |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 1998 | #endif |
| 1999 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2000 | info_ptr->pixel_depth = (png_byte)(info_ptr->channels * |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2001 | info_ptr->bit_depth); |
Glenn Randers-Pehrson | 272489d | 2004-08-04 06:34:52 -0500 | [diff] [blame] | 2002 | |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 2003 | 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] | 2004 | |
Glenn Randers-Pehrson | ef217b7 | 2011-06-15 12:58:27 -0500 | [diff] [blame] | 2005 | /* 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] | 2006 | * check in png_rowbytes that the user buffer won't get overwritten. Note |
| 2007 | * that the field is not always set - if png_read_update_info isn't called |
| 2008 | * the application has to either not do any transforms or get the calculation |
| 2009 | * right itself. |
| 2010 | */ |
| 2011 | png_ptr->info_rowbytes = info_ptr->rowbytes; |
| 2012 | |
Glenn Randers-Pehrson | b2aca21 | 2009-09-23 11:32:37 -0500 | [diff] [blame] | 2013 | #ifndef PNG_READ_EXPAND_SUPPORTED |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 2014 | if (png_ptr) |
Glenn Randers-Pehrson | 104622b | 2000-05-29 08:58:03 -0500 | [diff] [blame] | 2015 | return; |
| 2016 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2017 | } |
| 2018 | |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 2019 | /* Transform the row. The order of transformations is significant, |
| 2020 | * and is very touchy. If you add a transformation, take care to |
| 2021 | * decide how it fits in with the other transformations here. |
| 2022 | */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 2023 | void /* PRIVATE */ |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2024 | png_do_read_transformations(png_structp png_ptr, png_row_infop row_info) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2025 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 2026 | png_debug(1, "in png_do_read_transformations"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 2027 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2028 | if (png_ptr->row_buf == NULL) |
| 2029 | { |
Glenn Randers-Pehrson | ef217b7 | 2011-06-15 12:58:27 -0500 | [diff] [blame] | 2030 | /* Prior to 1.5.4 this output row/pass where the NULL pointer is, but this |
John Bowler | 88b77cc | 2011-05-05 06:49:55 -0500 | [diff] [blame] | 2031 | * error is incredibly rare and incredibly easy to debug without this |
| 2032 | * information. |
| 2033 | */ |
Glenn Randers-Pehrson | 70e3f54 | 1998-01-03 22:40:55 -0600 | [diff] [blame] | 2034 | png_error(png_ptr, "NULL row buffer"); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2035 | } |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 2036 | |
Glenn Randers-Pehrson | ef217b7 | 2011-06-15 12:58:27 -0500 | [diff] [blame] | 2037 | /* The following is debugging; prior to 1.5.4 the code was never compiled in; |
| 2038 | * in 1.5.4 PNG_FLAG_DETECT_UNINITIALIZED was added and the macro |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 2039 | * PNG_WARN_UNINITIALIZED_ROW removed. In 1.5 the new flag is set only for |
| 2040 | * selected new APIs to ensure that there is no API change. |
| 2041 | */ |
| 2042 | if ((png_ptr->flags & PNG_FLAG_DETECT_UNINITIALIZED) != 0 && |
| 2043 | !(png_ptr->flags & PNG_FLAG_ROW_INIT)) |
| 2044 | { |
| 2045 | /* Application has failed to call either png_read_start_image() or |
| 2046 | * png_read_update_info() after setting transforms that expand pixels. |
Glenn Randers-Pehrson | ef217b7 | 2011-06-15 12:58:27 -0500 | [diff] [blame] | 2047 | * This check added to libpng-1.2.19 (but not enabled until 1.5.4). |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 2048 | */ |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 2049 | png_error(png_ptr, "Uninitialized row"); |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 2050 | } |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 2051 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2052 | #ifdef PNG_READ_EXPAND_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2053 | if (png_ptr->transformations & PNG_EXPAND) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2054 | { |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2055 | if (row_info->color_type == PNG_COLOR_TYPE_PALETTE) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2056 | { |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2057 | png_do_expand_palette(row_info, png_ptr->row_buf + 1, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2058 | png_ptr->palette, png_ptr->trans_alpha, png_ptr->num_trans); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2059 | } |
Glenn Randers-Pehrson | c36bb79 | 2011-02-12 09:49:07 -0600 | [diff] [blame] | 2060 | |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 2061 | else |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2062 | { |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 2063 | if (png_ptr->num_trans && |
| 2064 | (png_ptr->transformations & PNG_EXPAND_tRNS)) |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2065 | png_do_expand(row_info, png_ptr->row_buf + 1, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2066 | &(png_ptr->trans_color)); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2067 | |
John Bowler | 4d56296 | 2011-02-12 09:01:20 -0600 | [diff] [blame] | 2068 | else |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2069 | png_do_expand(row_info, png_ptr->row_buf + 1, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2070 | NULL); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2071 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2072 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2073 | #endif |
| 2074 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2075 | #ifdef PNG_READ_STRIP_ALPHA_SUPPORTED |
John Bowler | 9b872f4 | 2011-02-12 09:00:16 -0600 | [diff] [blame] | 2076 | if ((png_ptr->transformations & PNG_STRIP_ALPHA) && |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 2077 | !(png_ptr->transformations & PNG_COMPOSE) && |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2078 | (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA || |
| 2079 | row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)) |
| 2080 | png_do_strip_channel(row_info, png_ptr->row_buf + 1, |
Glenn Randers-Pehrson | d2795b7 | 2011-04-16 19:41:23 -0500 | [diff] [blame] | 2081 | 0 /* at_start == false, because SWAP_ALPHA happens later */); |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2082 | #endif |
| 2083 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2084 | #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2085 | if (png_ptr->transformations & PNG_RGB_TO_GRAY) |
| 2086 | { |
| 2087 | int rgb_error = |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2088 | png_do_rgb_to_gray(png_ptr, row_info, |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2089 | png_ptr->row_buf + 1); |
| 2090 | |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 2091 | if (rgb_error) |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2092 | { |
| 2093 | png_ptr->rgb_to_gray_status=1; |
Glenn Randers-Pehrson | 79134c6 | 2009-02-14 10:32:18 -0600 | [diff] [blame] | 2094 | if ((png_ptr->transformations & PNG_RGB_TO_GRAY) == |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 2095 | PNG_RGB_TO_GRAY_WARN) |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2096 | png_warning(png_ptr, "png_do_rgb_to_gray found nongray pixel"); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2097 | |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 2098 | if ((png_ptr->transformations & PNG_RGB_TO_GRAY) == |
| 2099 | PNG_RGB_TO_GRAY_ERR) |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2100 | png_error(png_ptr, "png_do_rgb_to_gray found nongray pixel"); |
| 2101 | } |
| 2102 | } |
| 2103 | #endif |
| 2104 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 2105 | /* From Andreas Dilger e-mail to png-implement, 26 March 1998: |
Glenn Randers-Pehrson | d60c886 | 2009-06-15 21:56:14 -0500 | [diff] [blame] | 2106 | * |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 2107 | * In most cases, the "simple transparency" should be done prior to doing |
| 2108 | * gray-to-RGB, or you will have to test 3x as many bytes to check if a |
| 2109 | * pixel is transparent. You would also need to make sure that the |
| 2110 | * transparency information is upgraded to RGB. |
Glenn Randers-Pehrson | d60c886 | 2009-06-15 21:56:14 -0500 | [diff] [blame] | 2111 | * |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 2112 | * To summarize, the current flow is: |
| 2113 | * - Gray + simple transparency -> compare 1 or 2 gray bytes and composite |
| 2114 | * with background "in place" if transparent, |
| 2115 | * convert to RGB if necessary |
| 2116 | * - Gray + alpha -> composite with gray background and remove alpha bytes, |
| 2117 | * convert to RGB if necessary |
| 2118 | * |
| 2119 | * To support RGB backgrounds for gray images we need: |
| 2120 | * - Gray + simple transparency -> convert to RGB + simple transparency, |
| 2121 | * compare 3 or 6 bytes and composite with |
| 2122 | * background "in place" if transparent |
| 2123 | * (3x compare/pixel compared to doing |
| 2124 | * composite with gray bkgrnd) |
| 2125 | * - Gray + alpha -> convert to RGB + alpha, composite with background and |
| 2126 | * remove alpha bytes (3x float |
| 2127 | * operations/pixel compared with composite |
| 2128 | * on gray background) |
| 2129 | * |
| 2130 | * Greg's change will do this. The reason it wasn't done before is for |
| 2131 | * performance, as this increases the per-pixel operations. If we would check |
| 2132 | * in advance if the background was gray or RGB, and position the gray-to-RGB |
| 2133 | * transform appropriately, then it would save a lot of work/time. |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2134 | */ |
| 2135 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2136 | #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 2137 | /* If gray -> RGB, do so now only if background is non-gray; else do later |
| 2138 | * for performance reasons |
| 2139 | */ |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 2140 | if ((png_ptr->transformations & PNG_GRAY_TO_RGB) && |
Glenn Randers-Pehrson | 5379b24 | 1999-11-27 10:22:33 -0600 | [diff] [blame] | 2141 | !(png_ptr->mode & PNG_BACKGROUND_IS_GRAY)) |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2142 | png_do_gray_to_rgb(row_info, png_ptr->row_buf + 1); |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2143 | #endif |
| 2144 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 2145 | #if (defined PNG_READ_BACKGROUND_SUPPORTED) ||\ |
| 2146 | (defined PNG_READ_ALPHA_MODE_SUPPORTED) |
| 2147 | if (png_ptr->transformations & PNG_COMPOSE) |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2148 | png_do_compose(row_info, png_ptr->row_buf + 1, png_ptr); |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2149 | #endif |
| 2150 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2151 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2152 | if ((png_ptr->transformations & PNG_GAMMA) && |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 2153 | #if (defined PNG_READ_BACKGROUND_SUPPORTED) ||\ |
| 2154 | (defined PNG_READ_ALPHA_MODE_SUPPORTED) |
| 2155 | !((png_ptr->transformations & PNG_COMPOSE) && |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 2156 | ((png_ptr->num_trans != 0) || |
| 2157 | (png_ptr->color_type & PNG_COLOR_MASK_ALPHA))) && |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 2158 | #endif |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 2159 | (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE)) |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2160 | png_do_gamma(row_info, png_ptr->row_buf + 1, png_ptr); |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2161 | #endif |
| 2162 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 2163 | #ifdef PNG_READ_STRIP_ALPHA_SUPPORTED |
| 2164 | if ((png_ptr->transformations & PNG_STRIP_ALPHA) && |
| 2165 | (png_ptr->transformations & PNG_COMPOSE) && |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2166 | (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA || |
| 2167 | row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)) |
| 2168 | png_do_strip_channel(row_info, png_ptr->row_buf + 1, |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 2169 | 0 /* at_start == false, because SWAP_ALPHA happens later */); |
| 2170 | #endif |
| 2171 | |
| 2172 | #ifdef PNG_READ_ALPHA_MODE_SUPPORTED |
| 2173 | if ((png_ptr->transformations & PNG_ENCODE_ALPHA) && |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2174 | (row_info->color_type & PNG_COLOR_MASK_ALPHA)) |
| 2175 | png_do_encode_alpha(row_info, png_ptr->row_buf + 1, png_ptr); |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 2176 | #endif |
| 2177 | |
Glenn Randers-Pehrson | e6a8060 | 2011-06-17 22:28:23 -0500 | [diff] [blame] | 2178 | #ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED |
Glenn Randers-Pehrson | aee83b4 | 2011-06-18 00:19:54 -0500 | [diff] [blame] | 2179 | if (png_ptr->transformations & PNG_SCALE_16_TO_8) |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2180 | png_do_scale_16_to_8(row_info, png_ptr->row_buf + 1); |
Glenn Randers-Pehrson | e6a8060 | 2011-06-17 22:28:23 -0500 | [diff] [blame] | 2181 | #endif |
John Bowler | 8d26126 | 2011-06-18 13:37:11 -0500 | [diff] [blame] | 2182 | |
Glenn Randers-Pehrson | e6a8060 | 2011-06-17 22:28:23 -0500 | [diff] [blame] | 2183 | #ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED |
John Bowler | 8d26126 | 2011-06-18 13:37:11 -0500 | [diff] [blame] | 2184 | /* There is no harm in doing both of these because only one has any effect, |
| 2185 | * by putting the 'scale' option first if the app asks for scale (either by |
| 2186 | * calling the API or in a TRANSFORM flag) this is what happens. |
| 2187 | */ |
Glenn Randers-Pehrson | e6a8060 | 2011-06-17 22:28:23 -0500 | [diff] [blame] | 2188 | if (png_ptr->transformations & PNG_16_TO_8) |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2189 | png_do_chop(row_info, png_ptr->row_buf + 1); |
Glenn Randers-Pehrson | 7a59e1e | 2009-12-11 07:57:36 -0600 | [diff] [blame] | 2190 | #endif |
| 2191 | |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 2192 | #ifdef PNG_READ_QUANTIZE_SUPPORTED |
| 2193 | if (png_ptr->transformations & PNG_QUANTIZE) |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2194 | { |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2195 | png_do_quantize(row_info, png_ptr->row_buf + 1, |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 2196 | png_ptr->palette_lookup, png_ptr->quantize_index); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2197 | |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2198 | if (row_info->rowbytes == 0) |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 2199 | png_error(png_ptr, "png_do_quantize returned rowbytes=0"); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2200 | } |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 2201 | #endif /* PNG_READ_QUANTIZE_SUPPORTED */ |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2202 | |
John Bowler | 4d56296 | 2011-02-12 09:01:20 -0600 | [diff] [blame] | 2203 | #ifdef PNG_READ_EXPAND_16_SUPPORTED |
| 2204 | /* Do the expansion now, after all the arithmetic has been done. Notice |
| 2205 | * that previous transformations can handle the PNG_EXPAND_16 flag if this |
| 2206 | * is efficient (particularly true in the case of gamma correction, where |
| 2207 | * better accuracy results faster!) |
| 2208 | */ |
| 2209 | if (png_ptr->transformations & PNG_EXPAND_16) |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2210 | png_do_expand_16(row_info, png_ptr->row_buf + 1); |
John Bowler | 4d56296 | 2011-02-12 09:01:20 -0600 | [diff] [blame] | 2211 | #endif |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 2212 | |
| 2213 | #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED |
Glenn Randers-Pehrson | ef217b7 | 2011-06-15 12:58:27 -0500 | [diff] [blame] | 2214 | /*NOTE: moved here in 1.5.4 (from much later in this list.) */ |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 2215 | if ((png_ptr->transformations & PNG_GRAY_TO_RGB) && |
| 2216 | (png_ptr->mode & PNG_BACKGROUND_IS_GRAY)) |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2217 | png_do_gray_to_rgb(row_info, png_ptr->row_buf + 1); |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 2218 | #endif |
John Bowler | 4d56296 | 2011-02-12 09:01:20 -0600 | [diff] [blame] | 2219 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2220 | #ifdef PNG_READ_INVERT_SUPPORTED |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2221 | if (png_ptr->transformations & PNG_INVERT_MONO) |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2222 | png_do_invert(row_info, png_ptr->row_buf + 1); |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2223 | #endif |
| 2224 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2225 | #ifdef PNG_READ_SHIFT_SUPPORTED |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2226 | if (png_ptr->transformations & PNG_SHIFT) |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2227 | png_do_unshift(row_info, png_ptr->row_buf + 1, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2228 | &(png_ptr->shift)); |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2229 | #endif |
| 2230 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2231 | #ifdef PNG_READ_PACK_SUPPORTED |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2232 | if (png_ptr->transformations & PNG_PACK) |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2233 | png_do_unpack(row_info, png_ptr->row_buf + 1); |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2234 | #endif |
| 2235 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2236 | #ifdef PNG_READ_BGR_SUPPORTED |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2237 | if (png_ptr->transformations & PNG_BGR) |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2238 | png_do_bgr(row_info, png_ptr->row_buf + 1); |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2239 | #endif |
| 2240 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2241 | #ifdef PNG_READ_PACKSWAP_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2242 | if (png_ptr->transformations & PNG_PACKSWAP) |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2243 | png_do_packswap(row_info, png_ptr->row_buf + 1); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2244 | #endif |
| 2245 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2246 | #ifdef PNG_READ_FILLER_SUPPORTED |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2247 | if (png_ptr->transformations & PNG_FILLER) |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2248 | png_do_read_filler(row_info, png_ptr->row_buf + 1, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2249 | (png_uint_32)png_ptr->filler, png_ptr->flags); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2250 | #endif |
| 2251 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2252 | #ifdef PNG_READ_INVERT_ALPHA_SUPPORTED |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 2253 | if (png_ptr->transformations & PNG_INVERT_ALPHA) |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2254 | png_do_read_invert_alpha(row_info, png_ptr->row_buf + 1); |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 2255 | #endif |
| 2256 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2257 | #ifdef PNG_READ_SWAP_ALPHA_SUPPORTED |
Glenn Randers-Pehrson | cbe52d8 | 1998-02-28 07:00:24 -0600 | [diff] [blame] | 2258 | if (png_ptr->transformations & PNG_SWAP_ALPHA) |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2259 | png_do_read_swap_alpha(row_info, png_ptr->row_buf + 1); |
Glenn Randers-Pehrson | cbe52d8 | 1998-02-28 07:00:24 -0600 | [diff] [blame] | 2260 | #endif |
| 2261 | |
Glenn Randers-Pehrson | 925d23b | 2010-08-26 21:43:18 -0500 | [diff] [blame] | 2262 | #ifdef PNG_READ_16BIT_SUPPORTED |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2263 | #ifdef PNG_READ_SWAP_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2264 | if (png_ptr->transformations & PNG_SWAP_BYTES) |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2265 | png_do_swap(row_info, png_ptr->row_buf + 1); |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2266 | #endif |
Glenn Randers-Pehrson | 925d23b | 2010-08-26 21:43:18 -0500 | [diff] [blame] | 2267 | #endif |
Glenn Randers-Pehrson | 08a3343 | 1998-03-07 06:06:55 -0600 | [diff] [blame] | 2268 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2269 | #ifdef PNG_READ_USER_TRANSFORM_SUPPORTED |
Glenn Randers-Pehrson | 08a3343 | 1998-03-07 06:06:55 -0600 | [diff] [blame] | 2270 | if (png_ptr->transformations & PNG_USER_TRANSFORM) |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 2271 | { |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 2272 | if (png_ptr->read_user_transform_fn != NULL) |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 2273 | (*(png_ptr->read_user_transform_fn)) /* User read transform function */ |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2274 | (png_ptr, /* png_ptr */ |
| 2275 | row_info, /* row_info: */ |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2276 | /* png_uint_32 width; width of row */ |
Glenn Randers-Pehrson | bcb3aac | 2010-09-10 22:05:27 -0500 | [diff] [blame] | 2277 | /* png_size_t rowbytes; number of bytes in row */ |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2278 | /* png_byte color_type; color type of pixels */ |
| 2279 | /* png_byte bit_depth; bit depth of samples */ |
| 2280 | /* png_byte channels; number of channels (1-4) */ |
| 2281 | /* png_byte pixel_depth; bits per pixel (depth*channels) */ |
| 2282 | png_ptr->row_buf + 1); /* start of pixel data for row */ |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2283 | #ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 2284 | if (png_ptr->user_transform_depth) |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2285 | row_info->bit_depth = png_ptr->user_transform_depth; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2286 | |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 2287 | if (png_ptr->user_transform_channels) |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2288 | row_info->channels = png_ptr->user_transform_channels; |
Glenn Randers-Pehrson | 6942d53 | 2000-05-01 09:31:54 -0500 | [diff] [blame] | 2289 | #endif |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2290 | row_info->pixel_depth = (png_byte)(row_info->bit_depth * |
| 2291 | row_info->channels); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2292 | |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2293 | row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_info->width); |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 2294 | } |
Glenn Randers-Pehrson | 08a3343 | 1998-03-07 06:06:55 -0600 | [diff] [blame] | 2295 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2296 | } |
| 2297 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2298 | #ifdef PNG_READ_PACK_SUPPORTED |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 2299 | /* Unpack pixels of 1, 2, or 4 bits per pixel into 1 byte per pixel, |
| 2300 | * without changing the actual values. Thus, if you had a row with |
| 2301 | * a bit depth of 1, you would end up with bytes that only contained |
| 2302 | * the numbers 0 or 1. If you would rather they contain 0 and 255, use |
| 2303 | * png_do_shift() after this. |
| 2304 | */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 2305 | void /* PRIVATE */ |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 2306 | png_do_unpack(png_row_infop row_info, png_bytep row) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2307 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 2308 | png_debug(1, "in png_do_unpack"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 2309 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2310 | if (row_info->bit_depth < 8) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2311 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2312 | png_uint_32 i; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2313 | png_uint_32 row_width=row_info->width; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2314 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2315 | switch (row_info->bit_depth) |
| 2316 | { |
| 2317 | case 1: |
| 2318 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2319 | png_bytep sp = row + (png_size_t)((row_width - 1) >> 3); |
| 2320 | png_bytep dp = row + (png_size_t)row_width - 1; |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 2321 | png_uint_32 shift = 7 - (int)((row_width + 7) & 0x07); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2322 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2323 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 2324 | *dp = (png_byte)((*sp >> shift) & 0x01); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2325 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2326 | if (shift == 7) |
| 2327 | { |
| 2328 | shift = 0; |
| 2329 | sp--; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2330 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2331 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2332 | else |
| 2333 | shift++; |
| 2334 | |
| 2335 | dp--; |
| 2336 | } |
| 2337 | break; |
| 2338 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 2339 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2340 | case 2: |
| 2341 | { |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2342 | |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2343 | png_bytep sp = row + (png_size_t)((row_width - 1) >> 2); |
| 2344 | png_bytep dp = row + (png_size_t)row_width - 1; |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 2345 | png_uint_32 shift = (int)((3 - ((row_width + 3) & 0x03)) << 1); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2346 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2347 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 2348 | *dp = (png_byte)((*sp >> shift) & 0x03); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2349 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2350 | if (shift == 6) |
| 2351 | { |
| 2352 | shift = 0; |
| 2353 | sp--; |
| 2354 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2355 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2356 | else |
| 2357 | shift += 2; |
| 2358 | |
| 2359 | dp--; |
| 2360 | } |
| 2361 | break; |
| 2362 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 2363 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2364 | case 4: |
| 2365 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2366 | png_bytep sp = row + (png_size_t)((row_width - 1) >> 1); |
| 2367 | png_bytep dp = row + (png_size_t)row_width - 1; |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 2368 | png_uint_32 shift = (int)((1 - ((row_width + 1) & 0x01)) << 2); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2369 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2370 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 2371 | *dp = (png_byte)((*sp >> shift) & 0x0f); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2372 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2373 | if (shift == 4) |
| 2374 | { |
| 2375 | shift = 0; |
| 2376 | sp--; |
| 2377 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2378 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2379 | else |
| 2380 | shift = 4; |
| 2381 | |
| 2382 | dp--; |
| 2383 | } |
| 2384 | break; |
| 2385 | } |
Glenn Randers-Pehrson | b3edc73 | 2010-11-21 14:06:41 -0600 | [diff] [blame] | 2386 | |
| 2387 | default: |
| 2388 | break; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2389 | } |
| 2390 | row_info->bit_depth = 8; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2391 | row_info->pixel_depth = (png_byte)(8 * row_info->channels); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2392 | row_info->rowbytes = row_width * row_info->channels; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2393 | } |
| 2394 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2395 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2396 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2397 | #ifdef PNG_READ_SHIFT_SUPPORTED |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 2398 | /* Reverse the effects of png_do_shift. This routine merely shifts the |
| 2399 | * pixels back to their significant bits values. Thus, if you have |
| 2400 | * a row of bit depth 8, but only 5 are significant, this will shift |
| 2401 | * the values back to 0 through 31. |
| 2402 | */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 2403 | void /* PRIVATE */ |
Glenn Randers-Pehrson | e600c51 | 2010-08-18 07:25:46 -0500 | [diff] [blame] | 2404 | png_do_unshift(png_row_infop row_info, png_bytep row, |
| 2405 | png_const_color_8p sig_bits) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2406 | { |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2407 | int color_type; |
| 2408 | |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 2409 | png_debug(1, "in png_do_unshift"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 2410 | |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2411 | /* The palette case has already been handled in the _init routine. */ |
| 2412 | color_type = row_info->color_type; |
| 2413 | |
| 2414 | if (color_type != PNG_COLOR_TYPE_PALETTE) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2415 | { |
| 2416 | int shift[4]; |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2417 | int channels = 0; |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2418 | int bit_depth = row_info->bit_depth; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2419 | |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2420 | if (color_type & PNG_COLOR_MASK_COLOR) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2421 | { |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2422 | shift[channels++] = bit_depth - sig_bits->red; |
| 2423 | shift[channels++] = bit_depth - sig_bits->green; |
| 2424 | shift[channels++] = bit_depth - sig_bits->blue; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2425 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2426 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2427 | else |
| 2428 | { |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2429 | shift[channels++] = bit_depth - sig_bits->gray; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2430 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2431 | |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2432 | if (color_type & PNG_COLOR_MASK_ALPHA) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2433 | { |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2434 | shift[channels++] = bit_depth - sig_bits->alpha; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2435 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2436 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2437 | { |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2438 | int c, have_shift; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2439 | |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2440 | for (c = have_shift = 0; c < channels; ++c) |
| 2441 | { |
| 2442 | /* A shift of more than the bit depth is an error condition but it |
| 2443 | * gets ignored here. |
| 2444 | */ |
| 2445 | if (shift[c] <= 0 || shift[c] >= bit_depth) |
| 2446 | shift[c] = 0; |
| 2447 | |
| 2448 | else |
| 2449 | have_shift = 1; |
| 2450 | } |
| 2451 | |
| 2452 | if (!have_shift) |
| 2453 | return; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2454 | } |
Guy Schalnat | 0f71645 | 1995-11-28 11:22:13 -0600 | [diff] [blame] | 2455 | |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2456 | switch (bit_depth) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2457 | { |
Glenn Randers-Pehrson | b3edc73 | 2010-11-21 14:06:41 -0600 | [diff] [blame] | 2458 | default: |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2459 | /* Must be 1bpp gray: should not be here! */ |
| 2460 | /* NOTREACHED */ |
Glenn Randers-Pehrson | c36bb79 | 2011-02-12 09:49:07 -0600 | [diff] [blame] | 2461 | break; |
Glenn Randers-Pehrson | b3edc73 | 2010-11-21 14:06:41 -0600 | [diff] [blame] | 2462 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2463 | case 2: |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2464 | /* Must be 2bpp gray */ |
| 2465 | /* assert(channels == 1 && shift[0] == 1) */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2466 | { |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2467 | png_bytep bp = row; |
| 2468 | png_bytep bp_end = bp + row_info->rowbytes; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2469 | |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2470 | while (bp < bp_end) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2471 | { |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2472 | int byte = (*bp >> 1) & 0x55; |
| 2473 | *bp++ = (png_byte)byte; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2474 | } |
| 2475 | break; |
| 2476 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 2477 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2478 | case 4: |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2479 | /* Must be 4bpp gray */ |
| 2480 | /* assert(channels == 1) */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2481 | { |
Glenn Randers-Pehrson | 8686fff | 1998-05-21 09:27:50 -0500 | [diff] [blame] | 2482 | png_bytep bp = row; |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2483 | png_bytep bp_end = bp + row_info->rowbytes; |
| 2484 | int gray_shift = shift[0]; |
| 2485 | int mask = 0xf >> gray_shift; |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2486 | |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2487 | mask |= mask << 4; |
| 2488 | |
| 2489 | while (bp < bp_end) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2490 | { |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2491 | int byte = (*bp >> gray_shift) & mask; |
| 2492 | *bp++ = (png_byte)byte; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2493 | } |
| 2494 | break; |
| 2495 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 2496 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2497 | case 8: |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2498 | /* Single byte components, G, GA, RGB, RGBA */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2499 | { |
Glenn Randers-Pehrson | d0dce40 | 1998-05-09 10:02:29 -0500 | [diff] [blame] | 2500 | png_bytep bp = row; |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2501 | png_bytep bp_end = bp + row_info->rowbytes; |
| 2502 | int channel = 0; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2503 | |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2504 | while (bp < bp_end) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2505 | { |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2506 | int byte = *bp >> shift[channel]; |
| 2507 | if (++channel >= channels) |
| 2508 | channel = 0; |
| 2509 | *bp++ = (png_byte)byte; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2510 | } |
| 2511 | break; |
| 2512 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 2513 | |
Glenn Randers-Pehrson | 925d23b | 2010-08-26 21:43:18 -0500 | [diff] [blame] | 2514 | #ifdef PNG_READ_16BIT_SUPPORTED |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2515 | case 16: |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2516 | /* Double byte components, G, GA, RGB, RGBA */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2517 | { |
Glenn Randers-Pehrson | d0dce40 | 1998-05-09 10:02:29 -0500 | [diff] [blame] | 2518 | png_bytep bp = row; |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2519 | png_bytep bp_end = bp + row_info->rowbytes; |
| 2520 | int channel = 0; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2521 | |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2522 | while (bp < bp_end) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2523 | { |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 2524 | int value = (bp[0] << 8) + bp[1]; |
| 2525 | |
| 2526 | value >>= shift[channel]; |
| 2527 | if (++channel >= channels) |
| 2528 | channel = 0; |
Glenn Randers-Pehrson | d0dce40 | 1998-05-09 10:02:29 -0500 | [diff] [blame] | 2529 | *bp++ = (png_byte)(value >> 8); |
| 2530 | *bp++ = (png_byte)(value & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2531 | } |
| 2532 | break; |
| 2533 | } |
Glenn Randers-Pehrson | 925d23b | 2010-08-26 21:43:18 -0500 | [diff] [blame] | 2534 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2535 | } |
| 2536 | } |
| 2537 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2538 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2539 | |
Glenn Randers-Pehrson | e6a8060 | 2011-06-17 22:28:23 -0500 | [diff] [blame] | 2540 | #ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED |
Glenn Randers-Pehrson | 413138a | 2011-06-13 22:07:37 -0500 | [diff] [blame] | 2541 | /* Scale rows of bit depth 16 down to 8 accurately */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 2542 | void /* PRIVATE */ |
Glenn Randers-Pehrson | 413138a | 2011-06-13 22:07:37 -0500 | [diff] [blame] | 2543 | 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] | 2544 | { |
Glenn Randers-Pehrson | 413138a | 2011-06-13 22:07:37 -0500 | [diff] [blame] | 2545 | png_debug(1, "in png_do_scale_16_to_8"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 2546 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2547 | if (row_info->bit_depth == 16) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2548 | { |
John Bowler | b2bee33 | 2011-06-10 23:24:58 -0500 | [diff] [blame] | 2549 | png_bytep sp = row; /* source */ |
| 2550 | png_bytep dp = row; /* destinaton */ |
| 2551 | png_bytep ep = sp + row_info->rowbytes; /* end+1 */ |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2552 | |
John Bowler | b2bee33 | 2011-06-10 23:24:58 -0500 | [diff] [blame] | 2553 | while (sp < ep) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2554 | { |
John Bowler | b2bee33 | 2011-06-10 23:24:58 -0500 | [diff] [blame] | 2555 | /* The input is an array of 16 bit components, these must be scaled to |
| 2556 | * 8 bits each. For a 16 bit value V the required value (from the PNG |
| 2557 | * specification) is: |
| 2558 | * |
| 2559 | * (V * 255) / 65535 |
| 2560 | * |
| 2561 | * This reduces to round(V / 257), or floor((V + 128.5)/257) |
| 2562 | * |
| 2563 | * Represent V as the two byte value vhi.vlo. Make a guess that the |
| 2564 | * result is the top byte of V, vhi, then the correction to this value |
| 2565 | * is: |
| 2566 | * |
| 2567 | * error = floor(((V-vhi.vhi) + 128.5) / 257) |
| 2568 | * = floor(((vlo-vhi) + 128.5) / 257) |
| 2569 | * |
| 2570 | * This can be approximated using integer arithmetic (and a signed |
| 2571 | * shift): |
| 2572 | * |
| 2573 | * error = (vlo-vhi+128) >> 8; |
| 2574 | * |
| 2575 | * The approximate differs from the exact answer only when (vlo-vhi) is |
| 2576 | * 128; it then gives a correction of +1 when the exact correction is |
| 2577 | * 0. This gives 128 errors. The exact answer (correct for all 16 bit |
| 2578 | * input values) is: |
| 2579 | * |
| 2580 | * error = (vlo-vhi+128)*65535 >> 24; |
| 2581 | * |
| 2582 | * An alternative arithmetic calculation which also gives no errors is: |
| 2583 | * |
| 2584 | * (V * 255 + 32895) >> 16 |
| 2585 | */ |
Glenn Randers-Pehrson | 141d9e3 | 2011-06-13 11:47:00 -0500 | [diff] [blame] | 2586 | |
John Bowler | b2bee33 | 2011-06-10 23:24:58 -0500 | [diff] [blame] | 2587 | png_int_32 tmp = *sp++; /* must be signed! */ |
| 2588 | tmp += (((int)*sp++ - tmp + 128) * 65535) >> 24; |
John Bowler | 74945f2 | 2011-06-13 20:50:42 -0500 | [diff] [blame] | 2589 | *dp++ = (png_byte)tmp; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2590 | } |
John Bowler | b2bee33 | 2011-06-10 23:24:58 -0500 | [diff] [blame] | 2591 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2592 | row_info->bit_depth = 8; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2593 | row_info->pixel_depth = (png_byte)(8 * row_info->channels); |
Glenn Randers-Pehrson | 0f881d6 | 1998-02-07 10:20:57 -0600 | [diff] [blame] | 2594 | row_info->rowbytes = row_info->width * row_info->channels; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2595 | } |
| 2596 | } |
Glenn Randers-Pehrson | e6a8060 | 2011-06-17 22:28:23 -0500 | [diff] [blame] | 2597 | #endif |
Glenn Randers-Pehrson | 413138a | 2011-06-13 22:07:37 -0500 | [diff] [blame] | 2598 | |
Glenn Randers-Pehrson | e6a8060 | 2011-06-17 22:28:23 -0500 | [diff] [blame] | 2599 | #ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED |
Glenn Randers-Pehrson | 413138a | 2011-06-13 22:07:37 -0500 | [diff] [blame] | 2600 | void /* PRIVATE */ |
| 2601 | /* Simply discard the low byte. This was the default behavior prior |
| 2602 | * to libpng-1.5.4. |
| 2603 | */ |
| 2604 | png_do_chop(png_row_infop row_info, png_bytep row) |
| 2605 | { |
| 2606 | png_debug(1, "in png_do_chop"); |
| 2607 | |
| 2608 | if (row_info->bit_depth == 16) |
| 2609 | { |
| 2610 | png_bytep sp = row; /* source */ |
| 2611 | png_bytep dp = row; /* destinaton */ |
| 2612 | png_bytep ep = sp + row_info->rowbytes; /* end+1 */ |
| 2613 | |
| 2614 | while (sp < ep) |
| 2615 | { |
John Bowler | 8d26126 | 2011-06-18 13:37:11 -0500 | [diff] [blame] | 2616 | *dp++ = *sp; |
| 2617 | sp += 2; /* skip low byte */ |
Glenn Randers-Pehrson | 413138a | 2011-06-13 22:07:37 -0500 | [diff] [blame] | 2618 | } |
| 2619 | |
| 2620 | row_info->bit_depth = 8; |
| 2621 | row_info->pixel_depth = (png_byte)(8 * row_info->channels); |
| 2622 | row_info->rowbytes = row_info->width * row_info->channels; |
| 2623 | } |
| 2624 | } |
Glenn Randers-Pehrson | e6a8060 | 2011-06-17 22:28:23 -0500 | [diff] [blame] | 2625 | #endif |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2626 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2627 | #ifdef PNG_READ_SWAP_ALPHA_SUPPORTED |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 2628 | void /* PRIVATE */ |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2629 | png_do_read_swap_alpha(png_row_infop row_info, png_bytep row) |
| 2630 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 2631 | png_debug(1, "in png_do_read_swap_alpha"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 2632 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2633 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2634 | png_uint_32 row_width = row_info->width; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2635 | if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA) |
| 2636 | { |
| 2637 | /* This converts from RGBA to ARGB */ |
| 2638 | if (row_info->bit_depth == 8) |
| 2639 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2640 | png_bytep sp = row + row_info->rowbytes; |
| 2641 | png_bytep dp = sp; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2642 | png_byte save; |
| 2643 | png_uint_32 i; |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2644 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2645 | for (i = 0; i < row_width; i++) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2646 | { |
| 2647 | save = *(--sp); |
| 2648 | *(--dp) = *(--sp); |
| 2649 | *(--dp) = *(--sp); |
| 2650 | *(--dp) = *(--sp); |
| 2651 | *(--dp) = save; |
| 2652 | } |
| 2653 | } |
Glenn Randers-Pehrson | 925d23b | 2010-08-26 21:43:18 -0500 | [diff] [blame] | 2654 | |
| 2655 | #ifdef PNG_READ_16BIT_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2656 | /* This converts from RRGGBBAA to AARRGGBB */ |
| 2657 | else |
| 2658 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2659 | png_bytep sp = row + row_info->rowbytes; |
| 2660 | png_bytep dp = sp; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2661 | png_byte save[2]; |
| 2662 | png_uint_32 i; |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2663 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2664 | for (i = 0; i < row_width; i++) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2665 | { |
| 2666 | save[0] = *(--sp); |
| 2667 | save[1] = *(--sp); |
| 2668 | *(--dp) = *(--sp); |
| 2669 | *(--dp) = *(--sp); |
| 2670 | *(--dp) = *(--sp); |
| 2671 | *(--dp) = *(--sp); |
| 2672 | *(--dp) = *(--sp); |
| 2673 | *(--dp) = *(--sp); |
| 2674 | *(--dp) = save[0]; |
| 2675 | *(--dp) = save[1]; |
| 2676 | } |
| 2677 | } |
Glenn Randers-Pehrson | 925d23b | 2010-08-26 21:43:18 -0500 | [diff] [blame] | 2678 | #endif |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2679 | } |
Glenn Randers-Pehrson | 925d23b | 2010-08-26 21:43:18 -0500 | [diff] [blame] | 2680 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2681 | else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) |
| 2682 | { |
| 2683 | /* This converts from GA to AG */ |
| 2684 | if (row_info->bit_depth == 8) |
| 2685 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2686 | png_bytep sp = row + row_info->rowbytes; |
| 2687 | png_bytep dp = sp; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2688 | png_byte save; |
| 2689 | png_uint_32 i; |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2690 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2691 | for (i = 0; i < row_width; i++) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2692 | { |
| 2693 | save = *(--sp); |
| 2694 | *(--dp) = *(--sp); |
| 2695 | *(--dp) = save; |
| 2696 | } |
| 2697 | } |
Glenn Randers-Pehrson | 925d23b | 2010-08-26 21:43:18 -0500 | [diff] [blame] | 2698 | |
| 2699 | #ifdef PNG_READ_16BIT_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2700 | /* This converts from GGAA to AAGG */ |
| 2701 | else |
| 2702 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2703 | png_bytep sp = row + row_info->rowbytes; |
| 2704 | png_bytep dp = sp; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2705 | png_byte save[2]; |
| 2706 | png_uint_32 i; |
| 2707 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2708 | for (i = 0; i < row_width; i++) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2709 | { |
| 2710 | save[0] = *(--sp); |
| 2711 | save[1] = *(--sp); |
| 2712 | *(--dp) = *(--sp); |
| 2713 | *(--dp) = *(--sp); |
| 2714 | *(--dp) = save[0]; |
| 2715 | *(--dp) = save[1]; |
| 2716 | } |
| 2717 | } |
Glenn Randers-Pehrson | 925d23b | 2010-08-26 21:43:18 -0500 | [diff] [blame] | 2718 | #endif |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2719 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2720 | } |
| 2721 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2722 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2723 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2724 | #ifdef PNG_READ_INVERT_ALPHA_SUPPORTED |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 2725 | void /* PRIVATE */ |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 2726 | png_do_read_invert_alpha(png_row_infop row_info, png_bytep row) |
| 2727 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2728 | png_uint_32 row_width; |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 2729 | png_debug(1, "in png_do_read_invert_alpha"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 2730 | |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2731 | row_width = row_info->width; |
| 2732 | if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA) |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 2733 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2734 | if (row_info->bit_depth == 8) |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 2735 | { |
| 2736 | /* This inverts the alpha channel in RGBA */ |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2737 | png_bytep sp = row + row_info->rowbytes; |
| 2738 | png_bytep dp = sp; |
| 2739 | png_uint_32 i; |
| 2740 | |
| 2741 | for (i = 0; i < row_width; i++) |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 2742 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2743 | *(--dp) = (png_byte)(255 - *(--sp)); |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 2744 | |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2745 | /* This does nothing: |
| 2746 | *(--dp) = *(--sp); |
| 2747 | *(--dp) = *(--sp); |
| 2748 | *(--dp) = *(--sp); |
| 2749 | We can replace it with: |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 2750 | */ |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2751 | sp-=3; |
| 2752 | dp=sp; |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 2753 | } |
| 2754 | } |
Glenn Randers-Pehrson | 925d23b | 2010-08-26 21:43:18 -0500 | [diff] [blame] | 2755 | |
| 2756 | #ifdef PNG_READ_16BIT_SUPPORTED |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2757 | /* This inverts the alpha channel in RRGGBBAA */ |
| 2758 | else |
| 2759 | { |
| 2760 | png_bytep sp = row + row_info->rowbytes; |
| 2761 | png_bytep dp = sp; |
| 2762 | png_uint_32 i; |
| 2763 | |
| 2764 | for (i = 0; i < row_width; i++) |
| 2765 | { |
| 2766 | *(--dp) = (png_byte)(255 - *(--sp)); |
| 2767 | *(--dp) = (png_byte)(255 - *(--sp)); |
| 2768 | |
| 2769 | /* This does nothing: |
| 2770 | *(--dp) = *(--sp); |
| 2771 | *(--dp) = *(--sp); |
| 2772 | *(--dp) = *(--sp); |
| 2773 | *(--dp) = *(--sp); |
| 2774 | *(--dp) = *(--sp); |
| 2775 | *(--dp) = *(--sp); |
| 2776 | We can replace it with: |
| 2777 | */ |
| 2778 | sp-=6; |
| 2779 | dp=sp; |
| 2780 | } |
| 2781 | } |
Glenn Randers-Pehrson | 925d23b | 2010-08-26 21:43:18 -0500 | [diff] [blame] | 2782 | #endif |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2783 | } |
| 2784 | else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) |
| 2785 | { |
| 2786 | if (row_info->bit_depth == 8) |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 2787 | { |
Glenn Randers-Pehrson | cbe52d8 | 1998-02-28 07:00:24 -0600 | [diff] [blame] | 2788 | /* This inverts the alpha channel in GA */ |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2789 | png_bytep sp = row + row_info->rowbytes; |
| 2790 | png_bytep dp = sp; |
| 2791 | png_uint_32 i; |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 2792 | |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2793 | for (i = 0; i < row_width; i++) |
| 2794 | { |
| 2795 | *(--dp) = (png_byte)(255 - *(--sp)); |
| 2796 | *(--dp) = *(--sp); |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 2797 | } |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2798 | } |
Glenn Randers-Pehrson | 925d23b | 2010-08-26 21:43:18 -0500 | [diff] [blame] | 2799 | |
| 2800 | #ifdef PNG_READ_16BIT_SUPPORTED |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2801 | else |
| 2802 | { |
Glenn Randers-Pehrson | cbe52d8 | 1998-02-28 07:00:24 -0600 | [diff] [blame] | 2803 | /* This inverts the alpha channel in GGAA */ |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2804 | png_bytep sp = row + row_info->rowbytes; |
| 2805 | png_bytep dp = sp; |
| 2806 | png_uint_32 i; |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 2807 | |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2808 | for (i = 0; i < row_width; i++) |
| 2809 | { |
| 2810 | *(--dp) = (png_byte)(255 - *(--sp)); |
| 2811 | *(--dp) = (png_byte)(255 - *(--sp)); |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 2812 | /* |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2813 | *(--dp) = *(--sp); |
| 2814 | *(--dp) = *(--sp); |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 2815 | */ |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2816 | sp-=2; |
| 2817 | dp=sp; |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 2818 | } |
| 2819 | } |
Glenn Randers-Pehrson | 925d23b | 2010-08-26 21:43:18 -0500 | [diff] [blame] | 2820 | #endif |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 2821 | } |
| 2822 | } |
| 2823 | #endif |
| 2824 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2825 | #ifdef PNG_READ_FILLER_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2826 | /* Add filler channel if we have RGB color */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 2827 | void /* PRIVATE */ |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 2828 | 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] | 2829 | png_uint_32 filler, png_uint_32 flags) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2830 | { |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2831 | png_uint_32 i; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2832 | png_uint_32 row_width = row_info->width; |
| 2833 | |
Glenn Randers-Pehrson | 4554a54 | 2010-08-27 10:48:45 -0500 | [diff] [blame] | 2834 | #ifdef PNG_READ_16BIT_SUPPORTED |
Glenn Randers-Pehrson | d0dce40 | 1998-05-09 10:02:29 -0500 | [diff] [blame] | 2835 | png_byte hi_filler = (png_byte)((filler>>8) & 0xff); |
Glenn Randers-Pehrson | 4554a54 | 2010-08-27 10:48:45 -0500 | [diff] [blame] | 2836 | #endif |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2837 | png_byte lo_filler = (png_byte)(filler & 0xff); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2838 | |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 2839 | png_debug(1, "in png_do_read_filler"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 2840 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2841 | if ( |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2842 | row_info->color_type == PNG_COLOR_TYPE_GRAY) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2843 | { |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 2844 | if (row_info->bit_depth == 8) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2845 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2846 | if (flags & PNG_FLAG_FILLER_AFTER) |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2847 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2848 | /* This changes the data from G to GX */ |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2849 | png_bytep sp = row + (png_size_t)row_width; |
| 2850 | png_bytep dp = sp + (png_size_t)row_width; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2851 | for (i = 1; i < row_width; i++) |
| 2852 | { |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2853 | *(--dp) = lo_filler; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2854 | *(--dp) = *(--sp); |
| 2855 | } |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2856 | *(--dp) = lo_filler; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2857 | row_info->channels = 2; |
| 2858 | row_info->pixel_depth = 16; |
| 2859 | row_info->rowbytes = row_width * 2; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2860 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2861 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2862 | else |
| 2863 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2864 | /* This changes the data from G to XG */ |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2865 | png_bytep sp = row + (png_size_t)row_width; |
| 2866 | png_bytep dp = sp + (png_size_t)row_width; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2867 | for (i = 0; i < row_width; i++) |
| 2868 | { |
| 2869 | *(--dp) = *(--sp); |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2870 | *(--dp) = lo_filler; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2871 | } |
| 2872 | row_info->channels = 2; |
| 2873 | row_info->pixel_depth = 16; |
| 2874 | row_info->rowbytes = row_width * 2; |
| 2875 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2876 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2877 | |
Glenn Randers-Pehrson | 925d23b | 2010-08-26 21:43:18 -0500 | [diff] [blame] | 2878 | #ifdef PNG_READ_16BIT_SUPPORTED |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 2879 | else if (row_info->bit_depth == 16) |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2880 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2881 | if (flags & PNG_FLAG_FILLER_AFTER) |
| 2882 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2883 | /* This changes the data from GG to GGXX */ |
Glenn Randers-Pehrson | 5b5dcf8 | 2004-07-17 22:45:44 -0500 | [diff] [blame] | 2884 | png_bytep sp = row + (png_size_t)row_width * 2; |
| 2885 | png_bytep dp = sp + (png_size_t)row_width * 2; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2886 | for (i = 1; i < row_width; i++) |
| 2887 | { |
| 2888 | *(--dp) = hi_filler; |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2889 | *(--dp) = lo_filler; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2890 | *(--dp) = *(--sp); |
| 2891 | *(--dp) = *(--sp); |
| 2892 | } |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2893 | *(--dp) = hi_filler; |
| 2894 | *(--dp) = lo_filler; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2895 | row_info->channels = 2; |
| 2896 | row_info->pixel_depth = 32; |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 2897 | row_info->rowbytes = row_width * 4; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2898 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2899 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2900 | else |
| 2901 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2902 | /* This changes the data from GG to XXGG */ |
Glenn Randers-Pehrson | 5b5dcf8 | 2004-07-17 22:45:44 -0500 | [diff] [blame] | 2903 | png_bytep sp = row + (png_size_t)row_width * 2; |
| 2904 | png_bytep dp = sp + (png_size_t)row_width * 2; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2905 | for (i = 0; i < row_width; i++) |
| 2906 | { |
| 2907 | *(--dp) = *(--sp); |
| 2908 | *(--dp) = *(--sp); |
| 2909 | *(--dp) = hi_filler; |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2910 | *(--dp) = lo_filler; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2911 | } |
| 2912 | row_info->channels = 2; |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 2913 | row_info->pixel_depth = 32; |
| 2914 | row_info->rowbytes = row_width * 4; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2915 | } |
| 2916 | } |
Glenn Randers-Pehrson | 925d23b | 2010-08-26 21:43:18 -0500 | [diff] [blame] | 2917 | #endif |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2918 | } /* COLOR_TYPE == GRAY */ |
| 2919 | else if (row_info->color_type == PNG_COLOR_TYPE_RGB) |
| 2920 | { |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 2921 | if (row_info->bit_depth == 8) |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2922 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2923 | if (flags & PNG_FLAG_FILLER_AFTER) |
| 2924 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2925 | /* This changes the data from RGB to RGBX */ |
Glenn Randers-Pehrson | dff799e | 2004-08-07 21:42:49 -0500 | [diff] [blame] | 2926 | png_bytep sp = row + (png_size_t)row_width * 3; |
| 2927 | png_bytep dp = sp + (png_size_t)row_width; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2928 | for (i = 1; i < row_width; i++) |
| 2929 | { |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2930 | *(--dp) = lo_filler; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2931 | *(--dp) = *(--sp); |
| 2932 | *(--dp) = *(--sp); |
| 2933 | *(--dp) = *(--sp); |
| 2934 | } |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2935 | *(--dp) = lo_filler; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2936 | row_info->channels = 4; |
| 2937 | row_info->pixel_depth = 32; |
| 2938 | row_info->rowbytes = row_width * 4; |
| 2939 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2940 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2941 | else |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2942 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2943 | /* This changes the data from RGB to XRGB */ |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2944 | png_bytep sp = row + (png_size_t)row_width * 3; |
| 2945 | png_bytep dp = sp + (png_size_t)row_width; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2946 | for (i = 0; i < row_width; i++) |
| 2947 | { |
| 2948 | *(--dp) = *(--sp); |
| 2949 | *(--dp) = *(--sp); |
| 2950 | *(--dp) = *(--sp); |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2951 | *(--dp) = lo_filler; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2952 | } |
| 2953 | row_info->channels = 4; |
| 2954 | row_info->pixel_depth = 32; |
| 2955 | row_info->rowbytes = row_width * 4; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2956 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2957 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2958 | |
Glenn Randers-Pehrson | 925d23b | 2010-08-26 21:43:18 -0500 | [diff] [blame] | 2959 | #ifdef PNG_READ_16BIT_SUPPORTED |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 2960 | else if (row_info->bit_depth == 16) |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2961 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2962 | if (flags & PNG_FLAG_FILLER_AFTER) |
| 2963 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2964 | /* This changes the data from RRGGBB to RRGGBBXX */ |
Glenn Randers-Pehrson | 5b5dcf8 | 2004-07-17 22:45:44 -0500 | [diff] [blame] | 2965 | png_bytep sp = row + (png_size_t)row_width * 6; |
| 2966 | png_bytep dp = sp + (png_size_t)row_width * 2; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2967 | for (i = 1; i < row_width; i++) |
| 2968 | { |
| 2969 | *(--dp) = hi_filler; |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2970 | *(--dp) = lo_filler; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2971 | *(--dp) = *(--sp); |
| 2972 | *(--dp) = *(--sp); |
| 2973 | *(--dp) = *(--sp); |
| 2974 | *(--dp) = *(--sp); |
| 2975 | *(--dp) = *(--sp); |
| 2976 | *(--dp) = *(--sp); |
| 2977 | } |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2978 | *(--dp) = hi_filler; |
| 2979 | *(--dp) = lo_filler; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2980 | row_info->channels = 4; |
| 2981 | row_info->pixel_depth = 64; |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 2982 | row_info->rowbytes = row_width * 8; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2983 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 2984 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2985 | else |
| 2986 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2987 | /* This changes the data from RRGGBB to XXRRGGBB */ |
Glenn Randers-Pehrson | 5b5dcf8 | 2004-07-17 22:45:44 -0500 | [diff] [blame] | 2988 | png_bytep sp = row + (png_size_t)row_width * 6; |
| 2989 | png_bytep dp = sp + (png_size_t)row_width * 2; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2990 | for (i = 0; i < row_width; i++) |
| 2991 | { |
| 2992 | *(--dp) = *(--sp); |
| 2993 | *(--dp) = *(--sp); |
| 2994 | *(--dp) = *(--sp); |
| 2995 | *(--dp) = *(--sp); |
| 2996 | *(--dp) = *(--sp); |
| 2997 | *(--dp) = *(--sp); |
| 2998 | *(--dp) = hi_filler; |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2999 | *(--dp) = lo_filler; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3000 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3001 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3002 | row_info->channels = 4; |
| 3003 | row_info->pixel_depth = 64; |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 3004 | row_info->rowbytes = row_width * 8; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3005 | } |
| 3006 | } |
Glenn Randers-Pehrson | 925d23b | 2010-08-26 21:43:18 -0500 | [diff] [blame] | 3007 | #endif |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3008 | } /* COLOR_TYPE == RGB */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3009 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3010 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3011 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 3012 | #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 3013 | /* Expand grayscale files to RGB, with or without alpha */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 3014 | void /* PRIVATE */ |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 3015 | 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] | 3016 | { |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3017 | png_uint_32 i; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3018 | png_uint_32 row_width = row_info->width; |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 3019 | |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 3020 | png_debug(1, "in png_do_gray_to_rgb"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 3021 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3022 | if (row_info->bit_depth >= 8 && |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3023 | !(row_info->color_type & PNG_COLOR_MASK_COLOR)) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3024 | { |
| 3025 | if (row_info->color_type == PNG_COLOR_TYPE_GRAY) |
| 3026 | { |
| 3027 | if (row_info->bit_depth == 8) |
| 3028 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3029 | /* This changes G to RGB */ |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 3030 | png_bytep sp = row + (png_size_t)row_width - 1; |
| 3031 | png_bytep dp = sp + (png_size_t)row_width * 2; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3032 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3033 | { |
| 3034 | *(dp--) = *sp; |
| 3035 | *(dp--) = *sp; |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 3036 | *(dp--) = *(sp--); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3037 | } |
| 3038 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3039 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3040 | else |
| 3041 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3042 | /* This changes GG to RRGGBB */ |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 3043 | png_bytep sp = row + (png_size_t)row_width * 2 - 1; |
| 3044 | png_bytep dp = sp + (png_size_t)row_width * 4; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3045 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3046 | { |
| 3047 | *(dp--) = *sp; |
| 3048 | *(dp--) = *(sp - 1); |
| 3049 | *(dp--) = *sp; |
| 3050 | *(dp--) = *(sp - 1); |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 3051 | *(dp--) = *(sp--); |
| 3052 | *(dp--) = *(sp--); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3053 | } |
| 3054 | } |
| 3055 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3056 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3057 | else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) |
| 3058 | { |
| 3059 | if (row_info->bit_depth == 8) |
| 3060 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3061 | /* This changes GA to RGBA */ |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 3062 | png_bytep sp = row + (png_size_t)row_width * 2 - 1; |
| 3063 | png_bytep dp = sp + (png_size_t)row_width * 2; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3064 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3065 | { |
| 3066 | *(dp--) = *(sp--); |
| 3067 | *(dp--) = *sp; |
| 3068 | *(dp--) = *sp; |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 3069 | *(dp--) = *(sp--); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3070 | } |
| 3071 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3072 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3073 | else |
| 3074 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3075 | /* This changes GGAA to RRGGBBAA */ |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 3076 | png_bytep sp = row + (png_size_t)row_width * 4 - 1; |
| 3077 | png_bytep dp = sp + (png_size_t)row_width * 4; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3078 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3079 | { |
| 3080 | *(dp--) = *(sp--); |
| 3081 | *(dp--) = *(sp--); |
| 3082 | *(dp--) = *sp; |
| 3083 | *(dp--) = *(sp - 1); |
| 3084 | *(dp--) = *sp; |
| 3085 | *(dp--) = *(sp - 1); |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 3086 | *(dp--) = *(sp--); |
| 3087 | *(dp--) = *(sp--); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3088 | } |
| 3089 | } |
| 3090 | } |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 3091 | row_info->channels = (png_byte)(row_info->channels + 2); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3092 | row_info->color_type |= PNG_COLOR_MASK_COLOR; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3093 | row_info->pixel_depth = (png_byte)(row_info->channels * |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3094 | row_info->bit_depth); |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 3095 | row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3096 | } |
| 3097 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3098 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3099 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 3100 | #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 3101 | /* Reduce RGB files to grayscale, with or without alpha |
Glenn Randers-Pehrson | 99ffac0 | 2011-07-29 12:22:38 -0500 | [diff] [blame] | 3102 | * using the equation given in Poynton's ColorFAQ of 1998-01-04 at |
| 3103 | * <http://www.inforamp.net/~poynton/> (THIS LINK IS DEAD June 2008 but |
| 3104 | * versions dated 1998 through November 2002 have been archived at |
| 3105 | * http://web.archive.org/web/20000816232553/http://www.inforamp.net/ |
| 3106 | * ~poynton/notes/colour_and_gamma/ColorFAQ.txt ) |
Glenn Randers-Pehrson | 895a9c9 | 2008-07-25 08:51:18 -0500 | [diff] [blame] | 3107 | * Charles Poynton poynton at poynton.com |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3108 | * |
| 3109 | * Y = 0.212671 * R + 0.715160 * G + 0.072169 * B |
| 3110 | * |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3111 | * which can be expressed with integers as |
| 3112 | * |
Glenn Randers-Pehrson | 520a764 | 2000-03-21 05:13:06 -0600 | [diff] [blame] | 3113 | * Y = (6969 * R + 23434 * G + 2365 * B)/32768 |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3114 | * |
Glenn Randers-Pehrson | 99ffac0 | 2011-07-29 12:22:38 -0500 | [diff] [blame] | 3115 | * Poynton's current link (as of January 2003 through July 2011): |
| 3116 | * <http://www.poynton.com/notes/colour_and_gamma/> |
| 3117 | * has changed the numbers slightly: |
| 3118 | * |
| 3119 | * Y = 0.2126*R + 0.7152*G + 0.0722*B |
| 3120 | * |
| 3121 | * which can be expressed with integers as |
| 3122 | * |
| 3123 | * Y = (6966 * R + 23436 * G + 2366 * B)/32768 |
| 3124 | * |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3125 | * Historically, however, libpng uses numbers derived from the ITU-R Rec 709 |
| 3126 | * end point chromaticities and the D65 white point. Depending on the |
| 3127 | * precision used for the D65 white point this produces a variety of different |
| 3128 | * numbers, however if the four decimal place value used in ITU-R Rec 709 is |
| 3129 | * used (0.3127,0.3290) the Y calculation would be: |
| 3130 | * |
| 3131 | * Y = (6968 * R + 23435 * G + 2366 * B)/32768 |
| 3132 | * |
| 3133 | * While this is correct the rounding results in an overflow for white, because |
| 3134 | * the sum of the rounded coefficients is 32769, not 32768. Consequently |
| 3135 | * libpng uses, instead, the closest non-overflowing approximation: |
Glenn Randers-Pehrson | 99ffac0 | 2011-07-29 12:22:38 -0500 | [diff] [blame] | 3136 | * |
| 3137 | * Y = (6968 * R + 23434 * G + 2366 * B)/32768 |
| 3138 | * |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3139 | * Starting with libpng-1.5.5, if the image being converted has a cHRM chunk |
| 3140 | * (including an sRGB chunk) then the chromaticities are used to calculate the |
| 3141 | * coefficients. See the chunk handling in pngrutil.c for more information. |
Glenn Randers-Pehrson | 0bc7977 | 2011-08-11 09:01:57 -0500 | [diff] [blame] | 3142 | * |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3143 | * In all cases the calculation is to be done in a linear colorspace. If no |
| 3144 | * gamma information is available to correct the encoding of the original RGB |
| 3145 | * values this results in an implicit assumption that the original PNG RGB |
| 3146 | * values were linear. |
Glenn Randers-Pehrson | 0bc7977 | 2011-08-11 09:01:57 -0500 | [diff] [blame] | 3147 | * |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3148 | * Other integer coefficents can be used via png_set_rgb_to_gray(). Because |
| 3149 | * the API takes just red and green coefficients the blue coefficient is |
| 3150 | * calculated to make the sum 32768. This will result in different rounding |
| 3151 | * to that used above. |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3152 | */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 3153 | int /* PRIVATE */ |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3154 | png_do_rgb_to_gray(png_structp png_ptr, png_row_infop row_info, png_bytep row) |
| 3155 | |
| 3156 | { |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3157 | int rgb_error = 0; |
| 3158 | |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 3159 | png_debug(1, "in png_do_rgb_to_gray"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 3160 | |
John Bowler | a96117f | 2011-01-08 14:41:25 -0600 | [diff] [blame] | 3161 | if (!(row_info->color_type & PNG_COLOR_MASK_PALETTE) && |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3162 | (row_info->color_type & PNG_COLOR_MASK_COLOR)) |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3163 | { |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3164 | PNG_CONST png_uint_32 rc = png_ptr->rgb_to_gray_red_coeff; |
| 3165 | PNG_CONST png_uint_32 gc = png_ptr->rgb_to_gray_green_coeff; |
| 3166 | PNG_CONST png_uint_32 bc = 32768 - rc - gc; |
| 3167 | PNG_CONST png_uint_32 row_width = row_info->width; |
| 3168 | PNG_CONST int have_alpha = |
| 3169 | (row_info->color_type & PNG_COLOR_MASK_ALPHA) != 0; |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3170 | |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3171 | if (row_info->bit_depth == 8) |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3172 | { |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3173 | #if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED) |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3174 | /* Notice that gamma to/from 1 are not necessarily inverses (if |
| 3175 | * there is an overall gamma correction). Prior to 1.5.5 this code |
| 3176 | * checked the linearized values for equality; this doesn't match |
| 3177 | * the documentation, the original values must be checked. |
| 3178 | */ |
| 3179 | if (png_ptr->gamma_from_1 != NULL && png_ptr->gamma_to_1 != NULL) |
| 3180 | { |
| 3181 | png_bytep sp = row; |
| 3182 | png_bytep dp = row; |
| 3183 | png_uint_32 i; |
| 3184 | |
| 3185 | for (i = 0; i < row_width; i++) |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3186 | { |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3187 | png_byte red = *(sp++); |
| 3188 | png_byte green = *(sp++); |
| 3189 | png_byte blue = *(sp++); |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3190 | |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3191 | if (red != green || red != blue) |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3192 | { |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3193 | red = png_ptr->gamma_to_1[red]; |
| 3194 | green = png_ptr->gamma_to_1[green]; |
| 3195 | blue = png_ptr->gamma_to_1[blue]; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3196 | |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3197 | rgb_error |= 1; |
| 3198 | *(dp++) = png_ptr->gamma_from_1[ |
| 3199 | (rc*red + gc*green + bc*blue + 16384)>>15]; |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3200 | } |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3201 | |
| 3202 | else |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3203 | { |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3204 | /* If there is no overall correction the table will not be |
| 3205 | * set. |
| 3206 | */ |
| 3207 | if (png_ptr->gamma_table != NULL) |
| 3208 | red = png_ptr->gamma_table[red]; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3209 | |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3210 | *(dp++) = red; |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3211 | } |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3212 | |
| 3213 | if (have_alpha) |
| 3214 | *(dp++) = *(sp++); |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3215 | } |
| 3216 | } |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3217 | else |
| 3218 | #endif |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3219 | { |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3220 | png_bytep sp = row; |
| 3221 | png_bytep dp = row; |
| 3222 | png_uint_32 i; |
| 3223 | |
| 3224 | for (i = 0; i < row_width; i++) |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3225 | { |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3226 | png_byte red = *(sp++); |
| 3227 | png_byte green = *(sp++); |
| 3228 | png_byte blue = *(sp++); |
| 3229 | |
| 3230 | if (red != green || red != blue) |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3231 | { |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3232 | rgb_error |= 1; |
| 3233 | /*NOTE: this is the historical approach which simply |
| 3234 | * truncates the results. |
| 3235 | */ |
| 3236 | *(dp++) = (png_byte)((rc*red + gc*green + bc*blue)>>15); |
| 3237 | } |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3238 | |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3239 | else |
| 3240 | *(dp++) = red; |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3241 | |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3242 | if (have_alpha) |
| 3243 | *(dp++) = *(sp++); |
| 3244 | } |
| 3245 | } |
| 3246 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3247 | |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3248 | else /* RGB bit_depth == 16 */ |
| 3249 | { |
| 3250 | #if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED) |
| 3251 | if (png_ptr->gamma_16_to_1 != NULL && png_ptr->gamma_16_from_1 != NULL) |
| 3252 | { |
| 3253 | png_bytep sp = row; |
| 3254 | png_bytep dp = row; |
| 3255 | png_uint_32 i; |
| 3256 | |
| 3257 | for (i = 0; i < row_width; i++) |
| 3258 | { |
| 3259 | png_uint_16 red, green, blue, w; |
| 3260 | |
| 3261 | red = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2; |
| 3262 | green = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2; |
| 3263 | blue = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2; |
| 3264 | |
| 3265 | if (red == green && red == blue) |
| 3266 | { |
| 3267 | if (png_ptr->gamma_16_table != NULL) |
| 3268 | w = png_ptr->gamma_16_table[(red&0xff) |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3269 | >> png_ptr->gamma_shift][red>>8]; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3270 | |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3271 | else |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3272 | w = red; |
| 3273 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3274 | |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3275 | else |
| 3276 | { |
| 3277 | png_uint_16 red_1 = png_ptr->gamma_16_to_1[(red&0xff) |
| 3278 | >> png_ptr->gamma_shift][red>>8]; |
| 3279 | png_uint_16 green_1 = |
| 3280 | png_ptr->gamma_16_to_1[(green&0xff) >> |
| 3281 | png_ptr->gamma_shift][green>>8]; |
| 3282 | png_uint_16 blue_1 = png_ptr->gamma_16_to_1[(blue&0xff) |
| 3283 | >> png_ptr->gamma_shift][blue>>8]; |
| 3284 | png_uint_16 gray16 = (png_uint_16)((rc*red_1 + gc*green_1 |
| 3285 | + bc*blue_1 + 16384)>>15); |
| 3286 | w = png_ptr->gamma_16_from_1[(gray16&0xff) >> |
| 3287 | png_ptr->gamma_shift][gray16 >> 8]; |
| 3288 | rgb_error |= 1; |
| 3289 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3290 | |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3291 | *(dp++) = (png_byte)((w>>8) & 0xff); |
| 3292 | *(dp++) = (png_byte)(w & 0xff); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3293 | |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3294 | if (have_alpha) |
| 3295 | { |
| 3296 | *(dp++) = *(sp++); |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3297 | *(dp++) = *(sp++); |
| 3298 | } |
| 3299 | } |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3300 | } |
| 3301 | else |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3302 | #endif |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3303 | { |
| 3304 | png_bytep sp = row; |
| 3305 | png_bytep dp = row; |
| 3306 | png_uint_32 i; |
| 3307 | |
| 3308 | for (i = 0; i < row_width; i++) |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3309 | { |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3310 | png_uint_16 red, green, blue, gray16; |
| 3311 | |
| 3312 | red = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2; |
| 3313 | green = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2; |
| 3314 | blue = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2; |
| 3315 | |
| 3316 | if (red != green || red != blue) |
| 3317 | rgb_error |= 1; |
| 3318 | |
| 3319 | /* From 1.5.5 in the 16 bit case do the accurate convertion even |
| 3320 | * in the 'fast' case - this is because this is where the code |
| 3321 | * ends up when handling linear 16 bit data. |
| 3322 | */ |
| 3323 | gray16 = (png_uint_16)((rc*red + gc*green + bc*blue + 16384) >> |
| 3324 | 15); |
| 3325 | *(dp++) = (png_byte)((gray16>>8) & 0xff); |
| 3326 | *(dp++) = (png_byte)(gray16 & 0xff); |
| 3327 | |
| 3328 | if (have_alpha) |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3329 | { |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3330 | *(dp++) = *(sp++); |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3331 | *(dp++) = *(sp++); |
| 3332 | } |
| 3333 | } |
| 3334 | } |
| 3335 | } |
John Bowler | 736f40f | 2011-08-25 16:19:44 -0500 | [diff] [blame] | 3336 | |
Glenn Randers-Pehrson | bb5cb14 | 2011-09-22 12:41:58 -0500 | [diff] [blame] | 3337 | row_info->channels = (png_byte)(row_info->channels - 2); |
Glenn Randers-Pehrson | 67439c4 | 2010-08-19 07:01:09 -0500 | [diff] [blame] | 3338 | row_info->color_type = (png_byte)(row_info->color_type & |
| 3339 | ~PNG_COLOR_MASK_COLOR); |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3340 | row_info->pixel_depth = (png_byte)(row_info->channels * |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3341 | row_info->bit_depth); |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 3342 | row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width); |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3343 | } |
| 3344 | return rgb_error; |
| 3345 | } |
| 3346 | #endif |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3347 | #endif /* PNG_READ_TRANSFORMS_SUPPORTED */ |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 3348 | |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3349 | #ifdef PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 3350 | /* Build a grayscale palette. Palette is assumed to be 1 << bit_depth |
| 3351 | * large of png_color. This lets grayscale images be treated as |
| 3352 | * paletted. Most useful for gamma correction and simplification |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3353 | * of code. This API is not used internally. |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 3354 | */ |
Glenn Randers-Pehrson | 73d57cb | 2002-03-25 18:49:08 -0600 | [diff] [blame] | 3355 | void PNGAPI |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 3356 | png_build_grayscale_palette(int bit_depth, png_colorp palette) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3357 | { |
| 3358 | int num_palette; |
| 3359 | int color_inc; |
| 3360 | int i; |
| 3361 | int v; |
| 3362 | |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 3363 | png_debug(1, "in png_do_build_grayscale_palette"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 3364 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3365 | if (palette == NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3366 | return; |
| 3367 | |
| 3368 | switch (bit_depth) |
| 3369 | { |
| 3370 | case 1: |
| 3371 | num_palette = 2; |
| 3372 | color_inc = 0xff; |
| 3373 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3374 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3375 | case 2: |
| 3376 | num_palette = 4; |
| 3377 | color_inc = 0x55; |
| 3378 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3379 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3380 | case 4: |
| 3381 | num_palette = 16; |
| 3382 | color_inc = 0x11; |
| 3383 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3384 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3385 | case 8: |
| 3386 | num_palette = 256; |
| 3387 | color_inc = 1; |
| 3388 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3389 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3390 | default: |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3391 | num_palette = 0; |
Guy Schalnat | 69b1448 | 1996-01-10 02:56:49 -0600 | [diff] [blame] | 3392 | color_inc = 0; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3393 | break; |
| 3394 | } |
| 3395 | |
| 3396 | for (i = 0, v = 0; i < num_palette; i++, v += color_inc) |
| 3397 | { |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3398 | palette[i].red = (png_byte)v; |
| 3399 | palette[i].green = (png_byte)v; |
| 3400 | palette[i].blue = (png_byte)v; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3401 | } |
| 3402 | } |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3403 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3404 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3405 | |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3406 | #ifdef PNG_READ_TRANSFORMS_SUPPORTED |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 3407 | #ifdef PNG_READ_BACKGROUND_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3408 | /* Replace any alpha or transparency with the supplied background color. |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 3409 | * "background" is already in the screen gamma, while "background_1" is |
| 3410 | * at a gamma of 1.0. Paletted files have already been taken care of. |
| 3411 | */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 3412 | void /* PRIVATE */ |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3413 | png_do_compose(png_row_infop row_info, png_bytep row, png_structp png_ptr) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3414 | { |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3415 | #ifdef PNG_READ_GAMMA_SUPPORTED |
| 3416 | png_const_bytep gamma_table = png_ptr->gamma_table; |
| 3417 | png_const_bytep gamma_from_1 = png_ptr->gamma_from_1; |
| 3418 | png_const_bytep gamma_to_1 = png_ptr->gamma_to_1; |
| 3419 | png_const_uint_16pp gamma_16 = png_ptr->gamma_16_table; |
| 3420 | png_const_uint_16pp gamma_16_from_1 = png_ptr->gamma_16_from_1; |
| 3421 | png_const_uint_16pp gamma_16_to_1 = png_ptr->gamma_16_to_1; |
| 3422 | int gamma_shift = png_ptr->gamma_shift; |
| 3423 | #endif |
| 3424 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3425 | png_bytep sp; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3426 | png_uint_32 i; |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3427 | png_uint_32 row_width = row_info->width; |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3428 | int optimize = (png_ptr->flags & PNG_FLAG_OPTIMIZE_ALPHA) != 0; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3429 | int shift; |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 3430 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3431 | png_debug(1, "in png_do_compose"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 3432 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3433 | { |
| 3434 | switch (row_info->color_type) |
| 3435 | { |
| 3436 | case PNG_COLOR_TYPE_GRAY: |
| 3437 | { |
| 3438 | switch (row_info->bit_depth) |
| 3439 | { |
| 3440 | case 1: |
| 3441 | { |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3442 | sp = row; |
| 3443 | shift = 7; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3444 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3445 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 3446 | if ((png_uint_16)((*sp >> shift) & 0x01) |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3447 | == png_ptr->trans_color.gray) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3448 | { |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3449 | *sp &= (png_byte)((0x7f7f >> (7 - shift)) & 0xff); |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3450 | *sp |= (png_byte)(png_ptr->background.gray << shift); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3451 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3452 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3453 | if (!shift) |
| 3454 | { |
| 3455 | shift = 7; |
| 3456 | sp++; |
| 3457 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3458 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3459 | else |
| 3460 | shift--; |
| 3461 | } |
| 3462 | break; |
| 3463 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3464 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3465 | case 2: |
| 3466 | { |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 3467 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3468 | if (gamma_table != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3469 | { |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3470 | sp = row; |
| 3471 | shift = 6; |
| 3472 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3473 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 3474 | if ((png_uint_16)((*sp >> shift) & 0x03) |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3475 | == png_ptr->trans_color.gray) |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3476 | { |
| 3477 | *sp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff); |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3478 | *sp |= (png_byte)(png_ptr->background.gray << shift); |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3479 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3480 | |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3481 | else |
| 3482 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 3483 | png_byte p = (png_byte)((*sp >> shift) & 0x03); |
Glenn Randers-Pehrson | 860ab2b | 1999-10-14 07:43:10 -0500 | [diff] [blame] | 3484 | png_byte g = (png_byte)((gamma_table [p | (p << 2) | |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 3485 | (p << 4) | (p << 6)] >> 6) & 0x03); |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3486 | *sp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff); |
| 3487 | *sp |= (png_byte)(g << shift); |
| 3488 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3489 | |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3490 | if (!shift) |
| 3491 | { |
| 3492 | shift = 6; |
| 3493 | sp++; |
| 3494 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3495 | |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3496 | else |
| 3497 | shift -= 2; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3498 | } |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3499 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3500 | |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3501 | else |
| 3502 | #endif |
| 3503 | { |
| 3504 | sp = row; |
| 3505 | shift = 6; |
| 3506 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3507 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 3508 | if ((png_uint_16)((*sp >> shift) & 0x03) |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3509 | == png_ptr->trans_color.gray) |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3510 | { |
| 3511 | *sp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff); |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3512 | *sp |= (png_byte)(png_ptr->background.gray << shift); |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3513 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3514 | |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3515 | if (!shift) |
| 3516 | { |
| 3517 | shift = 6; |
| 3518 | sp++; |
| 3519 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3520 | |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3521 | else |
| 3522 | shift -= 2; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3523 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3524 | } |
| 3525 | break; |
| 3526 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3527 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3528 | case 4: |
| 3529 | { |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 3530 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3531 | if (gamma_table != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3532 | { |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3533 | sp = row; |
| 3534 | shift = 4; |
| 3535 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3536 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 3537 | if ((png_uint_16)((*sp >> shift) & 0x0f) |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3538 | == png_ptr->trans_color.gray) |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3539 | { |
| 3540 | *sp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff); |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3541 | *sp |= (png_byte)(png_ptr->background.gray << shift); |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3542 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3543 | |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3544 | else |
| 3545 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 3546 | png_byte p = (png_byte)((*sp >> shift) & 0x0f); |
Glenn Randers-Pehrson | 860ab2b | 1999-10-14 07:43:10 -0500 | [diff] [blame] | 3547 | png_byte g = (png_byte)((gamma_table[p | |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 3548 | (p << 4)] >> 4) & 0x0f); |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3549 | *sp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff); |
| 3550 | *sp |= (png_byte)(g << shift); |
| 3551 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3552 | |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3553 | if (!shift) |
| 3554 | { |
| 3555 | shift = 4; |
| 3556 | sp++; |
| 3557 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3558 | |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3559 | else |
| 3560 | shift -= 4; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3561 | } |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3562 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3563 | |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3564 | else |
| 3565 | #endif |
| 3566 | { |
| 3567 | sp = row; |
| 3568 | shift = 4; |
| 3569 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3570 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 3571 | if ((png_uint_16)((*sp >> shift) & 0x0f) |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3572 | == png_ptr->trans_color.gray) |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3573 | { |
| 3574 | *sp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff); |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3575 | *sp |= (png_byte)(png_ptr->background.gray << shift); |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3576 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3577 | |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3578 | if (!shift) |
| 3579 | { |
| 3580 | shift = 4; |
| 3581 | sp++; |
| 3582 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3583 | |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 3584 | else |
| 3585 | shift -= 4; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3586 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3587 | } |
| 3588 | break; |
| 3589 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3590 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3591 | case 8: |
| 3592 | { |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 3593 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3594 | if (gamma_table != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3595 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3596 | sp = row; |
| 3597 | for (i = 0; i < row_width; i++, sp++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3598 | { |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3599 | if (*sp == png_ptr->trans_color.gray) |
| 3600 | *sp = (png_byte)png_ptr->background.gray; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 3601 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3602 | else |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3603 | *sp = gamma_table[*sp]; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3604 | } |
| 3605 | } |
| 3606 | else |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3607 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3608 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3609 | sp = row; |
| 3610 | for (i = 0; i < row_width; i++, sp++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3611 | { |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3612 | if (*sp == png_ptr->trans_color.gray) |
| 3613 | *sp = (png_byte)png_ptr->background.gray; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3614 | } |
| 3615 | } |
| 3616 | break; |
| 3617 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3618 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3619 | case 16: |
| 3620 | { |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 3621 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3622 | if (gamma_16 != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3623 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3624 | sp = row; |
| 3625 | for (i = 0; i < row_width; i++, sp += 2) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3626 | { |
| 3627 | png_uint_16 v; |
| 3628 | |
Glenn Randers-Pehrson | 860ab2b | 1999-10-14 07:43:10 -0500 | [diff] [blame] | 3629 | v = (png_uint_16)(((*sp) << 8) + *(sp + 1)); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3630 | |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3631 | if (v == png_ptr->trans_color.gray) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3632 | { |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3633 | /* Background is already in screen gamma */ |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3634 | *sp = (png_byte)((png_ptr->background.gray >> 8) & 0xff); |
| 3635 | *(sp + 1) = (png_byte)(png_ptr->background.gray & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3636 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3637 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3638 | else |
| 3639 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3640 | v = gamma_16[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3641 | *sp = (png_byte)((v >> 8) & 0xff); |
Guy Schalnat | 4ee97b0 | 1996-01-16 01:51:56 -0600 | [diff] [blame] | 3642 | *(sp + 1) = (png_byte)(v & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3643 | } |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3644 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3645 | } |
| 3646 | else |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3647 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3648 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3649 | sp = row; |
| 3650 | for (i = 0; i < row_width; i++, sp += 2) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3651 | { |
| 3652 | png_uint_16 v; |
| 3653 | |
Glenn Randers-Pehrson | 860ab2b | 1999-10-14 07:43:10 -0500 | [diff] [blame] | 3654 | v = (png_uint_16)(((*sp) << 8) + *(sp + 1)); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3655 | |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3656 | if (v == png_ptr->trans_color.gray) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3657 | { |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3658 | *sp = (png_byte)((png_ptr->background.gray >> 8) & 0xff); |
| 3659 | *(sp + 1) = (png_byte)(png_ptr->background.gray & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3660 | } |
| 3661 | } |
| 3662 | } |
| 3663 | break; |
| 3664 | } |
Glenn Randers-Pehrson | b3edc73 | 2010-11-21 14:06:41 -0600 | [diff] [blame] | 3665 | |
| 3666 | default: |
| 3667 | break; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3668 | } |
| 3669 | break; |
| 3670 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3671 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3672 | case PNG_COLOR_TYPE_RGB: |
| 3673 | { |
| 3674 | if (row_info->bit_depth == 8) |
| 3675 | { |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 3676 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3677 | if (gamma_table != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3678 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3679 | sp = row; |
| 3680 | for (i = 0; i < row_width; i++, sp += 3) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3681 | { |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3682 | if (*sp == png_ptr->trans_color.red && |
| 3683 | *(sp + 1) == png_ptr->trans_color.green && |
| 3684 | *(sp + 2) == png_ptr->trans_color.blue) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3685 | { |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3686 | *sp = (png_byte)png_ptr->background.red; |
| 3687 | *(sp + 1) = (png_byte)png_ptr->background.green; |
| 3688 | *(sp + 2) = (png_byte)png_ptr->background.blue; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3689 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3690 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3691 | else |
| 3692 | { |
| 3693 | *sp = gamma_table[*sp]; |
| 3694 | *(sp + 1) = gamma_table[*(sp + 1)]; |
| 3695 | *(sp + 2) = gamma_table[*(sp + 2)]; |
| 3696 | } |
| 3697 | } |
| 3698 | } |
| 3699 | else |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3700 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3701 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3702 | sp = row; |
| 3703 | for (i = 0; i < row_width; i++, sp += 3) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3704 | { |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3705 | if (*sp == png_ptr->trans_color.red && |
| 3706 | *(sp + 1) == png_ptr->trans_color.green && |
| 3707 | *(sp + 2) == png_ptr->trans_color.blue) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3708 | { |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3709 | *sp = (png_byte)png_ptr->background.red; |
| 3710 | *(sp + 1) = (png_byte)png_ptr->background.green; |
| 3711 | *(sp + 2) = (png_byte)png_ptr->background.blue; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3712 | } |
| 3713 | } |
| 3714 | } |
| 3715 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3716 | else /* if (row_info->bit_depth == 16) */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3717 | { |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 3718 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3719 | if (gamma_16 != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3720 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3721 | sp = row; |
| 3722 | for (i = 0; i < row_width; i++, sp += 6) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3723 | { |
Glenn Randers-Pehrson | 860ab2b | 1999-10-14 07:43:10 -0500 | [diff] [blame] | 3724 | png_uint_16 r = (png_uint_16)(((*sp) << 8) + *(sp + 1)); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3725 | |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3726 | png_uint_16 g = (png_uint_16)(((*(sp + 2)) << 8) |
| 3727 | + *(sp + 3)); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3728 | |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3729 | png_uint_16 b = (png_uint_16)(((*(sp + 4)) << 8) |
| 3730 | + *(sp + 5)); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3731 | |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3732 | if (r == png_ptr->trans_color.red && |
| 3733 | g == png_ptr->trans_color.green && |
| 3734 | b == png_ptr->trans_color.blue) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3735 | { |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3736 | /* Background is already in screen gamma */ |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3737 | *sp = (png_byte)((png_ptr->background.red >> 8) & 0xff); |
| 3738 | *(sp + 1) = (png_byte)(png_ptr->background.red & 0xff); |
| 3739 | *(sp + 2) = (png_byte)((png_ptr->background.green >> 8) & 0xff); |
| 3740 | *(sp + 3) = (png_byte)(png_ptr->background.green & 0xff); |
| 3741 | *(sp + 4) = (png_byte)((png_ptr->background.blue >> 8) & 0xff); |
| 3742 | *(sp + 5) = (png_byte)(png_ptr->background.blue & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3743 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3744 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3745 | else |
| 3746 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 3747 | png_uint_16 v = gamma_16[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3748 | *sp = (png_byte)((v >> 8) & 0xff); |
Guy Schalnat | 4ee97b0 | 1996-01-16 01:51:56 -0600 | [diff] [blame] | 3749 | *(sp + 1) = (png_byte)(v & 0xff); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3750 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3751 | v = gamma_16[*(sp + 3) >> gamma_shift][*(sp + 2)]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3752 | *(sp + 2) = (png_byte)((v >> 8) & 0xff); |
| 3753 | *(sp + 3) = (png_byte)(v & 0xff); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3754 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3755 | v = gamma_16[*(sp + 5) >> gamma_shift][*(sp + 4)]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3756 | *(sp + 4) = (png_byte)((v >> 8) & 0xff); |
| 3757 | *(sp + 5) = (png_byte)(v & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3758 | } |
| 3759 | } |
| 3760 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3761 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3762 | else |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3763 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3764 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3765 | sp = row; |
| 3766 | for (i = 0; i < row_width; i++, sp += 6) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3767 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3768 | png_uint_16 r = (png_uint_16)(((*sp) << 8) + *(sp + 1)); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3769 | |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3770 | png_uint_16 g = (png_uint_16)(((*(sp + 2)) << 8) |
| 3771 | + *(sp + 3)); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3772 | |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3773 | png_uint_16 b = (png_uint_16)(((*(sp + 4)) << 8) |
| 3774 | + *(sp + 5)); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3775 | |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3776 | if (r == png_ptr->trans_color.red && |
| 3777 | g == png_ptr->trans_color.green && |
| 3778 | b == png_ptr->trans_color.blue) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3779 | { |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3780 | *sp = (png_byte)((png_ptr->background.red >> 8) & 0xff); |
| 3781 | *(sp + 1) = (png_byte)(png_ptr->background.red & 0xff); |
| 3782 | *(sp + 2) = (png_byte)((png_ptr->background.green >> 8) & 0xff); |
| 3783 | *(sp + 3) = (png_byte)(png_ptr->background.green & 0xff); |
| 3784 | *(sp + 4) = (png_byte)((png_ptr->background.blue >> 8) & 0xff); |
| 3785 | *(sp + 5) = (png_byte)(png_ptr->background.blue & 0xff); |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3786 | } |
| 3787 | } |
| 3788 | } |
| 3789 | } |
| 3790 | break; |
| 3791 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3792 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3793 | case PNG_COLOR_TYPE_GRAY_ALPHA: |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3794 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3795 | if (row_info->bit_depth == 8) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3796 | { |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 3797 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3798 | if (gamma_to_1 != NULL && gamma_from_1 != NULL && |
| 3799 | gamma_table != NULL) |
| 3800 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3801 | sp = row; |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3802 | for (i = 0; i < row_width; i++, sp += 2) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3803 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 3804 | png_uint_16 a = *(sp + 1); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3805 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3806 | if (a == 0xff) |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3807 | *sp = gamma_table[*sp]; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 3808 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3809 | else if (a == 0) |
| 3810 | { |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3811 | /* Background is already in screen gamma */ |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3812 | *sp = (png_byte)png_ptr->background.gray; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3813 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3814 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3815 | else |
| 3816 | { |
| 3817 | png_byte v, w; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3818 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3819 | v = gamma_to_1[*sp]; |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3820 | png_composite(w, v, a, png_ptr->background_1.gray); |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3821 | if (!optimize) |
| 3822 | w = gamma_from_1[w]; |
| 3823 | *sp = w; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3824 | } |
| 3825 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3826 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3827 | else |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3828 | #endif |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3829 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3830 | sp = row; |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3831 | for (i = 0; i < row_width; i++, sp += 2) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3832 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 3833 | png_byte a = *(sp + 1); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3834 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3835 | if (a == 0) |
| 3836 | *sp = (png_byte)png_ptr->background.gray; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 3837 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3838 | else if (a < 0xff) |
| 3839 | png_composite(*sp, *sp, a, png_ptr->background_1.gray); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3840 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3841 | } |
| 3842 | } |
| 3843 | else /* if (png_ptr->bit_depth == 16) */ |
| 3844 | { |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 3845 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3846 | if (gamma_16 != NULL && gamma_16_from_1 != NULL && |
| 3847 | gamma_16_to_1 != NULL) |
| 3848 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3849 | sp = row; |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3850 | for (i = 0; i < row_width; i++, sp += 4) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3851 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3852 | png_uint_16 a = (png_uint_16)(((*(sp + 2)) << 8) |
| 3853 | + *(sp + 3)); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3854 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3855 | if (a == (png_uint_16)0xffff) |
| 3856 | { |
| 3857 | png_uint_16 v; |
| 3858 | |
| 3859 | v = gamma_16[*(sp + 1) >> gamma_shift][*sp]; |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3860 | *sp = (png_byte)((v >> 8) & 0xff); |
| 3861 | *(sp + 1) = (png_byte)(v & 0xff); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3862 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3863 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3864 | else if (a == 0) |
| 3865 | { |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3866 | /* Background is already in screen gamma */ |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3867 | *sp = (png_byte)((png_ptr->background.gray >> 8) & 0xff); |
| 3868 | *(sp + 1) = (png_byte)(png_ptr->background.gray & 0xff); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3869 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3870 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3871 | else |
| 3872 | { |
| 3873 | png_uint_16 g, v, w; |
| 3874 | |
| 3875 | g = gamma_16_to_1[*(sp + 1) >> gamma_shift][*sp]; |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3876 | png_composite_16(v, g, a, png_ptr->background_1.gray); |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3877 | if (optimize) |
| 3878 | w = v; |
| 3879 | else |
| 3880 | w = gamma_16_from_1[(v&0xff) >> gamma_shift][v >> 8]; |
| 3881 | *sp = (png_byte)((w >> 8) & 0xff); |
| 3882 | *(sp + 1) = (png_byte)(w & 0xff); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3883 | } |
| 3884 | } |
| 3885 | } |
| 3886 | else |
| 3887 | #endif |
| 3888 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3889 | sp = row; |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3890 | for (i = 0; i < row_width; i++, sp += 4) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3891 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3892 | png_uint_16 a = (png_uint_16)(((*(sp + 2)) << 8) |
| 3893 | + *(sp + 3)); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3894 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3895 | if (a == 0) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3896 | { |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3897 | *sp = (png_byte)((png_ptr->background.gray >> 8) & 0xff); |
| 3898 | *(sp + 1) = (png_byte)(png_ptr->background.gray & 0xff); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3899 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3900 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3901 | else if (a < 0xffff) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3902 | { |
| 3903 | png_uint_16 g, v; |
| 3904 | |
Glenn Randers-Pehrson | 860ab2b | 1999-10-14 07:43:10 -0500 | [diff] [blame] | 3905 | g = (png_uint_16)(((*sp) << 8) + *(sp + 1)); |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3906 | png_composite_16(v, g, a, png_ptr->background_1.gray); |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3907 | *sp = (png_byte)((v >> 8) & 0xff); |
| 3908 | *(sp + 1) = (png_byte)(v & 0xff); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3909 | } |
| 3910 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3911 | } |
| 3912 | } |
| 3913 | break; |
| 3914 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3915 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3916 | case PNG_COLOR_TYPE_RGB_ALPHA: |
| 3917 | { |
| 3918 | if (row_info->bit_depth == 8) |
| 3919 | { |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 3920 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3921 | if (gamma_to_1 != NULL && gamma_from_1 != NULL && |
| 3922 | gamma_table != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3923 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3924 | sp = row; |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3925 | for (i = 0; i < row_width; i++, sp += 4) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3926 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 3927 | png_byte a = *(sp + 3); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3928 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3929 | if (a == 0xff) |
| 3930 | { |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3931 | *sp = gamma_table[*sp]; |
| 3932 | *(sp + 1) = gamma_table[*(sp + 1)]; |
| 3933 | *(sp + 2) = gamma_table[*(sp + 2)]; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3934 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3935 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3936 | else if (a == 0) |
| 3937 | { |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3938 | /* Background is already in screen gamma */ |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3939 | *sp = (png_byte)png_ptr->background.red; |
| 3940 | *(sp + 1) = (png_byte)png_ptr->background.green; |
| 3941 | *(sp + 2) = (png_byte)png_ptr->background.blue; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3942 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3943 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3944 | else |
| 3945 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3946 | png_byte v, w; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3947 | |
| 3948 | v = gamma_to_1[*sp]; |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3949 | png_composite(w, v, a, png_ptr->background_1.red); |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3950 | if (!optimize) w = gamma_from_1[w]; |
| 3951 | *sp = w; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3952 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3953 | v = gamma_to_1[*(sp + 1)]; |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3954 | png_composite(w, v, a, png_ptr->background_1.green); |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3955 | if (!optimize) w = gamma_from_1[w]; |
| 3956 | *(sp + 1) = w; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3957 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3958 | v = gamma_to_1[*(sp + 2)]; |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3959 | png_composite(w, v, a, png_ptr->background_1.blue); |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3960 | if (!optimize) w = gamma_from_1[w]; |
| 3961 | *(sp + 2) = w; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3962 | } |
| 3963 | } |
| 3964 | } |
| 3965 | else |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3966 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3967 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3968 | sp = row; |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3969 | for (i = 0; i < row_width; i++, sp += 4) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3970 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 3971 | png_byte a = *(sp + 3); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3972 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3973 | if (a == 0) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3974 | { |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3975 | *sp = (png_byte)png_ptr->background.red; |
| 3976 | *(sp + 1) = (png_byte)png_ptr->background.green; |
| 3977 | *(sp + 2) = (png_byte)png_ptr->background.blue; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3978 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3979 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3980 | else if (a < 0xff) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3981 | { |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3982 | png_composite(*sp, *sp, a, png_ptr->background.red); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3983 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3984 | png_composite(*(sp + 1), *(sp + 1), a, |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3985 | png_ptr->background.green); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 3986 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 3987 | png_composite(*(sp + 2), *(sp + 2), a, |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 3988 | png_ptr->background.blue); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3989 | } |
| 3990 | } |
| 3991 | } |
| 3992 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3993 | else /* if (row_info->bit_depth == 16) */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3994 | { |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 3995 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3996 | if (gamma_16 != NULL && gamma_16_from_1 != NULL && |
| 3997 | gamma_16_to_1 != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3998 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3999 | sp = row; |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 4000 | for (i = 0; i < row_width; i++, sp += 8) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4001 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 4002 | png_uint_16 a = (png_uint_16)(((png_uint_16)(*(sp + 6)) |
| 4003 | << 8) + (png_uint_16)(*(sp + 7))); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4004 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4005 | if (a == (png_uint_16)0xffff) |
| 4006 | { |
| 4007 | png_uint_16 v; |
| 4008 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 4009 | v = gamma_16[*(sp + 1) >> gamma_shift][*sp]; |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 4010 | *sp = (png_byte)((v >> 8) & 0xff); |
| 4011 | *(sp + 1) = (png_byte)(v & 0xff); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4012 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 4013 | v = gamma_16[*(sp + 3) >> gamma_shift][*(sp + 2)]; |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 4014 | *(sp + 2) = (png_byte)((v >> 8) & 0xff); |
| 4015 | *(sp + 3) = (png_byte)(v & 0xff); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4016 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 4017 | v = gamma_16[*(sp + 5) >> gamma_shift][*(sp + 4)]; |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 4018 | *(sp + 4) = (png_byte)((v >> 8) & 0xff); |
| 4019 | *(sp + 5) = (png_byte)(v & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4020 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4021 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4022 | else if (a == 0) |
| 4023 | { |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4024 | /* Background is already in screen gamma */ |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 4025 | *sp = (png_byte)((png_ptr->background.red >> 8) & 0xff); |
| 4026 | *(sp + 1) = (png_byte)(png_ptr->background.red & 0xff); |
| 4027 | *(sp + 2) = (png_byte)((png_ptr->background.green >> 8) & 0xff); |
| 4028 | *(sp + 3) = (png_byte)(png_ptr->background.green & 0xff); |
| 4029 | *(sp + 4) = (png_byte)((png_ptr->background.blue >> 8) & 0xff); |
| 4030 | *(sp + 5) = (png_byte)(png_ptr->background.blue & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4031 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4032 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4033 | else |
| 4034 | { |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 4035 | png_uint_16 v, w; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4036 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 4037 | v = gamma_16_to_1[*(sp + 1) >> gamma_shift][*sp]; |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 4038 | png_composite_16(w, v, a, png_ptr->background_1.red); |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 4039 | if (!optimize) |
| 4040 | w = gamma_16_from_1[((w&0xff) >> gamma_shift)][w >> 8]; |
| 4041 | *sp = (png_byte)((w >> 8) & 0xff); |
| 4042 | *(sp + 1) = (png_byte)(w & 0xff); |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 4043 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 4044 | v = gamma_16_to_1[*(sp + 3) >> gamma_shift][*(sp + 2)]; |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 4045 | png_composite_16(w, v, a, png_ptr->background_1.green); |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 4046 | if (!optimize) |
| 4047 | w = gamma_16_from_1[((w&0xff) >> gamma_shift)][w >> 8]; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4048 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 4049 | *(sp + 2) = (png_byte)((w >> 8) & 0xff); |
| 4050 | *(sp + 3) = (png_byte)(w & 0xff); |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 4051 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 4052 | v = gamma_16_to_1[*(sp + 5) >> gamma_shift][*(sp + 4)]; |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 4053 | png_composite_16(w, v, a, png_ptr->background_1.blue); |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 4054 | if (!optimize) |
| 4055 | w = gamma_16_from_1[((w&0xff) >> gamma_shift)][w >> 8]; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4056 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 4057 | *(sp + 4) = (png_byte)((w >> 8) & 0xff); |
| 4058 | *(sp + 5) = (png_byte)(w & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4059 | } |
| 4060 | } |
| 4061 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4062 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4063 | else |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 4064 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4065 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4066 | sp = row; |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 4067 | for (i = 0; i < row_width; i++, sp += 8) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4068 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 4069 | 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] | 4070 | << 8) + (png_uint_16)(*(sp + 7))); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4071 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 4072 | if (a == 0) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4073 | { |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 4074 | *sp = (png_byte)((png_ptr->background.red >> 8) & 0xff); |
| 4075 | *(sp + 1) = (png_byte)(png_ptr->background.red & 0xff); |
| 4076 | *(sp + 2) = (png_byte)((png_ptr->background.green >> 8) & 0xff); |
| 4077 | *(sp + 3) = (png_byte)(png_ptr->background.green & 0xff); |
| 4078 | *(sp + 4) = (png_byte)((png_ptr->background.blue >> 8) & 0xff); |
| 4079 | *(sp + 5) = (png_byte)(png_ptr->background.blue & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4080 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4081 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 4082 | else if (a < 0xffff) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4083 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 4084 | png_uint_16 v; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4085 | |
Glenn Randers-Pehrson | 860ab2b | 1999-10-14 07:43:10 -0500 | [diff] [blame] | 4086 | png_uint_16 r = (png_uint_16)(((*sp) << 8) + *(sp + 1)); |
| 4087 | png_uint_16 g = (png_uint_16)(((*(sp + 2)) << 8) |
| 4088 | + *(sp + 3)); |
| 4089 | png_uint_16 b = (png_uint_16)(((*(sp + 4)) << 8) |
| 4090 | + *(sp + 5)); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 4091 | |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 4092 | png_composite_16(v, r, a, png_ptr->background.red); |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 4093 | *sp = (png_byte)((v >> 8) & 0xff); |
| 4094 | *(sp + 1) = (png_byte)(v & 0xff); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4095 | |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 4096 | png_composite_16(v, g, a, png_ptr->background.green); |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 4097 | *(sp + 2) = (png_byte)((v >> 8) & 0xff); |
| 4098 | *(sp + 3) = (png_byte)(v & 0xff); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4099 | |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 4100 | png_composite_16(v, b, a, png_ptr->background.blue); |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 4101 | *(sp + 4) = (png_byte)((v >> 8) & 0xff); |
| 4102 | *(sp + 5) = (png_byte)(v & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4103 | } |
| 4104 | } |
| 4105 | } |
| 4106 | } |
| 4107 | break; |
| 4108 | } |
Glenn Randers-Pehrson | b3edc73 | 2010-11-21 14:06:41 -0600 | [diff] [blame] | 4109 | |
| 4110 | default: |
| 4111 | break; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4112 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4113 | } |
| 4114 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 4115 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4116 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 4117 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 4118 | /* Gamma correct the image, avoiding the alpha channel. Make sure |
Glenn Randers-Pehrson | 345bc27 | 1998-06-14 14:43:31 -0500 | [diff] [blame] | 4119 | * 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] | 4120 | * 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] | 4121 | * is 16, use gamma_16_table and gamma_shift. Build these with |
| 4122 | * build_gamma_table(). |
| 4123 | */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 4124 | void /* PRIVATE */ |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 4125 | png_do_gamma(png_row_infop row_info, png_bytep row, png_structp png_ptr) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4126 | { |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 4127 | png_const_bytep gamma_table = png_ptr->gamma_table; |
| 4128 | png_const_uint_16pp gamma_16_table = png_ptr->gamma_16_table; |
| 4129 | int gamma_shift = png_ptr->gamma_shift; |
| 4130 | |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 4131 | png_bytep sp; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 4132 | png_uint_32 i; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4133 | png_uint_32 row_width=row_info->width; |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 4134 | |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 4135 | png_debug(1, "in png_do_gamma"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 4136 | |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4137 | if (((row_info->bit_depth <= 8 && gamma_table != NULL) || |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 4138 | (row_info->bit_depth == 16 && gamma_16_table != NULL))) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4139 | { |
| 4140 | switch (row_info->color_type) |
| 4141 | { |
| 4142 | case PNG_COLOR_TYPE_RGB: |
| 4143 | { |
| 4144 | if (row_info->bit_depth == 8) |
| 4145 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4146 | sp = row; |
| 4147 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4148 | { |
| 4149 | *sp = gamma_table[*sp]; |
| 4150 | sp++; |
| 4151 | *sp = gamma_table[*sp]; |
| 4152 | sp++; |
| 4153 | *sp = gamma_table[*sp]; |
| 4154 | sp++; |
| 4155 | } |
| 4156 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4157 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 4158 | else /* if (row_info->bit_depth == 16) */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4159 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4160 | sp = row; |
| 4161 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4162 | { |
| 4163 | png_uint_16 v; |
| 4164 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 4165 | v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 4166 | *sp = (png_byte)((v >> 8) & 0xff); |
| 4167 | *(sp + 1) = (png_byte)(v & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4168 | sp += 2; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 4169 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 4170 | v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 4171 | *sp = (png_byte)((v >> 8) & 0xff); |
| 4172 | *(sp + 1) = (png_byte)(v & 0xff); |
| 4173 | sp += 2; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 4174 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 4175 | v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 4176 | *sp = (png_byte)((v >> 8) & 0xff); |
| 4177 | *(sp + 1) = (png_byte)(v & 0xff); |
| 4178 | sp += 2; |
| 4179 | } |
| 4180 | } |
| 4181 | break; |
| 4182 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4183 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 4184 | case PNG_COLOR_TYPE_RGB_ALPHA: |
| 4185 | { |
| 4186 | if (row_info->bit_depth == 8) |
| 4187 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4188 | sp = row; |
| 4189 | for (i = 0; i < row_width; i++) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 4190 | { |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4191 | *sp = gamma_table[*sp]; |
| 4192 | sp++; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 4193 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4194 | *sp = gamma_table[*sp]; |
| 4195 | sp++; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 4196 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4197 | *sp = gamma_table[*sp]; |
| 4198 | sp++; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 4199 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4200 | sp++; |
| 4201 | } |
| 4202 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4203 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 4204 | else /* if (row_info->bit_depth == 16) */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4205 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4206 | sp = row; |
| 4207 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4208 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 4209 | png_uint_16 v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 4210 | *sp = (png_byte)((v >> 8) & 0xff); |
| 4211 | *(sp + 1) = (png_byte)(v & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4212 | sp += 2; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 4213 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 4214 | v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 4215 | *sp = (png_byte)((v >> 8) & 0xff); |
| 4216 | *(sp + 1) = (png_byte)(v & 0xff); |
| 4217 | sp += 2; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 4218 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 4219 | v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 4220 | *sp = (png_byte)((v >> 8) & 0xff); |
| 4221 | *(sp + 1) = (png_byte)(v & 0xff); |
| 4222 | sp += 4; |
| 4223 | } |
| 4224 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4225 | break; |
| 4226 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4227 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4228 | case PNG_COLOR_TYPE_GRAY_ALPHA: |
| 4229 | { |
| 4230 | if (row_info->bit_depth == 8) |
| 4231 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4232 | sp = row; |
| 4233 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4234 | { |
| 4235 | *sp = gamma_table[*sp]; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 4236 | sp += 2; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4237 | } |
| 4238 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4239 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 4240 | else /* if (row_info->bit_depth == 16) */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4241 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4242 | sp = row; |
| 4243 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4244 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 4245 | png_uint_16 v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 4246 | *sp = (png_byte)((v >> 8) & 0xff); |
| 4247 | *(sp + 1) = (png_byte)(v & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4248 | sp += 4; |
| 4249 | } |
| 4250 | } |
| 4251 | break; |
| 4252 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4253 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4254 | case PNG_COLOR_TYPE_GRAY: |
| 4255 | { |
Glenn Randers-Pehrson | 2687fcc | 1998-01-07 20:54:20 -0600 | [diff] [blame] | 4256 | if (row_info->bit_depth == 2) |
| 4257 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4258 | sp = row; |
| 4259 | for (i = 0; i < row_width; i += 4) |
Glenn Randers-Pehrson | 2687fcc | 1998-01-07 20:54:20 -0600 | [diff] [blame] | 4260 | { |
| 4261 | int a = *sp & 0xc0; |
| 4262 | int b = *sp & 0x30; |
| 4263 | int c = *sp & 0x0c; |
| 4264 | int d = *sp & 0x03; |
| 4265 | |
Glenn Randers-Pehrson | 860ab2b | 1999-10-14 07:43:10 -0500 | [diff] [blame] | 4266 | *sp = (png_byte)( |
Glenn Randers-Pehrson | e3f3c4e | 2010-02-07 18:08:50 -0600 | [diff] [blame] | 4267 | ((((int)gamma_table[a|(a>>2)|(a>>4)|(a>>6)]) ) & 0xc0)| |
| 4268 | ((((int)gamma_table[(b<<2)|b|(b>>2)|(b>>4)])>>2) & 0x30)| |
| 4269 | ((((int)gamma_table[(c<<4)|(c<<2)|c|(c>>2)])>>4) & 0x0c)| |
| 4270 | ((((int)gamma_table[(d<<6)|(d<<4)|(d<<2)|d])>>6) )); |
Glenn Randers-Pehrson | 2687fcc | 1998-01-07 20:54:20 -0600 | [diff] [blame] | 4271 | sp++; |
| 4272 | } |
| 4273 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4274 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 4275 | if (row_info->bit_depth == 4) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4276 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4277 | sp = row; |
| 4278 | for (i = 0; i < row_width; i += 2) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 4279 | { |
| 4280 | int msb = *sp & 0xf0; |
| 4281 | int lsb = *sp & 0x0f; |
| 4282 | |
Glenn Randers-Pehrson | 860ab2b | 1999-10-14 07:43:10 -0500 | [diff] [blame] | 4283 | *sp = (png_byte)((((int)gamma_table[msb | (msb >> 4)]) & 0xf0) |
Glenn Randers-Pehrson | e3f3c4e | 2010-02-07 18:08:50 -0600 | [diff] [blame] | 4284 | | (((int)gamma_table[(lsb << 4) | lsb]) >> 4)); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 4285 | sp++; |
| 4286 | } |
| 4287 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4288 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 4289 | else if (row_info->bit_depth == 8) |
| 4290 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4291 | sp = row; |
| 4292 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4293 | { |
| 4294 | *sp = gamma_table[*sp]; |
| 4295 | sp++; |
| 4296 | } |
| 4297 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4298 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4299 | else if (row_info->bit_depth == 16) |
| 4300 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4301 | sp = row; |
| 4302 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4303 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 4304 | png_uint_16 v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 4305 | *sp = (png_byte)((v >> 8) & 0xff); |
| 4306 | *(sp + 1) = (png_byte)(v & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4307 | sp += 2; |
| 4308 | } |
| 4309 | } |
| 4310 | break; |
| 4311 | } |
Glenn Randers-Pehrson | b3edc73 | 2010-11-21 14:06:41 -0600 | [diff] [blame] | 4312 | |
| 4313 | default: |
| 4314 | break; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4315 | } |
| 4316 | } |
| 4317 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 4318 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4319 | |
John Bowler | d273ad2 | 2011-05-07 21:00:28 -0500 | [diff] [blame] | 4320 | #ifdef PNG_READ_ALPHA_MODE_SUPPORTED |
| 4321 | /* Encode the alpha channel to the output gamma (the input channel is always |
| 4322 | * linear.) Called only with color types that have an alpha channel. Needs the |
| 4323 | * from_1 tables. |
| 4324 | */ |
| 4325 | void /* PRIVATE */ |
| 4326 | png_do_encode_alpha(png_row_infop row_info, png_bytep row, png_structp png_ptr) |
| 4327 | { |
| 4328 | png_uint_32 row_width = row_info->width; |
| 4329 | |
| 4330 | png_debug(1, "in png_do_encode_alpha"); |
| 4331 | |
| 4332 | if (row_info->color_type & PNG_COLOR_MASK_ALPHA) |
| 4333 | { |
| 4334 | if (row_info->bit_depth == 8) |
| 4335 | { |
| 4336 | PNG_CONST png_bytep table = png_ptr->gamma_from_1; |
| 4337 | |
| 4338 | if (table != NULL) |
| 4339 | { |
| 4340 | PNG_CONST int step = |
| 4341 | (row_info->color_type & PNG_COLOR_MASK_COLOR) ? 4 : 2; |
| 4342 | |
| 4343 | /* The alpha channel is the last component: */ |
| 4344 | row += step - 1; |
| 4345 | |
| 4346 | for (; row_width > 0; --row_width, row += step) |
| 4347 | *row = table[*row]; |
| 4348 | |
| 4349 | return; |
| 4350 | } |
| 4351 | } |
| 4352 | |
| 4353 | else if (row_info->bit_depth == 16) |
| 4354 | { |
| 4355 | PNG_CONST png_uint_16pp table = png_ptr->gamma_16_from_1; |
| 4356 | PNG_CONST int gamma_shift = png_ptr->gamma_shift; |
| 4357 | |
| 4358 | if (table != NULL) |
| 4359 | { |
| 4360 | PNG_CONST int step = |
| 4361 | (row_info->color_type & PNG_COLOR_MASK_COLOR) ? 8 : 4; |
| 4362 | |
| 4363 | /* The alpha channel is the last component: */ |
| 4364 | row += step - 2; |
| 4365 | |
| 4366 | for (; row_width > 0; --row_width, row += step) |
| 4367 | { |
| 4368 | png_uint_16 v; |
| 4369 | |
| 4370 | v = table[*(row + 1) >> gamma_shift][*row]; |
| 4371 | *row = (png_byte)((v >> 8) & 0xff); |
| 4372 | *(row + 1) = (png_byte)(v & 0xff); |
| 4373 | } |
| 4374 | |
| 4375 | return; |
| 4376 | } |
| 4377 | } |
| 4378 | } |
| 4379 | |
| 4380 | /* Only get to here if called with a weird row_info; no harm has been done, |
| 4381 | * so just issue a warning. |
| 4382 | */ |
| 4383 | png_warning(png_ptr, "png_do_encode_alpha: unexpected call"); |
| 4384 | } |
| 4385 | #endif |
| 4386 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 4387 | #ifdef PNG_READ_EXPAND_SUPPORTED |
Glenn Randers-Pehrson | 352ca6b | 1999-09-18 15:49:20 -0500 | [diff] [blame] | 4388 | /* Expands a palette row to an RGB or RGBA row depending |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 4389 | * upon whether you supply trans and num_trans. |
| 4390 | */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 4391 | void /* PRIVATE */ |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 4392 | 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] | 4393 | png_const_colorp palette, png_const_bytep trans_alpha, int num_trans) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4394 | { |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 4395 | int shift, value; |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 4396 | png_bytep sp, dp; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 4397 | png_uint_32 i; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4398 | png_uint_32 row_width=row_info->width; |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 4399 | |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 4400 | png_debug(1, "in png_do_expand_palette"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 4401 | |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4402 | if (row_info->color_type == PNG_COLOR_TYPE_PALETTE) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4403 | { |
| 4404 | if (row_info->bit_depth < 8) |
| 4405 | { |
| 4406 | switch (row_info->bit_depth) |
| 4407 | { |
| 4408 | case 1: |
| 4409 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4410 | sp = row + (png_size_t)((row_width - 1) >> 3); |
| 4411 | dp = row + (png_size_t)row_width - 1; |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 4412 | shift = 7 - (int)((row_width + 7) & 0x07); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4413 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4414 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 4415 | if ((*sp >> shift) & 0x01) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4416 | *dp = 1; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 4417 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4418 | else |
| 4419 | *dp = 0; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 4420 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4421 | if (shift == 7) |
| 4422 | { |
| 4423 | shift = 0; |
| 4424 | sp--; |
| 4425 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4426 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4427 | else |
| 4428 | shift++; |
| 4429 | |
| 4430 | dp--; |
| 4431 | } |
| 4432 | break; |
| 4433 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4434 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4435 | case 2: |
| 4436 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4437 | sp = row + (png_size_t)((row_width - 1) >> 2); |
| 4438 | dp = row + (png_size_t)row_width - 1; |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 4439 | shift = (int)((3 - ((row_width + 3) & 0x03)) << 1); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4440 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4441 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 4442 | value = (*sp >> shift) & 0x03; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 4443 | *dp = (png_byte)value; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4444 | if (shift == 6) |
| 4445 | { |
| 4446 | shift = 0; |
| 4447 | sp--; |
| 4448 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4449 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4450 | else |
| 4451 | shift += 2; |
| 4452 | |
| 4453 | dp--; |
| 4454 | } |
| 4455 | break; |
| 4456 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4457 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4458 | case 4: |
| 4459 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4460 | sp = row + (png_size_t)((row_width - 1) >> 1); |
| 4461 | dp = row + (png_size_t)row_width - 1; |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 4462 | shift = (int)((row_width & 0x01) << 2); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4463 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4464 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 4465 | value = (*sp >> shift) & 0x0f; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 4466 | *dp = (png_byte)value; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4467 | if (shift == 4) |
| 4468 | { |
| 4469 | shift = 0; |
| 4470 | sp--; |
| 4471 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4472 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4473 | else |
| 4474 | shift += 4; |
| 4475 | |
| 4476 | dp--; |
| 4477 | } |
| 4478 | break; |
| 4479 | } |
Glenn Randers-Pehrson | b3edc73 | 2010-11-21 14:06:41 -0600 | [diff] [blame] | 4480 | |
| 4481 | default: |
| 4482 | break; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4483 | } |
| 4484 | row_info->bit_depth = 8; |
| 4485 | row_info->pixel_depth = 8; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4486 | row_info->rowbytes = row_width; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4487 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4488 | |
John Bowler | 4e230b0 | 2011-01-08 14:49:25 -0600 | [diff] [blame] | 4489 | if (row_info->bit_depth == 8) |
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 | { |
John Bowler | cd3b0cc | 2011-06-14 23:01:07 -0500 | [diff] [blame] | 4492 | if (num_trans > 0) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4493 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4494 | sp = row + (png_size_t)row_width - 1; |
| 4495 | dp = row + (png_size_t)(row_width << 2) - 1; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4496 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4497 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4498 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 4499 | if ((int)(*sp) >= num_trans) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4500 | *dp-- = 0xff; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 4501 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4502 | else |
Glenn Randers-Pehrson | 6abea75 | 2009-08-08 16:52:06 -0500 | [diff] [blame] | 4503 | *dp-- = trans_alpha[*sp]; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 4504 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4505 | *dp-- = palette[*sp].blue; |
| 4506 | *dp-- = palette[*sp].green; |
| 4507 | *dp-- = palette[*sp].red; |
| 4508 | sp--; |
| 4509 | } |
| 4510 | row_info->bit_depth = 8; |
| 4511 | row_info->pixel_depth = 32; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4512 | row_info->rowbytes = row_width * 4; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4513 | row_info->color_type = 6; |
| 4514 | row_info->channels = 4; |
| 4515 | } |
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 | else |
| 4518 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4519 | sp = row + (png_size_t)row_width - 1; |
| 4520 | dp = row + (png_size_t)(row_width * 3) - 1; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4521 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4522 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4523 | { |
| 4524 | *dp-- = palette[*sp].blue; |
| 4525 | *dp-- = palette[*sp].green; |
| 4526 | *dp-- = palette[*sp].red; |
| 4527 | sp--; |
| 4528 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4529 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4530 | row_info->bit_depth = 8; |
| 4531 | row_info->pixel_depth = 24; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4532 | row_info->rowbytes = row_width * 3; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4533 | row_info->color_type = 2; |
| 4534 | row_info->channels = 3; |
| 4535 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4536 | } |
| 4537 | } |
| 4538 | } |
| 4539 | } |
| 4540 | |
Glenn Randers-Pehrson | 1ce0836 | 2006-03-08 23:35:59 -0600 | [diff] [blame] | 4541 | /* If the bit depth < 8, it is expanded to 8. Also, if the already |
| 4542 | * expanded transparency value is supplied, an alpha channel is built. |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 4543 | */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 4544 | void /* PRIVATE */ |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 4545 | png_do_expand(png_row_infop row_info, png_bytep row, |
John Bowler | cd3b0cc | 2011-06-14 23:01:07 -0500 | [diff] [blame] | 4546 | png_const_color_16p trans_color) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4547 | { |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 4548 | int shift, value; |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 4549 | png_bytep sp, dp; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 4550 | png_uint_32 i; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4551 | png_uint_32 row_width=row_info->width; |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 4552 | |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 4553 | png_debug(1, "in png_do_expand"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 4554 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4555 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 4556 | if (row_info->color_type == PNG_COLOR_TYPE_GRAY) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4557 | { |
John Bowler | cd3b0cc | 2011-06-14 23:01:07 -0500 | [diff] [blame] | 4558 | png_uint_16 gray = (png_uint_16)(trans_color ? trans_color->gray : 0); |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4559 | |
| 4560 | if (row_info->bit_depth < 8) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4561 | { |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4562 | switch (row_info->bit_depth) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4563 | { |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4564 | case 1: |
| 4565 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 4566 | gray = (png_uint_16)((gray & 0x01) * 0xff); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4567 | sp = row + (png_size_t)((row_width - 1) >> 3); |
| 4568 | dp = row + (png_size_t)row_width - 1; |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 4569 | shift = 7 - (int)((row_width + 7) & 0x07); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4570 | for (i = 0; i < row_width; i++) |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4571 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 4572 | if ((*sp >> shift) & 0x01) |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4573 | *dp = 0xff; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 4574 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4575 | else |
| 4576 | *dp = 0; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 4577 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4578 | if (shift == 7) |
| 4579 | { |
| 4580 | shift = 0; |
| 4581 | sp--; |
| 4582 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4583 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4584 | else |
| 4585 | shift++; |
| 4586 | |
| 4587 | dp--; |
| 4588 | } |
| 4589 | break; |
| 4590 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4591 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4592 | case 2: |
| 4593 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 4594 | gray = (png_uint_16)((gray & 0x03) * 0x55); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4595 | sp = row + (png_size_t)((row_width - 1) >> 2); |
| 4596 | dp = row + (png_size_t)row_width - 1; |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 4597 | shift = (int)((3 - ((row_width + 3) & 0x03)) << 1); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4598 | for (i = 0; i < row_width; i++) |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4599 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 4600 | value = (*sp >> shift) & 0x03; |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4601 | *dp = (png_byte)(value | (value << 2) | (value << 4) | |
| 4602 | (value << 6)); |
| 4603 | if (shift == 6) |
| 4604 | { |
| 4605 | shift = 0; |
| 4606 | sp--; |
| 4607 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4608 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4609 | else |
| 4610 | shift += 2; |
| 4611 | |
| 4612 | dp--; |
| 4613 | } |
| 4614 | break; |
| 4615 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4616 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4617 | case 4: |
| 4618 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 4619 | gray = (png_uint_16)((gray & 0x0f) * 0x11); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4620 | sp = row + (png_size_t)((row_width - 1) >> 1); |
| 4621 | dp = row + (png_size_t)row_width - 1; |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 4622 | shift = (int)((1 - ((row_width + 1) & 0x01)) << 2); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4623 | for (i = 0; i < row_width; i++) |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4624 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 4625 | value = (*sp >> shift) & 0x0f; |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4626 | *dp = (png_byte)(value | (value << 4)); |
| 4627 | if (shift == 4) |
| 4628 | { |
| 4629 | shift = 0; |
| 4630 | sp--; |
| 4631 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4632 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4633 | else |
| 4634 | shift = 4; |
| 4635 | |
| 4636 | dp--; |
| 4637 | } |
| 4638 | break; |
| 4639 | } |
Glenn Randers-Pehrson | b3edc73 | 2010-11-21 14:06:41 -0600 | [diff] [blame] | 4640 | |
| 4641 | default: |
| 4642 | break; |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4643 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4644 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4645 | row_info->bit_depth = 8; |
| 4646 | row_info->pixel_depth = 8; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4647 | row_info->rowbytes = row_width; |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4648 | } |
| 4649 | |
John Bowler | cd3b0cc | 2011-06-14 23:01:07 -0500 | [diff] [blame] | 4650 | if (trans_color != NULL) |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4651 | { |
| 4652 | if (row_info->bit_depth == 8) |
| 4653 | { |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 4654 | gray = gray & 0xff; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4655 | sp = row + (png_size_t)row_width - 1; |
| 4656 | dp = row + (png_size_t)(row_width << 1) - 1; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4657 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4658 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4659 | { |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4660 | if (*sp == gray) |
| 4661 | *dp-- = 0; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4662 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4663 | else |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4664 | *dp-- = 0xff; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4665 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4666 | *dp-- = *sp--; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4667 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4668 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4669 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4670 | else if (row_info->bit_depth == 16) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4671 | { |
Glenn Randers-Pehrson | 67439c4 | 2010-08-19 07:01:09 -0500 | [diff] [blame] | 4672 | png_byte gray_high = (png_byte)((gray >> 8) & 0xff); |
| 4673 | png_byte gray_low = (png_byte)(gray & 0xff); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 4674 | sp = row + row_info->rowbytes - 1; |
| 4675 | dp = row + (row_info->rowbytes << 1) - 1; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4676 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4677 | { |
Glenn Randers-Pehrson | 79134c6 | 2009-02-14 10:32:18 -0600 | [diff] [blame] | 4678 | if (*(sp - 1) == gray_high && *(sp) == gray_low) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4679 | { |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4680 | *dp-- = 0; |
| 4681 | *dp-- = 0; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4682 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4683 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4684 | else |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4685 | { |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4686 | *dp-- = 0xff; |
| 4687 | *dp-- = 0xff; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4688 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4689 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4690 | *dp-- = *sp--; |
| 4691 | *dp-- = *sp--; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4692 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4693 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4694 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 4695 | row_info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA; |
| 4696 | row_info->channels = 2; |
| 4697 | row_info->pixel_depth = (png_byte)(row_info->bit_depth << 1); |
Glenn Randers-Pehrson | 272489d | 2004-08-04 06:34:52 -0500 | [diff] [blame] | 4698 | row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, |
| 4699 | row_width); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4700 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4701 | } |
John Bowler | cd3b0cc | 2011-06-14 23:01:07 -0500 | [diff] [blame] | 4702 | else if (row_info->color_type == PNG_COLOR_TYPE_RGB && trans_color) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4703 | { |
| 4704 | if (row_info->bit_depth == 8) |
| 4705 | { |
John Bowler | cd3b0cc | 2011-06-14 23:01:07 -0500 | [diff] [blame] | 4706 | png_byte red = (png_byte)(trans_color->red & 0xff); |
| 4707 | png_byte green = (png_byte)(trans_color->green & 0xff); |
| 4708 | png_byte blue = (png_byte)(trans_color->blue & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4709 | sp = row + (png_size_t)row_info->rowbytes - 1; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4710 | dp = row + (png_size_t)(row_width << 2) - 1; |
| 4711 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4712 | { |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 4713 | if (*(sp - 2) == red && *(sp - 1) == green && *(sp) == blue) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4714 | *dp-- = 0; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4715 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4716 | else |
| 4717 | *dp-- = 0xff; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4718 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4719 | *dp-- = *sp--; |
| 4720 | *dp-- = *sp--; |
| 4721 | *dp-- = *sp--; |
| 4722 | } |
| 4723 | } |
| 4724 | else if (row_info->bit_depth == 16) |
| 4725 | { |
John Bowler | cd3b0cc | 2011-06-14 23:01:07 -0500 | [diff] [blame] | 4726 | png_byte red_high = (png_byte)((trans_color->red >> 8) & 0xff); |
| 4727 | png_byte green_high = (png_byte)((trans_color->green >> 8) & 0xff); |
| 4728 | png_byte blue_high = (png_byte)((trans_color->blue >> 8) & 0xff); |
| 4729 | png_byte red_low = (png_byte)(trans_color->red & 0xff); |
| 4730 | png_byte green_low = (png_byte)(trans_color->green & 0xff); |
| 4731 | png_byte blue_low = (png_byte)(trans_color->blue & 0xff); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 4732 | sp = row + row_info->rowbytes - 1; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4733 | dp = row + (png_size_t)(row_width << 3) - 1; |
| 4734 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4735 | { |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 4736 | if (*(sp - 5) == red_high && |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 4737 | *(sp - 4) == red_low && |
| 4738 | *(sp - 3) == green_high && |
| 4739 | *(sp - 2) == green_low && |
| 4740 | *(sp - 1) == blue_high && |
| 4741 | *(sp ) == blue_low) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4742 | { |
| 4743 | *dp-- = 0; |
| 4744 | *dp-- = 0; |
| 4745 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4746 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4747 | else |
| 4748 | { |
| 4749 | *dp-- = 0xff; |
| 4750 | *dp-- = 0xff; |
| 4751 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4752 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4753 | *dp-- = *sp--; |
| 4754 | *dp-- = *sp--; |
| 4755 | *dp-- = *sp--; |
| 4756 | *dp-- = *sp--; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 4757 | *dp-- = *sp--; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4758 | *dp-- = *sp--; |
| 4759 | } |
| 4760 | } |
| 4761 | row_info->color_type = PNG_COLOR_TYPE_RGB_ALPHA; |
| 4762 | row_info->channels = 4; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 4763 | row_info->pixel_depth = (png_byte)(row_info->bit_depth << 2); |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 4764 | row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4765 | } |
| 4766 | } |
| 4767 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 4768 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4769 | |
John Bowler | 4d56296 | 2011-02-12 09:01:20 -0600 | [diff] [blame] | 4770 | #ifdef PNG_READ_EXPAND_16_SUPPORTED |
Glenn Randers-Pehrson | 8b8aacd | 2011-08-25 18:10:50 -0500 | [diff] [blame] | 4771 | /* 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] | 4772 | * whole row to 16 bits. Has no effect otherwise. |
| 4773 | */ |
| 4774 | void /* PRIVATE */ |
| 4775 | png_do_expand_16(png_row_infop row_info, png_bytep row) |
| 4776 | { |
| 4777 | if (row_info->bit_depth == 8 && |
| 4778 | row_info->color_type != PNG_COLOR_TYPE_PALETTE) |
| 4779 | { |
| 4780 | /* The row have a sequence of bytes containing [0..255] and we need |
| 4781 | * to turn it into another row containing [0..65535], to do this we |
| 4782 | * calculate: |
| 4783 | * |
| 4784 | * (input / 255) * 65535 |
| 4785 | * |
| 4786 | * Which happens to be exactly input * 257 and this can be achieved |
| 4787 | * simply by byte replication in place (copying backwards). |
| 4788 | */ |
| 4789 | png_byte *sp = row + row_info->rowbytes; /* source, last byte + 1 */ |
| 4790 | png_byte *dp = sp + row_info->rowbytes; /* destination, end + 1 */ |
| 4791 | while (dp > sp) |
| 4792 | dp[-2] = dp[-1] = *--sp, dp -= 2; |
| 4793 | |
| 4794 | row_info->rowbytes *= 2; |
| 4795 | row_info->bit_depth = 16; |
| 4796 | row_info->pixel_depth = (png_byte)(row_info->channels * 16); |
| 4797 | } |
| 4798 | } |
| 4799 | #endif |
| 4800 | |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 4801 | #ifdef PNG_READ_QUANTIZE_SUPPORTED |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 4802 | void /* PRIVATE */ |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 4803 | png_do_quantize(png_row_infop row_info, png_bytep row, |
Glenn Randers-Pehrson | e600c51 | 2010-08-18 07:25:46 -0500 | [diff] [blame] | 4804 | png_const_bytep palette_lookup, png_const_bytep quantize_lookup) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4805 | { |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 4806 | png_bytep sp, dp; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 4807 | png_uint_32 i; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4808 | png_uint_32 row_width=row_info->width; |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 4809 | |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 4810 | png_debug(1, "in png_do_quantize"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 4811 | |
Glenn Randers-Pehrson | 925d23b | 2010-08-26 21:43:18 -0500 | [diff] [blame] | 4812 | if (row_info->bit_depth == 8) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4813 | { |
Glenn Randers-Pehrson | 925d23b | 2010-08-26 21:43:18 -0500 | [diff] [blame] | 4814 | if (row_info->color_type == PNG_COLOR_TYPE_RGB && palette_lookup) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4815 | { |
| 4816 | int r, g, b, p; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4817 | sp = row; |
| 4818 | dp = row; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4819 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4820 | { |
| 4821 | r = *sp++; |
| 4822 | g = *sp++; |
| 4823 | b = *sp++; |
| 4824 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4825 | /* This looks real messy, but the compiler will reduce |
| 4826 | * it down to a reasonable formula. For example, with |
| 4827 | * 5 bits per color, we get: |
| 4828 | * p = (((r >> 3) & 0x1f) << 10) | |
| 4829 | * (((g >> 3) & 0x1f) << 5) | |
| 4830 | * ((b >> 3) & 0x1f); |
| 4831 | */ |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 4832 | p = (((r >> (8 - PNG_QUANTIZE_RED_BITS)) & |
| 4833 | ((1 << PNG_QUANTIZE_RED_BITS) - 1)) << |
| 4834 | (PNG_QUANTIZE_GREEN_BITS + PNG_QUANTIZE_BLUE_BITS)) | |
| 4835 | (((g >> (8 - PNG_QUANTIZE_GREEN_BITS)) & |
| 4836 | ((1 << PNG_QUANTIZE_GREEN_BITS) - 1)) << |
| 4837 | (PNG_QUANTIZE_BLUE_BITS)) | |
| 4838 | ((b >> (8 - PNG_QUANTIZE_BLUE_BITS)) & |
| 4839 | ((1 << PNG_QUANTIZE_BLUE_BITS) - 1)); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4840 | |
| 4841 | *dp++ = palette_lookup[p]; |
| 4842 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4843 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4844 | row_info->color_type = PNG_COLOR_TYPE_PALETTE; |
| 4845 | row_info->channels = 1; |
| 4846 | row_info->pixel_depth = row_info->bit_depth; |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 4847 | row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4848 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4849 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4850 | else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA && |
Glenn Randers-Pehrson | 925d23b | 2010-08-26 21:43:18 -0500 | [diff] [blame] | 4851 | palette_lookup != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4852 | { |
| 4853 | int r, g, b, p; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4854 | sp = row; |
| 4855 | dp = row; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4856 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4857 | { |
| 4858 | r = *sp++; |
| 4859 | g = *sp++; |
| 4860 | b = *sp++; |
| 4861 | sp++; |
| 4862 | |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 4863 | p = (((r >> (8 - PNG_QUANTIZE_RED_BITS)) & |
| 4864 | ((1 << PNG_QUANTIZE_RED_BITS) - 1)) << |
| 4865 | (PNG_QUANTIZE_GREEN_BITS + PNG_QUANTIZE_BLUE_BITS)) | |
| 4866 | (((g >> (8 - PNG_QUANTIZE_GREEN_BITS)) & |
| 4867 | ((1 << PNG_QUANTIZE_GREEN_BITS) - 1)) << |
| 4868 | (PNG_QUANTIZE_BLUE_BITS)) | |
| 4869 | ((b >> (8 - PNG_QUANTIZE_BLUE_BITS)) & |
| 4870 | ((1 << PNG_QUANTIZE_BLUE_BITS) - 1)); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4871 | |
| 4872 | *dp++ = palette_lookup[p]; |
| 4873 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4874 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4875 | row_info->color_type = PNG_COLOR_TYPE_PALETTE; |
| 4876 | row_info->channels = 1; |
| 4877 | row_info->pixel_depth = row_info->bit_depth; |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 4878 | row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4879 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4880 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4881 | else if (row_info->color_type == PNG_COLOR_TYPE_PALETTE && |
Glenn Randers-Pehrson | 925d23b | 2010-08-26 21:43:18 -0500 | [diff] [blame] | 4882 | quantize_lookup) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 4883 | { |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4884 | sp = row; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4885 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4886 | for (i = 0; i < row_width; i++, sp++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4887 | { |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 4888 | *sp = quantize_lookup[*sp]; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4889 | } |
| 4890 | } |
| 4891 | } |
| 4892 | } |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 4893 | #endif /* PNG_READ_QUANTIZE_SUPPORTED */ |
John Bowler | 4a12f4a | 2011-04-17 18:34:22 -0500 | [diff] [blame] | 4894 | #endif /* PNG_READ_TRANSFORMS_SUPPORTED */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4895 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 4896 | #ifdef PNG_MNG_FEATURES_SUPPORTED |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 4897 | /* Undoes intrapixel differencing */ |
Glenn Randers-Pehrson | 2ad31ae | 2000-12-15 08:54:42 -0600 | [diff] [blame] | 4898 | void /* PRIVATE */ |
| 4899 | png_do_read_intrapixel(png_row_infop row_info, png_bytep row) |
| 4900 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 4901 | png_debug(1, "in png_do_read_intrapixel"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 4902 | |
Glenn Randers-Pehrson | 2ad31ae | 2000-12-15 08:54:42 -0600 | [diff] [blame] | 4903 | if ( |
Glenn Randers-Pehrson | 2ad31ae | 2000-12-15 08:54:42 -0600 | [diff] [blame] | 4904 | (row_info->color_type & PNG_COLOR_MASK_COLOR)) |
| 4905 | { |
| 4906 | int bytes_per_pixel; |
| 4907 | png_uint_32 row_width = row_info->width; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame] | 4908 | |
Glenn Randers-Pehrson | 2ad31ae | 2000-12-15 08:54:42 -0600 | [diff] [blame] | 4909 | if (row_info->bit_depth == 8) |
| 4910 | { |
| 4911 | png_bytep rp; |
| 4912 | png_uint_32 i; |
| 4913 | |
| 4914 | if (row_info->color_type == PNG_COLOR_TYPE_RGB) |
| 4915 | bytes_per_pixel = 3; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4916 | |
Glenn Randers-Pehrson | 2ad31ae | 2000-12-15 08:54:42 -0600 | [diff] [blame] | 4917 | else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA) |
| 4918 | bytes_per_pixel = 4; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4919 | |
Glenn Randers-Pehrson | 2ad31ae | 2000-12-15 08:54:42 -0600 | [diff] [blame] | 4920 | else |
| 4921 | return; |
| 4922 | |
| 4923 | for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel) |
| 4924 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 4925 | *(rp) = (png_byte)((256 + *rp + *(rp + 1)) & 0xff); |
| 4926 | *(rp+2) = (png_byte)((256 + *(rp + 2) + *(rp + 1)) & 0xff); |
Glenn Randers-Pehrson | 2ad31ae | 2000-12-15 08:54:42 -0600 | [diff] [blame] | 4927 | } |
| 4928 | } |
| 4929 | else if (row_info->bit_depth == 16) |
| 4930 | { |
| 4931 | png_bytep rp; |
| 4932 | png_uint_32 i; |
| 4933 | |
| 4934 | if (row_info->color_type == PNG_COLOR_TYPE_RGB) |
| 4935 | bytes_per_pixel = 6; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4936 | |
Glenn Randers-Pehrson | 2ad31ae | 2000-12-15 08:54:42 -0600 | [diff] [blame] | 4937 | else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA) |
| 4938 | bytes_per_pixel = 8; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4939 | |
Glenn Randers-Pehrson | 2ad31ae | 2000-12-15 08:54:42 -0600 | [diff] [blame] | 4940 | else |
| 4941 | return; |
| 4942 | |
| 4943 | for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel) |
| 4944 | { |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 4945 | png_uint_32 s0 = (*(rp ) << 8) | *(rp + 1); |
| 4946 | png_uint_32 s1 = (*(rp + 2) << 8) | *(rp + 3); |
| 4947 | png_uint_32 s2 = (*(rp + 4) << 8) | *(rp + 5); |
John Bowler | 7515612 | 2011-09-09 17:21:44 -0500 | [diff] [blame] | 4948 | png_uint_32 red = (s0 + s1 + 65536) & 0xffff; |
| 4949 | png_uint_32 blue = (s2 + s1 + 65536) & 0xffff; |
Glenn Randers-Pehrson | bc363ec | 2010-10-12 21:17:00 -0500 | [diff] [blame] | 4950 | *(rp ) = (png_byte)((red >> 8) & 0xff); |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 4951 | *(rp + 1) = (png_byte)(red & 0xff); |
| 4952 | *(rp + 4) = (png_byte)((blue >> 8) & 0xff); |
| 4953 | *(rp + 5) = (png_byte)(blue & 0xff); |
Glenn Randers-Pehrson | 2ad31ae | 2000-12-15 08:54:42 -0600 | [diff] [blame] | 4954 | } |
| 4955 | } |
| 4956 | } |
| 4957 | } |
| 4958 | #endif /* PNG_MNG_FEATURES_SUPPORTED */ |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4959 | #endif /* PNG_READ_SUPPORTED */ |