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 | 345bc27 | 1998-06-14 14:43:31 -0500 | [diff] [blame^] | 4 | * libpng 1.0.2 - June 14, 1998 |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 5 | * For conditions of distribution and use, see copyright notice in png.h |
| 6 | * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. |
| 7 | * Copyright (c) 1996, 1997 Andreas Dilger |
Glenn Randers-Pehrson | 2687fcc | 1998-01-07 20:54:20 -0600 | [diff] [blame] | 8 | * Copyright (c) 1998, Glenn Randers-Pehrson |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 9 | * |
| 10 | * This file contains functions optionally called by an application |
| 11 | * 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] | 12 | * Transformations that are used in both reading and writing are |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 13 | * in pngtrans.c. |
| 14 | */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 15 | |
| 16 | #define PNG_INTERNAL |
| 17 | #include "png.h" |
| 18 | |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 19 | /* Set the action on getting a CRC error for an ancillary or critical chunk. */ |
| 20 | void |
| 21 | png_set_crc_action(png_structp png_ptr, int crit_action, int ancil_action) |
| 22 | { |
| 23 | png_debug(1, "in png_set_crc_action\n"); |
| 24 | /* Tell libpng how we react to CRC errors in critical chunks */ |
| 25 | switch (crit_action) |
| 26 | { |
| 27 | case PNG_CRC_NO_CHANGE: /* leave setting as is */ |
| 28 | break; |
| 29 | case PNG_CRC_WARN_USE: /* warn/use data */ |
| 30 | png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK; |
| 31 | png_ptr->flags |= PNG_FLAG_CRC_CRITICAL_USE; |
| 32 | break; |
| 33 | case PNG_CRC_QUIET_USE: /* quiet/use data */ |
| 34 | png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK; |
| 35 | png_ptr->flags |= PNG_FLAG_CRC_CRITICAL_USE | |
| 36 | PNG_FLAG_CRC_CRITICAL_IGNORE; |
| 37 | break; |
| 38 | case PNG_CRC_WARN_DISCARD: /* not a valid action for critical data */ |
| 39 | png_warning(png_ptr, "Can't discard critical data on CRC error."); |
| 40 | case PNG_CRC_ERROR_QUIT: /* error/quit */ |
| 41 | case PNG_CRC_DEFAULT: |
| 42 | default: |
| 43 | png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK; |
| 44 | break; |
| 45 | } |
| 46 | |
| 47 | switch (ancil_action) |
| 48 | { |
| 49 | case PNG_CRC_NO_CHANGE: /* leave setting as is */ |
| 50 | break; |
| 51 | case PNG_CRC_WARN_USE: /* warn/use data */ |
| 52 | png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK; |
| 53 | png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_USE; |
| 54 | break; |
| 55 | case PNG_CRC_QUIET_USE: /* quiet/use data */ |
| 56 | png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK; |
| 57 | png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_USE | |
| 58 | PNG_FLAG_CRC_ANCILLARY_NOWARN; |
| 59 | break; |
| 60 | case PNG_CRC_ERROR_QUIT: /* error/quit */ |
| 61 | png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK; |
| 62 | png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_NOWARN; |
| 63 | break; |
| 64 | case PNG_CRC_WARN_DISCARD: /* warn/discard data */ |
| 65 | case PNG_CRC_DEFAULT: |
| 66 | default: |
| 67 | png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK; |
| 68 | break; |
| 69 | } |
| 70 | } |
| 71 | |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 72 | #if defined(PNG_READ_BACKGROUND_SUPPORTED) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 73 | /* handle alpha and tRNS via a background color */ |
| 74 | void |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 75 | png_set_background(png_structp png_ptr, |
| 76 | png_color_16p background_color, int background_gamma_code, |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 77 | int need_expand, double background_gamma) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 78 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 79 | png_debug(1, "in png_set_background\n"); |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 80 | if (background_gamma_code == PNG_BACKGROUND_GAMMA_UNKNOWN) |
| 81 | { |
| 82 | png_warning(png_ptr, "Application must supply a known background gamma"); |
| 83 | return; |
| 84 | } |
| 85 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 86 | png_ptr->transformations |= PNG_BACKGROUND; |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 87 | png_memcpy(&(png_ptr->background), background_color, sizeof(png_color_16)); |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 88 | png_ptr->background_gamma = (float)background_gamma; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 89 | png_ptr->background_gamma_type = (png_byte)(background_gamma_code); |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 90 | png_ptr->transformations |= (need_expand ? PNG_BACKGROUND_EXPAND : 0); |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 91 | |
| 92 | /* Note: if need_expand is set and color_type is either RGB or RGB_ALPHA |
| 93 | * (in which case need_expand is superfluous anyway), the background color |
| 94 | * might actually be gray yet not be flagged as such. This is not a problem |
| 95 | * for the current code, which uses PNG_FLAG_BACKGROUND_IS_GRAY only to |
| 96 | * decide when to do the png_do_gray_to_rgb() transformation. |
| 97 | */ |
| 98 | if ((need_expand && !(png_ptr->color_type & PNG_COLOR_MASK_COLOR)) || |
| 99 | (!need_expand && background_color->red == background_color->green && |
| 100 | background_color->red == background_color->blue)) |
| 101 | png_ptr->flags |= PNG_FLAG_BACKGROUND_IS_GRAY; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 102 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 103 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 104 | |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 105 | #if defined(PNG_READ_16_TO_8_SUPPORTED) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 106 | /* strip 16 bit depth files to 8 bit depth */ |
| 107 | void |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 108 | png_set_strip_16(png_structp png_ptr) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 109 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 110 | png_debug(1, "in png_set_strip_16\n"); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 111 | png_ptr->transformations |= PNG_16_TO_8; |
| 112 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 113 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 114 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 115 | #if defined(PNG_READ_STRIP_ALPHA_SUPPORTED) |
| 116 | void |
| 117 | png_set_strip_alpha(png_structp png_ptr) |
| 118 | { |
| 119 | png_debug(1, "in png_set_strip_alpha\n"); |
| 120 | png_ptr->transformations |= PNG_STRIP_ALPHA; |
| 121 | } |
| 122 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 123 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 124 | #if defined(PNG_READ_DITHER_SUPPORTED) |
| 125 | /* Dither file to 8 bit. Supply a palette, the current number |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 126 | * of elements in the palette, the maximum number of elements |
| 127 | * allowed, and a histogram if possible. If the current number |
| 128 | * of colors is greater then the maximum number, the palette will be |
| 129 | * modified to fit in the maximum number. "full_dither" indicates |
| 130 | * whether we need a dithering cube set up for RGB images, or if we |
| 131 | * simply are reducing the number of colors in a paletted image. |
| 132 | */ |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 133 | |
| 134 | typedef struct png_dsort_struct |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 135 | { |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 136 | struct png_dsort_struct FAR * next; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 137 | png_byte left; |
| 138 | png_byte right; |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 139 | } png_dsort; |
| 140 | typedef png_dsort FAR * png_dsortp; |
| 141 | typedef png_dsort FAR * FAR * png_dsortpp; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 142 | |
| 143 | void |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 144 | png_set_dither(png_structp png_ptr, png_colorp palette, |
| 145 | int num_palette, int maximum_colors, png_uint_16p histogram, |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 146 | int full_dither) |
| 147 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 148 | png_debug(1, "in png_set_dither\n"); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 149 | png_ptr->transformations |= PNG_DITHER; |
| 150 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 151 | if (!full_dither) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 152 | { |
| 153 | int i; |
| 154 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 155 | png_ptr->dither_index = (png_bytep)png_malloc(png_ptr, |
Glenn Randers-Pehrson | 0f881d6 | 1998-02-07 10:20:57 -0600 | [diff] [blame] | 156 | (png_uint_32)(num_palette * sizeof (png_byte))); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 157 | for (i = 0; i < num_palette; i++) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 158 | png_ptr->dither_index[i] = (png_byte)i; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 159 | } |
| 160 | |
| 161 | if (num_palette > maximum_colors) |
| 162 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 163 | if (histogram != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 164 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 165 | /* This is easy enough, just throw out the least used colors. |
| 166 | Perhaps not the best solution, but good enough. */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 167 | |
| 168 | int i; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 169 | png_bytep sort; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 170 | |
| 171 | /* initialize an array to sort colors */ |
Glenn Randers-Pehrson | 0f881d6 | 1998-02-07 10:20:57 -0600 | [diff] [blame] | 172 | sort = (png_bytep)png_malloc(png_ptr, (png_uint_32)(num_palette |
| 173 | * sizeof (png_byte))); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 174 | |
| 175 | /* initialize the sort array */ |
| 176 | for (i = 0; i < num_palette; i++) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 177 | sort[i] = (png_byte)i; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 178 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 179 | /* Find the least used palette entries by starting a |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 180 | bubble sort, and running it until we have sorted |
| 181 | out enough colors. Note that we don't care about |
| 182 | sorting all the colors, just finding which are |
| 183 | least used. */ |
| 184 | |
| 185 | for (i = num_palette - 1; i >= maximum_colors; i--) |
| 186 | { |
| 187 | int done; /* to stop early if the list is pre-sorted */ |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 188 | int j; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 189 | |
| 190 | done = 1; |
| 191 | for (j = 0; j < i; j++) |
| 192 | { |
| 193 | if (histogram[sort[j]] < histogram[sort[j + 1]]) |
| 194 | { |
| 195 | png_byte t; |
| 196 | |
| 197 | t = sort[j]; |
| 198 | sort[j] = sort[j + 1]; |
| 199 | sort[j + 1] = t; |
| 200 | done = 0; |
| 201 | } |
| 202 | } |
| 203 | if (done) |
| 204 | break; |
| 205 | } |
| 206 | |
| 207 | /* swap the palette around, and set up a table, if necessary */ |
| 208 | if (full_dither) |
| 209 | { |
Glenn Randers-Pehrson | 8686fff | 1998-05-21 09:27:50 -0500 | [diff] [blame] | 210 | int j = num_palette; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 211 | |
| 212 | /* put all the useful colors within the max, but don't |
| 213 | move the others */ |
Glenn Randers-Pehrson | 8686fff | 1998-05-21 09:27:50 -0500 | [diff] [blame] | 214 | for (i = 0; i < maximum_colors; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 215 | { |
Glenn Randers-Pehrson | 0f881d6 | 1998-02-07 10:20:57 -0600 | [diff] [blame] | 216 | if ((int)sort[i] >= maximum_colors) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 217 | { |
| 218 | do |
| 219 | j--; |
Glenn Randers-Pehrson | 0f881d6 | 1998-02-07 10:20:57 -0600 | [diff] [blame] | 220 | while ((int)sort[j] >= maximum_colors); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 221 | palette[i] = palette[j]; |
| 222 | } |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 223 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 224 | } |
| 225 | else |
| 226 | { |
Glenn Randers-Pehrson | 8686fff | 1998-05-21 09:27:50 -0500 | [diff] [blame] | 227 | int j = num_palette; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 228 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 229 | /* move all the used colors inside the max limit, and |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 230 | develop a translation table */ |
Glenn Randers-Pehrson | 8686fff | 1998-05-21 09:27:50 -0500 | [diff] [blame] | 231 | for (i = 0; i < maximum_colors; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 232 | { |
| 233 | /* only move the colors we need to */ |
Glenn Randers-Pehrson | 0f881d6 | 1998-02-07 10:20:57 -0600 | [diff] [blame] | 234 | if ((int)sort[i] >= maximum_colors) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 235 | { |
| 236 | png_color tmp_color; |
| 237 | |
| 238 | do |
| 239 | j--; |
Glenn Randers-Pehrson | 0f881d6 | 1998-02-07 10:20:57 -0600 | [diff] [blame] | 240 | while ((int)sort[j] >= maximum_colors); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 241 | |
| 242 | tmp_color = palette[j]; |
| 243 | palette[j] = palette[i]; |
| 244 | palette[i] = tmp_color; |
| 245 | /* indicate where the color went */ |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 246 | png_ptr->dither_index[j] = (png_byte)i; |
| 247 | png_ptr->dither_index[i] = (png_byte)j; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 248 | } |
| 249 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 250 | |
| 251 | /* find closest color for those colors we are not using */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 252 | for (i = 0; i < num_palette; i++) |
| 253 | { |
Glenn Randers-Pehrson | 0f881d6 | 1998-02-07 10:20:57 -0600 | [diff] [blame] | 254 | if ((int)png_ptr->dither_index[i] >= maximum_colors) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 255 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 256 | int min_d, k, min_k, d_index; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 257 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 258 | /* find the closest color to one we threw out */ |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 259 | d_index = png_ptr->dither_index[i]; |
| 260 | min_d = PNG_COLOR_DIST(palette[d_index], palette[0]); |
| 261 | for (k = 1, min_k = 0; k < maximum_colors; k++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 262 | { |
| 263 | int d; |
| 264 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 265 | d = PNG_COLOR_DIST(palette[d_index], palette[k]); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 266 | |
| 267 | if (d < min_d) |
| 268 | { |
| 269 | min_d = d; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 270 | min_k = k; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 271 | } |
| 272 | } |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 273 | /* point to closest color */ |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 274 | png_ptr->dither_index[i] = (png_byte)min_k; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 275 | } |
| 276 | } |
| 277 | } |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 278 | png_free(png_ptr, sort); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 279 | } |
| 280 | else |
| 281 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 282 | /* This is much harder to do simply (and quickly). Perhaps |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 283 | we need to go through a median cut routine, but those |
| 284 | don't always behave themselves with only a few colors |
| 285 | as input. So we will just find the closest two colors, |
| 286 | and throw out one of them (chosen somewhat randomly). |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 287 | [I don't understand this at all, so if someone wants to |
| 288 | work on improving it, be my guest - AED] |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 289 | */ |
| 290 | int i; |
| 291 | int max_d; |
| 292 | int num_new_palette; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 293 | png_dsortpp hash; |
| 294 | png_bytep index_to_palette; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 295 | /* where the original index currently is in the palette */ |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 296 | png_bytep palette_to_index; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 297 | /* which original index points to this palette color */ |
| 298 | |
| 299 | /* initialize palette index arrays */ |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 300 | index_to_palette = (png_bytep)png_malloc(png_ptr, |
Glenn Randers-Pehrson | 0f881d6 | 1998-02-07 10:20:57 -0600 | [diff] [blame] | 301 | (png_uint_32)(num_palette * sizeof (png_byte))); |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 302 | palette_to_index = (png_bytep)png_malloc(png_ptr, |
Glenn Randers-Pehrson | 0f881d6 | 1998-02-07 10:20:57 -0600 | [diff] [blame] | 303 | (png_uint_32)(num_palette * sizeof (png_byte))); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 304 | |
| 305 | /* initialize the sort array */ |
| 306 | for (i = 0; i < num_palette; i++) |
| 307 | { |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 308 | index_to_palette[i] = (png_byte)i; |
| 309 | palette_to_index[i] = (png_byte)i; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 310 | } |
| 311 | |
Glenn Randers-Pehrson | 0f881d6 | 1998-02-07 10:20:57 -0600 | [diff] [blame] | 312 | hash = (png_dsortpp)png_malloc(png_ptr, (png_uint_32)(769 * |
| 313 | sizeof (png_dsortp))); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 314 | for (i = 0; i < 769; i++) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 315 | hash[i] = NULL; |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 316 | /* png_memset(hash, 0, 769 * sizeof (png_dsortp)); */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 317 | |
| 318 | num_new_palette = num_palette; |
| 319 | |
| 320 | /* initial wild guess at how far apart the farthest pixel |
| 321 | pair we will be eliminating will be. Larger |
| 322 | numbers mean more areas will be allocated, Smaller |
| 323 | numbers run the risk of not saving enough data, and |
| 324 | having to do this all over again. |
| 325 | |
| 326 | I have not done extensive checking on this number. |
| 327 | */ |
| 328 | max_d = 96; |
| 329 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 330 | while (num_new_palette > maximum_colors) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 331 | { |
| 332 | for (i = 0; i < num_new_palette - 1; i++) |
| 333 | { |
| 334 | int j; |
| 335 | |
| 336 | for (j = i + 1; j < num_new_palette; j++) |
| 337 | { |
| 338 | int d; |
| 339 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 340 | d = PNG_COLOR_DIST(palette[i], palette[j]); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 341 | |
| 342 | if (d <= max_d) |
| 343 | { |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 344 | png_dsortp t; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 345 | |
Glenn Randers-Pehrson | 0f881d6 | 1998-02-07 10:20:57 -0600 | [diff] [blame] | 346 | t = (png_dsortp)png_malloc(png_ptr, (png_uint_32)(sizeof |
| 347 | (png_dsort))); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 348 | t->next = hash[d]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 349 | t->left = (png_byte)i; |
| 350 | t->right = (png_byte)j; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 351 | hash[d] = t; |
| 352 | } |
| 353 | } |
| 354 | } |
| 355 | |
| 356 | for (i = 0; i <= max_d; i++) |
| 357 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 358 | if (hash[i] != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 359 | { |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 360 | png_dsortp p; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 361 | |
| 362 | for (p = hash[i]; p; p = p->next) |
| 363 | { |
Glenn Randers-Pehrson | 0f881d6 | 1998-02-07 10:20:57 -0600 | [diff] [blame] | 364 | if ((int)index_to_palette[p->left] < num_new_palette && |
| 365 | (int)index_to_palette[p->right] < num_new_palette) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 366 | { |
| 367 | int j, next_j; |
| 368 | |
| 369 | if (num_new_palette & 1) |
| 370 | { |
| 371 | j = p->left; |
| 372 | next_j = p->right; |
| 373 | } |
| 374 | else |
| 375 | { |
| 376 | j = p->right; |
| 377 | next_j = p->left; |
| 378 | } |
| 379 | |
| 380 | num_new_palette--; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 381 | palette[index_to_palette[j]] = palette[num_new_palette]; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 382 | if (!full_dither) |
| 383 | { |
| 384 | int k; |
| 385 | |
| 386 | for (k = 0; k < num_palette; k++) |
| 387 | { |
| 388 | if (png_ptr->dither_index[k] == |
| 389 | index_to_palette[j]) |
| 390 | png_ptr->dither_index[k] = |
| 391 | index_to_palette[next_j]; |
Glenn Randers-Pehrson | 0f881d6 | 1998-02-07 10:20:57 -0600 | [diff] [blame] | 392 | if ((int)png_ptr->dither_index[k] == |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 393 | num_new_palette) |
| 394 | png_ptr->dither_index[k] = |
| 395 | index_to_palette[j]; |
| 396 | } |
| 397 | } |
| 398 | |
| 399 | index_to_palette[palette_to_index[num_new_palette]] = |
| 400 | index_to_palette[j]; |
| 401 | palette_to_index[index_to_palette[j]] = |
| 402 | palette_to_index[num_new_palette]; |
| 403 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 404 | index_to_palette[j] = (png_byte)num_new_palette; |
| 405 | palette_to_index[num_new_palette] = (png_byte)j; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 406 | } |
| 407 | if (num_new_palette <= maximum_colors) |
| 408 | break; |
| 409 | } |
| 410 | if (num_new_palette <= maximum_colors) |
| 411 | break; |
| 412 | } |
| 413 | } |
| 414 | |
| 415 | for (i = 0; i < 769; i++) |
| 416 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 417 | if (hash[i] != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 418 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 419 | png_dsortp p = hash[i]; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 420 | while (p) |
| 421 | { |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 422 | png_dsortp t; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 423 | |
| 424 | t = p->next; |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 425 | png_free(png_ptr, p); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 426 | p = t; |
| 427 | } |
| 428 | } |
| 429 | hash[i] = 0; |
| 430 | } |
| 431 | max_d += 96; |
| 432 | } |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 433 | png_free(png_ptr, hash); |
| 434 | png_free(png_ptr, palette_to_index); |
| 435 | png_free(png_ptr, index_to_palette); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 436 | } |
| 437 | num_palette = maximum_colors; |
| 438 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 439 | if (png_ptr->palette == NULL) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 440 | { |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 441 | png_ptr->palette = palette; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 442 | } |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 443 | png_ptr->num_palette = (png_uint_16)num_palette; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 444 | |
| 445 | if (full_dither) |
| 446 | { |
| 447 | int i; |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 448 | png_bytep distance; |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 449 | int total_bits = PNG_DITHER_RED_BITS + PNG_DITHER_GREEN_BITS + |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 450 | PNG_DITHER_BLUE_BITS; |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 451 | int num_red = (1 << PNG_DITHER_RED_BITS); |
| 452 | int num_green = (1 << PNG_DITHER_GREEN_BITS); |
| 453 | int num_blue = (1 << PNG_DITHER_BLUE_BITS); |
| 454 | png_size_t num_entries = ((png_size_t)1 << total_bits); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 455 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 456 | png_ptr->palette_lookup = (png_bytep )png_malloc(png_ptr, |
Glenn Randers-Pehrson | 0f881d6 | 1998-02-07 10:20:57 -0600 | [diff] [blame] | 457 | (png_uint_32)(num_entries * sizeof (png_byte))); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 458 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 459 | png_memset(png_ptr->palette_lookup, 0, num_entries * sizeof (png_byte)); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 460 | |
Glenn Randers-Pehrson | 0f881d6 | 1998-02-07 10:20:57 -0600 | [diff] [blame] | 461 | distance = (png_bytep)png_malloc(png_ptr, (png_uint_32)(num_entries * |
| 462 | sizeof(png_byte))); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 463 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 464 | png_memset(distance, 0xff, num_entries * sizeof(png_byte)); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 465 | |
| 466 | for (i = 0; i < num_palette; i++) |
| 467 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 468 | int ir, ig, ib; |
| 469 | int r = (palette[i].red >> (8 - PNG_DITHER_RED_BITS)); |
| 470 | int g = (palette[i].green >> (8 - PNG_DITHER_GREEN_BITS)); |
| 471 | int b = (palette[i].blue >> (8 - PNG_DITHER_BLUE_BITS)); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 472 | |
| 473 | for (ir = 0; ir < num_red; ir++) |
| 474 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 475 | int dr = abs(ir - r); |
| 476 | int index_r = (ir << (PNG_DITHER_BLUE_BITS + PNG_DITHER_GREEN_BITS)); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 477 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 478 | for (ig = 0; ig < num_green; ig++) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 479 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 480 | int dg = abs(ig - g); |
| 481 | int dt = dr + dg; |
| 482 | int dm = ((dr > dg) ? dr : dg); |
| 483 | int index_g = index_r | (ig << PNG_DITHER_BLUE_BITS); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 484 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 485 | for (ib = 0; ib < num_blue; ib++) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 486 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 487 | int d_index = index_g | ib; |
| 488 | int db = abs(ib - b); |
| 489 | int dmax = ((dm > db) ? dm : db); |
| 490 | int d = dmax + dt + db; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 491 | |
Glenn Randers-Pehrson | 0f881d6 | 1998-02-07 10:20:57 -0600 | [diff] [blame] | 492 | if (d < (int)distance[d_index]) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 493 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 494 | distance[d_index] = (png_byte)d; |
| 495 | png_ptr->palette_lookup[d_index] = (png_byte)i; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 496 | } |
| 497 | } |
| 498 | } |
| 499 | } |
| 500 | } |
| 501 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 502 | png_free(png_ptr, distance); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 503 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 504 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 505 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 506 | |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 507 | #if defined(PNG_READ_GAMMA_SUPPORTED) |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 508 | /* Transform the image from the file_gamma to the screen_gamma. We |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 509 | * only do transformations on images where the file_gamma and screen_gamma |
| 510 | * are not close reciprocals, otherwise it slows things down slightly, and |
| 511 | * also needlessly introduces small errors. |
| 512 | */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 513 | void |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 514 | png_set_gamma(png_structp png_ptr, double scrn_gamma, double file_gamma) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 515 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 516 | png_debug(1, "in png_set_gamma\n"); |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 517 | if (fabs(scrn_gamma * file_gamma - 1.0) > PNG_GAMMA_THRESHOLD) |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 518 | png_ptr->transformations |= PNG_GAMMA; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 519 | png_ptr->gamma = (float)file_gamma; |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 520 | png_ptr->screen_gamma = (float)scrn_gamma; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 521 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 522 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 523 | |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 524 | #if defined(PNG_READ_EXPAND_SUPPORTED) |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 525 | /* Expand paletted images to rgb, expand grayscale images of |
Glenn Randers-Pehrson | 345bc27 | 1998-06-14 14:43:31 -0500 | [diff] [blame^] | 526 | * 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] | 527 | * to alpha channels. |
| 528 | */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 529 | void |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 530 | png_set_expand(png_structp png_ptr) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 531 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 532 | png_debug(1, "in png_set_expand\n"); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 533 | png_ptr->transformations |= PNG_EXPAND; |
| 534 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 535 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 536 | |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 537 | #if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 538 | void |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 539 | png_set_gray_to_rgb(png_structp png_ptr) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 540 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 541 | png_debug(1, "in png_set_gray_to_rgb\n"); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 542 | png_ptr->transformations |= PNG_GRAY_TO_RGB; |
| 543 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 544 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 545 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 546 | #if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED) |
| 547 | /* Convert a RGB image to a grayscale of the given width. This would |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 548 | * allow us, for example, to convert a 24 bpp RGB image into an 8 or |
| 549 | * 16 bpp grayscale image. (Not yet implemented.) |
| 550 | */ |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 551 | void |
| 552 | png_set_rgb_to_gray(png_structp png_ptr, int gray_bits) |
| 553 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 554 | png_debug(1, "in png_set_rgb_to_gray\n"); |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 555 | png_ptr->transformations |= PNG_RGB_TO_GRAY; |
| 556 | /* Need to do something with gray_bits here. */ |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 557 | png_warning(png_ptr, "RGB to GRAY transformation is not yet implemented."); |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 558 | } |
| 559 | #endif |
| 560 | |
Glenn Randers-Pehrson | 08a3343 | 1998-03-07 06:06:55 -0600 | [diff] [blame] | 561 | #if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) |
| 562 | void |
| 563 | png_set_read_user_transform_fn(png_structp png_ptr, png_user_transform_ptr |
| 564 | read_user_transform_fn) |
| 565 | { |
| 566 | png_debug(1, "in png_set_read_user_transform_fn\n"); |
| 567 | png_ptr->transformations |= PNG_USER_TRANSFORM; |
| 568 | png_ptr->read_user_transform_fn = read_user_transform_fn; |
| 569 | } |
| 570 | #endif |
| 571 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 572 | /* Initialize everything needed for the read. This includes modifying |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 573 | * the palette. |
| 574 | */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 575 | void |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 576 | png_init_read_transformations(png_structp png_ptr) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 577 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 578 | png_debug(1, "in png_init_read_transformations\n"); |
Glenn Randers-Pehrson | 8686fff | 1998-05-21 09:27:50 -0500 | [diff] [blame] | 579 | #if defined(PNG_USELESS_TESTS_SUPPORTED) |
| 580 | if(png_ptr != NULL) |
| 581 | #endif |
| 582 | { |
| 583 | #if defined(PNG_READ_BACKGROUND_SUPPORTED) || defined(PNG_READ_SHIFT_SUPPORTED) \ |
| 584 | || defined(PNG_READ_GAMMA_SUPPORTED) |
| 585 | int color_type = png_ptr->color_type; |
| 586 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 587 | |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 588 | #if defined(PNG_READ_EXPAND_SUPPORTED) && defined(PNG_READ_BACKGROUND_SUPPORTED) |
| 589 | if (png_ptr->transformations & PNG_BACKGROUND_EXPAND) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 590 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 591 | if (!(color_type & PNG_COLOR_MASK_COLOR)) /* i.e., GRAY or GRAY_ALPHA */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 592 | { |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 593 | /* expand background chunk. */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 594 | switch (png_ptr->bit_depth) |
| 595 | { |
| 596 | case 1: |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 597 | png_ptr->background.gray *= (png_uint_16)0xff; |
| 598 | png_ptr->background.red = png_ptr->background.green = |
| 599 | png_ptr->background.blue = png_ptr->background.gray; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 600 | break; |
| 601 | case 2: |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 602 | png_ptr->background.gray *= (png_uint_16)0x55; |
| 603 | png_ptr->background.red = png_ptr->background.green = |
| 604 | png_ptr->background.blue = png_ptr->background.gray; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 605 | break; |
| 606 | case 4: |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 607 | png_ptr->background.gray *= (png_uint_16)0x11; |
| 608 | png_ptr->background.red = png_ptr->background.green = |
| 609 | png_ptr->background.blue = png_ptr->background.gray; |
| 610 | break; |
| 611 | case 8: |
| 612 | case 16: |
| 613 | png_ptr->background.red = png_ptr->background.green = |
| 614 | png_ptr->background.blue = png_ptr->background.gray; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 615 | break; |
| 616 | } |
| 617 | } |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 618 | else if (color_type == PNG_COLOR_TYPE_PALETTE) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 619 | { |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 620 | png_ptr->background.red = |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 621 | png_ptr->palette[png_ptr->background.index].red; |
| 622 | png_ptr->background.green = |
| 623 | png_ptr->palette[png_ptr->background.index].green; |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 624 | png_ptr->background.blue = |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 625 | png_ptr->palette[png_ptr->background.index].blue; |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 626 | |
| 627 | #if defined(PNG_READ_INVERT_ALPHA_SUPPORTED) |
| 628 | if (png_ptr->transformations & PNG_INVERT_ALPHA) |
| 629 | { |
| 630 | #if defined(PNG_READ_EXPAND_SUPPORTED) |
Glenn Randers-Pehrson | 8f8fb6a | 1998-03-09 23:02:06 -0600 | [diff] [blame] | 631 | if (!(png_ptr->transformations & PNG_EXPAND)) |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 632 | #endif |
| 633 | { |
| 634 | /* invert the alpha channel (in tRNS) unless the pixels are |
| 635 | going to be expanded, in which case leave it for later */ |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 636 | int i,istop; |
| 637 | istop=(int)png_ptr->num_trans; |
| 638 | for (i=0; i<istop; i++) |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 639 | png_ptr->trans[i] = 255 - png_ptr->trans[i]; |
| 640 | } |
| 641 | } |
| 642 | #endif |
| 643 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 644 | } |
| 645 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 646 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 647 | |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 648 | #if defined(PNG_READ_BACKGROUND_SUPPORTED) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 649 | png_ptr->background_1 = png_ptr->background; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 650 | #endif |
| 651 | #if defined(PNG_READ_GAMMA_SUPPORTED) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 652 | if (png_ptr->transformations & PNG_GAMMA) |
| 653 | { |
| 654 | png_build_gamma_table(png_ptr); |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 655 | #if defined(PNG_READ_BACKGROUND_SUPPORTED) |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 656 | if (png_ptr->transformations & PNG_BACKGROUND) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 657 | { |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 658 | if (color_type == PNG_COLOR_TYPE_PALETTE) |
| 659 | { |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 660 | png_color back, back_1; |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 661 | png_colorp palette = png_ptr->palette; |
| 662 | int num_palette = png_ptr->num_palette; |
| 663 | int i; |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 664 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 665 | if (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_FILE) |
| 666 | { |
| 667 | back.red = png_ptr->gamma_table[png_ptr->background.red]; |
| 668 | back.green = png_ptr->gamma_table[png_ptr->background.green]; |
| 669 | back.blue = png_ptr->gamma_table[png_ptr->background.blue]; |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 670 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 671 | back_1.red = png_ptr->gamma_to_1[png_ptr->background.red]; |
| 672 | back_1.green = png_ptr->gamma_to_1[png_ptr->background.green]; |
| 673 | back_1.blue = png_ptr->gamma_to_1[png_ptr->background.blue]; |
| 674 | } |
| 675 | else |
| 676 | { |
Glenn Randers-Pehrson | 8f8fb6a | 1998-03-09 23:02:06 -0600 | [diff] [blame] | 677 | double g, gs; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 678 | |
Glenn Randers-Pehrson | 8f8fb6a | 1998-03-09 23:02:06 -0600 | [diff] [blame] | 679 | switch (png_ptr->background_gamma_type) |
Glenn Randers-Pehrson | 4922b1b | 1998-03-08 22:55:17 -0600 | [diff] [blame] | 680 | { |
Glenn Randers-Pehrson | 8f8fb6a | 1998-03-09 23:02:06 -0600 | [diff] [blame] | 681 | case PNG_BACKGROUND_GAMMA_SCREEN: |
| 682 | g = (png_ptr->screen_gamma); |
| 683 | gs = 1.0; |
| 684 | break; |
| 685 | case PNG_BACKGROUND_GAMMA_FILE: |
| 686 | g = 1.0 / (png_ptr->gamma); |
| 687 | gs = 1.0 / (png_ptr->gamma * png_ptr->screen_gamma); |
| 688 | break; |
| 689 | case PNG_BACKGROUND_GAMMA_UNIQUE: |
| 690 | g = 1.0 / (png_ptr->background_gamma); |
| 691 | gs = 1.0 / (png_ptr->background_gamma * |
| 692 | png_ptr->screen_gamma); |
| 693 | break; |
| 694 | default: |
| 695 | g = 1.0; /* back_1 */ |
| 696 | gs = 1.0; /* back */ |
| 697 | } |
| 698 | |
Glenn Randers-Pehrson | f9f2fe0 | 1998-03-15 18:20:23 -0600 | [diff] [blame] | 699 | if ( fabs(gs - 1.0) < PNG_GAMMA_THRESHOLD) |
Glenn Randers-Pehrson | 8f8fb6a | 1998-03-09 23:02:06 -0600 | [diff] [blame] | 700 | { |
| 701 | back.red = (png_byte)png_ptr->background.red; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 702 | back.green = (png_byte)png_ptr->background.green; |
Glenn Randers-Pehrson | 8f8fb6a | 1998-03-09 23:02:06 -0600 | [diff] [blame] | 703 | back.blue = (png_byte)png_ptr->background.blue; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 704 | } |
| 705 | else |
| 706 | { |
Glenn Randers-Pehrson | 8f8fb6a | 1998-03-09 23:02:06 -0600 | [diff] [blame] | 707 | back.red = (png_byte)(pow( |
| 708 | (double)png_ptr->background.red/255, gs) * 255.0 + .5); |
| 709 | back.green = (png_byte)(pow( |
| 710 | (double)png_ptr->background.green/255, gs) * 255.0 + .5); |
| 711 | back.blue = (png_byte)(pow( |
| 712 | (double)png_ptr->background.blue/255, gs) * 255.0 + .5); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 713 | } |
| 714 | |
Glenn Randers-Pehrson | 8f8fb6a | 1998-03-09 23:02:06 -0600 | [diff] [blame] | 715 | back_1.red = (png_byte)(pow( |
| 716 | (double)png_ptr->background.red/255, g) * 255.0 + .5); |
| 717 | back_1.green = (png_byte)(pow( |
| 718 | (double)png_ptr->background.green/255, g) * 255.0 + .5); |
| 719 | back_1.blue = (png_byte)(pow( |
| 720 | (double)png_ptr->background.blue/255, g) * 255.0 + .5); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 721 | } |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 722 | |
| 723 | for (i = 0; i < num_palette; i++) |
| 724 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 725 | if (i < (int)png_ptr->num_trans && png_ptr->trans[i] != 0xff) |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 726 | { |
| 727 | if (png_ptr->trans[i] == 0) |
| 728 | { |
| 729 | palette[i] = back; |
| 730 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 731 | else /* if (png_ptr->trans[i] != 0xff) */ |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 732 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 733 | png_byte v, w; |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 734 | |
| 735 | v = png_ptr->gamma_to_1[palette[i].red]; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 736 | png_composite(w, v, png_ptr->trans[i], back_1.red); |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 737 | palette[i].red = png_ptr->gamma_from_1[w]; |
| 738 | |
| 739 | v = png_ptr->gamma_to_1[palette[i].green]; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 740 | png_composite(w, v, png_ptr->trans[i], back_1.green); |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 741 | palette[i].green = png_ptr->gamma_from_1[w]; |
| 742 | |
| 743 | v = png_ptr->gamma_to_1[palette[i].blue]; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 744 | png_composite(w, v, png_ptr->trans[i], back_1.blue); |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 745 | palette[i].blue = png_ptr->gamma_from_1[w]; |
| 746 | } |
| 747 | } |
| 748 | else |
| 749 | { |
| 750 | palette[i].red = png_ptr->gamma_table[palette[i].red]; |
| 751 | palette[i].green = png_ptr->gamma_table[palette[i].green]; |
| 752 | palette[i].blue = png_ptr->gamma_table[palette[i].blue]; |
| 753 | } |
| 754 | } |
| 755 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 756 | /* if (png_ptr->background_gamma_type!=PNG_BACKGROUND_GAMMA_UNKNOWN)*/ |
Glenn Randers-Pehrson | cbe52d8 | 1998-02-28 07:00:24 -0600 | [diff] [blame] | 757 | else |
| 758 | /* color_type != PNG_COLOR_TYPE_PALETTE */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 759 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 760 | double m = (double)(((png_uint_32)1 << png_ptr->bit_depth) - 1); |
| 761 | double g = 1.0; |
| 762 | double gs = 1.0; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 763 | |
| 764 | switch (png_ptr->background_gamma_type) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 765 | { |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 766 | case PNG_BACKGROUND_GAMMA_SCREEN: |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 767 | g = (png_ptr->screen_gamma); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 768 | gs = 1.0; |
| 769 | break; |
| 770 | case PNG_BACKGROUND_GAMMA_FILE: |
| 771 | g = 1.0 / (png_ptr->gamma); |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 772 | gs = 1.0 / (png_ptr->gamma * png_ptr->screen_gamma); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 773 | break; |
| 774 | case PNG_BACKGROUND_GAMMA_UNIQUE: |
| 775 | g = 1.0 / (png_ptr->background_gamma); |
| 776 | gs = 1.0 / (png_ptr->background_gamma * |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 777 | png_ptr->screen_gamma); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 778 | break; |
| 779 | } |
| 780 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 781 | if (color_type & PNG_COLOR_MASK_COLOR) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 782 | { |
Glenn Randers-Pehrson | cbe52d8 | 1998-02-28 07:00:24 -0600 | [diff] [blame] | 783 | /* RGB or RGBA */ |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 784 | png_ptr->background_1.red = (png_uint_16)(pow( |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 785 | (double)png_ptr->background.red / m, g) * m + .5); |
| 786 | png_ptr->background_1.green = (png_uint_16)(pow( |
| 787 | (double)png_ptr->background.green / m, g) * m + .5); |
| 788 | png_ptr->background_1.blue = (png_uint_16)(pow( |
| 789 | (double)png_ptr->background.blue / m, g) * m + .5); |
| 790 | png_ptr->background.red = (png_uint_16)(pow( |
| 791 | (double)png_ptr->background.red / m, gs) * m + .5); |
| 792 | png_ptr->background.green = (png_uint_16)(pow( |
| 793 | (double)png_ptr->background.green / m, gs) * m + .5); |
| 794 | png_ptr->background.blue = (png_uint_16)(pow( |
| 795 | (double)png_ptr->background.blue / m, gs) * m + .5); |
| 796 | } |
| 797 | else |
| 798 | { |
Glenn Randers-Pehrson | cbe52d8 | 1998-02-28 07:00:24 -0600 | [diff] [blame] | 799 | /* GRAY or GRAY ALPHA */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 800 | png_ptr->background_1.gray = (png_uint_16)(pow( |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 801 | (double)png_ptr->background.gray / m, g) * m + .5); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 802 | png_ptr->background.gray = (png_uint_16)(pow( |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 803 | (double)png_ptr->background.gray / m, gs) * m + .5); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 804 | } |
| 805 | } |
| 806 | } |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 807 | else |
Glenn Randers-Pehrson | cbe52d8 | 1998-02-28 07:00:24 -0600 | [diff] [blame] | 808 | /* transformation does not include PNG_BACKGROUND */ |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 809 | #endif |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 810 | if (color_type == PNG_COLOR_TYPE_PALETTE) |
| 811 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 812 | png_colorp palette = png_ptr->palette; |
| 813 | int num_palette = png_ptr->num_palette; |
| 814 | int i; |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 815 | |
| 816 | for (i = 0; i < num_palette; i++) |
| 817 | { |
| 818 | palette[i].red = png_ptr->gamma_table[palette[i].red]; |
| 819 | palette[i].green = png_ptr->gamma_table[palette[i].green]; |
| 820 | palette[i].blue = png_ptr->gamma_table[palette[i].blue]; |
| 821 | } |
| 822 | } |
| 823 | } |
| 824 | #if defined(PNG_READ_BACKGROUND_SUPPORTED) |
| 825 | else |
| 826 | #endif |
| 827 | #endif |
| 828 | #if defined(PNG_READ_BACKGROUND_SUPPORTED) |
Glenn Randers-Pehrson | cbe52d8 | 1998-02-28 07:00:24 -0600 | [diff] [blame] | 829 | /* No GAMMA transformation */ |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 830 | if (png_ptr->transformations & PNG_BACKGROUND && |
| 831 | color_type == PNG_COLOR_TYPE_PALETTE) |
| 832 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 833 | int i; |
| 834 | int istop = (int)png_ptr->num_trans; |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 835 | png_color back; |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 836 | png_colorp palette = png_ptr->palette; |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 837 | |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 838 | back.red = (png_byte)png_ptr->background.red; |
| 839 | back.green = (png_byte)png_ptr->background.green; |
| 840 | back.blue = (png_byte)png_ptr->background.blue; |
| 841 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 842 | for (i = 0; i < istop; i++) |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 843 | { |
| 844 | if (png_ptr->trans[i] == 0) |
| 845 | { |
| 846 | palette[i] = back; |
| 847 | } |
| 848 | else if (png_ptr->trans[i] != 0xff) |
| 849 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 850 | /* The png_composite() macro is defined in png.h */ |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 851 | png_composite(palette[i].red, palette[i].red, |
| 852 | png_ptr->trans[i], back.red); |
| 853 | png_composite(palette[i].green, palette[i].green, |
| 854 | png_ptr->trans[i], back.green); |
| 855 | png_composite(palette[i].blue, palette[i].blue, |
| 856 | png_ptr->trans[i], back.blue); |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 857 | } |
| 858 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 859 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 860 | #endif |
| 861 | |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 862 | #if defined(PNG_READ_SHIFT_SUPPORTED) |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 863 | if ((png_ptr->transformations & PNG_SHIFT) && |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 864 | color_type == PNG_COLOR_TYPE_PALETTE) |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 865 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 866 | png_uint_16 i; |
| 867 | png_uint_16 istop = png_ptr->num_palette; |
| 868 | int sr = 8 - png_ptr->sig_bit.red; |
| 869 | int sg = 8 - png_ptr->sig_bit.green; |
| 870 | int sb = 8 - png_ptr->sig_bit.blue; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 871 | |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 872 | if (sr < 0 || sr > 8) |
| 873 | sr = 0; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 874 | if (sg < 0 || sg > 8) |
| 875 | sg = 0; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 876 | if (sb < 0 || sb > 8) |
| 877 | sb = 0; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 878 | for (i = 0; i < istop; i++) |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 879 | { |
| 880 | png_ptr->palette[i].red >>= sr; |
| 881 | png_ptr->palette[i].green >>= sg; |
| 882 | png_ptr->palette[i].blue >>= sb; |
| 883 | } |
| 884 | } |
| 885 | #endif |
Glenn Randers-Pehrson | 8686fff | 1998-05-21 09:27:50 -0500 | [diff] [blame] | 886 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 887 | } |
| 888 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 889 | /* Modify the info structure to reflect the transformations. The |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 890 | * info should be updated so a PNG file could be written with it, |
| 891 | * assuming the transformations result in valid PNG data. |
| 892 | */ |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 893 | void |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 894 | png_read_transform_info(png_structp png_ptr, png_infop info_ptr) |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 895 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 896 | png_debug(1, "in png_read_transform_info\n"); |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 897 | #if defined(PNG_READ_EXPAND_SUPPORTED) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 898 | if (png_ptr->transformations & PNG_EXPAND) |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 899 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 900 | if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) |
| 901 | { |
| 902 | if (png_ptr->num_trans) |
| 903 | info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA; |
| 904 | else |
| 905 | info_ptr->color_type = PNG_COLOR_TYPE_RGB; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 906 | info_ptr->bit_depth = 8; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 907 | info_ptr->num_trans = 0; |
| 908 | } |
| 909 | else |
| 910 | { |
| 911 | if (png_ptr->num_trans) |
| 912 | info_ptr->color_type |= PNG_COLOR_MASK_ALPHA; |
| 913 | if (info_ptr->bit_depth < 8) |
| 914 | info_ptr->bit_depth = 8; |
| 915 | info_ptr->num_trans = 0; |
| 916 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 917 | } |
| 918 | #endif |
| 919 | |
| 920 | #if defined(PNG_READ_BACKGROUND_SUPPORTED) |
| 921 | if (png_ptr->transformations & PNG_BACKGROUND) |
| 922 | { |
| 923 | info_ptr->color_type &= ~PNG_COLOR_MASK_ALPHA; |
| 924 | info_ptr->num_trans = 0; |
| 925 | info_ptr->background = png_ptr->background; |
| 926 | } |
| 927 | #endif |
| 928 | |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 929 | #if defined(PNG_READ_GAMMA_SUPPORTED) |
| 930 | if (png_ptr->transformations & PNG_GAMMA) |
| 931 | info_ptr->gamma = png_ptr->gamma; |
| 932 | #endif |
| 933 | |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 934 | #if defined(PNG_READ_16_TO_8_SUPPORTED) |
| 935 | if ((png_ptr->transformations & PNG_16_TO_8) && info_ptr->bit_depth == 16) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 936 | info_ptr->bit_depth = 8; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 937 | #endif |
| 938 | |
| 939 | #if defined(PNG_READ_DITHER_SUPPORTED) |
| 940 | if (png_ptr->transformations & PNG_DITHER) |
| 941 | { |
| 942 | if (((info_ptr->color_type == PNG_COLOR_TYPE_RGB) || |
| 943 | (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)) && |
| 944 | png_ptr->palette_lookup && info_ptr->bit_depth == 8) |
| 945 | { |
| 946 | info_ptr->color_type = PNG_COLOR_TYPE_PALETTE; |
| 947 | } |
| 948 | } |
| 949 | #endif |
| 950 | |
| 951 | #if defined(PNG_READ_PACK_SUPPORTED) |
| 952 | if ((png_ptr->transformations & PNG_PACK) && info_ptr->bit_depth < 8) |
| 953 | info_ptr->bit_depth = 8; |
| 954 | #endif |
| 955 | |
| 956 | #if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED) |
Glenn Randers-Pehrson | f9f2fe0 | 1998-03-15 18:20:23 -0600 | [diff] [blame] | 957 | if (png_ptr->transformations & PNG_GRAY_TO_RGB) |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 958 | info_ptr->color_type |= PNG_COLOR_MASK_COLOR; |
| 959 | #endif |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 960 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 961 | if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 962 | info_ptr->channels = 1; |
| 963 | else if (info_ptr->color_type & PNG_COLOR_MASK_COLOR) |
| 964 | info_ptr->channels = 3; |
| 965 | else |
| 966 | info_ptr->channels = 1; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 967 | |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 968 | #if defined(PNG_READ_STRIP_ALPHA_SUPPORTED) |
Glenn Randers-Pehrson | f9f2fe0 | 1998-03-15 18:20:23 -0600 | [diff] [blame] | 969 | if (png_ptr->transformations & PNG_STRIP_ALPHA) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 970 | info_ptr->color_type &= ~PNG_COLOR_MASK_ALPHA; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 971 | #endif |
| 972 | |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 973 | if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA) |
| 974 | info_ptr->channels++; |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 975 | |
| 976 | #if defined(PNG_READ_FILLER_SUPPORTED) |
| 977 | /* STRIP_ALPHA and FILLER allowed: MASK_ALPHA bit stripped above */ |
| 978 | if (png_ptr->transformations & PNG_FILLER && |
| 979 | (info_ptr->color_type == PNG_COLOR_TYPE_RGB || |
| 980 | info_ptr->color_type == PNG_COLOR_TYPE_GRAY)) |
| 981 | ++info_ptr->channels; |
| 982 | #endif |
| 983 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 984 | info_ptr->pixel_depth = (png_byte)(info_ptr->channels * |
| 985 | info_ptr->bit_depth); |
Glenn Randers-Pehrson | 0f881d6 | 1998-02-07 10:20:57 -0600 | [diff] [blame] | 986 | info_ptr->rowbytes = ((info_ptr->width * info_ptr->pixel_depth + 7) >> 3); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 987 | } |
| 988 | |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 989 | /* Transform the row. The order of transformations is significant, |
| 990 | * and is very touchy. If you add a transformation, take care to |
| 991 | * decide how it fits in with the other transformations here. |
| 992 | */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 993 | void |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 994 | png_do_read_transformations(png_structp png_ptr) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 995 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 996 | png_debug(1, "in png_do_read_transformations\n"); |
| 997 | #if !defined(PNG_USELESS_TESTS_SUPPORTED) |
| 998 | if (png_ptr->row_buf == NULL) |
| 999 | { |
Glenn Randers-Pehrson | 70e3f54 | 1998-01-03 22:40:55 -0600 | [diff] [blame] | 1000 | #if !defined(PNG_NO_STDIO) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1001 | char msg[50]; |
| 1002 | |
| 1003 | sprintf(msg, "NULL row buffer for row %ld, pass %d", png_ptr->row_number, |
| 1004 | png_ptr->pass); |
| 1005 | png_error(png_ptr, msg); |
Glenn Randers-Pehrson | 70e3f54 | 1998-01-03 22:40:55 -0600 | [diff] [blame] | 1006 | #else |
| 1007 | png_error(png_ptr, "NULL row buffer"); |
| 1008 | #endif |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1009 | } |
| 1010 | #endif |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 1011 | |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1012 | #if defined(PNG_READ_EXPAND_SUPPORTED) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1013 | if (png_ptr->transformations & PNG_EXPAND) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1014 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1015 | if (png_ptr->row_info.color_type == PNG_COLOR_TYPE_PALETTE) |
| 1016 | { |
| 1017 | png_do_expand_palette(&(png_ptr->row_info), png_ptr->row_buf + 1, |
| 1018 | png_ptr->palette, png_ptr->trans, png_ptr->num_trans); |
| 1019 | } |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 1020 | else |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1021 | { |
| 1022 | if (png_ptr->num_trans) |
| 1023 | png_do_expand(&(png_ptr->row_info), png_ptr->row_buf + 1, |
| 1024 | &(png_ptr->trans_values)); |
| 1025 | else |
| 1026 | png_do_expand(&(png_ptr->row_info), png_ptr->row_buf + 1, |
| 1027 | NULL); |
| 1028 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1029 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1030 | #endif |
| 1031 | |
| 1032 | #if defined(PNG_READ_STRIP_ALPHA_SUPPORTED) |
| 1033 | if (png_ptr->transformations & PNG_STRIP_ALPHA) |
| 1034 | png_do_strip_filler(&(png_ptr->row_info), png_ptr->row_buf + 1, |
| 1035 | PNG_FLAG_FILLER_AFTER); |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1036 | #endif |
| 1037 | |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1038 | /* |
| 1039 | From Andreas Dilger e-mail to png-implement, 26 March 1998: |
| 1040 | |
| 1041 | In most cases, the "simple transparency" should be done prior to doing |
| 1042 | gray-to-RGB, or you will have to test 3x as many bytes to check if a |
| 1043 | pixel is transparent. You would also need to make sure that the |
| 1044 | transparency information is upgraded to RGB. |
| 1045 | |
| 1046 | To summarize, the current flow is: |
| 1047 | - Gray + simple transparency -> compare 1 or 2 gray bytes and composite |
| 1048 | with background "in place" if transparent, |
| 1049 | convert to RGB if necessary |
| 1050 | - Gray + alpha -> composite with gray background and remove alpha bytes, |
| 1051 | convert to RGB if necessary |
| 1052 | |
| 1053 | To support RGB backgrounds for gray images we need: |
| 1054 | - Gray + simple transparency -> convert to RGB + simple transparency, compare |
| 1055 | 3 or 6 bytes and composite with background |
| 1056 | "in place" if transparent (3x compare/pixel |
| 1057 | compared to doing composite with gray bkgrnd) |
| 1058 | - Gray + alpha -> convert to RGB + alpha, composite with background and |
| 1059 | remove alpha bytes (3x float operations/pixel |
| 1060 | compared with composite on gray background) |
| 1061 | |
| 1062 | Greg's change will do this. The reason it wasn't done before is for |
| 1063 | performance, as this increases the per-pixel operations. If we would check |
| 1064 | in advance if the background was gray or RGB, and position the gray-to-RGB |
| 1065 | transform appropriately, then it would save a lot of work/time. |
| 1066 | */ |
| 1067 | |
| 1068 | #if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED) |
| 1069 | /* if gray -> RGB, do so now only if background is non-gray; else do later |
| 1070 | * for performance reasons */ |
| 1071 | if (png_ptr->transformations & PNG_GRAY_TO_RGB && |
| 1072 | !(png_ptr->flags & PNG_FLAG_BACKGROUND_IS_GRAY)) |
| 1073 | png_do_gray_to_rgb(&(png_ptr->row_info), png_ptr->row_buf + 1); |
| 1074 | #endif |
| 1075 | |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1076 | #if defined(PNG_READ_BACKGROUND_SUPPORTED) |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 1077 | if ((png_ptr->transformations & PNG_BACKGROUND) && |
| 1078 | ((png_ptr->num_trans != 0 ) || |
| 1079 | (png_ptr->color_type & PNG_COLOR_MASK_ALPHA))) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1080 | png_do_background(&(png_ptr->row_info), png_ptr->row_buf + 1, |
| 1081 | &(png_ptr->trans_values), &(png_ptr->background), |
| 1082 | &(png_ptr->background_1), |
| 1083 | png_ptr->gamma_table, png_ptr->gamma_from_1, |
| 1084 | png_ptr->gamma_to_1, png_ptr->gamma_16_table, |
| 1085 | png_ptr->gamma_16_from_1, png_ptr->gamma_16_to_1, |
| 1086 | png_ptr->gamma_shift); |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1087 | #endif |
| 1088 | |
| 1089 | #if defined(PNG_READ_GAMMA_SUPPORTED) |
| 1090 | if ((png_ptr->transformations & PNG_GAMMA) && |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 1091 | #if defined(PNG_READ_BACKGROUND_SUPPORTED) |
| 1092 | !((png_ptr->transformations & PNG_BACKGROUND) && |
| 1093 | ((png_ptr->num_trans != 0) || |
| 1094 | (png_ptr->color_type & PNG_COLOR_MASK_ALPHA))) && |
| 1095 | #endif |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 1096 | (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE)) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1097 | png_do_gamma(&(png_ptr->row_info), png_ptr->row_buf + 1, |
| 1098 | png_ptr->gamma_table, png_ptr->gamma_16_table, |
| 1099 | png_ptr->gamma_shift); |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1100 | #endif |
| 1101 | |
Glenn Randers-Pehrson | 08a3343 | 1998-03-07 06:06:55 -0600 | [diff] [blame] | 1102 | #if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED) |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 1103 | if (png_ptr->transformations & PNG_RGB_TO_GRAY) |
| 1104 | png_do_rgb_to_gray(&(png_ptr->row_info), png_ptr->row_buf + 1); |
| 1105 | #endif |
| 1106 | |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1107 | #if defined(PNG_READ_16_TO_8_SUPPORTED) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1108 | if (png_ptr->transformations & PNG_16_TO_8) |
| 1109 | png_do_chop(&(png_ptr->row_info), png_ptr->row_buf + 1); |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1110 | #endif |
| 1111 | |
| 1112 | #if defined(PNG_READ_DITHER_SUPPORTED) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1113 | if (png_ptr->transformations & PNG_DITHER) |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1114 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1115 | png_do_dither((png_row_infop)&(png_ptr->row_info), png_ptr->row_buf + 1, |
| 1116 | png_ptr->palette_lookup, png_ptr->dither_index); |
Glenn Randers-Pehrson | 0f881d6 | 1998-02-07 10:20:57 -0600 | [diff] [blame] | 1117 | if(png_ptr->row_info.rowbytes == (png_uint_32)0) |
| 1118 | png_error(png_ptr, "png_do_dither returned rowbytes=0"); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1119 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1120 | #endif |
| 1121 | |
| 1122 | #if defined(PNG_READ_INVERT_SUPPORTED) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1123 | if (png_ptr->transformations & PNG_INVERT_MONO) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 1124 | png_do_invert(&(png_ptr->row_info), png_ptr->row_buf + 1); |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1125 | #endif |
| 1126 | |
| 1127 | #if defined(PNG_READ_SHIFT_SUPPORTED) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1128 | if (png_ptr->transformations & PNG_SHIFT) |
| 1129 | png_do_unshift(&(png_ptr->row_info), png_ptr->row_buf + 1, |
| 1130 | &(png_ptr->shift)); |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1131 | #endif |
| 1132 | |
| 1133 | #if defined(PNG_READ_PACK_SUPPORTED) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1134 | if (png_ptr->transformations & PNG_PACK) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 1135 | png_do_unpack(&(png_ptr->row_info), png_ptr->row_buf + 1); |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1136 | #endif |
| 1137 | |
| 1138 | #if defined(PNG_READ_BGR_SUPPORTED) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1139 | if (png_ptr->transformations & PNG_BGR) |
| 1140 | png_do_bgr(&(png_ptr->row_info), png_ptr->row_buf + 1); |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1141 | #endif |
| 1142 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1143 | #if defined(PNG_READ_PACKSWAP_SUPPORTED) |
| 1144 | if (png_ptr->transformations & PNG_PACKSWAP) |
| 1145 | png_do_packswap(&(png_ptr->row_info), png_ptr->row_buf + 1); |
| 1146 | #endif |
| 1147 | |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1148 | #if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED) |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1149 | /* if gray -> RGB, do so now only if we did not do so above */ |
| 1150 | if (png_ptr->transformations & PNG_GRAY_TO_RGB && |
| 1151 | png_ptr->flags & PNG_FLAG_BACKGROUND_IS_GRAY) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1152 | png_do_gray_to_rgb(&(png_ptr->row_info), png_ptr->row_buf + 1); |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1153 | #endif |
| 1154 | |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1155 | #if defined(PNG_READ_FILLER_SUPPORTED) |
| 1156 | if (png_ptr->transformations & PNG_FILLER) |
| 1157 | png_do_read_filler(&(png_ptr->row_info), png_ptr->row_buf + 1, |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1158 | (png_uint_32)png_ptr->filler, png_ptr->flags); |
| 1159 | #endif |
| 1160 | |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 1161 | #if defined(PNG_READ_INVERT_ALPHA_SUPPORTED) |
| 1162 | if (png_ptr->transformations & PNG_INVERT_ALPHA) |
| 1163 | png_do_read_invert_alpha(&(png_ptr->row_info), png_ptr->row_buf + 1); |
| 1164 | #endif |
| 1165 | |
Glenn Randers-Pehrson | cbe52d8 | 1998-02-28 07:00:24 -0600 | [diff] [blame] | 1166 | #if defined(PNG_READ_SWAP_ALPHA_SUPPORTED) |
| 1167 | if (png_ptr->transformations & PNG_SWAP_ALPHA) |
| 1168 | png_do_read_swap_alpha(&(png_ptr->row_info), png_ptr->row_buf + 1); |
| 1169 | #endif |
| 1170 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1171 | #if defined(PNG_READ_SWAP_SUPPORTED) |
| 1172 | if (png_ptr->transformations & PNG_SWAP_BYTES) |
| 1173 | png_do_swap(&(png_ptr->row_info), png_ptr->row_buf + 1); |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1174 | #endif |
Glenn Randers-Pehrson | 08a3343 | 1998-03-07 06:06:55 -0600 | [diff] [blame] | 1175 | |
| 1176 | #if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) |
| 1177 | if (png_ptr->transformations & PNG_USER_TRANSFORM) |
| 1178 | if(png_ptr->read_user_transform_fn != NULL) |
| 1179 | (*(png_ptr->read_user_transform_fn)) /* user read transform function */ |
| 1180 | (png_ptr, /* png_ptr */ |
| 1181 | &(png_ptr->row_info), /* row_info: */ |
| 1182 | /* png_uint_32 width; width of row */ |
| 1183 | /* png_uint_32 rowbytes; number of bytes in row */ |
| 1184 | /* png_byte color_type; color type of pixels */ |
| 1185 | /* png_byte bit_depth; bit depth of samples */ |
| 1186 | /* png_byte channels; number of channels (1-4) */ |
| 1187 | /* png_byte pixel_depth; bits per pixel (depth*channels) */ |
| 1188 | png_ptr->row_buf + 1); /* start of pixel data for row */ |
| 1189 | #endif |
| 1190 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1191 | } |
| 1192 | |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1193 | #if defined(PNG_READ_PACK_SUPPORTED) |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 1194 | /* Unpack pixels of 1, 2, or 4 bits per pixel into 1 byte per pixel, |
| 1195 | * without changing the actual values. Thus, if you had a row with |
| 1196 | * a bit depth of 1, you would end up with bytes that only contained |
| 1197 | * the numbers 0 or 1. If you would rather they contain 0 and 255, use |
| 1198 | * png_do_shift() after this. |
| 1199 | */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1200 | void |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 1201 | png_do_unpack(png_row_infop row_info, png_bytep row) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1202 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1203 | png_debug(1, "in png_do_unpack\n"); |
| 1204 | #if defined(PNG_USELESS_TESTS_SUPPORTED) |
| 1205 | if (row != NULL && row_info != NULL && row_info->bit_depth < 8) |
| 1206 | #else |
| 1207 | if (row_info->bit_depth < 8) |
| 1208 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1209 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1210 | png_uint_32 i; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1211 | png_uint_32 row_width=row_info->width; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1212 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1213 | switch (row_info->bit_depth) |
| 1214 | { |
| 1215 | case 1: |
| 1216 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1217 | png_bytep sp = row + (png_size_t)((row_width - 1) >> 3); |
| 1218 | png_bytep dp = row + (png_size_t)row_width - 1; |
| 1219 | png_uint_32 shift = 7 - (int)((row_width + 7) & 7); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1220 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1221 | { |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 1222 | *dp = (png_byte)((*sp >> shift) & 0x1); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1223 | if (shift == 7) |
| 1224 | { |
| 1225 | shift = 0; |
| 1226 | sp--; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 1227 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1228 | else |
| 1229 | shift++; |
| 1230 | |
| 1231 | dp--; |
| 1232 | } |
| 1233 | break; |
| 1234 | } |
| 1235 | case 2: |
| 1236 | { |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1237 | |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1238 | png_bytep sp = row + (png_size_t)((row_width - 1) >> 2); |
| 1239 | png_bytep dp = row + (png_size_t)row_width - 1; |
| 1240 | png_uint_32 shift = (int)((3 - ((row_width + 3) & 3)) << 1); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1241 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1242 | { |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 1243 | *dp = (png_byte)((*sp >> shift) & 0x3); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1244 | if (shift == 6) |
| 1245 | { |
| 1246 | shift = 0; |
| 1247 | sp--; |
| 1248 | } |
| 1249 | else |
| 1250 | shift += 2; |
| 1251 | |
| 1252 | dp--; |
| 1253 | } |
| 1254 | break; |
| 1255 | } |
| 1256 | case 4: |
| 1257 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1258 | png_bytep sp = row + (png_size_t)((row_width - 1) >> 1); |
| 1259 | png_bytep dp = row + (png_size_t)row_width - 1; |
| 1260 | png_uint_32 shift = (int)((1 - ((row_width + 1) & 1)) << 2); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1261 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1262 | { |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 1263 | *dp = (png_byte)((*sp >> shift) & 0xf); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1264 | if (shift == 4) |
| 1265 | { |
| 1266 | shift = 0; |
| 1267 | sp--; |
| 1268 | } |
| 1269 | else |
| 1270 | shift = 4; |
| 1271 | |
| 1272 | dp--; |
| 1273 | } |
| 1274 | break; |
| 1275 | } |
| 1276 | } |
| 1277 | row_info->bit_depth = 8; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 1278 | row_info->pixel_depth = (png_byte)(8 * row_info->channels); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1279 | row_info->rowbytes = row_width * row_info->channels; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1280 | } |
| 1281 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1282 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1283 | |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1284 | #if defined(PNG_READ_SHIFT_SUPPORTED) |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 1285 | /* Reverse the effects of png_do_shift. This routine merely shifts the |
| 1286 | * pixels back to their significant bits values. Thus, if you have |
| 1287 | * a row of bit depth 8, but only 5 are significant, this will shift |
| 1288 | * the values back to 0 through 31. |
| 1289 | */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1290 | void |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1291 | png_do_unshift(png_row_infop row_info, png_bytep row, png_color_8p sig_bits) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1292 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1293 | png_debug(1, "in png_do_unshift\n"); |
| 1294 | if ( |
| 1295 | #if defined(PNG_USELESS_TESTS_SUPPORTED) |
| 1296 | row != NULL && row_info != NULL && sig_bits != NULL && |
| 1297 | #endif |
| 1298 | row_info->color_type != PNG_COLOR_TYPE_PALETTE) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1299 | { |
| 1300 | int shift[4]; |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1301 | int channels = 0; |
| 1302 | int c; |
| 1303 | png_uint_16 value = 0; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1304 | png_uint_32 row_width = row_info->width; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1305 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1306 | if (row_info->color_type & PNG_COLOR_MASK_COLOR) |
| 1307 | { |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 1308 | shift[channels++] = row_info->bit_depth - sig_bits->red; |
| 1309 | shift[channels++] = row_info->bit_depth - sig_bits->green; |
| 1310 | shift[channels++] = row_info->bit_depth - sig_bits->blue; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1311 | } |
| 1312 | else |
| 1313 | { |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 1314 | shift[channels++] = row_info->bit_depth - sig_bits->gray; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1315 | } |
| 1316 | if (row_info->color_type & PNG_COLOR_MASK_ALPHA) |
| 1317 | { |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 1318 | shift[channels++] = row_info->bit_depth - sig_bits->alpha; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 1319 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1320 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1321 | for (c = 0; c < channels; c++) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 1322 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1323 | if (shift[c] <= 0) |
| 1324 | shift[c] = 0; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 1325 | else |
| 1326 | value = 1; |
| 1327 | } |
Guy Schalnat | 0f71645 | 1995-11-28 11:22:13 -0600 | [diff] [blame] | 1328 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 1329 | if (!value) |
| 1330 | return; |
Guy Schalnat | 0f71645 | 1995-11-28 11:22:13 -0600 | [diff] [blame] | 1331 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 1332 | switch (row_info->bit_depth) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1333 | { |
| 1334 | case 2: |
| 1335 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1336 | png_bytep bp; |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1337 | png_uint_32 i; |
| 1338 | png_uint_32 istop = row_info->rowbytes; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1339 | |
Glenn Randers-Pehrson | d0dce40 | 1998-05-09 10:02:29 -0500 | [diff] [blame] | 1340 | for (bp = row, i = 0; i < istop; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1341 | { |
| 1342 | *bp >>= 1; |
Glenn Randers-Pehrson | d0dce40 | 1998-05-09 10:02:29 -0500 | [diff] [blame] | 1343 | *bp++ &= 0x55; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1344 | } |
| 1345 | break; |
| 1346 | } |
| 1347 | case 4: |
| 1348 | { |
Glenn Randers-Pehrson | 8686fff | 1998-05-21 09:27:50 -0500 | [diff] [blame] | 1349 | png_bytep bp = row; |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1350 | png_uint_32 i; |
| 1351 | png_uint_32 istop = row_info->rowbytes; |
| 1352 | png_byte mask = (png_byte)(((int)0xf0 >> shift[0]) & (int)0xf0) | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 1353 | (png_byte)((int)0xf >> shift[0]); |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1354 | |
Glenn Randers-Pehrson | 8686fff | 1998-05-21 09:27:50 -0500 | [diff] [blame] | 1355 | for (i = 0; i < istop; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1356 | { |
| 1357 | *bp >>= shift[0]; |
Glenn Randers-Pehrson | d0dce40 | 1998-05-09 10:02:29 -0500 | [diff] [blame] | 1358 | *bp++ &= mask; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1359 | } |
| 1360 | break; |
| 1361 | } |
Glenn Randers-Pehrson | 8686fff | 1998-05-21 09:27:50 -0500 | [diff] [blame] | 1362 | #ifndef PNG_SLOW_SHIFT |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1363 | case 8: |
| 1364 | { |
Glenn Randers-Pehrson | d0dce40 | 1998-05-09 10:02:29 -0500 | [diff] [blame] | 1365 | png_bytep bp = row; |
Glenn Randers-Pehrson | 0f881d6 | 1998-02-07 10:20:57 -0600 | [diff] [blame] | 1366 | png_uint_32 i; |
Glenn Randers-Pehrson | d0dce40 | 1998-05-09 10:02:29 -0500 | [diff] [blame] | 1367 | png_uint_32 istop = row_width * channels; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1368 | |
Glenn Randers-Pehrson | d0dce40 | 1998-05-09 10:02:29 -0500 | [diff] [blame] | 1369 | for (i = 0; i < istop; i++) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1370 | { |
Glenn Randers-Pehrson | d0dce40 | 1998-05-09 10:02:29 -0500 | [diff] [blame] | 1371 | *bp++ >>= shift[i%channels]; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1372 | } |
| 1373 | break; |
| 1374 | } |
| 1375 | case 16: |
| 1376 | { |
Glenn Randers-Pehrson | d0dce40 | 1998-05-09 10:02:29 -0500 | [diff] [blame] | 1377 | png_bytep bp = row; |
| 1378 | png_uint_32 i; |
| 1379 | png_uint_32 istop = channels * row_width; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1380 | |
Glenn Randers-Pehrson | d0dce40 | 1998-05-09 10:02:29 -0500 | [diff] [blame] | 1381 | for (i = 0; i < istop; i++) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1382 | { |
Glenn Randers-Pehrson | d0dce40 | 1998-05-09 10:02:29 -0500 | [diff] [blame] | 1383 | value = (png_uint_16)((*bp << 8) + *(bp + 1)); |
| 1384 | value >>= shift[i%channels]; |
| 1385 | *bp++ = (png_byte)(value >> 8); |
| 1386 | *bp++ = (png_byte)(value & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1387 | } |
| 1388 | break; |
| 1389 | } |
Glenn Randers-Pehrson | 8686fff | 1998-05-21 09:27:50 -0500 | [diff] [blame] | 1390 | #else |
| 1391 | case 8: |
| 1392 | { |
| 1393 | png_bytep bp; |
| 1394 | png_uint_32 i; |
| 1395 | int cstop; |
| 1396 | |
| 1397 | cstop=(int)row_info->channels; |
| 1398 | for (bp = row, i = 0; i < row_width; i++) |
| 1399 | { |
| 1400 | for (c = 0; c < cstop; c++, bp++) |
| 1401 | { |
| 1402 | *bp >>= shift[c]; |
| 1403 | } |
| 1404 | } |
| 1405 | break; |
| 1406 | } |
| 1407 | case 16: |
| 1408 | { |
| 1409 | png_bytep bp; |
| 1410 | png_size_t i; |
| 1411 | int cstop; |
| 1412 | |
| 1413 | cstop=(int)row_info->channels; |
| 1414 | for (bp = row, i = 0; i < row_width; i++) |
| 1415 | { |
| 1416 | for (c = 0; c < cstop; c++, bp += 2) |
| 1417 | { |
| 1418 | value = (png_uint_16)((*bp << 8) + *(bp + 1)); |
| 1419 | value >>= shift[c]; |
| 1420 | *bp = (png_byte)(value >> 8); |
| 1421 | *(bp + 1) = (png_byte)(value & 0xff); |
| 1422 | } |
| 1423 | } |
| 1424 | break; |
| 1425 | } |
| 1426 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1427 | } |
| 1428 | } |
| 1429 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1430 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1431 | |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1432 | #if defined(PNG_READ_16_TO_8_SUPPORTED) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1433 | /* chop rows of bit depth 16 down to 8 */ |
| 1434 | void |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 1435 | png_do_chop(png_row_infop row_info, png_bytep row) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1436 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1437 | png_debug(1, "in png_do_chop\n"); |
| 1438 | #if defined(PNG_USELESS_TESTS_SUPPORTED) |
| 1439 | if (row != NULL && row_info != NULL && row_info->bit_depth == 16) |
| 1440 | #else |
| 1441 | if (row_info->bit_depth == 16) |
| 1442 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1443 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1444 | png_bytep sp = row; |
| 1445 | png_bytep dp = row; |
| 1446 | png_uint_32 i; |
| 1447 | png_uint_32 istop = row_info->width * row_info->channels; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1448 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1449 | for (i = 0; i<istop; i++, sp += 2, dp++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1450 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1451 | #if defined(PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED) |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1452 | /* This does a more accurate scaling of the 16-bit color |
| 1453 | * value, rather than a simple low-byte truncation. |
| 1454 | * |
| 1455 | * What the ideal calculation should be: |
| 1456 | * *dp = (((((png_uint_32)(*sp) << 8) | |
| 1457 | * (png_uint_32)(*(sp + 1))) * 255 + 127) / (png_uint_32)65535L; |
| 1458 | * |
| 1459 | * GRR: no, I think this is what it really should be: |
| 1460 | * *dp = (((((png_uint_32)(*sp) << 8) | |
| 1461 | * (png_uint_32)(*(sp + 1))) + 128L) / (png_uint_32)257L; |
| 1462 | * |
| 1463 | * GRR: here's the exact calculation with shifts: |
| 1464 | * temp = (((png_uint_32)(*sp) << 8) | (png_uint_32)(*(sp + 1))) + 128L; |
| 1465 | * *dp = (temp - (temp >> 8)) >> 8; |
| 1466 | * |
| 1467 | * Approximate calculation with shift/add instead of multiply/divide: |
| 1468 | * *dp = ((((png_uint_32)(*sp) << 8) | |
| 1469 | * (png_uint_32)((int)(*(sp + 1)) - *sp)) + 128) >> 8; |
| 1470 | * |
| 1471 | * What we actually do to avoid extra shifting and conversion: |
| 1472 | */ |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1473 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1474 | *dp = *sp + ((((int)(*(sp + 1)) - *sp) > 128) ? 1 : 0); |
| 1475 | #else |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1476 | /* Simply discard the low order byte */ |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 1477 | *dp = *sp; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1478 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1479 | } |
| 1480 | row_info->bit_depth = 8; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 1481 | row_info->pixel_depth = (png_byte)(8 * row_info->channels); |
Glenn Randers-Pehrson | 0f881d6 | 1998-02-07 10:20:57 -0600 | [diff] [blame] | 1482 | row_info->rowbytes = row_info->width * row_info->channels; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1483 | } |
| 1484 | } |
| 1485 | #endif |
| 1486 | |
| 1487 | #if defined(PNG_READ_SWAP_ALPHA_SUPPORTED) |
| 1488 | void |
| 1489 | png_do_read_swap_alpha(png_row_infop row_info, png_bytep row) |
| 1490 | { |
| 1491 | png_debug(1, "in png_do_read_swap_alpha\n"); |
| 1492 | #if defined(PNG_USELESS_TESTS_SUPPORTED) |
| 1493 | if (row != NULL && row_info != NULL) |
| 1494 | #endif |
| 1495 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1496 | png_uint_32 row_width = row_info->width; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1497 | if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA) |
| 1498 | { |
| 1499 | /* This converts from RGBA to ARGB */ |
| 1500 | if (row_info->bit_depth == 8) |
| 1501 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1502 | png_bytep sp = row + row_info->rowbytes; |
| 1503 | png_bytep dp = sp; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1504 | png_byte save; |
| 1505 | png_uint_32 i; |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1506 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1507 | for (i = 0; i < row_width; i++) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1508 | { |
| 1509 | save = *(--sp); |
| 1510 | *(--dp) = *(--sp); |
| 1511 | *(--dp) = *(--sp); |
| 1512 | *(--dp) = *(--sp); |
| 1513 | *(--dp) = save; |
| 1514 | } |
| 1515 | } |
| 1516 | /* This converts from RRGGBBAA to AARRGGBB */ |
| 1517 | else |
| 1518 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1519 | png_bytep sp = row + row_info->rowbytes; |
| 1520 | png_bytep dp = sp; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1521 | png_byte save[2]; |
| 1522 | png_uint_32 i; |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1523 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1524 | for (i = 0; i < row_width; i++) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1525 | { |
| 1526 | save[0] = *(--sp); |
| 1527 | save[1] = *(--sp); |
| 1528 | *(--dp) = *(--sp); |
| 1529 | *(--dp) = *(--sp); |
| 1530 | *(--dp) = *(--sp); |
| 1531 | *(--dp) = *(--sp); |
| 1532 | *(--dp) = *(--sp); |
| 1533 | *(--dp) = *(--sp); |
| 1534 | *(--dp) = save[0]; |
| 1535 | *(--dp) = save[1]; |
| 1536 | } |
| 1537 | } |
| 1538 | } |
| 1539 | else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) |
| 1540 | { |
| 1541 | /* This converts from GA to AG */ |
| 1542 | if (row_info->bit_depth == 8) |
| 1543 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1544 | png_bytep sp = row + row_info->rowbytes; |
| 1545 | png_bytep dp = sp; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1546 | png_byte save; |
| 1547 | png_uint_32 i; |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1548 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1549 | for (i = 0; i < row_width; i++) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1550 | { |
| 1551 | save = *(--sp); |
| 1552 | *(--dp) = *(--sp); |
| 1553 | *(--dp) = save; |
| 1554 | } |
| 1555 | } |
| 1556 | /* This converts from GGAA to AAGG */ |
| 1557 | else |
| 1558 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1559 | png_bytep sp = row + row_info->rowbytes; |
| 1560 | png_bytep dp = sp; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1561 | png_byte save[2]; |
| 1562 | png_uint_32 i; |
| 1563 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1564 | for (i = 0; i < row_width; i++) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1565 | { |
| 1566 | save[0] = *(--sp); |
| 1567 | save[1] = *(--sp); |
| 1568 | *(--dp) = *(--sp); |
| 1569 | *(--dp) = *(--sp); |
| 1570 | *(--dp) = save[0]; |
| 1571 | *(--dp) = save[1]; |
| 1572 | } |
| 1573 | } |
| 1574 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1575 | } |
| 1576 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1577 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1578 | |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 1579 | #if defined(PNG_READ_INVERT_ALPHA_SUPPORTED) |
| 1580 | void |
| 1581 | png_do_read_invert_alpha(png_row_infop row_info, png_bytep row) |
| 1582 | { |
| 1583 | png_debug(1, "in png_do_read_invert_alpha\n"); |
| 1584 | #if defined(PNG_USELESS_TESTS_SUPPORTED) |
| 1585 | if (row != NULL && row_info != NULL) |
| 1586 | #endif |
| 1587 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1588 | png_uint_32 row_width = row_info->width; |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 1589 | if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA) |
| 1590 | { |
| 1591 | /* This inverts the alpha channel in RGBA */ |
| 1592 | if (row_info->bit_depth == 8) |
| 1593 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1594 | png_bytep sp = row + row_info->rowbytes; |
| 1595 | png_bytep dp = sp; |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 1596 | png_uint_32 i; |
| 1597 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1598 | for (i = 0; i < row_width; i++) |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 1599 | { |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 1600 | *(--dp) = 255 - *(--sp); |
Glenn Randers-Pehrson | cbe52d8 | 1998-02-28 07:00:24 -0600 | [diff] [blame] | 1601 | *(--dp) = *(--sp); |
| 1602 | *(--dp) = *(--sp); |
| 1603 | *(--dp) = *(--sp); |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 1604 | } |
| 1605 | } |
| 1606 | /* This inverts the alpha channel in RRGGBBAA */ |
| 1607 | else |
| 1608 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1609 | png_bytep sp = row + row_info->rowbytes; |
| 1610 | png_bytep dp = sp; |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 1611 | png_uint_32 i; |
| 1612 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1613 | for (i = 0; i < row_width; i++) |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 1614 | { |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 1615 | *(--dp) = 255 - *(--sp); |
| 1616 | *(--dp) = 255 - *(--sp); |
Glenn Randers-Pehrson | cbe52d8 | 1998-02-28 07:00:24 -0600 | [diff] [blame] | 1617 | *(--dp) = *(--sp); |
| 1618 | *(--dp) = *(--sp); |
| 1619 | *(--dp) = *(--sp); |
| 1620 | *(--dp) = *(--sp); |
| 1621 | *(--dp) = *(--sp); |
| 1622 | *(--dp) = *(--sp); |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 1623 | } |
| 1624 | } |
| 1625 | } |
| 1626 | else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) |
| 1627 | { |
Glenn Randers-Pehrson | cbe52d8 | 1998-02-28 07:00:24 -0600 | [diff] [blame] | 1628 | /* This inverts the alpha channel in GA */ |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 1629 | if (row_info->bit_depth == 8) |
| 1630 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1631 | png_bytep sp = row + row_info->rowbytes; |
| 1632 | png_bytep dp = sp; |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 1633 | png_uint_32 i; |
| 1634 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1635 | for (i = 0; i < row_width; i++) |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 1636 | { |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 1637 | *(--dp) = 255 - *(--sp); |
Glenn Randers-Pehrson | cbe52d8 | 1998-02-28 07:00:24 -0600 | [diff] [blame] | 1638 | *(--dp) = *(--sp); |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 1639 | } |
| 1640 | } |
Glenn Randers-Pehrson | cbe52d8 | 1998-02-28 07:00:24 -0600 | [diff] [blame] | 1641 | /* This inverts the alpha channel in GGAA */ |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 1642 | else |
| 1643 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1644 | png_bytep sp = row + row_info->rowbytes; |
| 1645 | png_bytep dp = sp; |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 1646 | png_uint_32 i; |
| 1647 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1648 | for (i = 0; i < row_width; i++) |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 1649 | { |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 1650 | *(--dp) = 255 - *(--sp); |
| 1651 | *(--dp) = 255 - *(--sp); |
Glenn Randers-Pehrson | cbe52d8 | 1998-02-28 07:00:24 -0600 | [diff] [blame] | 1652 | *(--dp) = *(--sp); |
| 1653 | *(--dp) = *(--sp); |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 1654 | } |
| 1655 | } |
| 1656 | } |
| 1657 | } |
| 1658 | } |
| 1659 | #endif |
| 1660 | |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1661 | #if defined(PNG_READ_FILLER_SUPPORTED) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1662 | /* Add filler channel if we have RGB color */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1663 | void |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 1664 | png_do_read_filler(png_row_infop row_info, png_bytep row, |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1665 | png_uint_32 filler, png_uint_32 flags) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1666 | { |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1667 | png_uint_32 i; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1668 | png_uint_32 row_width = row_info->width; |
| 1669 | |
Glenn Randers-Pehrson | d0dce40 | 1998-05-09 10:02:29 -0500 | [diff] [blame] | 1670 | png_byte hi_filler = (png_byte)((filler>>8) & 0xff); |
| 1671 | png_byte low_filler = (png_byte)(filler & 0xff); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1672 | |
| 1673 | png_debug(1, "in png_do_read_filler\n"); |
| 1674 | if ( |
| 1675 | #if defined(PNG_USELESS_TESTS_SUPPORTED) |
| 1676 | row != NULL && row_info != NULL && |
| 1677 | #endif |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1678 | row_info->color_type == PNG_COLOR_TYPE_GRAY) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1679 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1680 | if(row_info->bit_depth == 8) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1681 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1682 | /* This changes the data from G to GX */ |
| 1683 | if (flags & PNG_FLAG_FILLER_AFTER) |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1684 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1685 | png_bytep sp = row + (png_size_t)row_width; |
| 1686 | png_bytep dp = sp + (png_size_t)row_width; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1687 | for (i = 1; i < row_width; i++) |
| 1688 | { |
| 1689 | *(--dp) = low_filler; |
| 1690 | *(--dp) = *(--sp); |
| 1691 | } |
| 1692 | row_info->channels = 2; |
| 1693 | row_info->pixel_depth = 16; |
| 1694 | row_info->rowbytes = row_width * 2; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1695 | } |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1696 | /* This changes the data from G to XG */ |
| 1697 | else |
| 1698 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1699 | png_bytep sp = row + (png_size_t)row_width; |
| 1700 | png_bytep dp = sp + (png_size_t)row_width; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1701 | for (i = 0; i < row_width; i++) |
| 1702 | { |
| 1703 | *(--dp) = *(--sp); |
| 1704 | *(--dp) = low_filler; |
| 1705 | } |
| 1706 | row_info->channels = 2; |
| 1707 | row_info->pixel_depth = 16; |
| 1708 | row_info->rowbytes = row_width * 2; |
| 1709 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1710 | } |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1711 | else if(row_info->bit_depth == 16) |
| 1712 | { |
| 1713 | /* This changes the data from GG to GGXX */ |
| 1714 | if (flags & PNG_FLAG_FILLER_AFTER) |
| 1715 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1716 | png_bytep sp = row + (png_size_t)row_width; |
| 1717 | png_bytep dp = sp + (png_size_t)row_width; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1718 | for (i = 1; i < row_width; i++) |
| 1719 | { |
| 1720 | *(--dp) = hi_filler; |
| 1721 | *(--dp) = low_filler; |
| 1722 | *(--dp) = *(--sp); |
| 1723 | *(--dp) = *(--sp); |
| 1724 | } |
| 1725 | row_info->channels = 2; |
| 1726 | row_info->pixel_depth = 32; |
| 1727 | row_info->rowbytes = row_width * 2; |
| 1728 | } |
| 1729 | /* This changes the data from GG to XXGG */ |
| 1730 | else |
| 1731 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1732 | png_bytep sp = row + (png_size_t)row_width; |
| 1733 | png_bytep dp = sp + (png_size_t)row_width; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1734 | for (i = 0; i < row_width; i++) |
| 1735 | { |
| 1736 | *(--dp) = *(--sp); |
| 1737 | *(--dp) = *(--sp); |
| 1738 | *(--dp) = hi_filler; |
| 1739 | *(--dp) = low_filler; |
| 1740 | } |
| 1741 | row_info->channels = 2; |
| 1742 | row_info->pixel_depth = 16; |
| 1743 | row_info->rowbytes = row_width * 2; |
| 1744 | } |
| 1745 | } |
| 1746 | } /* COLOR_TYPE == GRAY */ |
| 1747 | else if (row_info->color_type == PNG_COLOR_TYPE_RGB) |
| 1748 | { |
| 1749 | if(row_info->bit_depth == 8) |
| 1750 | { |
| 1751 | /* This changes the data from RGB to RGBX */ |
| 1752 | if (flags & PNG_FLAG_FILLER_AFTER) |
| 1753 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1754 | png_bytep sp = row + (png_size_t)row_width * 3; |
| 1755 | png_bytep dp = sp + (png_size_t)row_width; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1756 | for (i = 1; i < row_width; i++) |
| 1757 | { |
| 1758 | *(--dp) = low_filler; |
| 1759 | *(--dp) = *(--sp); |
| 1760 | *(--dp) = *(--sp); |
| 1761 | *(--dp) = *(--sp); |
| 1762 | } |
| 1763 | row_info->channels = 4; |
| 1764 | row_info->pixel_depth = 32; |
| 1765 | row_info->rowbytes = row_width * 4; |
| 1766 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1767 | /* This changes the data from RGB to XRGB */ |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1768 | else |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1769 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1770 | png_bytep sp = row + (png_size_t)row_width * 3; |
| 1771 | png_bytep dp = sp + (png_size_t)row_width; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1772 | for (i = 0; i < row_width; i++) |
| 1773 | { |
| 1774 | *(--dp) = *(--sp); |
| 1775 | *(--dp) = *(--sp); |
| 1776 | *(--dp) = *(--sp); |
| 1777 | *(--dp) = low_filler; |
| 1778 | } |
| 1779 | row_info->channels = 4; |
| 1780 | row_info->pixel_depth = 32; |
| 1781 | row_info->rowbytes = row_width * 4; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1782 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1783 | } |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1784 | else if(row_info->bit_depth == 16) |
| 1785 | { |
| 1786 | /* This changes the data from RRGGBB to RRGGBBXX */ |
| 1787 | if (flags & PNG_FLAG_FILLER_AFTER) |
| 1788 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1789 | png_bytep sp = row + (png_size_t)row_width * 3; |
| 1790 | png_bytep dp = sp + (png_size_t)row_width; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1791 | for (i = 1; i < row_width; i++) |
| 1792 | { |
| 1793 | *(--dp) = hi_filler; |
| 1794 | *(--dp) = low_filler; |
| 1795 | *(--dp) = *(--sp); |
| 1796 | *(--dp) = *(--sp); |
| 1797 | *(--dp) = *(--sp); |
| 1798 | *(--dp) = *(--sp); |
| 1799 | *(--dp) = *(--sp); |
| 1800 | *(--dp) = *(--sp); |
| 1801 | } |
| 1802 | row_info->channels = 4; |
| 1803 | row_info->pixel_depth = 64; |
| 1804 | row_info->rowbytes = row_width * 4; |
| 1805 | } |
| 1806 | /* This changes the data from RRGGBB to XXRRGGBB */ |
| 1807 | else |
| 1808 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1809 | png_bytep sp = row + (png_size_t)row_width * 3; |
| 1810 | png_bytep dp = sp + (png_size_t)row_width; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1811 | for (i = 0; i < row_width; i++) |
| 1812 | { |
| 1813 | *(--dp) = *(--sp); |
| 1814 | *(--dp) = *(--sp); |
| 1815 | *(--dp) = *(--sp); |
| 1816 | *(--dp) = *(--sp); |
| 1817 | *(--dp) = *(--sp); |
| 1818 | *(--dp) = *(--sp); |
| 1819 | *(--dp) = hi_filler; |
| 1820 | *(--dp) = low_filler; |
| 1821 | } |
| 1822 | row_info->channels = 4; |
| 1823 | row_info->pixel_depth = 64; |
| 1824 | row_info->rowbytes = row_width * 4; |
| 1825 | } |
| 1826 | } |
| 1827 | } /* COLOR_TYPE == RGB */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1828 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1829 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1830 | |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1831 | #if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1832 | /* expand grayscale files to RGB, with or without alpha */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1833 | void |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 1834 | 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] | 1835 | { |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1836 | png_uint_32 i; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1837 | png_uint_32 row_width = row_info->width; |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 1838 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1839 | png_debug(1, "in png_do_gray_to_rgb\n"); |
| 1840 | if (row_info->bit_depth >= 8 && |
| 1841 | #if defined(PNG_USELESS_TESTS_SUPPORTED) |
| 1842 | row != NULL && row_info != NULL && |
| 1843 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1844 | !(row_info->color_type & PNG_COLOR_MASK_COLOR)) |
| 1845 | { |
| 1846 | if (row_info->color_type == PNG_COLOR_TYPE_GRAY) |
| 1847 | { |
| 1848 | if (row_info->bit_depth == 8) |
| 1849 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1850 | png_bytep sp = row + (png_size_t)row_width - 1; |
| 1851 | png_bytep dp = sp + (png_size_t)row_width * 2; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1852 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1853 | { |
| 1854 | *(dp--) = *sp; |
| 1855 | *(dp--) = *sp; |
| 1856 | *(dp--) = *sp; |
| 1857 | sp--; |
| 1858 | } |
| 1859 | } |
| 1860 | else |
| 1861 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1862 | png_bytep sp = row + (png_size_t)row_width * 2 - 1; |
| 1863 | png_bytep dp = sp + (png_size_t)row_width * 4; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1864 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1865 | { |
| 1866 | *(dp--) = *sp; |
| 1867 | *(dp--) = *(sp - 1); |
| 1868 | *(dp--) = *sp; |
| 1869 | *(dp--) = *(sp - 1); |
| 1870 | *(dp--) = *sp; |
| 1871 | *(dp--) = *(sp - 1); |
| 1872 | sp--; |
| 1873 | sp--; |
| 1874 | } |
| 1875 | } |
| 1876 | } |
| 1877 | else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) |
| 1878 | { |
| 1879 | if (row_info->bit_depth == 8) |
| 1880 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1881 | png_bytep sp = row + (png_size_t)row_width * 2 - 1; |
| 1882 | png_bytep dp = sp + (png_size_t)row_width * 2; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1883 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1884 | { |
| 1885 | *(dp--) = *(sp--); |
| 1886 | *(dp--) = *sp; |
| 1887 | *(dp--) = *sp; |
| 1888 | *(dp--) = *sp; |
| 1889 | sp--; |
| 1890 | } |
| 1891 | } |
| 1892 | else |
| 1893 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1894 | png_bytep sp = row + (png_size_t)row_width * 4 - 1; |
| 1895 | png_bytep dp = sp + (png_size_t)row_width * 4; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1896 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1897 | { |
| 1898 | *(dp--) = *(sp--); |
| 1899 | *(dp--) = *(sp--); |
| 1900 | *(dp--) = *sp; |
| 1901 | *(dp--) = *(sp - 1); |
| 1902 | *(dp--) = *sp; |
| 1903 | *(dp--) = *(sp - 1); |
| 1904 | *(dp--) = *sp; |
| 1905 | *(dp--) = *(sp - 1); |
| 1906 | sp--; |
| 1907 | sp--; |
| 1908 | } |
| 1909 | } |
| 1910 | } |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 1911 | row_info->channels += (png_byte)2; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1912 | row_info->color_type |= PNG_COLOR_MASK_COLOR; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 1913 | row_info->pixel_depth = (png_byte)(row_info->channels * |
| 1914 | row_info->bit_depth); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1915 | row_info->rowbytes = ((row_width * |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1916 | row_info->pixel_depth + 7) >> 3); |
| 1917 | } |
| 1918 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1919 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1920 | |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 1921 | /* Build a grayscale palette. Palette is assumed to be 1 << bit_depth |
| 1922 | * large of png_color. This lets grayscale images be treated as |
| 1923 | * paletted. Most useful for gamma correction and simplification |
| 1924 | * of code. |
| 1925 | */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1926 | void |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 1927 | png_build_grayscale_palette(int bit_depth, png_colorp palette) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1928 | { |
| 1929 | int num_palette; |
| 1930 | int color_inc; |
| 1931 | int i; |
| 1932 | int v; |
| 1933 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1934 | png_debug(1, "in png_do_build_grayscale_palette\n"); |
| 1935 | if (palette == NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1936 | return; |
| 1937 | |
| 1938 | switch (bit_depth) |
| 1939 | { |
| 1940 | case 1: |
| 1941 | num_palette = 2; |
| 1942 | color_inc = 0xff; |
| 1943 | break; |
| 1944 | case 2: |
| 1945 | num_palette = 4; |
| 1946 | color_inc = 0x55; |
| 1947 | break; |
| 1948 | case 4: |
| 1949 | num_palette = 16; |
| 1950 | color_inc = 0x11; |
| 1951 | break; |
| 1952 | case 8: |
| 1953 | num_palette = 256; |
| 1954 | color_inc = 1; |
| 1955 | break; |
| 1956 | default: |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 1957 | num_palette = 0; |
Guy Schalnat | 69b1448 | 1996-01-10 02:56:49 -0600 | [diff] [blame] | 1958 | color_inc = 0; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1959 | break; |
| 1960 | } |
| 1961 | |
| 1962 | for (i = 0, v = 0; i < num_palette; i++, v += color_inc) |
| 1963 | { |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 1964 | palette[i].red = (png_byte)v; |
| 1965 | palette[i].green = (png_byte)v; |
| 1966 | palette[i].blue = (png_byte)v; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1967 | } |
| 1968 | } |
| 1969 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 1970 | /* This function is currently unused. Do we really need it? */ |
| 1971 | #if defined(PNG_READ_DITHER_SUPPORTED) && defined(PNG_CORRECT_PALETTE_SUPPORTED) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1972 | void |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 1973 | png_correct_palette(png_structp png_ptr, png_colorp palette, |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1974 | int num_palette) |
| 1975 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1976 | png_debug(1, "in png_correct_palette\n"); |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1977 | #if defined(PNG_READ_BACKGROUND_SUPPORTED) && defined(PNG_READ_GAMMA_SUPPORTED) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1978 | if ((png_ptr->transformations & (PNG_GAMMA)) && |
| 1979 | (png_ptr->transformations & (PNG_BACKGROUND))) |
| 1980 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1981 | png_color back, back_1; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1982 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1983 | if (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_FILE) |
| 1984 | { |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1985 | back.red = png_ptr->gamma_table[png_ptr->background.red]; |
| 1986 | back.green = png_ptr->gamma_table[png_ptr->background.green]; |
| 1987 | back.blue = png_ptr->gamma_table[png_ptr->background.blue]; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1988 | |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1989 | back_1.red = png_ptr->gamma_to_1[png_ptr->background.red]; |
| 1990 | back_1.green = png_ptr->gamma_to_1[png_ptr->background.green]; |
| 1991 | back_1.blue = png_ptr->gamma_to_1[png_ptr->background.blue]; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1992 | } |
| 1993 | else |
| 1994 | { |
| 1995 | double g; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1996 | |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 1997 | g = 1.0 / (png_ptr->background_gamma * png_ptr->screen_gamma); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1998 | |
| 1999 | if (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_SCREEN || |
| 2000 | fabs(g - 1.0) < PNG_GAMMA_THRESHOLD) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2001 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2002 | back.red = png_ptr->background.red; |
| 2003 | back.green = png_ptr->background.green; |
| 2004 | back.blue = png_ptr->background.blue; |
| 2005 | } |
| 2006 | else |
| 2007 | { |
| 2008 | back.red = |
| 2009 | (png_byte)(pow((double)png_ptr->background.red/255, g) * |
| 2010 | 255.0 + 0.5); |
| 2011 | back.green = |
| 2012 | (png_byte)(pow((double)png_ptr->background.green/255, g) * |
| 2013 | 255.0 + 0.5); |
| 2014 | back.blue = |
| 2015 | (png_byte)(pow((double)png_ptr->background.blue/255, g) * |
| 2016 | 255.0 + 0.5); |
| 2017 | } |
| 2018 | |
| 2019 | g = 1.0 / png_ptr->background_gamma; |
| 2020 | |
| 2021 | back_1.red = |
| 2022 | (png_byte)(pow((double)png_ptr->background.red/255, g) * |
| 2023 | 255.0 + 0.5); |
| 2024 | back_1.green = |
| 2025 | (png_byte)(pow((double)png_ptr->background.green/255, g) * |
| 2026 | 255.0 + 0.5); |
| 2027 | back_1.blue = |
| 2028 | (png_byte)(pow((double)png_ptr->background.blue/255, g) * |
| 2029 | 255.0 + 0.5); |
| 2030 | } |
| 2031 | |
| 2032 | if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) |
| 2033 | { |
| 2034 | png_uint_32 i; |
| 2035 | |
| 2036 | for (i = 0; i < (png_uint_32)num_palette; i++) |
| 2037 | { |
| 2038 | if (i < png_ptr->num_trans && png_ptr->trans[i] == 0) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2039 | { |
| 2040 | palette[i] = back; |
| 2041 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2042 | else if (i < png_ptr->num_trans && png_ptr->trans[i] != 0xff) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2043 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2044 | png_byte v, w; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2045 | |
| 2046 | v = png_ptr->gamma_to_1[png_ptr->palette[i].red]; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2047 | png_composite(w, v, png_ptr->trans[i], back_1.red); |
| 2048 | palette[i].red = png_ptr->gamma_from_1[w]; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2049 | |
| 2050 | v = png_ptr->gamma_to_1[png_ptr->palette[i].green]; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2051 | png_composite(w, v, png_ptr->trans[i], back_1.green); |
| 2052 | palette[i].green = png_ptr->gamma_from_1[w]; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2053 | |
| 2054 | v = png_ptr->gamma_to_1[png_ptr->palette[i].blue]; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2055 | png_composite(w, v, png_ptr->trans[i], back_1.blue); |
| 2056 | palette[i].blue = png_ptr->gamma_from_1[w]; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2057 | } |
| 2058 | else |
| 2059 | { |
| 2060 | palette[i].red = png_ptr->gamma_table[palette[i].red]; |
| 2061 | palette[i].green = png_ptr->gamma_table[palette[i].green]; |
| 2062 | palette[i].blue = png_ptr->gamma_table[palette[i].blue]; |
| 2063 | } |
| 2064 | } |
| 2065 | } |
| 2066 | else |
| 2067 | { |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 2068 | int i; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2069 | |
| 2070 | for (i = 0; i < num_palette; i++) |
| 2071 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2072 | if (palette[i].red == (png_byte)png_ptr->trans_values.gray) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2073 | { |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 2074 | palette[i] = back; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2075 | } |
| 2076 | else |
| 2077 | { |
| 2078 | palette[i].red = png_ptr->gamma_table[palette[i].red]; |
| 2079 | palette[i].green = png_ptr->gamma_table[palette[i].green]; |
| 2080 | palette[i].blue = png_ptr->gamma_table[palette[i].blue]; |
| 2081 | } |
| 2082 | } |
| 2083 | } |
| 2084 | } |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 2085 | else |
| 2086 | #endif |
| 2087 | #if defined(PNG_READ_GAMMA_SUPPORTED) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2088 | if (png_ptr->transformations & PNG_GAMMA) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2089 | { |
| 2090 | int i; |
| 2091 | |
| 2092 | for (i = 0; i < num_palette; i++) |
| 2093 | { |
| 2094 | palette[i].red = png_ptr->gamma_table[palette[i].red]; |
| 2095 | palette[i].green = png_ptr->gamma_table[palette[i].green]; |
| 2096 | palette[i].blue = png_ptr->gamma_table[palette[i].blue]; |
| 2097 | } |
| 2098 | } |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 2099 | #if defined(PNG_READ_BACKGROUND_SUPPORTED) |
| 2100 | else |
| 2101 | #endif |
| 2102 | #endif |
| 2103 | #if defined(PNG_READ_BACKGROUND_SUPPORTED) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2104 | if (png_ptr->transformations & PNG_BACKGROUND) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2105 | { |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 2106 | if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2107 | { |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 2108 | png_color back; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2109 | |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 2110 | back.red = (png_byte)png_ptr->background.red; |
| 2111 | back.green = (png_byte)png_ptr->background.green; |
| 2112 | back.blue = (png_byte)png_ptr->background.blue; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2113 | |
Glenn Randers-Pehrson | cbe52d8 | 1998-02-28 07:00:24 -0600 | [diff] [blame] | 2114 | for (i = 0; i < (int)png_ptr->num_trans; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2115 | { |
Glenn Randers-Pehrson | a357b99 | 1998-02-08 20:56:40 -0600 | [diff] [blame] | 2116 | if (png_ptr->trans[i] == 0) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2117 | { |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 2118 | palette[i].red = back.red; |
| 2119 | palette[i].green = back.green; |
| 2120 | palette[i].blue = back.blue; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2121 | } |
Glenn Randers-Pehrson | a357b99 | 1998-02-08 20:56:40 -0600 | [diff] [blame] | 2122 | else if (png_ptr->trans[i] != 0xff) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2123 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2124 | png_composite(palette[i].red, png_ptr->palette[i].red, |
| 2125 | png_ptr->trans[i], back.red); |
| 2126 | png_composite(palette[i].green, png_ptr->palette[i].green, |
| 2127 | png_ptr->trans[i], back.green); |
| 2128 | png_composite(palette[i].blue, png_ptr->palette[i].blue, |
| 2129 | png_ptr->trans[i], back.blue); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2130 | } |
| 2131 | } |
| 2132 | } |
| 2133 | else /* assume grayscale palette (what else could it be?) */ |
| 2134 | { |
| 2135 | int i; |
| 2136 | |
| 2137 | for (i = 0; i < num_palette; i++) |
| 2138 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2139 | if (i == (png_byte)png_ptr->trans_values.gray) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2140 | { |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 2141 | palette[i].red = (png_byte)png_ptr->background.red; |
| 2142 | palette[i].green = (png_byte)png_ptr->background.green; |
| 2143 | palette[i].blue = (png_byte)png_ptr->background.blue; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2144 | } |
| 2145 | } |
| 2146 | } |
| 2147 | } |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 2148 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2149 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2150 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2151 | |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2152 | #if defined(PNG_READ_BACKGROUND_SUPPORTED) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2153 | /* Replace any alpha or transparency with the supplied background color. |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 2154 | * "background" is already in the screen gamma, while "background_1" is |
| 2155 | * at a gamma of 1.0. Paletted files have already been taken care of. |
| 2156 | */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2157 | void |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 2158 | png_do_background(png_row_infop row_info, png_bytep row, |
| 2159 | png_color_16p trans_values, png_color_16p background, |
| 2160 | png_color_16p background_1, |
| 2161 | png_bytep gamma_table, png_bytep gamma_from_1, png_bytep gamma_to_1, |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2162 | png_uint_16pp gamma_16, png_uint_16pp gamma_16_from_1, |
| 2163 | png_uint_16pp gamma_16_to_1, int gamma_shift) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2164 | { |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 2165 | png_bytep sp, dp; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2166 | png_uint_32 i; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2167 | png_uint_32 row_width=row_info->width; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2168 | int shift; |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 2169 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2170 | png_debug(1, "in png_do_background\n"); |
| 2171 | if (background != NULL && |
| 2172 | #if defined(PNG_USELESS_TESTS_SUPPORTED) |
| 2173 | row != NULL && row_info != NULL && |
| 2174 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2175 | (!(row_info->color_type & PNG_COLOR_MASK_ALPHA) || |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2176 | (row_info->color_type != PNG_COLOR_TYPE_PALETTE && trans_values))) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2177 | { |
| 2178 | switch (row_info->color_type) |
| 2179 | { |
| 2180 | case PNG_COLOR_TYPE_GRAY: |
| 2181 | { |
| 2182 | switch (row_info->bit_depth) |
| 2183 | { |
| 2184 | case 1: |
| 2185 | { |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2186 | sp = row; |
| 2187 | shift = 7; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2188 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2189 | { |
Glenn Randers-Pehrson | 0f881d6 | 1998-02-07 10:20:57 -0600 | [diff] [blame] | 2190 | if ((png_uint_16)((*sp >> shift) & 0x1) |
| 2191 | == trans_values->gray) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2192 | { |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2193 | *sp &= (png_byte)((0x7f7f >> (7 - shift)) & 0xff); |
| 2194 | *sp |= (png_byte)(background->gray << shift); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2195 | } |
| 2196 | if (!shift) |
| 2197 | { |
| 2198 | shift = 7; |
| 2199 | sp++; |
| 2200 | } |
| 2201 | else |
| 2202 | shift--; |
| 2203 | } |
| 2204 | break; |
| 2205 | } |
| 2206 | case 2: |
| 2207 | { |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 2208 | #if defined(PNG_READ_GAMMA_SUPPORTED) |
| 2209 | if (gamma_table != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2210 | { |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 2211 | sp = row; |
| 2212 | shift = 6; |
| 2213 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2214 | { |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 2215 | if ((png_uint_16)((*sp >> shift) & 0x3) |
| 2216 | == trans_values->gray) |
| 2217 | { |
| 2218 | *sp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff); |
| 2219 | *sp |= (png_byte)(background->gray << shift); |
| 2220 | } |
| 2221 | else |
| 2222 | { |
| 2223 | png_byte p = (*sp >> shift) & 0x3; |
| 2224 | png_byte g = (gamma_table [p | (p << 2) | (p << 4) | |
| 2225 | (p << 6)] >> 6) & 0x3; |
| 2226 | *sp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff); |
| 2227 | *sp |= (png_byte)(g << shift); |
| 2228 | } |
| 2229 | if (!shift) |
| 2230 | { |
| 2231 | shift = 6; |
| 2232 | sp++; |
| 2233 | } |
| 2234 | else |
| 2235 | shift -= 2; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2236 | } |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 2237 | } |
| 2238 | else |
| 2239 | #endif |
| 2240 | { |
| 2241 | sp = row; |
| 2242 | shift = 6; |
| 2243 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2244 | { |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 2245 | if ((png_uint_16)((*sp >> shift) & 0x3) |
| 2246 | == trans_values->gray) |
| 2247 | { |
| 2248 | *sp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff); |
| 2249 | *sp |= (png_byte)(background->gray << shift); |
| 2250 | } |
| 2251 | if (!shift) |
| 2252 | { |
| 2253 | shift = 6; |
| 2254 | sp++; |
| 2255 | } |
| 2256 | else |
| 2257 | shift -= 2; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2258 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2259 | } |
| 2260 | break; |
| 2261 | } |
| 2262 | case 4: |
| 2263 | { |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 2264 | #if defined(PNG_READ_GAMMA_SUPPORTED) |
| 2265 | if (gamma_table != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2266 | { |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 2267 | sp = row; |
| 2268 | shift = 4; |
| 2269 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2270 | { |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 2271 | if ((png_uint_16)((*sp >> shift) & 0xf) |
| 2272 | == trans_values->gray) |
| 2273 | { |
| 2274 | *sp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff); |
| 2275 | *sp |= (png_byte)(background->gray << shift); |
| 2276 | } |
| 2277 | else |
| 2278 | { |
| 2279 | png_byte p = (*sp >> shift) & 0xf; |
| 2280 | png_byte g = (gamma_table[p | (p << 4)] >> 4) & 0xf; |
| 2281 | *sp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff); |
| 2282 | *sp |= (png_byte)(g << shift); |
| 2283 | } |
| 2284 | if (!shift) |
| 2285 | { |
| 2286 | shift = 4; |
| 2287 | sp++; |
| 2288 | } |
| 2289 | else |
| 2290 | shift -= 4; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2291 | } |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 2292 | } |
| 2293 | else |
| 2294 | #endif |
| 2295 | { |
| 2296 | sp = row; |
| 2297 | shift = 4; |
| 2298 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2299 | { |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 2300 | if ((png_uint_16)((*sp >> shift) & 0xf) |
| 2301 | == trans_values->gray) |
| 2302 | { |
| 2303 | *sp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff); |
| 2304 | *sp |= (png_byte)(background->gray << shift); |
| 2305 | } |
| 2306 | if (!shift) |
| 2307 | { |
| 2308 | shift = 4; |
| 2309 | sp++; |
| 2310 | } |
| 2311 | else |
| 2312 | shift -= 4; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2313 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2314 | } |
| 2315 | break; |
| 2316 | } |
| 2317 | case 8: |
| 2318 | { |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2319 | #if defined(PNG_READ_GAMMA_SUPPORTED) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2320 | if (gamma_table != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2321 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2322 | sp = row; |
| 2323 | for (i = 0; i < row_width; i++, sp++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2324 | { |
| 2325 | if (*sp == trans_values->gray) |
| 2326 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2327 | *sp = (png_byte)background->gray; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2328 | } |
| 2329 | else |
| 2330 | { |
| 2331 | *sp = gamma_table[*sp]; |
| 2332 | } |
| 2333 | } |
| 2334 | } |
| 2335 | else |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2336 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2337 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2338 | sp = row; |
| 2339 | for (i = 0; i < row_width; i++, sp++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2340 | { |
| 2341 | if (*sp == trans_values->gray) |
| 2342 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2343 | *sp = (png_byte)background->gray; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2344 | } |
| 2345 | } |
| 2346 | } |
| 2347 | break; |
| 2348 | } |
| 2349 | case 16: |
| 2350 | { |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2351 | #if defined(PNG_READ_GAMMA_SUPPORTED) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2352 | if (gamma_16 != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2353 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2354 | sp = row; |
| 2355 | for (i = 0; i < row_width; i++, sp += 2) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2356 | { |
| 2357 | png_uint_16 v; |
| 2358 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2359 | v = ((png_uint_16)(*sp) << 8) + *(sp + 1); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2360 | if (v == trans_values->gray) |
| 2361 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2362 | /* background is already in screen gamma */ |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2363 | *sp = (png_byte)((background->gray >> 8) & 0xff); |
| 2364 | *(sp + 1) = (png_byte)(background->gray & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2365 | } |
| 2366 | else |
| 2367 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2368 | v = gamma_16[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2369 | *sp = (png_byte)((v >> 8) & 0xff); |
Guy Schalnat | 4ee97b0 | 1996-01-16 01:51:56 -0600 | [diff] [blame] | 2370 | *(sp + 1) = (png_byte)(v & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2371 | } |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2372 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2373 | } |
| 2374 | else |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2375 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2376 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2377 | sp = row; |
| 2378 | for (i = 0; i < row_width; i++, sp += 2) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2379 | { |
| 2380 | png_uint_16 v; |
| 2381 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2382 | v = ((png_uint_16)(*sp) << 8) + *(sp + 1); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2383 | if (v == trans_values->gray) |
| 2384 | { |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2385 | *sp = (png_byte)((background->gray >> 8) & 0xff); |
| 2386 | *(sp + 1) = (png_byte)(background->gray & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2387 | } |
| 2388 | } |
| 2389 | } |
| 2390 | break; |
| 2391 | } |
| 2392 | } |
| 2393 | break; |
| 2394 | } |
| 2395 | case PNG_COLOR_TYPE_RGB: |
| 2396 | { |
| 2397 | if (row_info->bit_depth == 8) |
| 2398 | { |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2399 | #if defined(PNG_READ_GAMMA_SUPPORTED) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2400 | if (gamma_table != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2401 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2402 | sp = row; |
| 2403 | for (i = 0; i < row_width; i++, sp += 3) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2404 | { |
| 2405 | if (*sp == trans_values->red && |
| 2406 | *(sp + 1) == trans_values->green && |
| 2407 | *(sp + 2) == trans_values->blue) |
| 2408 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2409 | *sp = (png_byte)background->red; |
| 2410 | *(sp + 1) = (png_byte)background->green; |
| 2411 | *(sp + 2) = (png_byte)background->blue; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2412 | } |
| 2413 | else |
| 2414 | { |
| 2415 | *sp = gamma_table[*sp]; |
| 2416 | *(sp + 1) = gamma_table[*(sp + 1)]; |
| 2417 | *(sp + 2) = gamma_table[*(sp + 2)]; |
| 2418 | } |
| 2419 | } |
| 2420 | } |
| 2421 | else |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2422 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2423 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2424 | sp = row; |
| 2425 | for (i = 0; i < row_width; i++, sp += 3) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2426 | { |
| 2427 | if (*sp == trans_values->red && |
| 2428 | *(sp + 1) == trans_values->green && |
| 2429 | *(sp + 2) == trans_values->blue) |
| 2430 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2431 | *sp = (png_byte)background->red; |
| 2432 | *(sp + 1) = (png_byte)background->green; |
| 2433 | *(sp + 2) = (png_byte)background->blue; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2434 | } |
| 2435 | } |
| 2436 | } |
| 2437 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2438 | else /* if (row_info->bit_depth == 16) */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2439 | { |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2440 | #if defined(PNG_READ_GAMMA_SUPPORTED) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2441 | if (gamma_16 != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2442 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2443 | sp = row; |
| 2444 | for (i = 0; i < row_width; i++, sp += 6) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2445 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2446 | png_uint_16 r = ((png_uint_16)(*sp) << 8) + *(sp + 1); |
| 2447 | png_uint_16 g = ((png_uint_16)(*(sp + 2)) << 8) + *(sp + 3); |
| 2448 | png_uint_16 b = ((png_uint_16)(*(sp + 4)) << 8) + *(sp + 5); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2449 | if (r == trans_values->red && g == trans_values->green && |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2450 | b == trans_values->blue) |
| 2451 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2452 | /* background is already in screen gamma */ |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2453 | *sp = (png_byte)((background->red >> 8) & 0xff); |
| 2454 | *(sp + 1) = (png_byte)(background->red & 0xff); |
| 2455 | *(sp + 2) = (png_byte)((background->green >> 8) & 0xff); |
| 2456 | *(sp + 3) = (png_byte)(background->green & 0xff); |
| 2457 | *(sp + 4) = (png_byte)((background->blue >> 8) & 0xff); |
| 2458 | *(sp + 5) = (png_byte)(background->blue & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2459 | } |
| 2460 | else |
| 2461 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2462 | png_uint_16 v = gamma_16[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2463 | *sp = (png_byte)((v >> 8) & 0xff); |
Guy Schalnat | 4ee97b0 | 1996-01-16 01:51:56 -0600 | [diff] [blame] | 2464 | *(sp + 1) = (png_byte)(v & 0xff); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2465 | v = gamma_16[*(sp + 3) >> gamma_shift][*(sp + 2)]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2466 | *(sp + 2) = (png_byte)((v >> 8) & 0xff); |
| 2467 | *(sp + 3) = (png_byte)(v & 0xff); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2468 | v = gamma_16[*(sp + 5) >> gamma_shift][*(sp + 4)]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2469 | *(sp + 4) = (png_byte)((v >> 8) & 0xff); |
| 2470 | *(sp + 5) = (png_byte)(v & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2471 | } |
| 2472 | } |
| 2473 | } |
| 2474 | else |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2475 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2476 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2477 | sp = row; |
| 2478 | for (i = 0; i < row_width; i++, sp += 6) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2479 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2480 | png_uint_16 r = ((png_uint_16)(*sp) << 8) + *(sp + 1); |
| 2481 | png_uint_16 g = ((png_uint_16)(*(sp + 2)) << 8) + *(sp + 3); |
| 2482 | png_uint_16 b = ((png_uint_16)(*(sp + 4)) << 8) + *(sp + 5); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2483 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2484 | if (r == trans_values->red && g == trans_values->green && |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2485 | b == trans_values->blue) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2486 | { |
| 2487 | *sp = (png_byte)((background->red >> 8) & 0xff); |
| 2488 | *(sp + 1) = (png_byte)(background->red & 0xff); |
| 2489 | *(sp + 2) = (png_byte)((background->green >> 8) & 0xff); |
| 2490 | *(sp + 3) = (png_byte)(background->green & 0xff); |
| 2491 | *(sp + 4) = (png_byte)((background->blue >> 8) & 0xff); |
| 2492 | *(sp + 5) = (png_byte)(background->blue & 0xff); |
| 2493 | } |
| 2494 | } |
| 2495 | } |
| 2496 | } |
| 2497 | break; |
| 2498 | } |
| 2499 | case PNG_COLOR_TYPE_GRAY_ALPHA: |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2500 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2501 | if (row_info->bit_depth == 8) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2502 | { |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2503 | #if defined(PNG_READ_GAMMA_SUPPORTED) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2504 | if (gamma_to_1 != NULL && gamma_from_1 != NULL && |
| 2505 | gamma_table != NULL) |
| 2506 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2507 | sp = row; |
| 2508 | dp = row; |
| 2509 | for (i = 0; i < row_width; i++, sp += 2, dp++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2510 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2511 | png_uint_16 a = *(sp + 1); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2512 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2513 | if (a == 0xff) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2514 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2515 | *dp = gamma_table[*sp]; |
| 2516 | } |
| 2517 | else if (a == 0) |
| 2518 | { |
| 2519 | /* background is already in screen gamma */ |
| 2520 | *dp = (png_byte)background->gray; |
| 2521 | } |
| 2522 | else |
| 2523 | { |
| 2524 | png_byte v, w; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2525 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2526 | v = gamma_to_1[*sp]; |
| 2527 | png_composite(w, v, a, background_1->gray); |
| 2528 | *dp = gamma_from_1[w]; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2529 | } |
| 2530 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2531 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2532 | else |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2533 | #endif |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2534 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2535 | sp = row; |
| 2536 | dp = row; |
| 2537 | for (i = 0; i < row_width; i++, sp += 2, dp++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2538 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2539 | png_byte a = *(sp + 1); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2540 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2541 | if (a == 0xff) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2542 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2543 | *dp = *sp; |
| 2544 | } |
| 2545 | else if (a == 0) |
| 2546 | { |
| 2547 | *dp = (png_byte)background->gray; |
| 2548 | } |
| 2549 | else |
| 2550 | { |
| 2551 | png_composite(*dp, *sp, a, background_1->gray); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2552 | } |
| 2553 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2554 | } |
| 2555 | } |
| 2556 | else /* if (png_ptr->bit_depth == 16) */ |
| 2557 | { |
| 2558 | #if defined(PNG_READ_GAMMA_SUPPORTED) |
| 2559 | if (gamma_16 != NULL && gamma_16_from_1 != NULL && |
| 2560 | gamma_16_to_1 != NULL) |
| 2561 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2562 | sp = row; |
| 2563 | dp = row; |
| 2564 | for (i = 0; i < row_width; i++, sp += 4, dp += 2) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2565 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2566 | png_uint_16 a = ((png_uint_16)(*(sp + 2)) << 8) + *(sp + 3); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2567 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2568 | if (a == (png_uint_16)0xffff) |
| 2569 | { |
| 2570 | png_uint_16 v; |
| 2571 | |
| 2572 | v = gamma_16[*(sp + 1) >> gamma_shift][*sp]; |
| 2573 | *dp = (png_byte)((v >> 8) & 0xff); |
| 2574 | *(dp + 1) = (png_byte)(v & 0xff); |
| 2575 | } |
| 2576 | else if (a == 0) |
| 2577 | { |
| 2578 | /* background is already in screen gamma */ |
| 2579 | *dp = (png_byte)((background->gray >> 8) & 0xff); |
| 2580 | *(dp + 1) = (png_byte)(background->gray & 0xff); |
| 2581 | } |
| 2582 | else |
| 2583 | { |
| 2584 | png_uint_16 g, v, w; |
| 2585 | |
| 2586 | g = gamma_16_to_1[*(sp + 1) >> gamma_shift][*sp]; |
| 2587 | png_composite_16(v, g, a, background_1->gray); |
| 2588 | w = gamma_16_from_1[(v&0xff) >> gamma_shift][v >> 8]; |
| 2589 | *dp = (png_byte)((w >> 8) & 0xff); |
| 2590 | *(dp + 1) = (png_byte)(w & 0xff); |
| 2591 | } |
| 2592 | } |
| 2593 | } |
| 2594 | else |
| 2595 | #endif |
| 2596 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2597 | sp = row; |
| 2598 | dp = row; |
| 2599 | for (i = 0; i < row_width; i++, sp += 4, dp += 2) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2600 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2601 | png_uint_16 a = ((png_uint_16)(*(sp + 2)) << 8) + *(sp + 3); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2602 | if (a == (png_uint_16)0xffff) |
| 2603 | { |
| 2604 | png_memcpy(dp, sp, 2); |
| 2605 | } |
| 2606 | else if (a == 0) |
| 2607 | { |
| 2608 | *dp = (png_byte)((background->gray >> 8) & 0xff); |
| 2609 | *(dp + 1) = (png_byte)(background->gray & 0xff); |
| 2610 | } |
| 2611 | else |
| 2612 | { |
| 2613 | png_uint_16 g, v; |
| 2614 | |
| 2615 | g = ((png_uint_16)(*sp) << 8) + *(sp + 1); |
| 2616 | png_composite_16(v, g, a, background_1->gray); |
| 2617 | *dp = (png_byte)((v >> 8) & 0xff); |
| 2618 | *(dp + 1) = (png_byte)(v & 0xff); |
| 2619 | } |
| 2620 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2621 | } |
| 2622 | } |
| 2623 | break; |
| 2624 | } |
| 2625 | case PNG_COLOR_TYPE_RGB_ALPHA: |
| 2626 | { |
| 2627 | if (row_info->bit_depth == 8) |
| 2628 | { |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2629 | #if defined(PNG_READ_GAMMA_SUPPORTED) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2630 | if (gamma_to_1 != NULL && gamma_from_1 != NULL && |
| 2631 | gamma_table != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2632 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2633 | sp = row; |
| 2634 | dp = row; |
| 2635 | for (i = 0; i < row_width; i++, sp += 4, dp += 3) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2636 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2637 | png_byte a = *(sp + 3); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2638 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2639 | if (a == 0xff) |
| 2640 | { |
| 2641 | *dp = gamma_table[*sp]; |
| 2642 | *(dp + 1) = gamma_table[*(sp + 1)]; |
| 2643 | *(dp + 2) = gamma_table[*(sp + 2)]; |
| 2644 | } |
| 2645 | else if (a == 0) |
| 2646 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2647 | /* background is already in screen gamma */ |
| 2648 | *dp = (png_byte)background->red; |
| 2649 | *(dp + 1) = (png_byte)background->green; |
| 2650 | *(dp + 2) = (png_byte)background->blue; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2651 | } |
| 2652 | else |
| 2653 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2654 | png_byte v, w; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2655 | |
| 2656 | v = gamma_to_1[*sp]; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2657 | png_composite(w, v, a, background_1->red); |
| 2658 | *dp = gamma_from_1[w]; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2659 | v = gamma_to_1[*(sp + 1)]; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2660 | png_composite(w, v, a, background_1->green); |
| 2661 | *(dp + 1) = gamma_from_1[w]; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2662 | v = gamma_to_1[*(sp + 2)]; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2663 | png_composite(w, v, a, background_1->blue); |
| 2664 | *(dp + 2) = gamma_from_1[w]; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2665 | } |
| 2666 | } |
| 2667 | } |
| 2668 | else |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2669 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2670 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2671 | sp = row; |
| 2672 | dp = row; |
| 2673 | for (i = 0; i < row_width; i++, sp += 4, dp += 3) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2674 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2675 | png_byte a = *(sp + 3); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2676 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2677 | if (a == 0xff) |
| 2678 | { |
| 2679 | *dp = *sp; |
| 2680 | *(dp + 1) = *(sp + 1); |
| 2681 | *(dp + 2) = *(sp + 2); |
| 2682 | } |
| 2683 | else if (a == 0) |
| 2684 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2685 | *dp = (png_byte)background->red; |
| 2686 | *(dp + 1) = (png_byte)background->green; |
| 2687 | *(dp + 2) = (png_byte)background->blue; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2688 | } |
| 2689 | else |
| 2690 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2691 | png_composite(*dp, *sp, a, background->red); |
| 2692 | png_composite(*(dp + 1), *(sp + 1), a, |
| 2693 | background->green); |
| 2694 | png_composite(*(dp + 2), *(sp + 2), a, |
| 2695 | background->blue); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2696 | } |
| 2697 | } |
| 2698 | } |
| 2699 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2700 | else /* if (row_info->bit_depth == 16) */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2701 | { |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2702 | #if defined(PNG_READ_GAMMA_SUPPORTED) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2703 | if (gamma_16 != NULL && gamma_16_from_1 != NULL && |
| 2704 | gamma_16_to_1 != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2705 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2706 | sp = row; |
| 2707 | dp = row; |
| 2708 | for (i = 0; i < row_width; i++, sp += 8, dp += 6) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2709 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2710 | png_uint_16 a = (png_uint_16)(((png_uint_16)(*(sp + 6)) |
| 2711 | << 8) + (png_uint_16)(*(sp + 7))); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2712 | if (a == (png_uint_16)0xffff) |
| 2713 | { |
| 2714 | png_uint_16 v; |
| 2715 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2716 | v = gamma_16[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2717 | *dp = (png_byte)((v >> 8) & 0xff); |
| 2718 | *(dp + 1) = (png_byte)(v & 0xff); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2719 | v = gamma_16[*(sp + 3) >> gamma_shift][*(sp + 2)]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2720 | *(dp + 2) = (png_byte)((v >> 8) & 0xff); |
| 2721 | *(dp + 3) = (png_byte)(v & 0xff); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2722 | v = gamma_16[*(sp + 5) >> gamma_shift][*(sp + 4)]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2723 | *(dp + 4) = (png_byte)((v >> 8) & 0xff); |
| 2724 | *(dp + 5) = (png_byte)(v & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2725 | } |
| 2726 | else if (a == 0) |
| 2727 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2728 | /* background is already in screen gamma */ |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2729 | *dp = (png_byte)((background->red >> 8) & 0xff); |
| 2730 | *(dp + 1) = (png_byte)(background->red & 0xff); |
| 2731 | *(dp + 2) = (png_byte)((background->green >> 8) & 0xff); |
| 2732 | *(dp + 3) = (png_byte)(background->green & 0xff); |
| 2733 | *(dp + 4) = (png_byte)((background->blue >> 8) & 0xff); |
| 2734 | *(dp + 5) = (png_byte)(background->blue & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2735 | } |
| 2736 | else |
| 2737 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2738 | png_uint_16 v, w, x; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2739 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2740 | v = gamma_16_to_1[*(sp + 1) >> gamma_shift][*sp]; |
| 2741 | png_composite_16(w, v, a, background->red); |
| 2742 | x = gamma_16_from_1[((w&0xff) >> gamma_shift)][w >> 8]; |
| 2743 | *dp = (png_byte)((x >> 8) & 0xff); |
| 2744 | *(dp + 1) = (png_byte)(x & 0xff); |
| 2745 | v = gamma_16_to_1[*(sp + 3) >> gamma_shift][*(sp + 2)]; |
| 2746 | png_composite_16(w, v, a, background->green); |
| 2747 | x = gamma_16_from_1[((w&0xff) >> gamma_shift)][w >> 8]; |
| 2748 | *(dp + 2) = (png_byte)((x >> 8) & 0xff); |
| 2749 | *(dp + 3) = (png_byte)(x & 0xff); |
| 2750 | v = gamma_16_to_1[*(sp + 5) >> gamma_shift][*(sp + 4)]; |
| 2751 | png_composite_16(w, v, a, background->blue); |
| 2752 | x = gamma_16_from_1[(w & 0xff) >> gamma_shift][w >> 8]; |
| 2753 | *(dp + 4) = (png_byte)((x >> 8) & 0xff); |
| 2754 | *(dp + 5) = (png_byte)(x & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2755 | } |
| 2756 | } |
| 2757 | } |
| 2758 | else |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2759 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2760 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2761 | sp = row; |
| 2762 | dp = row; |
| 2763 | for (i = 0; i < row_width; i++, sp += 8, dp += 6) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2764 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2765 | png_uint_16 a = (png_uint_16)(((png_uint_16)(*(sp + 6)) |
| 2766 | << 8) + (png_uint_16)(*(sp + 7))); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2767 | if (a == (png_uint_16)0xffff) |
| 2768 | { |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2769 | png_memcpy(dp, sp, 6); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2770 | } |
| 2771 | else if (a == 0) |
| 2772 | { |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2773 | *dp = (png_byte)((background->red >> 8) & 0xff); |
| 2774 | *(dp + 1) = (png_byte)(background->red & 0xff); |
| 2775 | *(dp + 2) = (png_byte)((background->green >> 8) & 0xff); |
| 2776 | *(dp + 3) = (png_byte)(background->green & 0xff); |
| 2777 | *(dp + 4) = (png_byte)((background->blue >> 8) & 0xff); |
| 2778 | *(dp + 5) = (png_byte)(background->blue & 0xff); |
| 2779 | } |
| 2780 | else |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2781 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2782 | png_uint_16 v; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2783 | |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2784 | png_uint_16 r = ((png_uint_16)(*sp) << 8) + *(sp + 1); |
| 2785 | png_uint_16 g = ((png_uint_16)(*(sp + 2)) << 8) |
| 2786 | + *(sp + 3); |
| 2787 | png_uint_16 b = ((png_uint_16)(*(sp + 4)) << 8) |
| 2788 | + *(sp + 5); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2789 | |
| 2790 | png_composite_16(v, r, a, background->red); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2791 | *dp = (png_byte)((v >> 8) & 0xff); |
| 2792 | *(dp + 1) = (png_byte)(v & 0xff); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2793 | png_composite_16(v, g, a, background->green); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2794 | *(dp + 2) = (png_byte)((v >> 8) & 0xff); |
| 2795 | *(dp + 3) = (png_byte)(v & 0xff); |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 2796 | png_composite_16(v, b, a, background->blue); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2797 | *(dp + 4) = (png_byte)((v >> 8) & 0xff); |
| 2798 | *(dp + 5) = (png_byte)(v & 0xff); |
| 2799 | } |
| 2800 | } |
| 2801 | } |
| 2802 | } |
| 2803 | break; |
| 2804 | } |
| 2805 | } |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 2806 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2807 | if (row_info->color_type & PNG_COLOR_MASK_ALPHA) |
| 2808 | { |
| 2809 | row_info->color_type &= ~PNG_COLOR_MASK_ALPHA; |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 2810 | row_info->channels--; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2811 | row_info->pixel_depth = (png_byte)(row_info->channels * |
| 2812 | row_info->bit_depth); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2813 | row_info->rowbytes = ((row_width * |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2814 | row_info->pixel_depth + 7) >> 3); |
| 2815 | } |
| 2816 | } |
| 2817 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2818 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2819 | |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2820 | #if defined(PNG_READ_GAMMA_SUPPORTED) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2821 | /* Gamma correct the image, avoiding the alpha channel. Make sure |
Glenn Randers-Pehrson | 345bc27 | 1998-06-14 14:43:31 -0500 | [diff] [blame^] | 2822 | * you do this after you deal with the transparency issue on grayscale |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 2823 | * or rgb images. If your bit depth is 8, use gamma_table, if it |
| 2824 | * is 16, use gamma_16_table and gamma_shift. Build these with |
| 2825 | * build_gamma_table(). |
| 2826 | */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2827 | void |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 2828 | png_do_gamma(png_row_infop row_info, png_bytep row, |
| 2829 | png_bytep gamma_table, png_uint_16pp gamma_16_table, |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2830 | int gamma_shift) |
| 2831 | { |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 2832 | png_bytep sp; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2833 | png_uint_32 i; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2834 | png_uint_32 row_width=row_info->width; |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 2835 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2836 | png_debug(1, "in png_do_gamma\n"); |
| 2837 | if ( |
| 2838 | #if defined(PNG_USELESS_TESTS_SUPPORTED) |
| 2839 | row != NULL && row_info != NULL && |
| 2840 | #endif |
| 2841 | ((row_info->bit_depth <= 8 && gamma_table != NULL) || |
| 2842 | (row_info->bit_depth == 16 && gamma_16_table != NULL))) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2843 | { |
| 2844 | switch (row_info->color_type) |
| 2845 | { |
| 2846 | case PNG_COLOR_TYPE_RGB: |
| 2847 | { |
| 2848 | if (row_info->bit_depth == 8) |
| 2849 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2850 | sp = row; |
| 2851 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2852 | { |
| 2853 | *sp = gamma_table[*sp]; |
| 2854 | sp++; |
| 2855 | *sp = gamma_table[*sp]; |
| 2856 | sp++; |
| 2857 | *sp = gamma_table[*sp]; |
| 2858 | sp++; |
| 2859 | } |
| 2860 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2861 | else /* if (row_info->bit_depth == 16) */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2862 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2863 | sp = row; |
| 2864 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2865 | { |
| 2866 | png_uint_16 v; |
| 2867 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2868 | v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2869 | *sp = (png_byte)((v >> 8) & 0xff); |
| 2870 | *(sp + 1) = (png_byte)(v & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2871 | sp += 2; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2872 | v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2873 | *sp = (png_byte)((v >> 8) & 0xff); |
| 2874 | *(sp + 1) = (png_byte)(v & 0xff); |
| 2875 | sp += 2; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2876 | v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2877 | *sp = (png_byte)((v >> 8) & 0xff); |
| 2878 | *(sp + 1) = (png_byte)(v & 0xff); |
| 2879 | sp += 2; |
| 2880 | } |
| 2881 | } |
| 2882 | break; |
| 2883 | } |
| 2884 | case PNG_COLOR_TYPE_RGB_ALPHA: |
| 2885 | { |
| 2886 | if (row_info->bit_depth == 8) |
| 2887 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2888 | sp = row; |
| 2889 | for (i = 0; i < row_width; i++) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2890 | { |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2891 | *sp = gamma_table[*sp]; |
| 2892 | sp++; |
| 2893 | *sp = gamma_table[*sp]; |
| 2894 | sp++; |
| 2895 | *sp = gamma_table[*sp]; |
| 2896 | sp++; |
| 2897 | sp++; |
| 2898 | } |
| 2899 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2900 | else /* if (row_info->bit_depth == 16) */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2901 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2902 | sp = row; |
| 2903 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2904 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2905 | png_uint_16 v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2906 | *sp = (png_byte)((v >> 8) & 0xff); |
| 2907 | *(sp + 1) = (png_byte)(v & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2908 | sp += 2; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2909 | v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2910 | *sp = (png_byte)((v >> 8) & 0xff); |
| 2911 | *(sp + 1) = (png_byte)(v & 0xff); |
| 2912 | sp += 2; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2913 | v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2914 | *sp = (png_byte)((v >> 8) & 0xff); |
| 2915 | *(sp + 1) = (png_byte)(v & 0xff); |
| 2916 | sp += 4; |
| 2917 | } |
| 2918 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2919 | break; |
| 2920 | } |
| 2921 | case PNG_COLOR_TYPE_GRAY_ALPHA: |
| 2922 | { |
| 2923 | if (row_info->bit_depth == 8) |
| 2924 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2925 | sp = row; |
| 2926 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2927 | { |
| 2928 | *sp = gamma_table[*sp]; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2929 | sp += 2; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2930 | } |
| 2931 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2932 | else /* if (row_info->bit_depth == 16) */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2933 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2934 | sp = row; |
| 2935 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2936 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2937 | png_uint_16 v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2938 | *sp = (png_byte)((v >> 8) & 0xff); |
| 2939 | *(sp + 1) = (png_byte)(v & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2940 | sp += 4; |
| 2941 | } |
| 2942 | } |
| 2943 | break; |
| 2944 | } |
| 2945 | case PNG_COLOR_TYPE_GRAY: |
| 2946 | { |
Glenn Randers-Pehrson | 2687fcc | 1998-01-07 20:54:20 -0600 | [diff] [blame] | 2947 | if (row_info->bit_depth == 2) |
| 2948 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2949 | sp = row; |
| 2950 | for (i = 0; i < row_width; i += 4) |
Glenn Randers-Pehrson | 2687fcc | 1998-01-07 20:54:20 -0600 | [diff] [blame] | 2951 | { |
| 2952 | int a = *sp & 0xc0; |
| 2953 | int b = *sp & 0x30; |
| 2954 | int c = *sp & 0x0c; |
| 2955 | int d = *sp & 0x03; |
| 2956 | |
| 2957 | *sp = ((((int)gamma_table[a|(a>>2)|(a>>4)|(a>>6)]) ) & 0xc0)| |
| 2958 | ((((int)gamma_table[(b<<2)|b|(b>>2)|(b>>4)])>>2) & 0x30)| |
| 2959 | ((((int)gamma_table[(c<<4)|(c<<2)|c|(c>>2)])>>4) & 0x0c)| |
| 2960 | ((((int)gamma_table[(d<<6)|(d<<4)|(d<<2)|d])>>6) ); |
| 2961 | sp++; |
| 2962 | } |
| 2963 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2964 | if (row_info->bit_depth == 4) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2965 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2966 | sp = row; |
| 2967 | for (i = 0; i < row_width; i += 2) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2968 | { |
| 2969 | int msb = *sp & 0xf0; |
| 2970 | int lsb = *sp & 0x0f; |
| 2971 | |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 2972 | *sp = (((int)gamma_table[msb | (msb >> 4)]) & 0xf0) | |
| 2973 | (((int)gamma_table[(lsb << 4) | lsb]) >> 4); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2974 | sp++; |
| 2975 | } |
| 2976 | } |
| 2977 | else if (row_info->bit_depth == 8) |
| 2978 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2979 | sp = row; |
| 2980 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2981 | { |
| 2982 | *sp = gamma_table[*sp]; |
| 2983 | sp++; |
| 2984 | } |
| 2985 | } |
| 2986 | else if (row_info->bit_depth == 16) |
| 2987 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2988 | sp = row; |
| 2989 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2990 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2991 | png_uint_16 v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2992 | *sp = (png_byte)((v >> 8) & 0xff); |
| 2993 | *(sp + 1) = (png_byte)(v & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2994 | sp += 2; |
| 2995 | } |
| 2996 | } |
| 2997 | break; |
| 2998 | } |
| 2999 | } |
| 3000 | } |
| 3001 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3002 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3003 | |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3004 | #if defined(PNG_READ_EXPAND_SUPPORTED) |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 3005 | /* Expands a palette row to an rgb or rgba row depending |
| 3006 | * upon whether you supply trans and num_trans. |
| 3007 | */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3008 | void |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 3009 | png_do_expand_palette(png_row_infop row_info, png_bytep row, |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3010 | png_colorp palette, png_bytep trans, int num_trans) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3011 | { |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3012 | int shift, value; |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 3013 | png_bytep sp, dp; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3014 | png_uint_32 i; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3015 | png_uint_32 row_width=row_info->width; |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 3016 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3017 | png_debug(1, "in png_do_expand_palette\n"); |
| 3018 | if ( |
| 3019 | #if defined(PNG_USELESS_TESTS_SUPPORTED) |
| 3020 | row != NULL && row_info != NULL && |
| 3021 | #endif |
| 3022 | row_info->color_type == PNG_COLOR_TYPE_PALETTE) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3023 | { |
| 3024 | if (row_info->bit_depth < 8) |
| 3025 | { |
| 3026 | switch (row_info->bit_depth) |
| 3027 | { |
| 3028 | case 1: |
| 3029 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3030 | sp = row + (png_size_t)((row_width - 1) >> 3); |
| 3031 | dp = row + (png_size_t)row_width - 1; |
| 3032 | shift = 7 - (int)((row_width + 7) & 7); |
| 3033 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3034 | { |
| 3035 | if ((*sp >> shift) & 0x1) |
| 3036 | *dp = 1; |
| 3037 | else |
| 3038 | *dp = 0; |
| 3039 | if (shift == 7) |
| 3040 | { |
| 3041 | shift = 0; |
| 3042 | sp--; |
| 3043 | } |
| 3044 | else |
| 3045 | shift++; |
| 3046 | |
| 3047 | dp--; |
| 3048 | } |
| 3049 | break; |
| 3050 | } |
| 3051 | case 2: |
| 3052 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3053 | sp = row + (png_size_t)((row_width - 1) >> 2); |
| 3054 | dp = row + (png_size_t)row_width - 1; |
| 3055 | shift = (int)((3 - ((row_width + 3) & 3)) << 1); |
| 3056 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3057 | { |
| 3058 | value = (*sp >> shift) & 0x3; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3059 | *dp = (png_byte)value; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3060 | if (shift == 6) |
| 3061 | { |
| 3062 | shift = 0; |
| 3063 | sp--; |
| 3064 | } |
| 3065 | else |
| 3066 | shift += 2; |
| 3067 | |
| 3068 | dp--; |
| 3069 | } |
| 3070 | break; |
| 3071 | } |
| 3072 | case 4: |
| 3073 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3074 | sp = row + (png_size_t)((row_width - 1) >> 1); |
| 3075 | dp = row + (png_size_t)row_width - 1; |
| 3076 | shift = (int)((row_width & 1) << 2); |
| 3077 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3078 | { |
| 3079 | value = (*sp >> shift) & 0xf; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3080 | *dp = (png_byte)value; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3081 | if (shift == 4) |
| 3082 | { |
| 3083 | shift = 0; |
| 3084 | sp--; |
| 3085 | } |
| 3086 | else |
| 3087 | shift += 4; |
| 3088 | |
| 3089 | dp--; |
| 3090 | } |
| 3091 | break; |
| 3092 | } |
| 3093 | } |
| 3094 | row_info->bit_depth = 8; |
| 3095 | row_info->pixel_depth = 8; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3096 | row_info->rowbytes = row_width; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3097 | } |
| 3098 | switch (row_info->bit_depth) |
| 3099 | { |
| 3100 | case 8: |
| 3101 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3102 | if (trans != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3103 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3104 | sp = row + (png_size_t)row_width - 1; |
| 3105 | dp = row + (png_size_t)(row_width << 2) - 1; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3106 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3107 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3108 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3109 | if ((int)(*sp) >= num_trans) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3110 | *dp-- = 0xff; |
| 3111 | else |
| 3112 | *dp-- = trans[*sp]; |
| 3113 | *dp-- = palette[*sp].blue; |
| 3114 | *dp-- = palette[*sp].green; |
| 3115 | *dp-- = palette[*sp].red; |
| 3116 | sp--; |
| 3117 | } |
| 3118 | row_info->bit_depth = 8; |
| 3119 | row_info->pixel_depth = 32; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3120 | row_info->rowbytes = row_width * 4; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3121 | row_info->color_type = 6; |
| 3122 | row_info->channels = 4; |
| 3123 | } |
| 3124 | else |
| 3125 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3126 | sp = row + (png_size_t)row_width - 1; |
| 3127 | dp = row + (png_size_t)(row_width * 3) - 1; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3128 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3129 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3130 | { |
| 3131 | *dp-- = palette[*sp].blue; |
| 3132 | *dp-- = palette[*sp].green; |
| 3133 | *dp-- = palette[*sp].red; |
| 3134 | sp--; |
| 3135 | } |
| 3136 | row_info->bit_depth = 8; |
| 3137 | row_info->pixel_depth = 24; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3138 | row_info->rowbytes = row_width * 3; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3139 | row_info->color_type = 2; |
| 3140 | row_info->channels = 3; |
| 3141 | } |
| 3142 | break; |
| 3143 | } |
| 3144 | } |
| 3145 | } |
| 3146 | } |
| 3147 | |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 3148 | /* If the bit depth < 8, it is expanded to 8. Also, if the |
| 3149 | * transparency value is supplied, an alpha channel is built. |
| 3150 | */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3151 | void |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 3152 | png_do_expand(png_row_infop row_info, png_bytep row, |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3153 | png_color_16p trans_value) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3154 | { |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3155 | int shift, value; |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 3156 | png_bytep sp, dp; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3157 | png_uint_32 i; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3158 | png_uint_32 row_width=row_info->width; |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 3159 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3160 | png_debug(1, "in png_do_expand\n"); |
| 3161 | #if defined(PNG_USELESS_TESTS_SUPPORTED) |
| 3162 | if (row != NULL && row_info != NULL) |
| 3163 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3164 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3165 | if (row_info->color_type == PNG_COLOR_TYPE_GRAY) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3166 | { |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3167 | png_uint_16 gray = trans_value ? trans_value->gray : 0; |
| 3168 | |
| 3169 | if (row_info->bit_depth < 8) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3170 | { |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3171 | switch (row_info->bit_depth) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3172 | { |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3173 | case 1: |
| 3174 | { |
| 3175 | gray *= 0xff; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3176 | sp = row + (png_size_t)((row_width - 1) >> 3); |
| 3177 | dp = row + (png_size_t)row_width - 1; |
| 3178 | shift = 7 - (int)((row_width + 7) & 7); |
| 3179 | for (i = 0; i < row_width; i++) |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3180 | { |
| 3181 | if ((*sp >> shift) & 0x1) |
| 3182 | *dp = 0xff; |
| 3183 | else |
| 3184 | *dp = 0; |
| 3185 | if (shift == 7) |
| 3186 | { |
| 3187 | shift = 0; |
| 3188 | sp--; |
| 3189 | } |
| 3190 | else |
| 3191 | shift++; |
| 3192 | |
| 3193 | dp--; |
| 3194 | } |
| 3195 | break; |
| 3196 | } |
| 3197 | case 2: |
| 3198 | { |
| 3199 | gray *= 0x55; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3200 | sp = row + (png_size_t)((row_width - 1) >> 2); |
| 3201 | dp = row + (png_size_t)row_width - 1; |
| 3202 | shift = (int)((3 - ((row_width + 3) & 3)) << 1); |
| 3203 | for (i = 0; i < row_width; i++) |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3204 | { |
| 3205 | value = (*sp >> shift) & 0x3; |
| 3206 | *dp = (png_byte)(value | (value << 2) | (value << 4) | |
| 3207 | (value << 6)); |
| 3208 | if (shift == 6) |
| 3209 | { |
| 3210 | shift = 0; |
| 3211 | sp--; |
| 3212 | } |
| 3213 | else |
| 3214 | shift += 2; |
| 3215 | |
| 3216 | dp--; |
| 3217 | } |
| 3218 | break; |
| 3219 | } |
| 3220 | case 4: |
| 3221 | { |
| 3222 | gray *= 0x11; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3223 | sp = row + (png_size_t)((row_width - 1) >> 1); |
| 3224 | dp = row + (png_size_t)row_width - 1; |
| 3225 | shift = (int)((1 - ((row_width + 1) & 1)) << 2); |
| 3226 | for (i = 0; i < row_width; i++) |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3227 | { |
| 3228 | value = (*sp >> shift) & 0xf; |
| 3229 | *dp = (png_byte)(value | (value << 4)); |
| 3230 | if (shift == 4) |
| 3231 | { |
| 3232 | shift = 0; |
| 3233 | sp--; |
| 3234 | } |
| 3235 | else |
| 3236 | shift = 4; |
| 3237 | |
| 3238 | dp--; |
| 3239 | } |
| 3240 | break; |
| 3241 | } |
| 3242 | } |
| 3243 | row_info->bit_depth = 8; |
| 3244 | row_info->pixel_depth = 8; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3245 | row_info->rowbytes = row_width; |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3246 | } |
| 3247 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3248 | if (trans_value != NULL) |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3249 | { |
| 3250 | if (row_info->bit_depth == 8) |
| 3251 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3252 | sp = row + (png_size_t)row_width - 1; |
| 3253 | dp = row + (png_size_t)(row_width << 1) - 1; |
| 3254 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3255 | { |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3256 | if (*sp == gray) |
| 3257 | *dp-- = 0; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3258 | else |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3259 | *dp-- = 0xff; |
| 3260 | *dp-- = *sp--; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3261 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3262 | } |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3263 | else if (row_info->bit_depth == 16) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3264 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3265 | sp = row + row_info->rowbytes - 1; |
| 3266 | dp = row + (row_info->rowbytes << 1) - 1; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3267 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3268 | { |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3269 | if (((png_uint_16)*(sp) | |
| 3270 | ((png_uint_16)*(sp - 1) << 8)) == gray) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3271 | { |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3272 | *dp-- = 0; |
| 3273 | *dp-- = 0; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3274 | } |
| 3275 | else |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3276 | { |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3277 | *dp-- = 0xff; |
| 3278 | *dp-- = 0xff; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3279 | } |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3280 | *dp-- = *sp--; |
| 3281 | *dp-- = *sp--; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3282 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3283 | } |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3284 | row_info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA; |
| 3285 | row_info->channels = 2; |
| 3286 | row_info->pixel_depth = (png_byte)(row_info->bit_depth << 1); |
| 3287 | row_info->rowbytes = |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3288 | ((row_width * row_info->pixel_depth) >> 3); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3289 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3290 | } |
| 3291 | else if (row_info->color_type == PNG_COLOR_TYPE_RGB && trans_value) |
| 3292 | { |
| 3293 | if (row_info->bit_depth == 8) |
| 3294 | { |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3295 | sp = row + (png_size_t)row_info->rowbytes - 1; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3296 | dp = row + (png_size_t)(row_width << 2) - 1; |
| 3297 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3298 | { |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3299 | if (*(sp - 2) == trans_value->red && |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3300 | *(sp - 1) == trans_value->green && |
| 3301 | *(sp - 0) == trans_value->blue) |
| 3302 | *dp-- = 0; |
| 3303 | else |
| 3304 | *dp-- = 0xff; |
| 3305 | *dp-- = *sp--; |
| 3306 | *dp-- = *sp--; |
| 3307 | *dp-- = *sp--; |
| 3308 | } |
| 3309 | } |
| 3310 | else if (row_info->bit_depth == 16) |
| 3311 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3312 | sp = row + row_info->rowbytes - 1; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3313 | dp = row + (png_size_t)(row_width << 3) - 1; |
| 3314 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3315 | { |
| 3316 | if ((((png_uint_16)*(sp - 4) | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3317 | ((png_uint_16)*(sp - 5) << 8)) == trans_value->red) && |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3318 | (((png_uint_16)*(sp - 2) | |
| 3319 | ((png_uint_16)*(sp - 3) << 8)) == trans_value->green) && |
| 3320 | (((png_uint_16)*(sp - 0) | |
| 3321 | ((png_uint_16)*(sp - 1) << 8)) == trans_value->blue)) |
| 3322 | { |
| 3323 | *dp-- = 0; |
| 3324 | *dp-- = 0; |
| 3325 | } |
| 3326 | else |
| 3327 | { |
| 3328 | *dp-- = 0xff; |
| 3329 | *dp-- = 0xff; |
| 3330 | } |
| 3331 | *dp-- = *sp--; |
| 3332 | *dp-- = *sp--; |
| 3333 | *dp-- = *sp--; |
| 3334 | *dp-- = *sp--; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3335 | *dp-- = *sp--; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3336 | *dp-- = *sp--; |
| 3337 | } |
| 3338 | } |
| 3339 | row_info->color_type = PNG_COLOR_TYPE_RGB_ALPHA; |
| 3340 | row_info->channels = 4; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3341 | row_info->pixel_depth = (png_byte)(row_info->bit_depth << 2); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3342 | row_info->rowbytes = |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3343 | ((row_width * row_info->pixel_depth) >> 3); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3344 | } |
| 3345 | } |
| 3346 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3347 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3348 | |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3349 | #if defined(PNG_READ_DITHER_SUPPORTED) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3350 | void |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 3351 | png_do_dither(png_row_infop row_info, png_bytep row, |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3352 | png_bytep palette_lookup, png_bytep dither_lookup) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3353 | { |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 3354 | png_bytep sp, dp; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3355 | png_uint_32 i; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3356 | png_uint_32 row_width=row_info->width; |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 3357 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3358 | png_debug(1, "in png_do_dither\n"); |
| 3359 | #if defined(PNG_USELESS_TESTS_SUPPORTED) |
| 3360 | if (row != NULL && row_info != NULL) |
| 3361 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3362 | { |
| 3363 | if (row_info->color_type == PNG_COLOR_TYPE_RGB && |
| 3364 | palette_lookup && row_info->bit_depth == 8) |
| 3365 | { |
| 3366 | int r, g, b, p; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3367 | sp = row; |
| 3368 | dp = row; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3369 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3370 | { |
| 3371 | r = *sp++; |
| 3372 | g = *sp++; |
| 3373 | b = *sp++; |
| 3374 | |
| 3375 | /* this looks real messy, but the compiler will reduce |
| 3376 | it down to a reasonable formula. For example, with |
| 3377 | 5 bits per color, we get: |
| 3378 | p = (((r >> 3) & 0x1f) << 10) | |
| 3379 | (((g >> 3) & 0x1f) << 5) | |
| 3380 | ((b >> 3) & 0x1f); |
| 3381 | */ |
| 3382 | p = (((r >> (8 - PNG_DITHER_RED_BITS)) & |
| 3383 | ((1 << PNG_DITHER_RED_BITS) - 1)) << |
| 3384 | (PNG_DITHER_GREEN_BITS + PNG_DITHER_BLUE_BITS)) | |
| 3385 | (((g >> (8 - PNG_DITHER_GREEN_BITS)) & |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3386 | ((1 << PNG_DITHER_GREEN_BITS) - 1)) << |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3387 | (PNG_DITHER_BLUE_BITS)) | |
| 3388 | ((b >> (8 - PNG_DITHER_BLUE_BITS)) & |
| 3389 | ((1 << PNG_DITHER_BLUE_BITS) - 1)); |
| 3390 | |
| 3391 | *dp++ = palette_lookup[p]; |
| 3392 | } |
| 3393 | row_info->color_type = PNG_COLOR_TYPE_PALETTE; |
| 3394 | row_info->channels = 1; |
| 3395 | row_info->pixel_depth = row_info->bit_depth; |
| 3396 | row_info->rowbytes = |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3397 | ((row_width * row_info->pixel_depth + 7) >> 3); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3398 | } |
| 3399 | else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA && |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3400 | palette_lookup != NULL && row_info->bit_depth == 8) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3401 | { |
| 3402 | int r, g, b, p; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3403 | sp = row; |
| 3404 | dp = row; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3405 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3406 | { |
| 3407 | r = *sp++; |
| 3408 | g = *sp++; |
| 3409 | b = *sp++; |
| 3410 | sp++; |
| 3411 | |
| 3412 | p = (((r >> (8 - PNG_DITHER_RED_BITS)) & |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3413 | ((1 << PNG_DITHER_RED_BITS) - 1)) << |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3414 | (PNG_DITHER_GREEN_BITS + PNG_DITHER_BLUE_BITS)) | |
| 3415 | (((g >> (8 - PNG_DITHER_GREEN_BITS)) & |
| 3416 | ((1 << PNG_DITHER_GREEN_BITS) - 1)) << |
| 3417 | (PNG_DITHER_BLUE_BITS)) | |
| 3418 | ((b >> (8 - PNG_DITHER_BLUE_BITS)) & |
| 3419 | ((1 << PNG_DITHER_BLUE_BITS) - 1)); |
| 3420 | |
| 3421 | *dp++ = palette_lookup[p]; |
| 3422 | } |
| 3423 | row_info->color_type = PNG_COLOR_TYPE_PALETTE; |
| 3424 | row_info->channels = 1; |
| 3425 | row_info->pixel_depth = row_info->bit_depth; |
| 3426 | row_info->rowbytes = |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3427 | ((row_width * row_info->pixel_depth + 7) >> 3); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3428 | } |
| 3429 | else if (row_info->color_type == PNG_COLOR_TYPE_PALETTE && |
| 3430 | dither_lookup && row_info->bit_depth == 8) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3431 | { |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3432 | sp = row; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3433 | for (i = 0; i < row_width; i++, sp++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3434 | { |
| 3435 | *sp = dither_lookup[*sp]; |
| 3436 | } |
| 3437 | } |
| 3438 | } |
| 3439 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3440 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3441 | |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3442 | #if defined(PNG_READ_GAMMA_SUPPORTED) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3443 | static int png_gamma_shift[] = |
| 3444 | {0x10, 0x21, 0x42, 0x84, 0x110, 0x248, 0x550, 0xff0}; |
| 3445 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3446 | /* We build the 8- or 16-bit gamma tables here. Note that for 16-bit |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 3447 | * tables, we don't make a full table if we are reducing to 8-bit in |
| 3448 | * the future. Note also how the gamma_16 tables are segmented so that |
| 3449 | * we don't need to allocate > 64K chunks for a full 16-bit table. |
| 3450 | */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3451 | void |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 3452 | png_build_gamma_table(png_structp png_ptr) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3453 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3454 | png_debug(1, "in png_build_gamma_table\n"); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3455 | if (png_ptr->bit_depth <= 8) |
| 3456 | { |
| 3457 | int i; |
| 3458 | double g; |
| 3459 | |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 3460 | g = 1.0 / (png_ptr->gamma * png_ptr->screen_gamma); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3461 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3462 | png_ptr->gamma_table = (png_bytep)png_malloc(png_ptr, |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3463 | (png_uint_32)256); |
| 3464 | |
| 3465 | for (i = 0; i < 256; i++) |
| 3466 | { |
| 3467 | png_ptr->gamma_table[i] = (png_byte)(pow((double)i / 255.0, |
| 3468 | g) * 255.0 + .5); |
| 3469 | } |
| 3470 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3471 | #if defined(PNG_READ_BACKGROUND_SUPPORTED) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3472 | if (png_ptr->transformations & PNG_BACKGROUND) |
| 3473 | { |
| 3474 | g = 1.0 / (png_ptr->gamma); |
| 3475 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3476 | png_ptr->gamma_to_1 = (png_bytep)png_malloc(png_ptr, |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3477 | (png_uint_32)256); |
| 3478 | |
| 3479 | for (i = 0; i < 256; i++) |
| 3480 | { |
| 3481 | png_ptr->gamma_to_1[i] = (png_byte)(pow((double)i / 255.0, |
| 3482 | g) * 255.0 + .5); |
| 3483 | } |
| 3484 | |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 3485 | g = 1.0 / (png_ptr->screen_gamma); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3486 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3487 | png_ptr->gamma_from_1 = (png_bytep)png_malloc(png_ptr, |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3488 | (png_uint_32)256); |
| 3489 | |
| 3490 | for (i = 0; i < 256; i++) |
| 3491 | { |
| 3492 | png_ptr->gamma_from_1[i] = (png_byte)(pow((double)i / 255.0, |
| 3493 | g) * 255.0 + .5); |
| 3494 | } |
| 3495 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3496 | #endif /* PNG_BACKGROUND_SUPPORTED */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3497 | } |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3498 | else |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3499 | { |
| 3500 | double g; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3501 | int i, j, shift, num; |
| 3502 | int sig_bit; |
| 3503 | png_uint_32 ig; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3504 | |
| 3505 | if (png_ptr->color_type & PNG_COLOR_MASK_COLOR) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3506 | { |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3507 | sig_bit = (int)png_ptr->sig_bit.red; |
| 3508 | if ((int)png_ptr->sig_bit.green > sig_bit) |
| 3509 | sig_bit = png_ptr->sig_bit.green; |
| 3510 | if ((int)png_ptr->sig_bit.blue > sig_bit) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3511 | sig_bit = png_ptr->sig_bit.blue; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3512 | } |
| 3513 | else |
| 3514 | { |
| 3515 | sig_bit = (int)png_ptr->sig_bit.gray; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3516 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3517 | |
| 3518 | if (sig_bit > 0) |
| 3519 | shift = 16 - sig_bit; |
| 3520 | else |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3521 | shift = 0; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3522 | |
| 3523 | if (png_ptr->transformations & PNG_16_TO_8) |
| 3524 | { |
| 3525 | if (shift < (16 - PNG_MAX_GAMMA_8)) |
| 3526 | shift = (16 - PNG_MAX_GAMMA_8); |
| 3527 | } |
| 3528 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3529 | if (shift > 8) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3530 | shift = 8; |
| 3531 | if (shift < 0) |
| 3532 | shift = 0; |
| 3533 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3534 | png_ptr->gamma_shift = (png_byte)shift; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3535 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3536 | num = (1 << (8 - shift)); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3537 | |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 3538 | g = 1.0 / (png_ptr->gamma * png_ptr->screen_gamma); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3539 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3540 | png_ptr->gamma_16_table = (png_uint_16pp)png_malloc(png_ptr, |
Glenn Randers-Pehrson | 0f881d6 | 1998-02-07 10:20:57 -0600 | [diff] [blame] | 3541 | (png_uint_32)(num * sizeof (png_uint_16p))); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3542 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3543 | if ((png_ptr->transformations & PNG_16_TO_8) && |
| 3544 | !(png_ptr->transformations & PNG_BACKGROUND)) |
| 3545 | { |
| 3546 | double fin, fout; |
| 3547 | png_uint_32 last, max; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3548 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3549 | for (i = 0; i < num; i++) |
| 3550 | { |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3551 | png_ptr->gamma_16_table[i] = (png_uint_16p)png_malloc(png_ptr, |
Glenn Randers-Pehrson | 0f881d6 | 1998-02-07 10:20:57 -0600 | [diff] [blame] | 3552 | (png_uint_32)(256 * sizeof (png_uint_16))); |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3553 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3554 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3555 | g = 1.0 / g; |
| 3556 | last = 0; |
| 3557 | for (i = 0; i < 256; i++) |
| 3558 | { |
| 3559 | fout = ((double)i + 0.5) / 256.0; |
| 3560 | fin = pow(fout, g); |
| 3561 | max = (png_uint_32)(fin * (double)((png_uint_32)num << 8)); |
| 3562 | while (last <= max) |
| 3563 | { |
| 3564 | png_ptr->gamma_16_table[(int)(last & (0xff >> shift))] |
| 3565 | [(int)(last >> (8 - shift))] = (png_uint_16)( |
| 3566 | (png_uint_16)i | ((png_uint_16)i << 8)); |
| 3567 | last++; |
| 3568 | } |
| 3569 | } |
| 3570 | while (last < ((png_uint_32)num << 8)) |
| 3571 | { |
| 3572 | png_ptr->gamma_16_table[(int)(last & (0xff >> shift))] |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3573 | [(int)(last >> (8 - shift))] = (png_uint_16)65535L; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3574 | last++; |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 3575 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3576 | } |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3577 | else |
| 3578 | { |
| 3579 | for (i = 0; i < num; i++) |
| 3580 | { |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3581 | png_ptr->gamma_16_table[i] = (png_uint_16p)png_malloc(png_ptr, |
Glenn Randers-Pehrson | 0f881d6 | 1998-02-07 10:20:57 -0600 | [diff] [blame] | 3582 | (png_uint_32)(256 * sizeof (png_uint_16))); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3583 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3584 | ig = (((png_uint_32)i * (png_uint_32)png_gamma_shift[shift]) >> 4); |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3585 | for (j = 0; j < 256; j++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3586 | { |
| 3587 | png_ptr->gamma_16_table[i][j] = |
| 3588 | (png_uint_16)(pow((double)(ig + ((png_uint_32)j << 8)) / |
| 3589 | 65535.0, g) * 65535.0 + .5); |
| 3590 | } |
| 3591 | } |
| 3592 | } |
| 3593 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3594 | #if defined(PNG_READ_BACKGROUND_SUPPORTED) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3595 | if (png_ptr->transformations & PNG_BACKGROUND) |
| 3596 | { |
| 3597 | g = 1.0 / (png_ptr->gamma); |
| 3598 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3599 | png_ptr->gamma_16_to_1 = (png_uint_16pp)png_malloc(png_ptr, |
Glenn Randers-Pehrson | 0f881d6 | 1998-02-07 10:20:57 -0600 | [diff] [blame] | 3600 | (png_uint_32)(num * sizeof (png_uint_16p ))); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3601 | |
| 3602 | for (i = 0; i < num; i++) |
| 3603 | { |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3604 | png_ptr->gamma_16_to_1[i] = (png_uint_16p)png_malloc(png_ptr, |
Glenn Randers-Pehrson | 0f881d6 | 1998-02-07 10:20:57 -0600 | [diff] [blame] | 3605 | (png_uint_32)(256 * sizeof (png_uint_16))); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3606 | |
| 3607 | ig = (((png_uint_32)i * |
| 3608 | (png_uint_32)png_gamma_shift[shift]) >> 4); |
| 3609 | for (j = 0; j < 256; j++) |
| 3610 | { |
| 3611 | png_ptr->gamma_16_to_1[i][j] = |
| 3612 | (png_uint_16)(pow((double)(ig + ((png_uint_32)j << 8)) / |
| 3613 | 65535.0, g) * 65535.0 + .5); |
| 3614 | } |
| 3615 | } |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 3616 | g = 1.0 / (png_ptr->screen_gamma); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3617 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3618 | png_ptr->gamma_16_from_1 = (png_uint_16pp)png_malloc(png_ptr, |
Glenn Randers-Pehrson | 0f881d6 | 1998-02-07 10:20:57 -0600 | [diff] [blame] | 3619 | (png_uint_32)(num * sizeof (png_uint_16p))); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3620 | |
| 3621 | for (i = 0; i < num; i++) |
| 3622 | { |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3623 | png_ptr->gamma_16_from_1[i] = (png_uint_16p)png_malloc(png_ptr, |
Glenn Randers-Pehrson | 0f881d6 | 1998-02-07 10:20:57 -0600 | [diff] [blame] | 3624 | (png_uint_32)(256 * sizeof (png_uint_16))); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3625 | |
| 3626 | ig = (((png_uint_32)i * |
| 3627 | (png_uint_32)png_gamma_shift[shift]) >> 4); |
| 3628 | for (j = 0; j < 256; j++) |
| 3629 | { |
| 3630 | png_ptr->gamma_16_from_1[i][j] = |
| 3631 | (png_uint_16)(pow((double)(ig + ((png_uint_32)j << 8)) / |
| 3632 | 65535.0, g) * 65535.0 + .5); |
| 3633 | } |
| 3634 | } |
| 3635 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3636 | #endif /* PNG_BACKGROUND_SUPPORTED */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3637 | } |
| 3638 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3639 | #endif |
| 3640 | |