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 | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 4 | * Last changed in libpng 1.5.0 [May 6, 2010] |
Glenn Randers-Pehrson | e69b55d | 2010-01-01 10:29:06 -0600 | [diff] [blame] | 5 | * Copyright (c) 1998-2010 Glenn Randers-Pehrson |
Glenn Randers-Pehrson | d436672 | 2000-06-04 14:29:29 -0500 | [diff] [blame] | 6 | * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) |
| 7 | * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 8 | * |
Glenn Randers-Pehrson | bfbf865 | 2009-06-26 21:46:52 -0500 | [diff] [blame] | 9 | * This code is released under the libpng license. |
Glenn Randers-Pehrson | c332bbc | 2009-06-25 13:43:50 -0500 | [diff] [blame] | 10 | * For conditions of distribution and use, see the disclaimer |
Glenn Randers-Pehrson | 037023b | 2009-06-24 10:27:36 -0500 | [diff] [blame] | 11 | * and license in png.h |
Glenn Randers-Pehrson | 3e61d79 | 2009-06-24 09:31:28 -0500 | [diff] [blame] | 12 | * |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 13 | * This file contains functions optionally called by an application |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 14 | * in order to tell libpng how to handle data when reading a PNG. |
Glenn Randers-Pehrson | 8686fff | 1998-05-21 09:27:50 -0500 | [diff] [blame] | 15 | * Transformations that are used in both reading and writing are |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 16 | * in pngtrans.c. |
| 17 | */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 18 | |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 19 | #include "pngpriv.h" |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 20 | |
Glenn Randers-Pehrson | c3cd22b | 2010-03-08 21:10:25 -0600 | [diff] [blame] | 21 | #ifdef PNG_READ_SUPPORTED |
| 22 | |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 23 | /* Set the action on getting a CRC error for an ancillary or critical chunk. */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 24 | void PNGAPI |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 25 | png_set_crc_action(png_structp png_ptr, int crit_action, int ancil_action) |
| 26 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 27 | png_debug(1, "in png_set_crc_action"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 28 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 29 | if (png_ptr == NULL) |
| 30 | return; |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 31 | |
| 32 | /* Tell libpng how we react to CRC errors in critical chunks */ |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 33 | switch (crit_action) |
| 34 | { |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 35 | case PNG_CRC_NO_CHANGE: /* Leave setting as is */ |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 36 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 37 | |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 38 | case PNG_CRC_WARN_USE: /* Warn/use data */ |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 39 | png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK; |
| 40 | png_ptr->flags |= PNG_FLAG_CRC_CRITICAL_USE; |
| 41 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 42 | |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 43 | case PNG_CRC_QUIET_USE: /* Quiet/use data */ |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 44 | png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK; |
| 45 | png_ptr->flags |= PNG_FLAG_CRC_CRITICAL_USE | |
| 46 | PNG_FLAG_CRC_CRITICAL_IGNORE; |
| 47 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 48 | |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 49 | case PNG_CRC_WARN_DISCARD: /* Not a valid action for critical data */ |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 50 | png_warning(png_ptr, |
| 51 | "Can't discard critical data on CRC error"); |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 52 | case PNG_CRC_ERROR_QUIT: /* Error/quit */ |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 53 | |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 54 | case PNG_CRC_DEFAULT: |
| 55 | default: |
| 56 | png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK; |
| 57 | break; |
| 58 | } |
| 59 | |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 60 | /* Tell libpng how we react to CRC errors in ancillary chunks */ |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 61 | switch (ancil_action) |
| 62 | { |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 63 | case PNG_CRC_NO_CHANGE: /* Leave setting as is */ |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 64 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 65 | |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 66 | case PNG_CRC_WARN_USE: /* Warn/use data */ |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 67 | png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK; |
| 68 | png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_USE; |
| 69 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 70 | |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 71 | case PNG_CRC_QUIET_USE: /* Quiet/use data */ |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 72 | png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK; |
| 73 | png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_USE | |
| 74 | PNG_FLAG_CRC_ANCILLARY_NOWARN; |
| 75 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 76 | |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 77 | case PNG_CRC_ERROR_QUIT: /* Error/quit */ |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 78 | png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK; |
| 79 | png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_NOWARN; |
| 80 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 81 | |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 82 | case PNG_CRC_WARN_DISCARD: /* Warn/discard data */ |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 83 | |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 84 | case PNG_CRC_DEFAULT: |
| 85 | default: |
| 86 | png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK; |
| 87 | break; |
| 88 | } |
| 89 | } |
| 90 | |
Glenn Randers-Pehrson | 166c5a3 | 1999-12-10 09:43:02 -0600 | [diff] [blame] | 91 | #if defined(PNG_READ_BACKGROUND_SUPPORTED) && \ |
| 92 | defined(PNG_FLOATING_POINT_SUPPORTED) |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 93 | /* Handle alpha and tRNS via a background color */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 94 | void PNGAPI |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 95 | png_set_background(png_structp png_ptr, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 96 | png_color_16p background_color, int background_gamma_code, |
| 97 | int need_expand, double background_gamma) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 98 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 99 | png_debug(1, "in png_set_background"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 100 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 101 | if (png_ptr == NULL) |
| 102 | return; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 103 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 104 | if (background_gamma_code == PNG_BACKGROUND_GAMMA_UNKNOWN) |
| 105 | { |
| 106 | png_warning(png_ptr, "Application must supply a known background gamma"); |
| 107 | return; |
| 108 | } |
| 109 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 110 | png_ptr->transformations |= PNG_BACKGROUND; |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 111 | png_memcpy(&(png_ptr->background), background_color, |
| 112 | png_sizeof(png_color_16)); |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 113 | png_ptr->background_gamma = (float)background_gamma; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 114 | png_ptr->background_gamma_type = (png_byte)(background_gamma_code); |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 115 | png_ptr->transformations |= (need_expand ? PNG_BACKGROUND_EXPAND : 0); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 116 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 117 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 118 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 119 | #ifdef PNG_READ_16_TO_8_SUPPORTED |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 120 | /* Strip 16 bit depth files to 8 bit depth */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 121 | void PNGAPI |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 122 | png_set_strip_16(png_structp png_ptr) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 123 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 124 | png_debug(1, "in png_set_strip_16"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 125 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 126 | if (png_ptr == NULL) |
| 127 | return; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 128 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 129 | png_ptr->transformations |= PNG_16_TO_8; |
| 130 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 131 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 132 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 133 | #ifdef PNG_READ_STRIP_ALPHA_SUPPORTED |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 134 | void PNGAPI |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 135 | png_set_strip_alpha(png_structp png_ptr) |
| 136 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 137 | png_debug(1, "in png_set_strip_alpha"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 138 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 139 | if (png_ptr == NULL) |
| 140 | return; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 141 | |
Glenn Randers-Pehrson | 4093607 | 2004-11-20 11:18:40 -0600 | [diff] [blame] | 142 | png_ptr->flags |= PNG_FLAG_STRIP_ALPHA; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 143 | } |
| 144 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 145 | |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 146 | #ifdef PNG_READ_QUANTIZE_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 147 | /* Dither file to 8 bit. Supply a palette, the current number |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 148 | * of elements in the palette, the maximum number of elements |
| 149 | * allowed, and a histogram if possible. If the current number |
| 150 | * of colors is greater then the maximum number, the palette will be |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 151 | * modified to fit in the maximum number. "full_quantize" indicates |
| 152 | * whether we need a quantizing cube set up for RGB images, or if we |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 153 | * simply are reducing the number of colors in a paletted image. |
| 154 | */ |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 155 | |
| 156 | typedef struct png_dsort_struct |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 157 | { |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 158 | struct png_dsort_struct FAR * next; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 159 | png_byte left; |
| 160 | png_byte right; |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 161 | } png_dsort; |
| 162 | typedef png_dsort FAR * png_dsortp; |
| 163 | typedef png_dsort FAR * FAR * png_dsortpp; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 164 | |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 165 | void PNGAPI |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 166 | png_set_quantize(png_structp png_ptr, png_colorp palette, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 167 | int num_palette, int maximum_colors, png_uint_16p histogram, |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 168 | int full_quantize) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 169 | { |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 170 | png_debug(1, "in png_set_quantize"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 171 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 172 | if (png_ptr == NULL) |
| 173 | return; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 174 | |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 175 | png_ptr->transformations |= PNG_QUANTIZE; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 176 | |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 177 | if (!full_quantize) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 178 | { |
| 179 | int i; |
| 180 | |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 181 | png_ptr->quantize_index = (png_bytep)png_malloc(png_ptr, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 182 | (png_uint_32)(num_palette * png_sizeof(png_byte))); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 183 | for (i = 0; i < num_palette; i++) |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 184 | png_ptr->quantize_index[i] = (png_byte)i; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 185 | } |
| 186 | |
| 187 | if (num_palette > maximum_colors) |
| 188 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 189 | if (histogram != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 190 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 191 | /* This is easy enough, just throw out the least used colors. |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 192 | * Perhaps not the best solution, but good enough. |
| 193 | */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 194 | |
| 195 | int i; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 196 | |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 197 | /* Initialize an array to sort colors */ |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 198 | png_ptr->quantize_sort = (png_bytep)png_malloc(png_ptr, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 199 | (png_uint_32)(num_palette * png_sizeof(png_byte))); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 200 | |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 201 | /* Initialize the quantize_sort array */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 202 | for (i = 0; i < num_palette; i++) |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 203 | png_ptr->quantize_sort[i] = (png_byte)i; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 204 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 205 | /* Find the least used palette entries by starting a |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 206 | * bubble sort, and running it until we have sorted |
| 207 | * out enough colors. Note that we don't care about |
| 208 | * sorting all the colors, just finding which are |
| 209 | * least used. |
| 210 | */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 211 | |
| 212 | for (i = num_palette - 1; i >= maximum_colors; i--) |
| 213 | { |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 214 | int done; /* To stop early if the list is pre-sorted */ |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 215 | int j; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 216 | |
| 217 | done = 1; |
| 218 | for (j = 0; j < i; j++) |
| 219 | { |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 220 | if (histogram[png_ptr->quantize_sort[j]] |
| 221 | < histogram[png_ptr->quantize_sort[j + 1]]) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 222 | { |
| 223 | png_byte t; |
| 224 | |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 225 | t = png_ptr->quantize_sort[j]; |
| 226 | png_ptr->quantize_sort[j] = png_ptr->quantize_sort[j + 1]; |
| 227 | png_ptr->quantize_sort[j + 1] = t; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 228 | done = 0; |
| 229 | } |
| 230 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 231 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 232 | if (done) |
| 233 | break; |
| 234 | } |
| 235 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 236 | /* Swap the palette around, and set up a table, if necessary */ |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 237 | if (full_quantize) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 238 | { |
Glenn Randers-Pehrson | 8686fff | 1998-05-21 09:27:50 -0500 | [diff] [blame] | 239 | int j = num_palette; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 240 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 241 | /* Put all the useful colors within the max, but don't |
| 242 | * move the others. |
| 243 | */ |
Glenn Randers-Pehrson | 8686fff | 1998-05-21 09:27:50 -0500 | [diff] [blame] | 244 | for (i = 0; i < maximum_colors; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 245 | { |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 246 | if ((int)png_ptr->quantize_sort[i] >= maximum_colors) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 247 | { |
| 248 | do |
| 249 | j--; |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 250 | while ((int)png_ptr->quantize_sort[j] >= maximum_colors); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 251 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 252 | palette[i] = palette[j]; |
| 253 | } |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 254 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 255 | } |
| 256 | else |
| 257 | { |
Glenn Randers-Pehrson | 8686fff | 1998-05-21 09:27:50 -0500 | [diff] [blame] | 258 | int j = num_palette; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 259 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 260 | /* Move all the used colors inside the max limit, and |
| 261 | * develop a translation table. |
| 262 | */ |
Glenn Randers-Pehrson | 8686fff | 1998-05-21 09:27:50 -0500 | [diff] [blame] | 263 | for (i = 0; i < maximum_colors; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 264 | { |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 265 | /* Only move the colors we need to */ |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 266 | if ((int)png_ptr->quantize_sort[i] >= maximum_colors) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 267 | { |
| 268 | png_color tmp_color; |
| 269 | |
| 270 | do |
| 271 | j--; |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 272 | while ((int)png_ptr->quantize_sort[j] >= maximum_colors); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 273 | |
| 274 | tmp_color = palette[j]; |
| 275 | palette[j] = palette[i]; |
| 276 | palette[i] = tmp_color; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 277 | /* Indicate where the color went */ |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 278 | png_ptr->quantize_index[j] = (png_byte)i; |
| 279 | png_ptr->quantize_index[i] = (png_byte)j; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 280 | } |
| 281 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 282 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 283 | /* Find closest color for those colors we are not using */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 284 | for (i = 0; i < num_palette; i++) |
| 285 | { |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 286 | if ((int)png_ptr->quantize_index[i] >= maximum_colors) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 287 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 288 | int min_d, k, min_k, d_index; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 289 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 290 | /* Find the closest color to one we threw out */ |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 291 | d_index = png_ptr->quantize_index[i]; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 292 | min_d = PNG_COLOR_DIST(palette[d_index], palette[0]); |
| 293 | for (k = 1, min_k = 0; k < maximum_colors; k++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 294 | { |
| 295 | int d; |
| 296 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 297 | d = PNG_COLOR_DIST(palette[d_index], palette[k]); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 298 | |
| 299 | if (d < min_d) |
| 300 | { |
| 301 | min_d = d; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 302 | min_k = k; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 303 | } |
| 304 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 305 | /* Point to closest color */ |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 306 | png_ptr->quantize_index[i] = (png_byte)min_k; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 307 | } |
| 308 | } |
| 309 | } |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 310 | png_free(png_ptr, png_ptr->quantize_sort); |
| 311 | png_ptr->quantize_sort = NULL; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 312 | } |
| 313 | else |
| 314 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 315 | /* This is much harder to do simply (and quickly). Perhaps |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 316 | * we need to go through a median cut routine, but those |
| 317 | * don't always behave themselves with only a few colors |
| 318 | * as input. So we will just find the closest two colors, |
| 319 | * and throw out one of them (chosen somewhat randomly). |
| 320 | * [We don't understand this at all, so if someone wants to |
| 321 | * work on improving it, be our guest - AED, GRP] |
| 322 | */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 323 | int i; |
| 324 | int max_d; |
| 325 | int num_new_palette; |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 326 | png_dsortp t; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 327 | png_dsortpp hash; |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 328 | |
Glenn Randers-Pehrson | 895a9c9 | 2008-07-25 08:51:18 -0500 | [diff] [blame] | 329 | t = NULL; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 330 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 331 | /* Initialize palette index arrays */ |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 332 | png_ptr->index_to_palette = (png_bytep)png_malloc(png_ptr, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 333 | (png_uint_32)(num_palette * png_sizeof(png_byte))); |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 334 | png_ptr->palette_to_index = (png_bytep)png_malloc(png_ptr, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 335 | (png_uint_32)(num_palette * png_sizeof(png_byte))); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 336 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 337 | /* Initialize the sort array */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 338 | for (i = 0; i < num_palette; i++) |
| 339 | { |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 340 | png_ptr->index_to_palette[i] = (png_byte)i; |
| 341 | png_ptr->palette_to_index[i] = (png_byte)i; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 342 | } |
| 343 | |
Glenn Randers-Pehrson | 79134c6 | 2009-02-14 10:32:18 -0600 | [diff] [blame] | 344 | hash = (png_dsortpp)png_calloc(png_ptr, (png_uint_32)(769 * |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 345 | png_sizeof(png_dsortp))); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 346 | |
| 347 | num_new_palette = num_palette; |
| 348 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 349 | /* Initial wild guess at how far apart the farthest pixel |
| 350 | * pair we will be eliminating will be. Larger |
| 351 | * numbers mean more areas will be allocated, Smaller |
| 352 | * numbers run the risk of not saving enough data, and |
| 353 | * having to do this all over again. |
| 354 | * |
| 355 | * I have not done extensive checking on this number. |
| 356 | */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 357 | max_d = 96; |
| 358 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 359 | while (num_new_palette > maximum_colors) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 360 | { |
| 361 | for (i = 0; i < num_new_palette - 1; i++) |
| 362 | { |
| 363 | int j; |
| 364 | |
| 365 | for (j = i + 1; j < num_new_palette; j++) |
| 366 | { |
| 367 | int d; |
| 368 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 369 | d = PNG_COLOR_DIST(palette[i], palette[j]); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 370 | |
| 371 | if (d <= max_d) |
| 372 | { |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 373 | |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 374 | t = (png_dsortp)png_malloc_warn(png_ptr, |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 375 | (png_uint_32)(png_sizeof(png_dsort))); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 376 | |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 377 | if (t == NULL) |
| 378 | break; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 379 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 380 | t->next = hash[d]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 381 | t->left = (png_byte)i; |
| 382 | t->right = (png_byte)j; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 383 | hash[d] = t; |
| 384 | } |
| 385 | } |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 386 | if (t == NULL) |
| 387 | break; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 388 | } |
| 389 | |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 390 | if (t != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 391 | for (i = 0; i <= max_d; i++) |
| 392 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 393 | if (hash[i] != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 394 | { |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 395 | png_dsortp p; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 396 | |
| 397 | for (p = hash[i]; p; p = p->next) |
| 398 | { |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 399 | if ((int)png_ptr->index_to_palette[p->left] |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 400 | < num_new_palette && |
| 401 | (int)png_ptr->index_to_palette[p->right] |
| 402 | < num_new_palette) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 403 | { |
| 404 | int j, next_j; |
| 405 | |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 406 | if (num_new_palette & 0x01) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 407 | { |
| 408 | j = p->left; |
| 409 | next_j = p->right; |
| 410 | } |
| 411 | else |
| 412 | { |
| 413 | j = p->right; |
| 414 | next_j = p->left; |
| 415 | } |
| 416 | |
| 417 | num_new_palette--; |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 418 | palette[png_ptr->index_to_palette[j]] |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 419 | = palette[num_new_palette]; |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 420 | if (!full_quantize) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 421 | { |
| 422 | int k; |
| 423 | |
| 424 | for (k = 0; k < num_palette; k++) |
| 425 | { |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 426 | if (png_ptr->quantize_index[k] == |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 427 | png_ptr->index_to_palette[j]) |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 428 | png_ptr->quantize_index[k] = |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 429 | png_ptr->index_to_palette[next_j]; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 430 | |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 431 | if ((int)png_ptr->quantize_index[k] == |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 432 | num_new_palette) |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 433 | png_ptr->quantize_index[k] = |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 434 | png_ptr->index_to_palette[j]; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 435 | } |
| 436 | } |
| 437 | |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 438 | png_ptr->index_to_palette[png_ptr->palette_to_index |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 439 | [num_new_palette]] = png_ptr->index_to_palette[j]; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 440 | |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 441 | png_ptr->palette_to_index[png_ptr->index_to_palette[j]] |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 442 | = png_ptr->palette_to_index[num_new_palette]; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 443 | |
Glenn Randers-Pehrson | e3f3c4e | 2010-02-07 18:08:50 -0600 | [diff] [blame] | 444 | png_ptr->index_to_palette[j] = |
| 445 | (png_byte)num_new_palette; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 446 | |
Glenn Randers-Pehrson | e3f3c4e | 2010-02-07 18:08:50 -0600 | [diff] [blame] | 447 | png_ptr->palette_to_index[num_new_palette] = |
| 448 | (png_byte)j; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 449 | } |
| 450 | if (num_new_palette <= maximum_colors) |
| 451 | break; |
| 452 | } |
| 453 | if (num_new_palette <= maximum_colors) |
| 454 | break; |
| 455 | } |
| 456 | } |
| 457 | |
| 458 | for (i = 0; i < 769; i++) |
| 459 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 460 | if (hash[i] != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 461 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 462 | png_dsortp p = hash[i]; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 463 | while (p) |
| 464 | { |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 465 | t = p->next; |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 466 | png_free(png_ptr, p); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 467 | p = t; |
| 468 | } |
| 469 | } |
| 470 | hash[i] = 0; |
| 471 | } |
| 472 | max_d += 96; |
| 473 | } |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 474 | png_free(png_ptr, hash); |
Glenn Randers-Pehrson | 07748d1 | 2002-05-25 11:12:10 -0500 | [diff] [blame] | 475 | png_free(png_ptr, png_ptr->palette_to_index); |
| 476 | png_free(png_ptr, png_ptr->index_to_palette); |
Glenn Randers-Pehrson | 895a9c9 | 2008-07-25 08:51:18 -0500 | [diff] [blame] | 477 | png_ptr->palette_to_index = NULL; |
| 478 | png_ptr->index_to_palette = NULL; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 479 | } |
| 480 | num_palette = maximum_colors; |
| 481 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 482 | if (png_ptr->palette == NULL) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 483 | { |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 484 | png_ptr->palette = palette; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 485 | } |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 486 | png_ptr->num_palette = (png_uint_16)num_palette; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 487 | |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 488 | if (full_quantize) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 489 | { |
| 490 | int i; |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 491 | png_bytep distance; |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 492 | int total_bits = PNG_QUANTIZE_RED_BITS + PNG_QUANTIZE_GREEN_BITS + |
| 493 | PNG_QUANTIZE_BLUE_BITS; |
| 494 | int num_red = (1 << PNG_QUANTIZE_RED_BITS); |
| 495 | int num_green = (1 << PNG_QUANTIZE_GREEN_BITS); |
| 496 | int num_blue = (1 << PNG_QUANTIZE_BLUE_BITS); |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 497 | png_size_t num_entries = ((png_size_t)1 << total_bits); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 498 | |
Glenn Randers-Pehrson | 79134c6 | 2009-02-14 10:32:18 -0600 | [diff] [blame] | 499 | png_ptr->palette_lookup = (png_bytep )png_calloc(png_ptr, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 500 | (png_uint_32)(num_entries * png_sizeof(png_byte))); |
Glenn Randers-Pehrson | 82ae383 | 2001-04-20 10:32:10 -0500 | [diff] [blame] | 501 | |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 502 | distance = (png_bytep)png_malloc(png_ptr, (png_uint_32)(num_entries * |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 503 | png_sizeof(png_byte))); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 504 | |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 505 | png_memset(distance, 0xff, num_entries * png_sizeof(png_byte)); |
Glenn Randers-Pehrson | 82ae383 | 2001-04-20 10:32:10 -0500 | [diff] [blame] | 506 | |
| 507 | for (i = 0; i < num_palette; i++) |
| 508 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 509 | int ir, ig, ib; |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 510 | int r = (palette[i].red >> (8 - PNG_QUANTIZE_RED_BITS)); |
| 511 | int g = (palette[i].green >> (8 - PNG_QUANTIZE_GREEN_BITS)); |
| 512 | int b = (palette[i].blue >> (8 - PNG_QUANTIZE_BLUE_BITS)); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 513 | |
| 514 | for (ir = 0; ir < num_red; ir++) |
| 515 | { |
Glenn Randers-Pehrson | d029a75 | 2004-08-09 21:50:32 -0500 | [diff] [blame] | 516 | /* int dr = abs(ir - r); */ |
| 517 | int dr = ((ir > r) ? ir - r : r - ir); |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 518 | int index_r = (ir << (PNG_QUANTIZE_BLUE_BITS + |
| 519 | PNG_QUANTIZE_GREEN_BITS)); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 520 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 521 | for (ig = 0; ig < num_green; ig++) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 522 | { |
Glenn Randers-Pehrson | d029a75 | 2004-08-09 21:50:32 -0500 | [diff] [blame] | 523 | /* int dg = abs(ig - g); */ |
| 524 | int dg = ((ig > g) ? ig - g : g - ig); |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 525 | int dt = dr + dg; |
| 526 | int dm = ((dr > dg) ? dr : dg); |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 527 | int index_g = index_r | (ig << PNG_QUANTIZE_BLUE_BITS); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 528 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 529 | for (ib = 0; ib < num_blue; ib++) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 530 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 531 | int d_index = index_g | ib; |
Glenn Randers-Pehrson | d029a75 | 2004-08-09 21:50:32 -0500 | [diff] [blame] | 532 | /* int db = abs(ib - b); */ |
| 533 | int db = ((ib > b) ? ib - b : b - ib); |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 534 | int dmax = ((dm > db) ? dm : db); |
| 535 | int d = dmax + dt + db; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 536 | |
Glenn Randers-Pehrson | 0f881d6 | 1998-02-07 10:20:57 -0600 | [diff] [blame] | 537 | if (d < (int)distance[d_index]) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 538 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 539 | distance[d_index] = (png_byte)d; |
| 540 | png_ptr->palette_lookup[d_index] = (png_byte)i; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 541 | } |
| 542 | } |
Glenn Randers-Pehrson | 82ae383 | 2001-04-20 10:32:10 -0500 | [diff] [blame] | 543 | } |
| 544 | } |
| 545 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 546 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 547 | png_free(png_ptr, distance); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 548 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 549 | } |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 550 | #endif /* PNG_READ_QUANTIZE_SUPPORTED */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 551 | |
Glenn Randers-Pehrson | 166c5a3 | 1999-12-10 09:43:02 -0600 | [diff] [blame] | 552 | #if defined(PNG_READ_GAMMA_SUPPORTED) && defined(PNG_FLOATING_POINT_SUPPORTED) |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 553 | /* 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] | 554 | * only do transformations on images where the file_gamma and screen_gamma |
| 555 | * are not close reciprocals, otherwise it slows things down slightly, and |
| 556 | * also needlessly introduces small errors. |
Glenn Randers-Pehrson | c6de22d | 2002-02-23 18:55:25 -0600 | [diff] [blame] | 557 | * |
| 558 | * We will turn off gamma transformation later if no semitransparent entries |
| 559 | * are present in the tRNS array for palette images. We can't do it here |
| 560 | * because we don't necessarily have the tRNS chunk yet. |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 561 | */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 562 | void PNGAPI |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 563 | 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] | 564 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 565 | png_debug(1, "in png_set_gamma"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 566 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 567 | if (png_ptr == NULL) |
| 568 | return; |
Glenn Randers-Pehrson | b3ce365 | 2009-08-15 21:47:03 -0500 | [diff] [blame] | 569 | |
Glenn Randers-Pehrson | c6de22d | 2002-02-23 18:55:25 -0600 | [diff] [blame] | 570 | if ((fabs(scrn_gamma * file_gamma - 1.0) > PNG_GAMMA_THRESHOLD) || |
| 571 | (png_ptr->color_type & PNG_COLOR_MASK_ALPHA) || |
| 572 | (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)) |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 573 | png_ptr->transformations |= PNG_GAMMA; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 574 | png_ptr->gamma = (float)file_gamma; |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 575 | png_ptr->screen_gamma = (float)scrn_gamma; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 576 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 577 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 578 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 579 | #ifdef PNG_READ_EXPAND_SUPPORTED |
Glenn Randers-Pehrson | 352ca6b | 1999-09-18 15:49:20 -0500 | [diff] [blame] | 580 | /* Expand paletted images to RGB, expand grayscale images of |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 581 | * 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] | 582 | * to alpha channels. |
| 583 | */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 584 | void PNGAPI |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 585 | png_set_expand(png_structp png_ptr) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 586 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 587 | png_debug(1, "in png_set_expand"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 588 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 589 | if (png_ptr == NULL) |
| 590 | return; |
Glenn Randers-Pehrson | b3ce365 | 2009-08-15 21:47:03 -0500 | [diff] [blame] | 591 | |
Glenn Randers-Pehrson | 1ce0836 | 2006-03-08 23:35:59 -0600 | [diff] [blame] | 592 | png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS); |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 593 | png_ptr->flags &= ~PNG_FLAG_ROW_INIT; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 594 | } |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 595 | |
| 596 | /* GRR 19990627: the following three functions currently are identical |
| 597 | * to png_set_expand(). However, it is entirely reasonable that someone |
| 598 | * might wish to expand an indexed image to RGB but *not* expand a single, |
| 599 | * fully transparent palette entry to a full alpha channel--perhaps instead |
| 600 | * convert tRNS to the grayscale/RGB format (16-bit RGB value), or replace |
| 601 | * the transparent color with a particular RGB value, or drop tRNS entirely. |
| 602 | * IOW, a future version of the library may make the transformations flag |
| 603 | * a bit more fine-grained, with separate bits for each of these three |
| 604 | * functions. |
| 605 | * |
| 606 | * More to the point, these functions make it obvious what libpng will be |
| 607 | * doing, whereas "expand" can (and does) mean any number of things. |
Glenn Randers-Pehrson | 1ce0836 | 2006-03-08 23:35:59 -0600 | [diff] [blame] | 608 | * |
Glenn Randers-Pehrson | 17ca340 | 2009-11-09 06:51:16 -0600 | [diff] [blame] | 609 | * GRP 20060307: In libpng-1.2.9, png_set_gray_1_2_4_to_8() was modified |
| 610 | * to expand only the sample depth but not to expand the tRNS to alpha |
| 611 | * and its name was changed to png_set_expand_gray_1_2_4_to_8(). |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 612 | */ |
| 613 | |
| 614 | /* Expand paletted images to RGB. */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 615 | void PNGAPI |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 616 | png_set_palette_to_rgb(png_structp png_ptr) |
| 617 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 618 | png_debug(1, "in png_set_palette_to_rgb"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 619 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 620 | if (png_ptr == NULL) |
| 621 | return; |
Glenn Randers-Pehrson | b3ce365 | 2009-08-15 21:47:03 -0500 | [diff] [blame] | 622 | |
Glenn Randers-Pehrson | 1ce0836 | 2006-03-08 23:35:59 -0600 | [diff] [blame] | 623 | png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS); |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 624 | png_ptr->flags &= ~PNG_FLAG_ROW_INIT; |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 625 | } |
| 626 | |
| 627 | /* Expand grayscale images of less than 8-bit depth to 8 bits. */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 628 | void PNGAPI |
Glenn Randers-Pehrson | 1ce0836 | 2006-03-08 23:35:59 -0600 | [diff] [blame] | 629 | png_set_expand_gray_1_2_4_to_8(png_structp png_ptr) |
| 630 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 631 | png_debug(1, "in png_set_expand_gray_1_2_4_to_8"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 632 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 633 | if (png_ptr == NULL) |
| 634 | return; |
Glenn Randers-Pehrson | b3ce365 | 2009-08-15 21:47:03 -0500 | [diff] [blame] | 635 | |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 636 | png_ptr->transformations |= PNG_EXPAND; |
| 637 | png_ptr->flags &= ~PNG_FLAG_ROW_INIT; |
Glenn Randers-Pehrson | 1ce0836 | 2006-03-08 23:35:59 -0600 | [diff] [blame] | 638 | } |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 639 | |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 640 | |
| 641 | |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 642 | /* Expand tRNS chunks to alpha channels. */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 643 | void PNGAPI |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 644 | png_set_tRNS_to_alpha(png_structp png_ptr) |
| 645 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 646 | png_debug(1, "in png_set_tRNS_to_alpha"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 647 | |
Glenn Randers-Pehrson | 1ce0836 | 2006-03-08 23:35:59 -0600 | [diff] [blame] | 648 | png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS); |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 649 | png_ptr->flags &= ~PNG_FLAG_ROW_INIT; |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 650 | } |
| 651 | #endif /* defined(PNG_READ_EXPAND_SUPPORTED) */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 652 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 653 | #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 654 | void PNGAPI |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 655 | png_set_gray_to_rgb(png_structp png_ptr) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 656 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 657 | png_debug(1, "in png_set_gray_to_rgb"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 658 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 659 | png_ptr->transformations |= PNG_GRAY_TO_RGB; |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 660 | png_ptr->flags &= ~PNG_FLAG_ROW_INIT; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 661 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 662 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 663 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 664 | #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED |
| 665 | #ifdef PNG_FLOATING_POINT_SUPPORTED |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 666 | /* Convert a RGB image to a grayscale of the same width. This allows us, |
| 667 | * for example, to convert a 24 bpp RGB image into an 8 bpp grayscale image. |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 668 | */ |
Glenn Randers-Pehrson | 520a764 | 2000-03-21 05:13:06 -0600 | [diff] [blame] | 669 | |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 670 | void PNGAPI |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 671 | png_set_rgb_to_gray(png_structp png_ptr, int error_action, double red, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 672 | double green) |
Glenn Randers-Pehrson | 520a764 | 2000-03-21 05:13:06 -0600 | [diff] [blame] | 673 | { |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 674 | int red_fixed = (int)((float)red*100000.0 + 0.5); |
| 675 | int green_fixed = (int)((float)green*100000.0 + 0.5); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 676 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 677 | if (png_ptr == NULL) |
| 678 | return; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 679 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 680 | png_set_rgb_to_gray_fixed(png_ptr, error_action, red_fixed, green_fixed); |
Glenn Randers-Pehrson | 520a764 | 2000-03-21 05:13:06 -0600 | [diff] [blame] | 681 | } |
| 682 | #endif |
| 683 | |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 684 | void PNGAPI |
Glenn Randers-Pehrson | 520a764 | 2000-03-21 05:13:06 -0600 | [diff] [blame] | 685 | png_set_rgb_to_gray_fixed(png_structp png_ptr, int error_action, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 686 | png_fixed_point red, png_fixed_point green) |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 687 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 688 | png_debug(1, "in png_set_rgb_to_gray"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 689 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 690 | if (png_ptr == NULL) |
| 691 | return; |
Glenn Randers-Pehrson | b3ce365 | 2009-08-15 21:47:03 -0500 | [diff] [blame] | 692 | |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 693 | switch(error_action) |
| 694 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 695 | case 1: |
| 696 | png_ptr->transformations |= PNG_RGB_TO_GRAY; |
| 697 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 698 | |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 699 | case 2: |
| 700 | png_ptr->transformations |= PNG_RGB_TO_GRAY_WARN; |
| 701 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 702 | |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 703 | case 3: |
| 704 | png_ptr->transformations |= PNG_RGB_TO_GRAY_ERR; |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 705 | } |
| 706 | if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 707 | #ifdef PNG_READ_EXPAND_SUPPORTED |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 708 | png_ptr->transformations |= PNG_EXPAND; |
| 709 | #else |
| 710 | { |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 711 | png_warning(png_ptr, |
| 712 | "Cannot do RGB_TO_GRAY without EXPAND_SUPPORTED"); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 713 | |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 714 | png_ptr->transformations &= ~PNG_RGB_TO_GRAY; |
| 715 | } |
| 716 | #endif |
| 717 | { |
Glenn Randers-Pehrson | 520a764 | 2000-03-21 05:13:06 -0600 | [diff] [blame] | 718 | png_uint_16 red_int, green_int; |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 719 | if (red < 0 || green < 0) |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 720 | { |
Glenn Randers-Pehrson | 520a764 | 2000-03-21 05:13:06 -0600 | [diff] [blame] | 721 | red_int = 6968; /* .212671 * 32768 + .5 */ |
| 722 | green_int = 23434; /* .715160 * 32768 + .5 */ |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 723 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 724 | |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 725 | else if (red + green < 100000L) |
Glenn Randers-Pehrson | 520a764 | 2000-03-21 05:13:06 -0600 | [diff] [blame] | 726 | { |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 727 | red_int = (png_uint_16)(((png_uint_32)red*32768L)/100000L); |
| 728 | green_int = (png_uint_16)(((png_uint_32)green*32768L)/100000L); |
Glenn Randers-Pehrson | 520a764 | 2000-03-21 05:13:06 -0600 | [diff] [blame] | 729 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 730 | |
Glenn Randers-Pehrson | 520a764 | 2000-03-21 05:13:06 -0600 | [diff] [blame] | 731 | else |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 732 | { |
| 733 | png_warning(png_ptr, "ignoring out of range rgb_to_gray coefficients"); |
Glenn Randers-Pehrson | 520a764 | 2000-03-21 05:13:06 -0600 | [diff] [blame] | 734 | red_int = 6968; |
| 735 | green_int = 23434; |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 736 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 737 | |
Glenn Randers-Pehrson | 520a764 | 2000-03-21 05:13:06 -0600 | [diff] [blame] | 738 | png_ptr->rgb_to_gray_red_coeff = red_int; |
| 739 | png_ptr->rgb_to_gray_green_coeff = green_int; |
Glenn Randers-Pehrson | 79134c6 | 2009-02-14 10:32:18 -0600 | [diff] [blame] | 740 | png_ptr->rgb_to_gray_blue_coeff = |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 741 | (png_uint_16)(32768 - red_int - green_int); |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 742 | } |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 743 | } |
| 744 | #endif |
| 745 | |
Glenn Randers-Pehrson | 6942d53 | 2000-05-01 09:31:54 -0500 | [diff] [blame] | 746 | #if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \ |
Glenn Randers-Pehrson | 33188ac | 2009-06-16 14:12:35 -0500 | [diff] [blame] | 747 | defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED) |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 748 | void PNGAPI |
Glenn Randers-Pehrson | 08a3343 | 1998-03-07 06:06:55 -0600 | [diff] [blame] | 749 | png_set_read_user_transform_fn(png_structp png_ptr, png_user_transform_ptr |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 750 | read_user_transform_fn) |
Glenn Randers-Pehrson | 08a3343 | 1998-03-07 06:06:55 -0600 | [diff] [blame] | 751 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 752 | png_debug(1, "in png_set_read_user_transform_fn"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 753 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 754 | if (png_ptr == NULL) |
| 755 | return; |
Glenn Randers-Pehrson | b3ce365 | 2009-08-15 21:47:03 -0500 | [diff] [blame] | 756 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 757 | #ifdef PNG_READ_USER_TRANSFORM_SUPPORTED |
Glenn Randers-Pehrson | 08a3343 | 1998-03-07 06:06:55 -0600 | [diff] [blame] | 758 | png_ptr->transformations |= PNG_USER_TRANSFORM; |
| 759 | png_ptr->read_user_transform_fn = read_user_transform_fn; |
Glenn Randers-Pehrson | 6942d53 | 2000-05-01 09:31:54 -0500 | [diff] [blame] | 760 | #endif |
Glenn Randers-Pehrson | 08a3343 | 1998-03-07 06:06:55 -0600 | [diff] [blame] | 761 | } |
| 762 | #endif |
| 763 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 764 | /* Initialize everything needed for the read. This includes modifying |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 765 | * the palette. |
| 766 | */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 767 | void /* PRIVATE */ |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 768 | png_init_read_transformations(png_structp png_ptr) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 769 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 770 | png_debug(1, "in png_init_read_transformations"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 771 | |
Glenn Randers-Pehrson | 8686fff | 1998-05-21 09:27:50 -0500 | [diff] [blame] | 772 | { |
Glenn Randers-Pehrson | e3f3c4e | 2010-02-07 18:08:50 -0600 | [diff] [blame] | 773 | #if defined(PNG_READ_BACKGROUND_SUPPORTED) || \ |
| 774 | defined(PNG_READ_SHIFT_SUPPORTED) || \ |
| 775 | defined(PNG_READ_GAMMA_SUPPORTED) |
Glenn Randers-Pehrson | 8686fff | 1998-05-21 09:27:50 -0500 | [diff] [blame] | 776 | int color_type = png_ptr->color_type; |
| 777 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 778 | |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 779 | #if defined(PNG_READ_EXPAND_SUPPORTED) && defined(PNG_READ_BACKGROUND_SUPPORTED) |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 780 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 781 | #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 782 | /* Detect gray background and attempt to enable optimization |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 783 | * for gray --> RGB case |
| 784 | * |
| 785 | * Note: if PNG_BACKGROUND_EXPAND is set and color_type is either RGB or |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 786 | * RGB_ALPHA (in which case need_expand is superfluous anyway), the |
| 787 | * background color might actually be gray yet not be flagged as such. |
| 788 | * This is not a problem for the current code, which uses |
| 789 | * PNG_BACKGROUND_IS_GRAY only to decide when to do the |
| 790 | * png_do_gray_to_rgb() transformation. |
| 791 | */ |
| 792 | if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) && |
| 793 | !(color_type & PNG_COLOR_MASK_COLOR)) |
| 794 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 795 | png_ptr->mode |= PNG_BACKGROUND_IS_GRAY; |
| 796 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 797 | |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 798 | else if ((png_ptr->transformations & PNG_BACKGROUND) && |
| 799 | !(png_ptr->transformations & PNG_BACKGROUND_EXPAND) && |
| 800 | (png_ptr->transformations & PNG_GRAY_TO_RGB) && |
| 801 | png_ptr->background.red == png_ptr->background.green && |
| 802 | png_ptr->background.red == png_ptr->background.blue) |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 803 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 804 | png_ptr->mode |= PNG_BACKGROUND_IS_GRAY; |
| 805 | png_ptr->background.gray = png_ptr->background.red; |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 806 | } |
| 807 | #endif |
| 808 | |
Glenn Randers-Pehrson | a77ef62 | 2000-02-18 13:48:52 -0600 | [diff] [blame] | 809 | if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) && |
| 810 | (png_ptr->transformations & PNG_EXPAND)) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 811 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 812 | 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] | 813 | { |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 814 | /* Expand background and tRNS chunks */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 815 | switch (png_ptr->bit_depth) |
| 816 | { |
| 817 | case 1: |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 818 | png_ptr->background.gray *= (png_uint_16)0xff; |
Glenn Randers-Pehrson | 73d57cb | 2002-03-25 18:49:08 -0600 | [diff] [blame] | 819 | png_ptr->background.red = png_ptr->background.green |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 820 | = png_ptr->background.blue = png_ptr->background.gray; |
Glenn Randers-Pehrson | 1ce0836 | 2006-03-08 23:35:59 -0600 | [diff] [blame] | 821 | if (!(png_ptr->transformations & PNG_EXPAND_tRNS)) |
| 822 | { |
Glenn Randers-Pehrson | 56f6396 | 2008-10-06 10:16:17 -0500 | [diff] [blame] | 823 | png_ptr->trans_color.gray *= (png_uint_16)0xff; |
| 824 | png_ptr->trans_color.red = png_ptr->trans_color.green |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 825 | = png_ptr->trans_color.blue = png_ptr->trans_color.gray; |
Glenn Randers-Pehrson | 1ce0836 | 2006-03-08 23:35:59 -0600 | [diff] [blame] | 826 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 827 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 828 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 829 | case 2: |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 830 | png_ptr->background.gray *= (png_uint_16)0x55; |
Glenn Randers-Pehrson | 73d57cb | 2002-03-25 18:49:08 -0600 | [diff] [blame] | 831 | png_ptr->background.red = png_ptr->background.green |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 832 | = png_ptr->background.blue = png_ptr->background.gray; |
Glenn Randers-Pehrson | 1ce0836 | 2006-03-08 23:35:59 -0600 | [diff] [blame] | 833 | if (!(png_ptr->transformations & PNG_EXPAND_tRNS)) |
| 834 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 835 | png_ptr->trans_color.gray *= (png_uint_16)0x55; |
| 836 | png_ptr->trans_color.red = png_ptr->trans_color.green |
| 837 | = png_ptr->trans_color.blue = png_ptr->trans_color.gray; |
Glenn Randers-Pehrson | 1ce0836 | 2006-03-08 23:35:59 -0600 | [diff] [blame] | 838 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 839 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 840 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 841 | case 4: |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 842 | png_ptr->background.gray *= (png_uint_16)0x11; |
Glenn Randers-Pehrson | 73d57cb | 2002-03-25 18:49:08 -0600 | [diff] [blame] | 843 | png_ptr->background.red = png_ptr->background.green |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 844 | = png_ptr->background.blue = png_ptr->background.gray; |
Glenn Randers-Pehrson | 1ce0836 | 2006-03-08 23:35:59 -0600 | [diff] [blame] | 845 | if (!(png_ptr->transformations & PNG_EXPAND_tRNS)) |
| 846 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 847 | png_ptr->trans_color.gray *= (png_uint_16)0x11; |
| 848 | png_ptr->trans_color.red = png_ptr->trans_color.green |
| 849 | = png_ptr->trans_color.blue = png_ptr->trans_color.gray; |
Glenn Randers-Pehrson | 1ce0836 | 2006-03-08 23:35:59 -0600 | [diff] [blame] | 850 | } |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 851 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 852 | |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 853 | case 8: |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 854 | |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 855 | case 16: |
Glenn Randers-Pehrson | 73d57cb | 2002-03-25 18:49:08 -0600 | [diff] [blame] | 856 | png_ptr->background.red = png_ptr->background.green |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 857 | = png_ptr->background.blue = png_ptr->background.gray; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 858 | break; |
| 859 | } |
| 860 | } |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 861 | else if (color_type == PNG_COLOR_TYPE_PALETTE) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 862 | { |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 863 | png_ptr->background.red = |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 864 | png_ptr->palette[png_ptr->background.index].red; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 865 | png_ptr->background.green = |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 866 | png_ptr->palette[png_ptr->background.index].green; |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 867 | png_ptr->background.blue = |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 868 | png_ptr->palette[png_ptr->background.index].blue; |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 869 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 870 | #ifdef PNG_READ_INVERT_ALPHA_SUPPORTED |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 871 | if (png_ptr->transformations & PNG_INVERT_ALPHA) |
| 872 | { |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 873 | #ifdef PNG_READ_EXPAND_SUPPORTED |
Glenn Randers-Pehrson | 1ce0836 | 2006-03-08 23:35:59 -0600 | [diff] [blame] | 874 | if (!(png_ptr->transformations & PNG_EXPAND_tRNS)) |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 875 | #endif |
| 876 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 877 | /* Invert the alpha channel (in tRNS) unless the pixels are |
| 878 | * going to be expanded, in which case leave it for later |
| 879 | */ |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 880 | int i, istop; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 881 | istop=(int)png_ptr->num_trans; |
| 882 | for (i=0; i<istop; i++) |
Glenn Randers-Pehrson | 6abea75 | 2009-08-08 16:52:06 -0500 | [diff] [blame] | 883 | png_ptr->trans_alpha[i] = (png_byte)(255 - png_ptr->trans_alpha[i]); |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 884 | } |
| 885 | } |
| 886 | #endif |
| 887 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 888 | } |
| 889 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 890 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 891 | |
Glenn Randers-Pehrson | 5a0be34 | 2001-10-18 20:55:13 -0500 | [diff] [blame] | 892 | #if defined(PNG_READ_BACKGROUND_SUPPORTED) && defined(PNG_READ_GAMMA_SUPPORTED) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 893 | png_ptr->background_1 = png_ptr->background; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 894 | #endif |
Glenn Randers-Pehrson | 166c5a3 | 1999-12-10 09:43:02 -0600 | [diff] [blame] | 895 | #if defined(PNG_READ_GAMMA_SUPPORTED) && defined(PNG_FLOATING_POINT_SUPPORTED) |
Glenn Randers-Pehrson | c6de22d | 2002-02-23 18:55:25 -0600 | [diff] [blame] | 896 | |
| 897 | if ((color_type == PNG_COLOR_TYPE_PALETTE && png_ptr->num_trans != 0) |
| 898 | && (fabs(png_ptr->screen_gamma * png_ptr->gamma - 1.0) |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 899 | < PNG_GAMMA_THRESHOLD)) |
Glenn Randers-Pehrson | c6de22d | 2002-02-23 18:55:25 -0600 | [diff] [blame] | 900 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 901 | int i, k; |
| 902 | k=0; |
| 903 | for (i=0; i<png_ptr->num_trans; i++) |
| 904 | { |
| 905 | if (png_ptr->trans_alpha[i] != 0 && png_ptr->trans_alpha[i] != 0xff) |
| 906 | k=1; /* Partial transparency is present */ |
| 907 | } |
| 908 | if (k == 0) |
| 909 | png_ptr->transformations &= ~PNG_GAMMA; |
Glenn Randers-Pehrson | c6de22d | 2002-02-23 18:55:25 -0600 | [diff] [blame] | 910 | } |
| 911 | |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 912 | if ((png_ptr->transformations & (PNG_GAMMA | PNG_RGB_TO_GRAY)) && |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 913 | png_ptr->gamma != 0.0) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 914 | { |
Glenn Randers-Pehrson | f81b50b | 2009-12-29 16:50:15 -0600 | [diff] [blame] | 915 | png_build_gamma_table(png_ptr, png_ptr->bit_depth); |
Glenn Randers-Pehrson | ffa8924 | 2009-12-13 08:14:40 -0600 | [diff] [blame] | 916 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 917 | #ifdef PNG_READ_BACKGROUND_SUPPORTED |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 918 | if (png_ptr->transformations & PNG_BACKGROUND) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 919 | { |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 920 | if (color_type == PNG_COLOR_TYPE_PALETTE) |
| 921 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 922 | /* Could skip if no transparency */ |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 923 | png_color back, back_1; |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 924 | png_colorp palette = png_ptr->palette; |
| 925 | int num_palette = png_ptr->num_palette; |
| 926 | int i; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 927 | if (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_FILE) |
| 928 | { |
| 929 | back.red = png_ptr->gamma_table[png_ptr->background.red]; |
| 930 | back.green = png_ptr->gamma_table[png_ptr->background.green]; |
| 931 | back.blue = png_ptr->gamma_table[png_ptr->background.blue]; |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 932 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 933 | back_1.red = png_ptr->gamma_to_1[png_ptr->background.red]; |
| 934 | back_1.green = png_ptr->gamma_to_1[png_ptr->background.green]; |
| 935 | back_1.blue = png_ptr->gamma_to_1[png_ptr->background.blue]; |
| 936 | } |
| 937 | else |
| 938 | { |
Glenn Randers-Pehrson | 8f8fb6a | 1998-03-09 23:02:06 -0600 | [diff] [blame] | 939 | double g, gs; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 940 | |
Glenn Randers-Pehrson | 8f8fb6a | 1998-03-09 23:02:06 -0600 | [diff] [blame] | 941 | switch (png_ptr->background_gamma_type) |
Glenn Randers-Pehrson | 4922b1b | 1998-03-08 22:55:17 -0600 | [diff] [blame] | 942 | { |
Glenn Randers-Pehrson | 8f8fb6a | 1998-03-09 23:02:06 -0600 | [diff] [blame] | 943 | case PNG_BACKGROUND_GAMMA_SCREEN: |
| 944 | g = (png_ptr->screen_gamma); |
| 945 | gs = 1.0; |
| 946 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 947 | |
Glenn Randers-Pehrson | 8f8fb6a | 1998-03-09 23:02:06 -0600 | [diff] [blame] | 948 | case PNG_BACKGROUND_GAMMA_FILE: |
| 949 | g = 1.0 / (png_ptr->gamma); |
| 950 | gs = 1.0 / (png_ptr->gamma * png_ptr->screen_gamma); |
| 951 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 952 | |
Glenn Randers-Pehrson | 8f8fb6a | 1998-03-09 23:02:06 -0600 | [diff] [blame] | 953 | case PNG_BACKGROUND_GAMMA_UNIQUE: |
| 954 | g = 1.0 / (png_ptr->background_gamma); |
| 955 | gs = 1.0 / (png_ptr->background_gamma * |
| 956 | png_ptr->screen_gamma); |
| 957 | break; |
| 958 | default: |
| 959 | g = 1.0; /* back_1 */ |
| 960 | gs = 1.0; /* back */ |
| 961 | } |
| 962 | |
Glenn Randers-Pehrson | f9f2fe0 | 1998-03-15 18:20:23 -0600 | [diff] [blame] | 963 | if ( fabs(gs - 1.0) < PNG_GAMMA_THRESHOLD) |
Glenn Randers-Pehrson | 8f8fb6a | 1998-03-09 23:02:06 -0600 | [diff] [blame] | 964 | { |
| 965 | back.red = (png_byte)png_ptr->background.red; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 966 | back.green = (png_byte)png_ptr->background.green; |
Glenn Randers-Pehrson | 8f8fb6a | 1998-03-09 23:02:06 -0600 | [diff] [blame] | 967 | back.blue = (png_byte)png_ptr->background.blue; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 968 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 969 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 970 | else |
| 971 | { |
Glenn Randers-Pehrson | 8f8fb6a | 1998-03-09 23:02:06 -0600 | [diff] [blame] | 972 | back.red = (png_byte)(pow( |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 973 | (double)png_ptr->background.red/255.0, gs) * 255.0 + .5); |
Glenn Randers-Pehrson | 8f8fb6a | 1998-03-09 23:02:06 -0600 | [diff] [blame] | 974 | back.green = (png_byte)(pow( |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 975 | (double)png_ptr->background.green/255.0, gs) * 255.0 |
| 976 | + .5); |
Glenn Randers-Pehrson | 8f8fb6a | 1998-03-09 23:02:06 -0600 | [diff] [blame] | 977 | back.blue = (png_byte)(pow( |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 978 | (double)png_ptr->background.blue/255.0, gs) * 255.0 |
| 979 | + .5); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 980 | } |
| 981 | |
Glenn Randers-Pehrson | 8f8fb6a | 1998-03-09 23:02:06 -0600 | [diff] [blame] | 982 | back_1.red = (png_byte)(pow( |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 983 | (double)png_ptr->background.red/255.0, g) * 255.0 + .5); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 984 | |
Glenn Randers-Pehrson | 8f8fb6a | 1998-03-09 23:02:06 -0600 | [diff] [blame] | 985 | back_1.green = (png_byte)(pow( |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 986 | (double)png_ptr->background.green/255.0, g) * 255.0 + .5); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 987 | |
Glenn Randers-Pehrson | 8f8fb6a | 1998-03-09 23:02:06 -0600 | [diff] [blame] | 988 | back_1.blue = (png_byte)(pow( |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 989 | (double)png_ptr->background.blue/255.0, g) * 255.0 + .5); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 990 | } |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 991 | for (i = 0; i < num_palette; i++) |
| 992 | { |
Glenn Randers-Pehrson | 6abea75 | 2009-08-08 16:52:06 -0500 | [diff] [blame] | 993 | if (i < (int)png_ptr->num_trans && png_ptr->trans_alpha[i] != 0xff) |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 994 | { |
Glenn Randers-Pehrson | 6abea75 | 2009-08-08 16:52:06 -0500 | [diff] [blame] | 995 | if (png_ptr->trans_alpha[i] == 0) |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 996 | { |
| 997 | palette[i] = back; |
| 998 | } |
Glenn Randers-Pehrson | 6abea75 | 2009-08-08 16:52:06 -0500 | [diff] [blame] | 999 | else /* if (png_ptr->trans_alpha[i] != 0xff) */ |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1000 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1001 | png_byte v, w; |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1002 | |
| 1003 | v = png_ptr->gamma_to_1[palette[i].red]; |
Glenn Randers-Pehrson | 6abea75 | 2009-08-08 16:52:06 -0500 | [diff] [blame] | 1004 | png_composite(w, v, png_ptr->trans_alpha[i], back_1.red); |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1005 | palette[i].red = png_ptr->gamma_from_1[w]; |
| 1006 | |
| 1007 | v = png_ptr->gamma_to_1[palette[i].green]; |
Glenn Randers-Pehrson | 6abea75 | 2009-08-08 16:52:06 -0500 | [diff] [blame] | 1008 | png_composite(w, v, png_ptr->trans_alpha[i], back_1.green); |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1009 | palette[i].green = png_ptr->gamma_from_1[w]; |
| 1010 | |
| 1011 | v = png_ptr->gamma_to_1[palette[i].blue]; |
Glenn Randers-Pehrson | 6abea75 | 2009-08-08 16:52:06 -0500 | [diff] [blame] | 1012 | png_composite(w, v, png_ptr->trans_alpha[i], back_1.blue); |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1013 | palette[i].blue = png_ptr->gamma_from_1[w]; |
| 1014 | } |
| 1015 | } |
| 1016 | else |
| 1017 | { |
| 1018 | palette[i].red = png_ptr->gamma_table[palette[i].red]; |
| 1019 | palette[i].green = png_ptr->gamma_table[palette[i].green]; |
| 1020 | palette[i].blue = png_ptr->gamma_table[palette[i].blue]; |
| 1021 | } |
| 1022 | } |
Glenn Randers-Pehrson | 72cbc6e | 2009-09-20 07:28:43 -0500 | [diff] [blame] | 1023 | /* Prevent the transformations being done again, and make sure |
| 1024 | * that the now spurious alpha channel is stripped - the code |
| 1025 | * has just reduced background composition and gamma correction |
| 1026 | * to a simple alpha channel strip. |
| 1027 | */ |
| 1028 | png_ptr->transformations &= ~PNG_BACKGROUND; |
| 1029 | png_ptr->transformations &= ~PNG_GAMMA; |
| 1030 | png_ptr->transformations |= PNG_STRIP_ALPHA; |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1031 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 1032 | |
Glenn Randers-Pehrson | d1e8c86 | 2002-06-20 06:54:34 -0500 | [diff] [blame] | 1033 | /* if (png_ptr->background_gamma_type!=PNG_BACKGROUND_GAMMA_UNKNOWN) */ |
Glenn Randers-Pehrson | cbe52d8 | 1998-02-28 07:00:24 -0600 | [diff] [blame] | 1034 | else |
| 1035 | /* color_type != PNG_COLOR_TYPE_PALETTE */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1036 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1037 | double m = (double)(((png_uint_32)1 << png_ptr->bit_depth) - 1); |
| 1038 | double g = 1.0; |
| 1039 | double gs = 1.0; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1040 | |
| 1041 | switch (png_ptr->background_gamma_type) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 1042 | { |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1043 | case PNG_BACKGROUND_GAMMA_SCREEN: |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 1044 | g = (png_ptr->screen_gamma); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1045 | gs = 1.0; |
| 1046 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1047 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1048 | case PNG_BACKGROUND_GAMMA_FILE: |
| 1049 | g = 1.0 / (png_ptr->gamma); |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 1050 | gs = 1.0 / (png_ptr->gamma * png_ptr->screen_gamma); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1051 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1052 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1053 | case PNG_BACKGROUND_GAMMA_UNIQUE: |
| 1054 | g = 1.0 / (png_ptr->background_gamma); |
| 1055 | gs = 1.0 / (png_ptr->background_gamma * |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 1056 | png_ptr->screen_gamma); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1057 | break; |
| 1058 | } |
| 1059 | |
Glenn Randers-Pehrson | 377657d | 2002-03-08 01:31:27 -0600 | [diff] [blame] | 1060 | png_ptr->background_1.gray = (png_uint_16)(pow( |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1061 | (double)png_ptr->background.gray / m, g) * m + .5); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 1062 | |
Glenn Randers-Pehrson | 377657d | 2002-03-08 01:31:27 -0600 | [diff] [blame] | 1063 | png_ptr->background.gray = (png_uint_16)(pow( |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1064 | (double)png_ptr->background.gray / m, gs) * m + .5); |
Glenn Randers-Pehrson | 377657d | 2002-03-08 01:31:27 -0600 | [diff] [blame] | 1065 | |
Glenn Randers-Pehrson | 73d57cb | 2002-03-25 18:49:08 -0600 | [diff] [blame] | 1066 | if ((png_ptr->background.red != png_ptr->background.green) || |
| 1067 | (png_ptr->background.red != png_ptr->background.blue) || |
| 1068 | (png_ptr->background.red != png_ptr->background.gray)) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1069 | { |
Glenn Randers-Pehrson | 73d57cb | 2002-03-25 18:49:08 -0600 | [diff] [blame] | 1070 | /* RGB or RGBA with color background */ |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 1071 | png_ptr->background_1.red = (png_uint_16)(pow( |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1072 | (double)png_ptr->background.red / m, g) * m + .5); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 1073 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1074 | png_ptr->background_1.green = (png_uint_16)(pow( |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1075 | (double)png_ptr->background.green / m, g) * m + .5); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 1076 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1077 | png_ptr->background_1.blue = (png_uint_16)(pow( |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1078 | (double)png_ptr->background.blue / m, g) * m + .5); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 1079 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1080 | png_ptr->background.red = (png_uint_16)(pow( |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1081 | (double)png_ptr->background.red / m, gs) * m + .5); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 1082 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1083 | png_ptr->background.green = (png_uint_16)(pow( |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1084 | (double)png_ptr->background.green / m, gs) * m + .5); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 1085 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1086 | png_ptr->background.blue = (png_uint_16)(pow( |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1087 | (double)png_ptr->background.blue / m, gs) * m + .5); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1088 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 1089 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1090 | else |
| 1091 | { |
Glenn Randers-Pehrson | 73d57cb | 2002-03-25 18:49:08 -0600 | [diff] [blame] | 1092 | /* GRAY, GRAY ALPHA, RGB, or RGBA with gray background */ |
| 1093 | png_ptr->background_1.red = png_ptr->background_1.green |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1094 | = png_ptr->background_1.blue = png_ptr->background_1.gray; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 1095 | |
Glenn Randers-Pehrson | 73d57cb | 2002-03-25 18:49:08 -0600 | [diff] [blame] | 1096 | png_ptr->background.red = png_ptr->background.green |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1097 | = png_ptr->background.blue = png_ptr->background.gray; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1098 | } |
| 1099 | } |
| 1100 | } |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1101 | else |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 1102 | /* Transformation does not include PNG_BACKGROUND */ |
Glenn Randers-Pehrson | 5a0be34 | 2001-10-18 20:55:13 -0500 | [diff] [blame] | 1103 | #endif /* PNG_READ_BACKGROUND_SUPPORTED */ |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1104 | if (color_type == PNG_COLOR_TYPE_PALETTE) |
| 1105 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1106 | png_colorp palette = png_ptr->palette; |
| 1107 | int num_palette = png_ptr->num_palette; |
| 1108 | int i; |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1109 | |
| 1110 | for (i = 0; i < num_palette; i++) |
| 1111 | { |
| 1112 | palette[i].red = png_ptr->gamma_table[palette[i].red]; |
| 1113 | palette[i].green = png_ptr->gamma_table[palette[i].green]; |
| 1114 | palette[i].blue = png_ptr->gamma_table[palette[i].blue]; |
| 1115 | } |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 1116 | |
Glenn Randers-Pehrson | 72cbc6e | 2009-09-20 07:28:43 -0500 | [diff] [blame] | 1117 | /* Done the gamma correction. */ |
| 1118 | png_ptr->transformations &= ~PNG_GAMMA; |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1119 | } |
| 1120 | } |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1121 | #ifdef PNG_READ_BACKGROUND_SUPPORTED |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1122 | else |
| 1123 | #endif |
Glenn Randers-Pehrson | 5a0be34 | 2001-10-18 20:55:13 -0500 | [diff] [blame] | 1124 | #endif /* PNG_READ_GAMMA_SUPPORTED && PNG_FLOATING_POINT_SUPPORTED */ |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1125 | #ifdef PNG_READ_BACKGROUND_SUPPORTED |
Glenn Randers-Pehrson | cbe52d8 | 1998-02-28 07:00:24 -0600 | [diff] [blame] | 1126 | /* No GAMMA transformation */ |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 1127 | if ((png_ptr->transformations & PNG_BACKGROUND) && |
| 1128 | (color_type == PNG_COLOR_TYPE_PALETTE)) |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1129 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1130 | int i; |
| 1131 | int istop = (int)png_ptr->num_trans; |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1132 | png_color back; |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1133 | png_colorp palette = png_ptr->palette; |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1134 | |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1135 | back.red = (png_byte)png_ptr->background.red; |
| 1136 | back.green = (png_byte)png_ptr->background.green; |
| 1137 | back.blue = (png_byte)png_ptr->background.blue; |
| 1138 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1139 | for (i = 0; i < istop; i++) |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1140 | { |
Glenn Randers-Pehrson | 6abea75 | 2009-08-08 16:52:06 -0500 | [diff] [blame] | 1141 | if (png_ptr->trans_alpha[i] == 0) |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1142 | { |
| 1143 | palette[i] = back; |
| 1144 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 1145 | |
Glenn Randers-Pehrson | 6abea75 | 2009-08-08 16:52:06 -0500 | [diff] [blame] | 1146 | else if (png_ptr->trans_alpha[i] != 0xff) |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1147 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1148 | /* The png_composite() macro is defined in png.h */ |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1149 | png_composite(palette[i].red, palette[i].red, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1150 | png_ptr->trans_alpha[i], back.red); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 1151 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1152 | png_composite(palette[i].green, palette[i].green, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1153 | png_ptr->trans_alpha[i], back.green); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 1154 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1155 | png_composite(palette[i].blue, palette[i].blue, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1156 | png_ptr->trans_alpha[i], back.blue); |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 1157 | } |
| 1158 | } |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 1159 | |
| 1160 | /* Handled alpha, still need to strip the channel. */ |
| 1161 | png_ptr->transformations &= ~PNG_BACKGROUND; |
| 1162 | png_ptr->transformations |= PNG_STRIP_ALPHA; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1163 | } |
Glenn Randers-Pehrson | 5a0be34 | 2001-10-18 20:55:13 -0500 | [diff] [blame] | 1164 | #endif /* PNG_READ_BACKGROUND_SUPPORTED */ |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1165 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1166 | #ifdef PNG_READ_SHIFT_SUPPORTED |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1167 | if ((png_ptr->transformations & PNG_SHIFT) && |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1168 | (color_type == PNG_COLOR_TYPE_PALETTE)) |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1169 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1170 | png_uint_16 i; |
| 1171 | png_uint_16 istop = png_ptr->num_palette; |
| 1172 | int sr = 8 - png_ptr->sig_bit.red; |
| 1173 | int sg = 8 - png_ptr->sig_bit.green; |
| 1174 | int sb = 8 - png_ptr->sig_bit.blue; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1175 | |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1176 | if (sr < 0 || sr > 8) |
| 1177 | sr = 0; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 1178 | |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1179 | if (sg < 0 || sg > 8) |
| 1180 | sg = 0; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 1181 | |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1182 | if (sb < 0 || sb > 8) |
| 1183 | sb = 0; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 1184 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1185 | for (i = 0; i < istop; i++) |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1186 | { |
| 1187 | png_ptr->palette[i].red >>= sr; |
| 1188 | png_ptr->palette[i].green >>= sg; |
| 1189 | png_ptr->palette[i].blue >>= sb; |
| 1190 | } |
| 1191 | } |
Glenn Randers-Pehrson | 5a0be34 | 2001-10-18 20:55:13 -0500 | [diff] [blame] | 1192 | #endif /* PNG_READ_SHIFT_SUPPORTED */ |
Glenn Randers-Pehrson | 8686fff | 1998-05-21 09:27:50 -0500 | [diff] [blame] | 1193 | } |
Glenn Randers-Pehrson | 104622b | 2000-05-29 08:58:03 -0500 | [diff] [blame] | 1194 | #if !defined(PNG_READ_GAMMA_SUPPORTED) && !defined(PNG_READ_SHIFT_SUPPORTED) \ |
| 1195 | && !defined(PNG_READ_BACKGROUND_SUPPORTED) |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 1196 | if (png_ptr) |
Glenn Randers-Pehrson | 104622b | 2000-05-29 08:58:03 -0500 | [diff] [blame] | 1197 | return; |
| 1198 | #endif |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1199 | } |
| 1200 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1201 | /* Modify the info structure to reflect the transformations. The |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 1202 | * info should be updated so a PNG file could be written with it, |
| 1203 | * assuming the transformations result in valid PNG data. |
| 1204 | */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 1205 | void /* PRIVATE */ |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 1206 | png_read_transform_info(png_structp png_ptr, png_infop info_ptr) |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1207 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 1208 | png_debug(1, "in png_read_transform_info"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 1209 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1210 | #ifdef PNG_READ_EXPAND_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1211 | if (png_ptr->transformations & PNG_EXPAND) |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1212 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1213 | if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) |
| 1214 | { |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 1215 | if (png_ptr->num_trans && |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1216 | (png_ptr->transformations & PNG_EXPAND_tRNS)) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1217 | info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 1218 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1219 | else |
| 1220 | info_ptr->color_type = PNG_COLOR_TYPE_RGB; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 1221 | |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1222 | info_ptr->bit_depth = 8; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1223 | info_ptr->num_trans = 0; |
| 1224 | } |
| 1225 | else |
| 1226 | { |
| 1227 | if (png_ptr->num_trans) |
Glenn Randers-Pehrson | 1ce0836 | 2006-03-08 23:35:59 -0600 | [diff] [blame] | 1228 | { |
| 1229 | if (png_ptr->transformations & PNG_EXPAND_tRNS) |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1230 | info_ptr->color_type |= PNG_COLOR_MASK_ALPHA; |
Glenn Randers-Pehrson | 1ce0836 | 2006-03-08 23:35:59 -0600 | [diff] [blame] | 1231 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1232 | if (info_ptr->bit_depth < 8) |
| 1233 | info_ptr->bit_depth = 8; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 1234 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1235 | info_ptr->num_trans = 0; |
| 1236 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1237 | } |
| 1238 | #endif |
| 1239 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1240 | #ifdef PNG_READ_BACKGROUND_SUPPORTED |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1241 | if (png_ptr->transformations & PNG_BACKGROUND) |
| 1242 | { |
| 1243 | info_ptr->color_type &= ~PNG_COLOR_MASK_ALPHA; |
| 1244 | info_ptr->num_trans = 0; |
| 1245 | info_ptr->background = png_ptr->background; |
| 1246 | } |
| 1247 | #endif |
| 1248 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1249 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 1250 | if (png_ptr->transformations & PNG_GAMMA) |
Glenn Randers-Pehrson | 166c5a3 | 1999-12-10 09:43:02 -0600 | [diff] [blame] | 1251 | { |
| 1252 | #ifdef PNG_FLOATING_POINT_SUPPORTED |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 1253 | info_ptr->gamma = png_ptr->gamma; |
| 1254 | #endif |
Glenn Randers-Pehrson | 166c5a3 | 1999-12-10 09:43:02 -0600 | [diff] [blame] | 1255 | #ifdef PNG_FIXED_POINT_SUPPORTED |
| 1256 | info_ptr->int_gamma = png_ptr->int_gamma; |
| 1257 | #endif |
| 1258 | } |
| 1259 | #endif |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 1260 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1261 | #ifdef PNG_READ_16_TO_8_SUPPORTED |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 1262 | 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] | 1263 | info_ptr->bit_depth = 8; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1264 | #endif |
| 1265 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1266 | #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED |
Glenn Randers-Pehrson | ddfebd3 | 2006-02-22 09:19:25 -0600 | [diff] [blame] | 1267 | if (png_ptr->transformations & PNG_GRAY_TO_RGB) |
| 1268 | info_ptr->color_type |= PNG_COLOR_MASK_COLOR; |
| 1269 | #endif |
| 1270 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1271 | #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED |
Glenn Randers-Pehrson | ddfebd3 | 2006-02-22 09:19:25 -0600 | [diff] [blame] | 1272 | if (png_ptr->transformations & PNG_RGB_TO_GRAY) |
| 1273 | info_ptr->color_type &= ~PNG_COLOR_MASK_COLOR; |
| 1274 | #endif |
| 1275 | |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 1276 | #ifdef PNG_READ_QUANTIZE_SUPPORTED |
| 1277 | if (png_ptr->transformations & PNG_QUANTIZE) |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1278 | { |
| 1279 | if (((info_ptr->color_type == PNG_COLOR_TYPE_RGB) || |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1280 | (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)) && |
| 1281 | png_ptr->palette_lookup && info_ptr->bit_depth == 8) |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1282 | { |
| 1283 | info_ptr->color_type = PNG_COLOR_TYPE_PALETTE; |
| 1284 | } |
| 1285 | } |
| 1286 | #endif |
| 1287 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1288 | #ifdef PNG_READ_PACK_SUPPORTED |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 1289 | if ((png_ptr->transformations & PNG_PACK) && (info_ptr->bit_depth < 8)) |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1290 | info_ptr->bit_depth = 8; |
| 1291 | #endif |
| 1292 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 1293 | if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1294 | info_ptr->channels = 1; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 1295 | |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1296 | else if (info_ptr->color_type & PNG_COLOR_MASK_COLOR) |
| 1297 | info_ptr->channels = 3; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 1298 | |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1299 | else |
| 1300 | info_ptr->channels = 1; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1301 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1302 | #ifdef PNG_READ_STRIP_ALPHA_SUPPORTED |
Glenn Randers-Pehrson | 4093607 | 2004-11-20 11:18:40 -0600 | [diff] [blame] | 1303 | if (png_ptr->flags & PNG_FLAG_STRIP_ALPHA) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1304 | info_ptr->color_type &= ~PNG_COLOR_MASK_ALPHA; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1305 | #endif |
| 1306 | |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1307 | if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA) |
| 1308 | info_ptr->channels++; |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1309 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1310 | #ifdef PNG_READ_FILLER_SUPPORTED |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1311 | /* STRIP_ALPHA and FILLER allowed: MASK_ALPHA bit stripped above */ |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 1312 | if ((png_ptr->transformations & PNG_FILLER) && |
| 1313 | ((info_ptr->color_type == PNG_COLOR_TYPE_RGB) || |
| 1314 | (info_ptr->color_type == PNG_COLOR_TYPE_GRAY))) |
Glenn Randers-Pehrson | 5e5c1e1 | 2000-11-10 12:26:19 -0600 | [diff] [blame] | 1315 | { |
Glenn Randers-Pehrson | 860ab2b | 1999-10-14 07:43:10 -0500 | [diff] [blame] | 1316 | info_ptr->channels++; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1317 | /* If adding a true alpha channel not just filler */ |
Glenn Randers-Pehrson | 67864af | 2004-08-28 23:30:07 -0500 | [diff] [blame] | 1318 | if (png_ptr->transformations & PNG_ADD_ALPHA) |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1319 | info_ptr->color_type |= PNG_COLOR_MASK_ALPHA; |
Glenn Randers-Pehrson | 5e5c1e1 | 2000-11-10 12:26:19 -0600 | [diff] [blame] | 1320 | } |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1321 | #endif |
| 1322 | |
Glenn Randers-Pehrson | 6942d53 | 2000-05-01 09:31:54 -0500 | [diff] [blame] | 1323 | #if defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) && \ |
| 1324 | defined(PNG_READ_USER_TRANSFORM_SUPPORTED) |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 1325 | if (png_ptr->transformations & PNG_USER_TRANSFORM) |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1326 | { |
| 1327 | if (info_ptr->bit_depth < png_ptr->user_transform_depth) |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 1328 | info_ptr->bit_depth = png_ptr->user_transform_depth; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 1329 | |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1330 | if (info_ptr->channels < png_ptr->user_transform_channels) |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 1331 | info_ptr->channels = png_ptr->user_transform_channels; |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1332 | } |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 1333 | #endif |
| 1334 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 1335 | info_ptr->pixel_depth = (png_byte)(info_ptr->channels * |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1336 | info_ptr->bit_depth); |
Glenn Randers-Pehrson | 272489d | 2004-08-04 06:34:52 -0500 | [diff] [blame] | 1337 | |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 1338 | info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, info_ptr->width); |
Glenn Randers-Pehrson | bcfd15d | 1999-10-01 14:22:25 -0500 | [diff] [blame] | 1339 | |
Glenn Randers-Pehrson | b2aca21 | 2009-09-23 11:32:37 -0500 | [diff] [blame] | 1340 | #ifndef PNG_READ_EXPAND_SUPPORTED |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 1341 | if (png_ptr) |
Glenn Randers-Pehrson | 104622b | 2000-05-29 08:58:03 -0500 | [diff] [blame] | 1342 | return; |
| 1343 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1344 | } |
| 1345 | |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 1346 | /* Transform the row. The order of transformations is significant, |
| 1347 | * and is very touchy. If you add a transformation, take care to |
| 1348 | * decide how it fits in with the other transformations here. |
| 1349 | */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 1350 | void /* PRIVATE */ |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 1351 | png_do_read_transformations(png_structp png_ptr) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1352 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 1353 | png_debug(1, "in png_do_read_transformations"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 1354 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1355 | if (png_ptr->row_buf == NULL) |
| 1356 | { |
Glenn Randers-Pehrson | 6a9e480 | 2010-02-19 09:47:43 -0600 | [diff] [blame] | 1357 | #ifdef PNG_CONSOLE_IO_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1358 | char msg[50]; |
| 1359 | |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 1360 | png_snprintf2(msg, 50, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1361 | "NULL row buffer for row %ld, pass %d", (long)png_ptr->row_number, |
| 1362 | png_ptr->pass); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1363 | png_error(png_ptr, msg); |
Glenn Randers-Pehrson | 70e3f54 | 1998-01-03 22:40:55 -0600 | [diff] [blame] | 1364 | #else |
| 1365 | png_error(png_ptr, "NULL row buffer"); |
| 1366 | #endif |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1367 | } |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 1368 | #ifdef PNG_WARN_UNINITIALIZED_ROW |
| 1369 | if (!(png_ptr->flags & PNG_FLAG_ROW_INIT)) |
| 1370 | /* Application has failed to call either png_read_start_image() |
| 1371 | * or png_read_update_info() after setting transforms that expand |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1372 | * pixels. This check added to libpng-1.2.19 |
| 1373 | */ |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 1374 | #if (PNG_WARN_UNINITIALIZED_ROW==1) |
| 1375 | png_error(png_ptr, "Uninitialized row"); |
| 1376 | #else |
| 1377 | png_warning(png_ptr, "Uninitialized row"); |
| 1378 | #endif |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1379 | #endif |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 1380 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1381 | #ifdef PNG_READ_EXPAND_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1382 | if (png_ptr->transformations & PNG_EXPAND) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1383 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1384 | if (png_ptr->row_info.color_type == PNG_COLOR_TYPE_PALETTE) |
| 1385 | { |
| 1386 | png_do_expand_palette(&(png_ptr->row_info), png_ptr->row_buf + 1, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1387 | png_ptr->palette, png_ptr->trans_alpha, png_ptr->num_trans); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1388 | } |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 1389 | else |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1390 | { |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 1391 | if (png_ptr->num_trans && |
| 1392 | (png_ptr->transformations & PNG_EXPAND_tRNS)) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1393 | png_do_expand(&(png_ptr->row_info), png_ptr->row_buf + 1, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1394 | &(png_ptr->trans_color)); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1395 | else |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 1396 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1397 | png_do_expand(&(png_ptr->row_info), png_ptr->row_buf + 1, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1398 | NULL); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1399 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1400 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1401 | #endif |
| 1402 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1403 | #ifdef PNG_READ_STRIP_ALPHA_SUPPORTED |
Glenn Randers-Pehrson | 4093607 | 2004-11-20 11:18:40 -0600 | [diff] [blame] | 1404 | if (png_ptr->flags & PNG_FLAG_STRIP_ALPHA) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1405 | png_do_strip_filler(&(png_ptr->row_info), png_ptr->row_buf + 1, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1406 | PNG_FLAG_FILLER_AFTER | (png_ptr->flags & PNG_FLAG_STRIP_ALPHA)); |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1407 | #endif |
| 1408 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1409 | #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 1410 | if (png_ptr->transformations & PNG_RGB_TO_GRAY) |
| 1411 | { |
| 1412 | int rgb_error = |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 1413 | png_do_rgb_to_gray(png_ptr, &(png_ptr->row_info), |
| 1414 | png_ptr->row_buf + 1); |
| 1415 | |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 1416 | if (rgb_error) |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 1417 | { |
| 1418 | png_ptr->rgb_to_gray_status=1; |
Glenn Randers-Pehrson | 79134c6 | 2009-02-14 10:32:18 -0600 | [diff] [blame] | 1419 | if ((png_ptr->transformations & PNG_RGB_TO_GRAY) == |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 1420 | PNG_RGB_TO_GRAY_WARN) |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 1421 | png_warning(png_ptr, "png_do_rgb_to_gray found nongray pixel"); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 1422 | |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 1423 | if ((png_ptr->transformations & PNG_RGB_TO_GRAY) == |
| 1424 | PNG_RGB_TO_GRAY_ERR) |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 1425 | png_error(png_ptr, "png_do_rgb_to_gray found nongray pixel"); |
| 1426 | } |
| 1427 | } |
| 1428 | #endif |
| 1429 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1430 | /* From Andreas Dilger e-mail to png-implement, 26 March 1998: |
Glenn Randers-Pehrson | d60c886 | 2009-06-15 21:56:14 -0500 | [diff] [blame] | 1431 | * |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1432 | * In most cases, the "simple transparency" should be done prior to doing |
| 1433 | * gray-to-RGB, or you will have to test 3x as many bytes to check if a |
| 1434 | * pixel is transparent. You would also need to make sure that the |
| 1435 | * transparency information is upgraded to RGB. |
Glenn Randers-Pehrson | d60c886 | 2009-06-15 21:56:14 -0500 | [diff] [blame] | 1436 | * |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1437 | * To summarize, the current flow is: |
| 1438 | * - Gray + simple transparency -> compare 1 or 2 gray bytes and composite |
| 1439 | * with background "in place" if transparent, |
| 1440 | * convert to RGB if necessary |
| 1441 | * - Gray + alpha -> composite with gray background and remove alpha bytes, |
| 1442 | * convert to RGB if necessary |
| 1443 | * |
| 1444 | * To support RGB backgrounds for gray images we need: |
| 1445 | * - Gray + simple transparency -> convert to RGB + simple transparency, |
| 1446 | * compare 3 or 6 bytes and composite with |
| 1447 | * background "in place" if transparent |
| 1448 | * (3x compare/pixel compared to doing |
| 1449 | * composite with gray bkgrnd) |
| 1450 | * - Gray + alpha -> convert to RGB + alpha, composite with background and |
| 1451 | * remove alpha bytes (3x float |
| 1452 | * operations/pixel compared with composite |
| 1453 | * on gray background) |
| 1454 | * |
| 1455 | * Greg's change will do this. The reason it wasn't done before is for |
| 1456 | * performance, as this increases the per-pixel operations. If we would check |
| 1457 | * in advance if the background was gray or RGB, and position the gray-to-RGB |
| 1458 | * transform appropriately, then it would save a lot of work/time. |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1459 | */ |
| 1460 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1461 | #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1462 | /* If gray -> RGB, do so now only if background is non-gray; else do later |
| 1463 | * for performance reasons |
| 1464 | */ |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 1465 | if ((png_ptr->transformations & PNG_GRAY_TO_RGB) && |
Glenn Randers-Pehrson | 5379b24 | 1999-11-27 10:22:33 -0600 | [diff] [blame] | 1466 | !(png_ptr->mode & PNG_BACKGROUND_IS_GRAY)) |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1467 | png_do_gray_to_rgb(&(png_ptr->row_info), png_ptr->row_buf + 1); |
| 1468 | #endif |
| 1469 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1470 | #ifdef PNG_READ_BACKGROUND_SUPPORTED |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 1471 | if ((png_ptr->transformations & PNG_BACKGROUND) && |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1472 | ((png_ptr->num_trans != 0 ) || |
| 1473 | (png_ptr->color_type & PNG_COLOR_MASK_ALPHA))) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1474 | png_do_background(&(png_ptr->row_info), png_ptr->row_buf + 1, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1475 | &(png_ptr->trans_color), &(png_ptr->background) |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1476 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1477 | , &(png_ptr->background_1), |
| 1478 | png_ptr->gamma_table, png_ptr->gamma_from_1, |
| 1479 | png_ptr->gamma_to_1, png_ptr->gamma_16_table, |
| 1480 | png_ptr->gamma_16_from_1, png_ptr->gamma_16_to_1, |
| 1481 | png_ptr->gamma_shift |
Glenn Randers-Pehrson | 5a0be34 | 2001-10-18 20:55:13 -0500 | [diff] [blame] | 1482 | #endif |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1483 | ); |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1484 | #endif |
| 1485 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1486 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1487 | if ((png_ptr->transformations & PNG_GAMMA) && |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1488 | #ifdef PNG_READ_BACKGROUND_SUPPORTED |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1489 | !((png_ptr->transformations & PNG_BACKGROUND) && |
| 1490 | ((png_ptr->num_trans != 0) || |
| 1491 | (png_ptr->color_type & PNG_COLOR_MASK_ALPHA))) && |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 1492 | #endif |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1493 | (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE)) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1494 | png_do_gamma(&(png_ptr->row_info), png_ptr->row_buf + 1, |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1495 | png_ptr->gamma_table, png_ptr->gamma_16_table, |
| 1496 | png_ptr->gamma_shift); |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1497 | #endif |
| 1498 | |
Glenn Randers-Pehrson | 7a59e1e | 2009-12-11 07:57:36 -0600 | [diff] [blame] | 1499 | #ifdef PNG_READ_16_TO_8_SUPPORTED |
| 1500 | if (png_ptr->transformations & PNG_16_TO_8) |
| 1501 | png_do_chop(&(png_ptr->row_info), png_ptr->row_buf + 1); |
| 1502 | #endif |
| 1503 | |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 1504 | #ifdef PNG_READ_QUANTIZE_SUPPORTED |
| 1505 | if (png_ptr->transformations & PNG_QUANTIZE) |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1506 | { |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 1507 | png_do_quantize((png_row_infop)&(png_ptr->row_info), png_ptr->row_buf + 1, |
| 1508 | png_ptr->palette_lookup, png_ptr->quantize_index); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 1509 | |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 1510 | if (png_ptr->row_info.rowbytes == (png_uint_32)0) |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 1511 | png_error(png_ptr, "png_do_quantize returned rowbytes=0"); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1512 | } |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 1513 | #endif /* PNG_READ_QUANTIZE_SUPPORTED */ |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1514 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1515 | #ifdef PNG_READ_INVERT_SUPPORTED |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1516 | if (png_ptr->transformations & PNG_INVERT_MONO) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 1517 | png_do_invert(&(png_ptr->row_info), png_ptr->row_buf + 1); |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1518 | #endif |
| 1519 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1520 | #ifdef PNG_READ_SHIFT_SUPPORTED |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1521 | if (png_ptr->transformations & PNG_SHIFT) |
| 1522 | png_do_unshift(&(png_ptr->row_info), png_ptr->row_buf + 1, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1523 | &(png_ptr->shift)); |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1524 | #endif |
| 1525 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1526 | #ifdef PNG_READ_PACK_SUPPORTED |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1527 | if (png_ptr->transformations & PNG_PACK) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 1528 | png_do_unpack(&(png_ptr->row_info), png_ptr->row_buf + 1); |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1529 | #endif |
| 1530 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1531 | #ifdef PNG_READ_BGR_SUPPORTED |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1532 | if (png_ptr->transformations & PNG_BGR) |
| 1533 | png_do_bgr(&(png_ptr->row_info), png_ptr->row_buf + 1); |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1534 | #endif |
| 1535 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1536 | #ifdef PNG_READ_PACKSWAP_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1537 | if (png_ptr->transformations & PNG_PACKSWAP) |
| 1538 | png_do_packswap(&(png_ptr->row_info), png_ptr->row_buf + 1); |
| 1539 | #endif |
| 1540 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1541 | #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1542 | /* If gray -> RGB, do so now only if we did not do so above */ |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 1543 | if ((png_ptr->transformations & PNG_GRAY_TO_RGB) && |
| 1544 | (png_ptr->mode & PNG_BACKGROUND_IS_GRAY)) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1545 | 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] | 1546 | #endif |
| 1547 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1548 | #ifdef PNG_READ_FILLER_SUPPORTED |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1549 | if (png_ptr->transformations & PNG_FILLER) |
| 1550 | png_do_read_filler(&(png_ptr->row_info), png_ptr->row_buf + 1, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1551 | (png_uint_32)png_ptr->filler, png_ptr->flags); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1552 | #endif |
| 1553 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1554 | #ifdef PNG_READ_INVERT_ALPHA_SUPPORTED |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 1555 | if (png_ptr->transformations & PNG_INVERT_ALPHA) |
| 1556 | png_do_read_invert_alpha(&(png_ptr->row_info), png_ptr->row_buf + 1); |
| 1557 | #endif |
| 1558 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1559 | #ifdef PNG_READ_SWAP_ALPHA_SUPPORTED |
Glenn Randers-Pehrson | cbe52d8 | 1998-02-28 07:00:24 -0600 | [diff] [blame] | 1560 | if (png_ptr->transformations & PNG_SWAP_ALPHA) |
| 1561 | png_do_read_swap_alpha(&(png_ptr->row_info), png_ptr->row_buf + 1); |
| 1562 | #endif |
| 1563 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1564 | #ifdef PNG_READ_SWAP_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1565 | if (png_ptr->transformations & PNG_SWAP_BYTES) |
| 1566 | png_do_swap(&(png_ptr->row_info), png_ptr->row_buf + 1); |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1567 | #endif |
Glenn Randers-Pehrson | 08a3343 | 1998-03-07 06:06:55 -0600 | [diff] [blame] | 1568 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1569 | #ifdef PNG_READ_USER_TRANSFORM_SUPPORTED |
Glenn Randers-Pehrson | 08a3343 | 1998-03-07 06:06:55 -0600 | [diff] [blame] | 1570 | if (png_ptr->transformations & PNG_USER_TRANSFORM) |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 1571 | { |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 1572 | if (png_ptr->read_user_transform_fn != NULL) |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 1573 | (*(png_ptr->read_user_transform_fn)) /* User read transform function */ |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1574 | (png_ptr, /* png_ptr */ |
| 1575 | &(png_ptr->row_info), /* row_info: */ |
| 1576 | /* png_uint_32 width; width of row */ |
| 1577 | /* png_uint_32 rowbytes; number of bytes in row */ |
| 1578 | /* png_byte color_type; color type of pixels */ |
| 1579 | /* png_byte bit_depth; bit depth of samples */ |
| 1580 | /* png_byte channels; number of channels (1-4) */ |
| 1581 | /* png_byte pixel_depth; bits per pixel (depth*channels) */ |
| 1582 | png_ptr->row_buf + 1); /* start of pixel data for row */ |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1583 | #ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 1584 | if (png_ptr->user_transform_depth) |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 1585 | png_ptr->row_info.bit_depth = png_ptr->user_transform_depth; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 1586 | |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 1587 | if (png_ptr->user_transform_channels) |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 1588 | png_ptr->row_info.channels = png_ptr->user_transform_channels; |
Glenn Randers-Pehrson | 6942d53 | 2000-05-01 09:31:54 -0500 | [diff] [blame] | 1589 | #endif |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 1590 | png_ptr->row_info.pixel_depth = (png_byte)(png_ptr->row_info.bit_depth * |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1591 | png_ptr->row_info.channels); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 1592 | |
Glenn Randers-Pehrson | 272489d | 2004-08-04 06:34:52 -0500 | [diff] [blame] | 1593 | png_ptr->row_info.rowbytes = PNG_ROWBYTES(png_ptr->row_info.pixel_depth, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1594 | png_ptr->row_info.width); |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 1595 | } |
Glenn Randers-Pehrson | 08a3343 | 1998-03-07 06:06:55 -0600 | [diff] [blame] | 1596 | #endif |
| 1597 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1598 | } |
| 1599 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1600 | #ifdef PNG_READ_PACK_SUPPORTED |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 1601 | /* Unpack pixels of 1, 2, or 4 bits per pixel into 1 byte per pixel, |
| 1602 | * without changing the actual values. Thus, if you had a row with |
| 1603 | * a bit depth of 1, you would end up with bytes that only contained |
| 1604 | * the numbers 0 or 1. If you would rather they contain 0 and 255, use |
| 1605 | * png_do_shift() after this. |
| 1606 | */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 1607 | void /* PRIVATE */ |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 1608 | png_do_unpack(png_row_infop row_info, png_bytep row) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1609 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 1610 | png_debug(1, "in png_do_unpack"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 1611 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1612 | if (row_info->bit_depth < 8) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1613 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1614 | png_uint_32 i; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1615 | png_uint_32 row_width=row_info->width; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1616 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1617 | switch (row_info->bit_depth) |
| 1618 | { |
| 1619 | case 1: |
| 1620 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1621 | png_bytep sp = row + (png_size_t)((row_width - 1) >> 3); |
| 1622 | png_bytep dp = row + (png_size_t)row_width - 1; |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 1623 | png_uint_32 shift = 7 - (int)((row_width + 7) & 0x07); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1624 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1625 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 1626 | *dp = (png_byte)((*sp >> shift) & 0x01); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 1627 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1628 | if (shift == 7) |
| 1629 | { |
| 1630 | shift = 0; |
| 1631 | sp--; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 1632 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 1633 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1634 | else |
| 1635 | shift++; |
| 1636 | |
| 1637 | dp--; |
| 1638 | } |
| 1639 | break; |
| 1640 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1641 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1642 | case 2: |
| 1643 | { |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1644 | |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1645 | png_bytep sp = row + (png_size_t)((row_width - 1) >> 2); |
| 1646 | png_bytep dp = row + (png_size_t)row_width - 1; |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 1647 | png_uint_32 shift = (int)((3 - ((row_width + 3) & 0x03)) << 1); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1648 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1649 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 1650 | *dp = (png_byte)((*sp >> shift) & 0x03); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 1651 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1652 | if (shift == 6) |
| 1653 | { |
| 1654 | shift = 0; |
| 1655 | sp--; |
| 1656 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 1657 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1658 | else |
| 1659 | shift += 2; |
| 1660 | |
| 1661 | dp--; |
| 1662 | } |
| 1663 | break; |
| 1664 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1665 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1666 | case 4: |
| 1667 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1668 | png_bytep sp = row + (png_size_t)((row_width - 1) >> 1); |
| 1669 | png_bytep dp = row + (png_size_t)row_width - 1; |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 1670 | png_uint_32 shift = (int)((1 - ((row_width + 1) & 0x01)) << 2); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1671 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1672 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 1673 | *dp = (png_byte)((*sp >> shift) & 0x0f); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 1674 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1675 | if (shift == 4) |
| 1676 | { |
| 1677 | shift = 0; |
| 1678 | sp--; |
| 1679 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 1680 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1681 | else |
| 1682 | shift = 4; |
| 1683 | |
| 1684 | dp--; |
| 1685 | } |
| 1686 | break; |
| 1687 | } |
| 1688 | } |
| 1689 | row_info->bit_depth = 8; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 1690 | row_info->pixel_depth = (png_byte)(8 * row_info->channels); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1691 | row_info->rowbytes = row_width * row_info->channels; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1692 | } |
| 1693 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1694 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1695 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1696 | #ifdef PNG_READ_SHIFT_SUPPORTED |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 1697 | /* Reverse the effects of png_do_shift. This routine merely shifts the |
| 1698 | * pixels back to their significant bits values. Thus, if you have |
| 1699 | * a row of bit depth 8, but only 5 are significant, this will shift |
| 1700 | * the values back to 0 through 31. |
| 1701 | */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 1702 | void /* PRIVATE */ |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1703 | 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] | 1704 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 1705 | png_debug(1, "in png_do_unshift"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 1706 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1707 | if ( |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1708 | row_info->color_type != PNG_COLOR_TYPE_PALETTE) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1709 | { |
| 1710 | int shift[4]; |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1711 | int channels = 0; |
| 1712 | int c; |
| 1713 | png_uint_16 value = 0; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1714 | png_uint_32 row_width = row_info->width; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1715 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1716 | if (row_info->color_type & PNG_COLOR_MASK_COLOR) |
| 1717 | { |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 1718 | shift[channels++] = row_info->bit_depth - sig_bits->red; |
| 1719 | shift[channels++] = row_info->bit_depth - sig_bits->green; |
| 1720 | shift[channels++] = row_info->bit_depth - sig_bits->blue; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1721 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 1722 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1723 | else |
| 1724 | { |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 1725 | shift[channels++] = row_info->bit_depth - sig_bits->gray; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1726 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 1727 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1728 | if (row_info->color_type & PNG_COLOR_MASK_ALPHA) |
| 1729 | { |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 1730 | shift[channels++] = row_info->bit_depth - sig_bits->alpha; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 1731 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1732 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1733 | for (c = 0; c < channels; c++) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 1734 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1735 | if (shift[c] <= 0) |
| 1736 | shift[c] = 0; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 1737 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 1738 | else |
| 1739 | value = 1; |
| 1740 | } |
Guy Schalnat | 0f71645 | 1995-11-28 11:22:13 -0600 | [diff] [blame] | 1741 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 1742 | if (!value) |
| 1743 | return; |
Guy Schalnat | 0f71645 | 1995-11-28 11:22:13 -0600 | [diff] [blame] | 1744 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 1745 | switch (row_info->bit_depth) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1746 | { |
| 1747 | case 2: |
| 1748 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1749 | png_bytep bp; |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1750 | png_uint_32 i; |
| 1751 | png_uint_32 istop = row_info->rowbytes; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1752 | |
Glenn Randers-Pehrson | d0dce40 | 1998-05-09 10:02:29 -0500 | [diff] [blame] | 1753 | for (bp = row, i = 0; i < istop; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1754 | { |
| 1755 | *bp >>= 1; |
Glenn Randers-Pehrson | d0dce40 | 1998-05-09 10:02:29 -0500 | [diff] [blame] | 1756 | *bp++ &= 0x55; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1757 | } |
| 1758 | break; |
| 1759 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1760 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1761 | case 4: |
| 1762 | { |
Glenn Randers-Pehrson | 8686fff | 1998-05-21 09:27:50 -0500 | [diff] [blame] | 1763 | png_bytep bp = row; |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1764 | png_uint_32 i; |
| 1765 | png_uint_32 istop = row_info->rowbytes; |
Glenn Randers-Pehrson | 860ab2b | 1999-10-14 07:43:10 -0500 | [diff] [blame] | 1766 | png_byte mask = (png_byte)((((int)0xf0 >> shift[0]) & (int)0xf0) | |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1767 | (png_byte)((int)0xf >> shift[0])); |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1768 | |
Glenn Randers-Pehrson | 8686fff | 1998-05-21 09:27:50 -0500 | [diff] [blame] | 1769 | for (i = 0; i < istop; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1770 | { |
| 1771 | *bp >>= shift[0]; |
Glenn Randers-Pehrson | d0dce40 | 1998-05-09 10:02:29 -0500 | [diff] [blame] | 1772 | *bp++ &= mask; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1773 | } |
| 1774 | break; |
| 1775 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1776 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1777 | case 8: |
| 1778 | { |
Glenn Randers-Pehrson | d0dce40 | 1998-05-09 10:02:29 -0500 | [diff] [blame] | 1779 | png_bytep bp = row; |
Glenn Randers-Pehrson | 0f881d6 | 1998-02-07 10:20:57 -0600 | [diff] [blame] | 1780 | png_uint_32 i; |
Glenn Randers-Pehrson | d0dce40 | 1998-05-09 10:02:29 -0500 | [diff] [blame] | 1781 | png_uint_32 istop = row_width * channels; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1782 | |
Glenn Randers-Pehrson | d0dce40 | 1998-05-09 10:02:29 -0500 | [diff] [blame] | 1783 | for (i = 0; i < istop; i++) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1784 | { |
Glenn Randers-Pehrson | d0dce40 | 1998-05-09 10:02:29 -0500 | [diff] [blame] | 1785 | *bp++ >>= shift[i%channels]; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1786 | } |
| 1787 | break; |
| 1788 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1789 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1790 | case 16: |
| 1791 | { |
Glenn Randers-Pehrson | d0dce40 | 1998-05-09 10:02:29 -0500 | [diff] [blame] | 1792 | png_bytep bp = row; |
| 1793 | png_uint_32 i; |
| 1794 | png_uint_32 istop = channels * row_width; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1795 | |
Glenn Randers-Pehrson | d0dce40 | 1998-05-09 10:02:29 -0500 | [diff] [blame] | 1796 | for (i = 0; i < istop; i++) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1797 | { |
Glenn Randers-Pehrson | d0dce40 | 1998-05-09 10:02:29 -0500 | [diff] [blame] | 1798 | value = (png_uint_16)((*bp << 8) + *(bp + 1)); |
| 1799 | value >>= shift[i%channels]; |
| 1800 | *bp++ = (png_byte)(value >> 8); |
| 1801 | *bp++ = (png_byte)(value & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1802 | } |
| 1803 | break; |
| 1804 | } |
| 1805 | } |
| 1806 | } |
| 1807 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1808 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1809 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1810 | #ifdef PNG_READ_16_TO_8_SUPPORTED |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1811 | /* Chop rows of bit depth 16 down to 8 */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 1812 | void /* PRIVATE */ |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 1813 | png_do_chop(png_row_infop row_info, png_bytep row) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1814 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 1815 | png_debug(1, "in png_do_chop"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 1816 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1817 | if (row_info->bit_depth == 16) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1818 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1819 | png_bytep sp = row; |
| 1820 | png_bytep dp = row; |
| 1821 | png_uint_32 i; |
| 1822 | png_uint_32 istop = row_info->width * row_info->channels; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1823 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1824 | for (i = 0; i<istop; i++, sp += 2, dp++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1825 | { |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1826 | #ifdef PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1827 | /* This does a more accurate scaling of the 16-bit color |
| 1828 | * value, rather than a simple low-byte truncation. |
| 1829 | * |
| 1830 | * What the ideal calculation should be: |
| 1831 | * *dp = (((((png_uint_32)(*sp) << 8) | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1832 | * (png_uint_32)(*(sp + 1))) * 255 + 127) |
| 1833 | * / (png_uint_32)65535L; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1834 | * |
| 1835 | * GRR: no, I think this is what it really should be: |
| 1836 | * *dp = (((((png_uint_32)(*sp) << 8) | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1837 | * (png_uint_32)(*(sp + 1))) + 128L) |
| 1838 | * / (png_uint_32)257L; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1839 | * |
| 1840 | * GRR: here's the exact calculation with shifts: |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 1841 | * temp = (((png_uint_32)(*sp) << 8) | |
| 1842 | * (png_uint_32)(*(sp + 1))) + 128L; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1843 | * *dp = (temp - (temp >> 8)) >> 8; |
| 1844 | * |
| 1845 | * Approximate calculation with shift/add instead of multiply/divide: |
| 1846 | * *dp = ((((png_uint_32)(*sp) << 8) | |
| 1847 | * (png_uint_32)((int)(*(sp + 1)) - *sp)) + 128) >> 8; |
| 1848 | * |
| 1849 | * What we actually do to avoid extra shifting and conversion: |
| 1850 | */ |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1851 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1852 | *dp = *sp + ((((int)(*(sp + 1)) - *sp) > 128) ? 1 : 0); |
| 1853 | #else |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1854 | /* Simply discard the low order byte */ |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 1855 | *dp = *sp; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1856 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1857 | } |
| 1858 | row_info->bit_depth = 8; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 1859 | row_info->pixel_depth = (png_byte)(8 * row_info->channels); |
Glenn Randers-Pehrson | 0f881d6 | 1998-02-07 10:20:57 -0600 | [diff] [blame] | 1860 | row_info->rowbytes = row_info->width * row_info->channels; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1861 | } |
| 1862 | } |
| 1863 | #endif |
| 1864 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1865 | #ifdef PNG_READ_SWAP_ALPHA_SUPPORTED |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 1866 | void /* PRIVATE */ |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1867 | png_do_read_swap_alpha(png_row_infop row_info, png_bytep row) |
| 1868 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 1869 | png_debug(1, "in png_do_read_swap_alpha"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 1870 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1871 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1872 | png_uint_32 row_width = row_info->width; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1873 | if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA) |
| 1874 | { |
| 1875 | /* This converts from RGBA to ARGB */ |
| 1876 | if (row_info->bit_depth == 8) |
| 1877 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1878 | png_bytep sp = row + row_info->rowbytes; |
| 1879 | png_bytep dp = sp; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1880 | png_byte save; |
| 1881 | png_uint_32 i; |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1882 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1883 | for (i = 0; i < row_width; i++) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1884 | { |
| 1885 | save = *(--sp); |
| 1886 | *(--dp) = *(--sp); |
| 1887 | *(--dp) = *(--sp); |
| 1888 | *(--dp) = *(--sp); |
| 1889 | *(--dp) = save; |
| 1890 | } |
| 1891 | } |
| 1892 | /* This converts from RRGGBBAA to AARRGGBB */ |
| 1893 | else |
| 1894 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1895 | png_bytep sp = row + row_info->rowbytes; |
| 1896 | png_bytep dp = sp; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1897 | png_byte save[2]; |
| 1898 | png_uint_32 i; |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1899 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1900 | for (i = 0; i < row_width; i++) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1901 | { |
| 1902 | save[0] = *(--sp); |
| 1903 | save[1] = *(--sp); |
| 1904 | *(--dp) = *(--sp); |
| 1905 | *(--dp) = *(--sp); |
| 1906 | *(--dp) = *(--sp); |
| 1907 | *(--dp) = *(--sp); |
| 1908 | *(--dp) = *(--sp); |
| 1909 | *(--dp) = *(--sp); |
| 1910 | *(--dp) = save[0]; |
| 1911 | *(--dp) = save[1]; |
| 1912 | } |
| 1913 | } |
| 1914 | } |
| 1915 | else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) |
| 1916 | { |
| 1917 | /* This converts from GA to AG */ |
| 1918 | if (row_info->bit_depth == 8) |
| 1919 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1920 | png_bytep sp = row + row_info->rowbytes; |
| 1921 | png_bytep dp = sp; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1922 | png_byte save; |
| 1923 | png_uint_32 i; |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1924 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1925 | for (i = 0; i < row_width; i++) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1926 | { |
| 1927 | save = *(--sp); |
| 1928 | *(--dp) = *(--sp); |
| 1929 | *(--dp) = save; |
| 1930 | } |
| 1931 | } |
| 1932 | /* This converts from GGAA to AAGG */ |
| 1933 | else |
| 1934 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 1935 | png_bytep sp = row + row_info->rowbytes; |
| 1936 | png_bytep dp = sp; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1937 | png_byte save[2]; |
| 1938 | png_uint_32 i; |
| 1939 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 1940 | for (i = 0; i < row_width; i++) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 1941 | { |
| 1942 | save[0] = *(--sp); |
| 1943 | save[1] = *(--sp); |
| 1944 | *(--dp) = *(--sp); |
| 1945 | *(--dp) = *(--sp); |
| 1946 | *(--dp) = save[0]; |
| 1947 | *(--dp) = save[1]; |
| 1948 | } |
| 1949 | } |
| 1950 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1951 | } |
| 1952 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 1953 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 1954 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 1955 | #ifdef PNG_READ_INVERT_ALPHA_SUPPORTED |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 1956 | void /* PRIVATE */ |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 1957 | png_do_read_invert_alpha(png_row_infop row_info, png_bytep row) |
| 1958 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1959 | png_uint_32 row_width; |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 1960 | png_debug(1, "in png_do_read_invert_alpha"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 1961 | |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1962 | row_width = row_info->width; |
| 1963 | if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA) |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 1964 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1965 | if (row_info->bit_depth == 8) |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 1966 | { |
| 1967 | /* This inverts the alpha channel in RGBA */ |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1968 | png_bytep sp = row + row_info->rowbytes; |
| 1969 | png_bytep dp = sp; |
| 1970 | png_uint_32 i; |
| 1971 | |
| 1972 | for (i = 0; i < row_width; i++) |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 1973 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1974 | *(--dp) = (png_byte)(255 - *(--sp)); |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 1975 | |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1976 | /* This does nothing: |
| 1977 | *(--dp) = *(--sp); |
| 1978 | *(--dp) = *(--sp); |
| 1979 | *(--dp) = *(--sp); |
| 1980 | We can replace it with: |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 1981 | */ |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1982 | sp-=3; |
| 1983 | dp=sp; |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 1984 | } |
| 1985 | } |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 1986 | /* This inverts the alpha channel in RRGGBBAA */ |
| 1987 | else |
| 1988 | { |
| 1989 | png_bytep sp = row + row_info->rowbytes; |
| 1990 | png_bytep dp = sp; |
| 1991 | png_uint_32 i; |
| 1992 | |
| 1993 | for (i = 0; i < row_width; i++) |
| 1994 | { |
| 1995 | *(--dp) = (png_byte)(255 - *(--sp)); |
| 1996 | *(--dp) = (png_byte)(255 - *(--sp)); |
| 1997 | |
| 1998 | /* This does nothing: |
| 1999 | *(--dp) = *(--sp); |
| 2000 | *(--dp) = *(--sp); |
| 2001 | *(--dp) = *(--sp); |
| 2002 | *(--dp) = *(--sp); |
| 2003 | *(--dp) = *(--sp); |
| 2004 | *(--dp) = *(--sp); |
| 2005 | We can replace it with: |
| 2006 | */ |
| 2007 | sp-=6; |
| 2008 | dp=sp; |
| 2009 | } |
| 2010 | } |
| 2011 | } |
| 2012 | else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) |
| 2013 | { |
| 2014 | if (row_info->bit_depth == 8) |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 2015 | { |
Glenn Randers-Pehrson | cbe52d8 | 1998-02-28 07:00:24 -0600 | [diff] [blame] | 2016 | /* This inverts the alpha channel in GA */ |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2017 | png_bytep sp = row + row_info->rowbytes; |
| 2018 | png_bytep dp = sp; |
| 2019 | png_uint_32 i; |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 2020 | |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2021 | for (i = 0; i < row_width; i++) |
| 2022 | { |
| 2023 | *(--dp) = (png_byte)(255 - *(--sp)); |
| 2024 | *(--dp) = *(--sp); |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 2025 | } |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2026 | } |
| 2027 | else |
| 2028 | { |
Glenn Randers-Pehrson | cbe52d8 | 1998-02-28 07:00:24 -0600 | [diff] [blame] | 2029 | /* This inverts the alpha channel in GGAA */ |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2030 | png_bytep sp = row + row_info->rowbytes; |
| 2031 | png_bytep dp = sp; |
| 2032 | png_uint_32 i; |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 2033 | |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2034 | for (i = 0; i < row_width; i++) |
| 2035 | { |
| 2036 | *(--dp) = (png_byte)(255 - *(--sp)); |
| 2037 | *(--dp) = (png_byte)(255 - *(--sp)); |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 2038 | /* |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2039 | *(--dp) = *(--sp); |
| 2040 | *(--dp) = *(--sp); |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 2041 | */ |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2042 | sp-=2; |
| 2043 | dp=sp; |
Glenn Randers-Pehrson | c4a2ae6 | 1998-01-16 22:06:18 -0600 | [diff] [blame] | 2044 | } |
| 2045 | } |
| 2046 | } |
| 2047 | } |
| 2048 | #endif |
| 2049 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2050 | #ifdef PNG_READ_FILLER_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2051 | /* Add filler channel if we have RGB color */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 2052 | void /* PRIVATE */ |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 2053 | png_do_read_filler(png_row_infop row_info, png_bytep row, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2054 | png_uint_32 filler, png_uint_32 flags) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2055 | { |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2056 | png_uint_32 i; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2057 | png_uint_32 row_width = row_info->width; |
| 2058 | |
Glenn Randers-Pehrson | d0dce40 | 1998-05-09 10:02:29 -0500 | [diff] [blame] | 2059 | png_byte hi_filler = (png_byte)((filler>>8) & 0xff); |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2060 | png_byte lo_filler = (png_byte)(filler & 0xff); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2061 | |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 2062 | png_debug(1, "in png_do_read_filler"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 2063 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2064 | if ( |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2065 | row_info->color_type == PNG_COLOR_TYPE_GRAY) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2066 | { |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 2067 | if (row_info->bit_depth == 8) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2068 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2069 | if (flags & PNG_FLAG_FILLER_AFTER) |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2070 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2071 | /* This changes the data from G to GX */ |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2072 | png_bytep sp = row + (png_size_t)row_width; |
| 2073 | png_bytep dp = sp + (png_size_t)row_width; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2074 | for (i = 1; i < row_width; i++) |
| 2075 | { |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2076 | *(--dp) = lo_filler; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2077 | *(--dp) = *(--sp); |
| 2078 | } |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2079 | *(--dp) = lo_filler; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2080 | row_info->channels = 2; |
| 2081 | row_info->pixel_depth = 16; |
| 2082 | row_info->rowbytes = row_width * 2; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2083 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2084 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2085 | else |
| 2086 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2087 | /* This changes the data from G to XG */ |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2088 | png_bytep sp = row + (png_size_t)row_width; |
| 2089 | png_bytep dp = sp + (png_size_t)row_width; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2090 | for (i = 0; i < row_width; i++) |
| 2091 | { |
| 2092 | *(--dp) = *(--sp); |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2093 | *(--dp) = lo_filler; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2094 | } |
| 2095 | row_info->channels = 2; |
| 2096 | row_info->pixel_depth = 16; |
| 2097 | row_info->rowbytes = row_width * 2; |
| 2098 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2099 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2100 | |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 2101 | else if (row_info->bit_depth == 16) |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2102 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2103 | if (flags & PNG_FLAG_FILLER_AFTER) |
| 2104 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2105 | /* This changes the data from GG to GGXX */ |
Glenn Randers-Pehrson | 5b5dcf8 | 2004-07-17 22:45:44 -0500 | [diff] [blame] | 2106 | png_bytep sp = row + (png_size_t)row_width * 2; |
| 2107 | png_bytep dp = sp + (png_size_t)row_width * 2; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2108 | for (i = 1; i < row_width; i++) |
| 2109 | { |
| 2110 | *(--dp) = hi_filler; |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2111 | *(--dp) = lo_filler; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2112 | *(--dp) = *(--sp); |
| 2113 | *(--dp) = *(--sp); |
| 2114 | } |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2115 | *(--dp) = hi_filler; |
| 2116 | *(--dp) = lo_filler; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2117 | row_info->channels = 2; |
| 2118 | row_info->pixel_depth = 32; |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 2119 | row_info->rowbytes = row_width * 4; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2120 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2121 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2122 | else |
| 2123 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2124 | /* This changes the data from GG to XXGG */ |
Glenn Randers-Pehrson | 5b5dcf8 | 2004-07-17 22:45:44 -0500 | [diff] [blame] | 2125 | png_bytep sp = row + (png_size_t)row_width * 2; |
| 2126 | png_bytep dp = sp + (png_size_t)row_width * 2; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2127 | for (i = 0; i < row_width; i++) |
| 2128 | { |
| 2129 | *(--dp) = *(--sp); |
| 2130 | *(--dp) = *(--sp); |
| 2131 | *(--dp) = hi_filler; |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2132 | *(--dp) = lo_filler; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2133 | } |
| 2134 | row_info->channels = 2; |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 2135 | row_info->pixel_depth = 32; |
| 2136 | row_info->rowbytes = row_width * 4; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2137 | } |
| 2138 | } |
| 2139 | } /* COLOR_TYPE == GRAY */ |
| 2140 | else if (row_info->color_type == PNG_COLOR_TYPE_RGB) |
| 2141 | { |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 2142 | if (row_info->bit_depth == 8) |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2143 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2144 | if (flags & PNG_FLAG_FILLER_AFTER) |
| 2145 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2146 | /* This changes the data from RGB to RGBX */ |
Glenn Randers-Pehrson | dff799e | 2004-08-07 21:42:49 -0500 | [diff] [blame] | 2147 | png_bytep sp = row + (png_size_t)row_width * 3; |
| 2148 | png_bytep dp = sp + (png_size_t)row_width; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2149 | for (i = 1; i < row_width; i++) |
| 2150 | { |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2151 | *(--dp) = lo_filler; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2152 | *(--dp) = *(--sp); |
| 2153 | *(--dp) = *(--sp); |
| 2154 | *(--dp) = *(--sp); |
| 2155 | } |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2156 | *(--dp) = lo_filler; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2157 | row_info->channels = 4; |
| 2158 | row_info->pixel_depth = 32; |
| 2159 | row_info->rowbytes = row_width * 4; |
| 2160 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2161 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2162 | else |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2163 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2164 | /* This changes the data from RGB to XRGB */ |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2165 | png_bytep sp = row + (png_size_t)row_width * 3; |
| 2166 | png_bytep dp = sp + (png_size_t)row_width; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2167 | for (i = 0; i < row_width; i++) |
| 2168 | { |
| 2169 | *(--dp) = *(--sp); |
| 2170 | *(--dp) = *(--sp); |
| 2171 | *(--dp) = *(--sp); |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2172 | *(--dp) = lo_filler; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2173 | } |
| 2174 | row_info->channels = 4; |
| 2175 | row_info->pixel_depth = 32; |
| 2176 | row_info->rowbytes = row_width * 4; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2177 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2178 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2179 | |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 2180 | else if (row_info->bit_depth == 16) |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2181 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2182 | if (flags & PNG_FLAG_FILLER_AFTER) |
| 2183 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2184 | /* This changes the data from RRGGBB to RRGGBBXX */ |
Glenn Randers-Pehrson | 5b5dcf8 | 2004-07-17 22:45:44 -0500 | [diff] [blame] | 2185 | png_bytep sp = row + (png_size_t)row_width * 6; |
| 2186 | png_bytep dp = sp + (png_size_t)row_width * 2; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2187 | for (i = 1; i < row_width; i++) |
| 2188 | { |
| 2189 | *(--dp) = hi_filler; |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2190 | *(--dp) = lo_filler; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2191 | *(--dp) = *(--sp); |
| 2192 | *(--dp) = *(--sp); |
| 2193 | *(--dp) = *(--sp); |
| 2194 | *(--dp) = *(--sp); |
| 2195 | *(--dp) = *(--sp); |
| 2196 | *(--dp) = *(--sp); |
| 2197 | } |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2198 | *(--dp) = hi_filler; |
| 2199 | *(--dp) = lo_filler; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2200 | row_info->channels = 4; |
| 2201 | row_info->pixel_depth = 64; |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 2202 | row_info->rowbytes = row_width * 8; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2203 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2204 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2205 | else |
| 2206 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2207 | /* This changes the data from RRGGBB to XXRRGGBB */ |
Glenn Randers-Pehrson | 5b5dcf8 | 2004-07-17 22:45:44 -0500 | [diff] [blame] | 2208 | png_bytep sp = row + (png_size_t)row_width * 6; |
| 2209 | png_bytep dp = sp + (png_size_t)row_width * 2; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2210 | for (i = 0; i < row_width; i++) |
| 2211 | { |
| 2212 | *(--dp) = *(--sp); |
| 2213 | *(--dp) = *(--sp); |
| 2214 | *(--dp) = *(--sp); |
| 2215 | *(--dp) = *(--sp); |
| 2216 | *(--dp) = *(--sp); |
| 2217 | *(--dp) = *(--sp); |
| 2218 | *(--dp) = hi_filler; |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2219 | *(--dp) = lo_filler; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2220 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2221 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2222 | row_info->channels = 4; |
| 2223 | row_info->pixel_depth = 64; |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 2224 | row_info->rowbytes = row_width * 8; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2225 | } |
| 2226 | } |
| 2227 | } /* COLOR_TYPE == RGB */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2228 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2229 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2230 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2231 | #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 2232 | /* Expand grayscale files to RGB, with or without alpha */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 2233 | void /* PRIVATE */ |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 2234 | 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] | 2235 | { |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2236 | png_uint_32 i; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2237 | png_uint_32 row_width = row_info->width; |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 2238 | |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 2239 | png_debug(1, "in png_do_gray_to_rgb"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 2240 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2241 | if (row_info->bit_depth >= 8 && |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2242 | !(row_info->color_type & PNG_COLOR_MASK_COLOR)) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2243 | { |
| 2244 | if (row_info->color_type == PNG_COLOR_TYPE_GRAY) |
| 2245 | { |
| 2246 | if (row_info->bit_depth == 8) |
| 2247 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2248 | /* This changes G to RGB */ |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2249 | png_bytep sp = row + (png_size_t)row_width - 1; |
| 2250 | png_bytep dp = sp + (png_size_t)row_width * 2; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2251 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2252 | { |
| 2253 | *(dp--) = *sp; |
| 2254 | *(dp--) = *sp; |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 2255 | *(dp--) = *(sp--); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2256 | } |
| 2257 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2258 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2259 | else |
| 2260 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2261 | /* This changes GG to RRGGBB */ |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2262 | png_bytep sp = row + (png_size_t)row_width * 2 - 1; |
| 2263 | png_bytep dp = sp + (png_size_t)row_width * 4; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2264 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2265 | { |
| 2266 | *(dp--) = *sp; |
| 2267 | *(dp--) = *(sp - 1); |
| 2268 | *(dp--) = *sp; |
| 2269 | *(dp--) = *(sp - 1); |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 2270 | *(dp--) = *(sp--); |
| 2271 | *(dp--) = *(sp--); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2272 | } |
| 2273 | } |
| 2274 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2275 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2276 | else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) |
| 2277 | { |
| 2278 | if (row_info->bit_depth == 8) |
| 2279 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2280 | /* This changes GA to RGBA */ |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2281 | png_bytep sp = row + (png_size_t)row_width * 2 - 1; |
| 2282 | png_bytep dp = sp + (png_size_t)row_width * 2; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2283 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2284 | { |
| 2285 | *(dp--) = *(sp--); |
| 2286 | *(dp--) = *sp; |
| 2287 | *(dp--) = *sp; |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 2288 | *(dp--) = *(sp--); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2289 | } |
| 2290 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2291 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2292 | else |
| 2293 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2294 | /* This changes GGAA to RRGGBBAA */ |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2295 | png_bytep sp = row + (png_size_t)row_width * 4 - 1; |
| 2296 | png_bytep dp = sp + (png_size_t)row_width * 4; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2297 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2298 | { |
| 2299 | *(dp--) = *(sp--); |
| 2300 | *(dp--) = *(sp--); |
| 2301 | *(dp--) = *sp; |
| 2302 | *(dp--) = *(sp - 1); |
| 2303 | *(dp--) = *sp; |
| 2304 | *(dp--) = *(sp - 1); |
Glenn Randers-Pehrson | 4393a9a | 1999-09-17 12:27:26 -0500 | [diff] [blame] | 2305 | *(dp--) = *(sp--); |
| 2306 | *(dp--) = *(sp--); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2307 | } |
| 2308 | } |
| 2309 | } |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2310 | row_info->channels += (png_byte)2; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2311 | row_info->color_type |= PNG_COLOR_MASK_COLOR; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2312 | row_info->pixel_depth = (png_byte)(row_info->channels * |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2313 | row_info->bit_depth); |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 2314 | row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2315 | } |
| 2316 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2317 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2318 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2319 | #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 2320 | /* Reduce RGB files to grayscale, with or without alpha |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2321 | * using the equation given in Poynton's ColorFAQ at |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 2322 | * <http://www.inforamp.net/~poynton/> (THIS LINK IS DEAD June 2008) |
Glenn Randers-Pehrson | 895a9c9 | 2008-07-25 08:51:18 -0500 | [diff] [blame] | 2323 | * New link: |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 2324 | * <http://www.poynton.com/notes/colour_and_gamma/> |
Glenn Randers-Pehrson | 895a9c9 | 2008-07-25 08:51:18 -0500 | [diff] [blame] | 2325 | * Charles Poynton poynton at poynton.com |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2326 | * |
| 2327 | * Y = 0.212671 * R + 0.715160 * G + 0.072169 * B |
| 2328 | * |
| 2329 | * We approximate this with |
Glenn Randers-Pehrson | 166c5a3 | 1999-12-10 09:43:02 -0600 | [diff] [blame] | 2330 | * |
Glenn Randers-Pehrson | 520a764 | 2000-03-21 05:13:06 -0600 | [diff] [blame] | 2331 | * Y = 0.21268 * R + 0.7151 * G + 0.07217 * B |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2332 | * |
| 2333 | * which can be expressed with integers as |
| 2334 | * |
Glenn Randers-Pehrson | 520a764 | 2000-03-21 05:13:06 -0600 | [diff] [blame] | 2335 | * Y = (6969 * R + 23434 * G + 2365 * B)/32768 |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2336 | * |
| 2337 | * The calculation is to be done in a linear colorspace. |
| 2338 | * |
| 2339 | * Other integer coefficents can be used via png_set_rgb_to_gray(). |
| 2340 | */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 2341 | int /* PRIVATE */ |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2342 | png_do_rgb_to_gray(png_structp png_ptr, png_row_infop row_info, png_bytep row) |
| 2343 | |
| 2344 | { |
| 2345 | png_uint_32 i; |
| 2346 | |
| 2347 | png_uint_32 row_width = row_info->width; |
| 2348 | int rgb_error = 0; |
| 2349 | |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 2350 | png_debug(1, "in png_do_rgb_to_gray"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 2351 | |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2352 | if ( |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2353 | (row_info->color_type & PNG_COLOR_MASK_COLOR)) |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2354 | { |
Glenn Randers-Pehrson | 520a764 | 2000-03-21 05:13:06 -0600 | [diff] [blame] | 2355 | png_uint_32 rc = png_ptr->rgb_to_gray_red_coeff; |
| 2356 | png_uint_32 gc = png_ptr->rgb_to_gray_green_coeff; |
| 2357 | png_uint_32 bc = png_ptr->rgb_to_gray_blue_coeff; |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2358 | |
| 2359 | if (row_info->color_type == PNG_COLOR_TYPE_RGB) |
| 2360 | { |
| 2361 | if (row_info->bit_depth == 8) |
| 2362 | { |
| 2363 | #if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED) |
| 2364 | if (png_ptr->gamma_from_1 != NULL && png_ptr->gamma_to_1 != NULL) |
| 2365 | { |
| 2366 | png_bytep sp = row; |
| 2367 | png_bytep dp = row; |
| 2368 | |
| 2369 | for (i = 0; i < row_width; i++) |
| 2370 | { |
| 2371 | png_byte red = png_ptr->gamma_to_1[*(sp++)]; |
| 2372 | png_byte green = png_ptr->gamma_to_1[*(sp++)]; |
| 2373 | png_byte blue = png_ptr->gamma_to_1[*(sp++)]; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2374 | |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 2375 | if (red != green || red != blue) |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2376 | { |
| 2377 | rgb_error |= 1; |
| 2378 | *(dp++) = png_ptr->gamma_from_1[ |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2379 | (rc*red + gc*green + bc*blue)>>15]; |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2380 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2381 | |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2382 | else |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 2383 | *(dp++) = *(sp - 1); |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2384 | } |
| 2385 | } |
| 2386 | else |
| 2387 | #endif |
| 2388 | { |
| 2389 | png_bytep sp = row; |
| 2390 | png_bytep dp = row; |
| 2391 | for (i = 0; i < row_width; i++) |
| 2392 | { |
| 2393 | png_byte red = *(sp++); |
| 2394 | png_byte green = *(sp++); |
| 2395 | png_byte blue = *(sp++); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2396 | |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 2397 | if (red != green || red != blue) |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2398 | { |
| 2399 | rgb_error |= 1; |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 2400 | *(dp++) = (png_byte)((rc*red + gc*green + bc*blue)>>15); |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2401 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2402 | |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2403 | else |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 2404 | *(dp++) = *(sp - 1); |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2405 | } |
| 2406 | } |
| 2407 | } |
Glenn Randers-Pehrson | 166c5a3 | 1999-12-10 09:43:02 -0600 | [diff] [blame] | 2408 | |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2409 | else /* RGB bit_depth == 16 */ |
| 2410 | { |
| 2411 | #if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED) |
| 2412 | if (png_ptr->gamma_16_to_1 != NULL && |
| 2413 | png_ptr->gamma_16_from_1 != NULL) |
| 2414 | { |
| 2415 | png_bytep sp = row; |
| 2416 | png_bytep dp = row; |
| 2417 | for (i = 0; i < row_width; i++) |
| 2418 | { |
| 2419 | png_uint_16 red, green, blue, w; |
| 2420 | |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2421 | red = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2; |
| 2422 | green = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2; |
| 2423 | blue = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2; |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2424 | |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 2425 | if (red == green && red == blue) |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2426 | w = red; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2427 | |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2428 | else |
| 2429 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2430 | png_uint_16 red_1 = png_ptr->gamma_16_to_1[(red&0xff) |
| 2431 | >> png_ptr->gamma_shift][red>>8]; |
Glenn Randers-Pehrson | e3f3c4e | 2010-02-07 18:08:50 -0600 | [diff] [blame] | 2432 | png_uint_16 green_1 = |
| 2433 | png_ptr->gamma_16_to_1[(green&0xff) >> |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 2434 | png_ptr->gamma_shift][green>>8]; |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2435 | png_uint_16 blue_1 = png_ptr->gamma_16_to_1[(blue&0xff) |
| 2436 | >> png_ptr->gamma_shift][blue>>8]; |
Glenn Randers-Pehrson | 860ab2b | 1999-10-14 07:43:10 -0500 | [diff] [blame] | 2437 | png_uint_16 gray16 = (png_uint_16)((rc*red_1 + gc*green_1 |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 2438 | + bc*blue_1)>>15); |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2439 | w = png_ptr->gamma_16_from_1[(gray16&0xff) >> |
| 2440 | png_ptr->gamma_shift][gray16 >> 8]; |
| 2441 | rgb_error |= 1; |
| 2442 | } |
Glenn Randers-Pehrson | 166c5a3 | 1999-12-10 09:43:02 -0600 | [diff] [blame] | 2443 | |
Glenn Randers-Pehrson | 860ab2b | 1999-10-14 07:43:10 -0500 | [diff] [blame] | 2444 | *(dp++) = (png_byte)((w>>8) & 0xff); |
| 2445 | *(dp++) = (png_byte)(w & 0xff); |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2446 | } |
| 2447 | } |
| 2448 | else |
| 2449 | #endif |
| 2450 | { |
| 2451 | png_bytep sp = row; |
| 2452 | png_bytep dp = row; |
| 2453 | for (i = 0; i < row_width; i++) |
| 2454 | { |
| 2455 | png_uint_16 red, green, blue, gray16; |
| 2456 | |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2457 | red = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2; |
| 2458 | green = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2; |
| 2459 | blue = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2; |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2460 | |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 2461 | if (red != green || red != blue) |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2462 | rgb_error |= 1; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2463 | |
Glenn Randers-Pehrson | 520a764 | 2000-03-21 05:13:06 -0600 | [diff] [blame] | 2464 | gray16 = (png_uint_16)((rc*red + gc*green + bc*blue)>>15); |
Glenn Randers-Pehrson | 860ab2b | 1999-10-14 07:43:10 -0500 | [diff] [blame] | 2465 | *(dp++) = (png_byte)((gray16>>8) & 0xff); |
| 2466 | *(dp++) = (png_byte)(gray16 & 0xff); |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2467 | } |
| 2468 | } |
| 2469 | } |
| 2470 | } |
| 2471 | if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA) |
| 2472 | { |
| 2473 | if (row_info->bit_depth == 8) |
| 2474 | { |
| 2475 | #if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED) |
| 2476 | if (png_ptr->gamma_from_1 != NULL && png_ptr->gamma_to_1 != NULL) |
| 2477 | { |
| 2478 | png_bytep sp = row; |
| 2479 | png_bytep dp = row; |
| 2480 | for (i = 0; i < row_width; i++) |
| 2481 | { |
| 2482 | png_byte red = png_ptr->gamma_to_1[*(sp++)]; |
| 2483 | png_byte green = png_ptr->gamma_to_1[*(sp++)]; |
| 2484 | png_byte blue = png_ptr->gamma_to_1[*(sp++)]; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2485 | |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 2486 | if (red != green || red != blue) |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2487 | rgb_error |= 1; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2488 | |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2489 | *(dp++) = png_ptr->gamma_from_1 |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 2490 | [(rc*red + gc*green + bc*blue)>>15]; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2491 | |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2492 | *(dp++) = *(sp++); /* alpha */ |
| 2493 | } |
| 2494 | } |
| 2495 | else |
| 2496 | #endif |
| 2497 | { |
| 2498 | png_bytep sp = row; |
| 2499 | png_bytep dp = row; |
| 2500 | for (i = 0; i < row_width; i++) |
| 2501 | { |
| 2502 | png_byte red = *(sp++); |
| 2503 | png_byte green = *(sp++); |
| 2504 | png_byte blue = *(sp++); |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 2505 | if (red != green || red != blue) |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2506 | rgb_error |= 1; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2507 | |
Glenn Randers-Pehrson | dff799e | 2004-08-07 21:42:49 -0500 | [diff] [blame] | 2508 | *(dp++) = (png_byte)((rc*red + gc*green + bc*blue)>>15); |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2509 | *(dp++) = *(sp++); /* alpha */ |
| 2510 | } |
| 2511 | } |
| 2512 | } |
| 2513 | else /* RGBA bit_depth == 16 */ |
| 2514 | { |
| 2515 | #if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED) |
| 2516 | if (png_ptr->gamma_16_to_1 != NULL && |
| 2517 | png_ptr->gamma_16_from_1 != NULL) |
| 2518 | { |
| 2519 | png_bytep sp = row; |
| 2520 | png_bytep dp = row; |
| 2521 | for (i = 0; i < row_width; i++) |
| 2522 | { |
| 2523 | png_uint_16 red, green, blue, w; |
| 2524 | |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2525 | red = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2; |
| 2526 | green = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2; |
| 2527 | blue = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2; |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2528 | |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 2529 | if (red == green && red == blue) |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2530 | w = red; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2531 | |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2532 | else |
| 2533 | { |
| 2534 | png_uint_16 red_1 = png_ptr->gamma_16_to_1[(red&0xff) >> |
Glenn Randers-Pehrson | e3f3c4e | 2010-02-07 18:08:50 -0600 | [diff] [blame] | 2535 | png_ptr->gamma_shift][red>>8]; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2536 | |
Glenn Randers-Pehrson | e3f3c4e | 2010-02-07 18:08:50 -0600 | [diff] [blame] | 2537 | png_uint_16 green_1 = |
| 2538 | png_ptr->gamma_16_to_1[(green&0xff) >> |
| 2539 | png_ptr->gamma_shift][green>>8]; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2540 | |
Glenn Randers-Pehrson | 166c5a3 | 1999-12-10 09:43:02 -0600 | [diff] [blame] | 2541 | png_uint_16 blue_1 = png_ptr->gamma_16_to_1[(blue&0xff) >> |
Glenn Randers-Pehrson | e3f3c4e | 2010-02-07 18:08:50 -0600 | [diff] [blame] | 2542 | png_ptr->gamma_shift][blue>>8]; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2543 | |
Glenn Randers-Pehrson | 860ab2b | 1999-10-14 07:43:10 -0500 | [diff] [blame] | 2544 | png_uint_16 gray16 = (png_uint_16)((rc * red_1 |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2545 | + gc * green_1 + bc * blue_1)>>15); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2546 | |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2547 | w = png_ptr->gamma_16_from_1[(gray16&0xff) >> |
| 2548 | png_ptr->gamma_shift][gray16 >> 8]; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2549 | |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2550 | rgb_error |= 1; |
| 2551 | } |
Glenn Randers-Pehrson | 166c5a3 | 1999-12-10 09:43:02 -0600 | [diff] [blame] | 2552 | |
Glenn Randers-Pehrson | 860ab2b | 1999-10-14 07:43:10 -0500 | [diff] [blame] | 2553 | *(dp++) = (png_byte)((w>>8) & 0xff); |
| 2554 | *(dp++) = (png_byte)(w & 0xff); |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2555 | *(dp++) = *(sp++); /* alpha */ |
| 2556 | *(dp++) = *(sp++); |
| 2557 | } |
| 2558 | } |
| 2559 | else |
| 2560 | #endif |
| 2561 | { |
| 2562 | png_bytep sp = row; |
| 2563 | png_bytep dp = row; |
| 2564 | for (i = 0; i < row_width; i++) |
| 2565 | { |
| 2566 | png_uint_16 red, green, blue, gray16; |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2567 | red = (png_uint_16)((*(sp)<<8) | *(sp + 1)); sp += 2; |
| 2568 | green = (png_uint_16)((*(sp)<<8) | *(sp + 1)); sp += 2; |
| 2569 | blue = (png_uint_16)((*(sp)<<8) | *(sp + 1)); sp += 2; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2570 | |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 2571 | if (red != green || red != blue) |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2572 | rgb_error |= 1; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2573 | |
Glenn Randers-Pehrson | 520a764 | 2000-03-21 05:13:06 -0600 | [diff] [blame] | 2574 | gray16 = (png_uint_16)((rc*red + gc*green + bc*blue)>>15); |
Glenn Randers-Pehrson | 860ab2b | 1999-10-14 07:43:10 -0500 | [diff] [blame] | 2575 | *(dp++) = (png_byte)((gray16>>8) & 0xff); |
| 2576 | *(dp++) = (png_byte)(gray16 & 0xff); |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2577 | *(dp++) = *(sp++); /* alpha */ |
| 2578 | *(dp++) = *(sp++); |
| 2579 | } |
| 2580 | } |
| 2581 | } |
| 2582 | } |
| 2583 | row_info->channels -= (png_byte)2; |
| 2584 | row_info->color_type &= ~PNG_COLOR_MASK_COLOR; |
| 2585 | row_info->pixel_depth = (png_byte)(row_info->channels * |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2586 | row_info->bit_depth); |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 2587 | row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width); |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 2588 | } |
| 2589 | return rgb_error; |
| 2590 | } |
| 2591 | #endif |
| 2592 | |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 2593 | /* Build a grayscale palette. Palette is assumed to be 1 << bit_depth |
| 2594 | * large of png_color. This lets grayscale images be treated as |
| 2595 | * paletted. Most useful for gamma correction and simplification |
| 2596 | * of code. |
| 2597 | */ |
Glenn Randers-Pehrson | 73d57cb | 2002-03-25 18:49:08 -0600 | [diff] [blame] | 2598 | void PNGAPI |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 2599 | png_build_grayscale_palette(int bit_depth, png_colorp palette) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2600 | { |
| 2601 | int num_palette; |
| 2602 | int color_inc; |
| 2603 | int i; |
| 2604 | int v; |
| 2605 | |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 2606 | png_debug(1, "in png_do_build_grayscale_palette"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 2607 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2608 | if (palette == NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2609 | return; |
| 2610 | |
| 2611 | switch (bit_depth) |
| 2612 | { |
| 2613 | case 1: |
| 2614 | num_palette = 2; |
| 2615 | color_inc = 0xff; |
| 2616 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 2617 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2618 | case 2: |
| 2619 | num_palette = 4; |
| 2620 | color_inc = 0x55; |
| 2621 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 2622 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2623 | case 4: |
| 2624 | num_palette = 16; |
| 2625 | color_inc = 0x11; |
| 2626 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 2627 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2628 | case 8: |
| 2629 | num_palette = 256; |
| 2630 | color_inc = 1; |
| 2631 | break; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 2632 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2633 | default: |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2634 | num_palette = 0; |
Guy Schalnat | 69b1448 | 1996-01-10 02:56:49 -0600 | [diff] [blame] | 2635 | color_inc = 0; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2636 | break; |
| 2637 | } |
| 2638 | |
| 2639 | for (i = 0, v = 0; i < num_palette; i++, v += color_inc) |
| 2640 | { |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2641 | palette[i].red = (png_byte)v; |
| 2642 | palette[i].green = (png_byte)v; |
| 2643 | palette[i].blue = (png_byte)v; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2644 | } |
| 2645 | } |
| 2646 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2647 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2648 | #ifdef PNG_READ_BACKGROUND_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2649 | /* Replace any alpha or transparency with the supplied background color. |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 2650 | * "background" is already in the screen gamma, while "background_1" is |
| 2651 | * at a gamma of 1.0. Paletted files have already been taken care of. |
| 2652 | */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 2653 | void /* PRIVATE */ |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 2654 | png_do_background(png_row_infop row_info, png_bytep row, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2655 | png_color_16p trans_color, png_color_16p background |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2656 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2657 | , png_color_16p background_1, |
| 2658 | png_bytep gamma_table, png_bytep gamma_from_1, png_bytep gamma_to_1, |
| 2659 | png_uint_16pp gamma_16, png_uint_16pp gamma_16_from_1, |
| 2660 | png_uint_16pp gamma_16_to_1, int gamma_shift |
Glenn Randers-Pehrson | 5a0be34 | 2001-10-18 20:55:13 -0500 | [diff] [blame] | 2661 | #endif |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2662 | ) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2663 | { |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 2664 | png_bytep sp, dp; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2665 | png_uint_32 i; |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2666 | png_uint_32 row_width = row_info->width; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2667 | int shift; |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 2668 | |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 2669 | png_debug(1, "in png_do_background"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 2670 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2671 | if (background != NULL && |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2672 | (!(row_info->color_type & PNG_COLOR_MASK_ALPHA) || |
Glenn Randers-Pehrson | 56f6396 | 2008-10-06 10:16:17 -0500 | [diff] [blame] | 2673 | (row_info->color_type != PNG_COLOR_TYPE_PALETTE && trans_color))) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2674 | { |
| 2675 | switch (row_info->color_type) |
| 2676 | { |
| 2677 | case PNG_COLOR_TYPE_GRAY: |
| 2678 | { |
| 2679 | switch (row_info->bit_depth) |
| 2680 | { |
| 2681 | case 1: |
| 2682 | { |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2683 | sp = row; |
| 2684 | shift = 7; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2685 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2686 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 2687 | if ((png_uint_16)((*sp >> shift) & 0x01) |
Glenn Randers-Pehrson | 56f6396 | 2008-10-06 10:16:17 -0500 | [diff] [blame] | 2688 | == trans_color->gray) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2689 | { |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2690 | *sp &= (png_byte)((0x7f7f >> (7 - shift)) & 0xff); |
| 2691 | *sp |= (png_byte)(background->gray << shift); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2692 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2693 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2694 | if (!shift) |
| 2695 | { |
| 2696 | shift = 7; |
| 2697 | sp++; |
| 2698 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2699 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2700 | else |
| 2701 | shift--; |
| 2702 | } |
| 2703 | break; |
| 2704 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 2705 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2706 | case 2: |
| 2707 | { |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2708 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 2709 | if (gamma_table != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2710 | { |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 2711 | sp = row; |
| 2712 | shift = 6; |
| 2713 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2714 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 2715 | if ((png_uint_16)((*sp >> shift) & 0x03) |
Glenn Randers-Pehrson | 56f6396 | 2008-10-06 10:16:17 -0500 | [diff] [blame] | 2716 | == trans_color->gray) |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 2717 | { |
| 2718 | *sp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff); |
| 2719 | *sp |= (png_byte)(background->gray << shift); |
| 2720 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2721 | |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 2722 | else |
| 2723 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 2724 | png_byte p = (png_byte)((*sp >> shift) & 0x03); |
Glenn Randers-Pehrson | 860ab2b | 1999-10-14 07:43:10 -0500 | [diff] [blame] | 2725 | png_byte g = (png_byte)((gamma_table [p | (p << 2) | |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 2726 | (p << 4) | (p << 6)] >> 6) & 0x03); |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 2727 | *sp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff); |
| 2728 | *sp |= (png_byte)(g << shift); |
| 2729 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2730 | |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 2731 | if (!shift) |
| 2732 | { |
| 2733 | shift = 6; |
| 2734 | sp++; |
| 2735 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2736 | |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 2737 | else |
| 2738 | shift -= 2; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2739 | } |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 2740 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2741 | |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 2742 | else |
| 2743 | #endif |
| 2744 | { |
| 2745 | sp = row; |
| 2746 | shift = 6; |
| 2747 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2748 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 2749 | if ((png_uint_16)((*sp >> shift) & 0x03) |
Glenn Randers-Pehrson | 56f6396 | 2008-10-06 10:16:17 -0500 | [diff] [blame] | 2750 | == trans_color->gray) |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 2751 | { |
| 2752 | *sp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff); |
| 2753 | *sp |= (png_byte)(background->gray << shift); |
| 2754 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2755 | |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 2756 | if (!shift) |
| 2757 | { |
| 2758 | shift = 6; |
| 2759 | sp++; |
| 2760 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2761 | |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 2762 | else |
| 2763 | shift -= 2; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2764 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2765 | } |
| 2766 | break; |
| 2767 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 2768 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2769 | case 4: |
| 2770 | { |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2771 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 2772 | if (gamma_table != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2773 | { |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 2774 | sp = row; |
| 2775 | shift = 4; |
| 2776 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2777 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 2778 | if ((png_uint_16)((*sp >> shift) & 0x0f) |
Glenn Randers-Pehrson | 56f6396 | 2008-10-06 10:16:17 -0500 | [diff] [blame] | 2779 | == trans_color->gray) |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 2780 | { |
| 2781 | *sp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff); |
| 2782 | *sp |= (png_byte)(background->gray << shift); |
| 2783 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2784 | |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 2785 | else |
| 2786 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 2787 | png_byte p = (png_byte)((*sp >> shift) & 0x0f); |
Glenn Randers-Pehrson | 860ab2b | 1999-10-14 07:43:10 -0500 | [diff] [blame] | 2788 | png_byte g = (png_byte)((gamma_table[p | |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 2789 | (p << 4)] >> 4) & 0x0f); |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 2790 | *sp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff); |
| 2791 | *sp |= (png_byte)(g << shift); |
| 2792 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2793 | |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 2794 | if (!shift) |
| 2795 | { |
| 2796 | shift = 4; |
| 2797 | sp++; |
| 2798 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2799 | |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 2800 | else |
| 2801 | shift -= 4; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2802 | } |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 2803 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2804 | |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 2805 | else |
| 2806 | #endif |
| 2807 | { |
| 2808 | sp = row; |
| 2809 | shift = 4; |
| 2810 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2811 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 2812 | if ((png_uint_16)((*sp >> shift) & 0x0f) |
Glenn Randers-Pehrson | 56f6396 | 2008-10-06 10:16:17 -0500 | [diff] [blame] | 2813 | == trans_color->gray) |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 2814 | { |
| 2815 | *sp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff); |
| 2816 | *sp |= (png_byte)(background->gray << shift); |
| 2817 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2818 | |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 2819 | if (!shift) |
| 2820 | { |
| 2821 | shift = 4; |
| 2822 | sp++; |
| 2823 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2824 | |
Glenn Randers-Pehrson | f7d1a17 | 1998-06-06 15:31:35 -0500 | [diff] [blame] | 2825 | else |
| 2826 | shift -= 4; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2827 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2828 | } |
| 2829 | break; |
| 2830 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 2831 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2832 | case 8: |
| 2833 | { |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2834 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2835 | if (gamma_table != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2836 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2837 | sp = row; |
| 2838 | for (i = 0; i < row_width; i++, sp++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2839 | { |
Glenn Randers-Pehrson | 56f6396 | 2008-10-06 10:16:17 -0500 | [diff] [blame] | 2840 | if (*sp == trans_color->gray) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2841 | *sp = (png_byte)background->gray; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 2842 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2843 | else |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2844 | *sp = gamma_table[*sp]; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2845 | } |
| 2846 | } |
| 2847 | else |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2848 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 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++, sp++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2852 | { |
Glenn Randers-Pehrson | 56f6396 | 2008-10-06 10:16:17 -0500 | [diff] [blame] | 2853 | if (*sp == trans_color->gray) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2854 | *sp = (png_byte)background->gray; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2855 | } |
| 2856 | } |
| 2857 | break; |
| 2858 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 2859 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2860 | case 16: |
| 2861 | { |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2862 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2863 | if (gamma_16 != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2864 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2865 | sp = row; |
| 2866 | for (i = 0; i < row_width; i++, sp += 2) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2867 | { |
| 2868 | png_uint_16 v; |
| 2869 | |
Glenn Randers-Pehrson | 860ab2b | 1999-10-14 07:43:10 -0500 | [diff] [blame] | 2870 | v = (png_uint_16)(((*sp) << 8) + *(sp + 1)); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2871 | |
Glenn Randers-Pehrson | 56f6396 | 2008-10-06 10:16:17 -0500 | [diff] [blame] | 2872 | if (v == trans_color->gray) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2873 | { |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 2874 | /* Background is already in screen gamma */ |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2875 | *sp = (png_byte)((background->gray >> 8) & 0xff); |
| 2876 | *(sp + 1) = (png_byte)(background->gray & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2877 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2878 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2879 | else |
| 2880 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2881 | v = gamma_16[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2882 | *sp = (png_byte)((v >> 8) & 0xff); |
Guy Schalnat | 4ee97b0 | 1996-01-16 01:51:56 -0600 | [diff] [blame] | 2883 | *(sp + 1) = (png_byte)(v & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2884 | } |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2885 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2886 | } |
| 2887 | else |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2888 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2889 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2890 | sp = row; |
| 2891 | for (i = 0; i < row_width; i++, sp += 2) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2892 | { |
| 2893 | png_uint_16 v; |
| 2894 | |
Glenn Randers-Pehrson | 860ab2b | 1999-10-14 07:43:10 -0500 | [diff] [blame] | 2895 | v = (png_uint_16)(((*sp) << 8) + *(sp + 1)); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2896 | |
Glenn Randers-Pehrson | 56f6396 | 2008-10-06 10:16:17 -0500 | [diff] [blame] | 2897 | if (v == trans_color->gray) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2898 | { |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2899 | *sp = (png_byte)((background->gray >> 8) & 0xff); |
| 2900 | *(sp + 1) = (png_byte)(background->gray & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2901 | } |
| 2902 | } |
| 2903 | } |
| 2904 | break; |
| 2905 | } |
| 2906 | } |
| 2907 | break; |
| 2908 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 2909 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2910 | case PNG_COLOR_TYPE_RGB: |
| 2911 | { |
| 2912 | if (row_info->bit_depth == 8) |
| 2913 | { |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2914 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2915 | if (gamma_table != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2916 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2917 | sp = row; |
| 2918 | for (i = 0; i < row_width; i++, sp += 3) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2919 | { |
Glenn Randers-Pehrson | 56f6396 | 2008-10-06 10:16:17 -0500 | [diff] [blame] | 2920 | if (*sp == trans_color->red && |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2921 | *(sp + 1) == trans_color->green && |
| 2922 | *(sp + 2) == trans_color->blue) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2923 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2924 | *sp = (png_byte)background->red; |
| 2925 | *(sp + 1) = (png_byte)background->green; |
| 2926 | *(sp + 2) = (png_byte)background->blue; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2927 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2928 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2929 | else |
| 2930 | { |
| 2931 | *sp = gamma_table[*sp]; |
| 2932 | *(sp + 1) = gamma_table[*(sp + 1)]; |
| 2933 | *(sp + 2) = gamma_table[*(sp + 2)]; |
| 2934 | } |
| 2935 | } |
| 2936 | } |
| 2937 | else |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 2938 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2939 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2940 | sp = row; |
| 2941 | for (i = 0; i < row_width; i++, sp += 3) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2942 | { |
Glenn Randers-Pehrson | 56f6396 | 2008-10-06 10:16:17 -0500 | [diff] [blame] | 2943 | if (*sp == trans_color->red && |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 2944 | *(sp + 1) == trans_color->green && |
| 2945 | *(sp + 2) == trans_color->blue) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2946 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2947 | *sp = (png_byte)background->red; |
| 2948 | *(sp + 1) = (png_byte)background->green; |
| 2949 | *(sp + 2) = (png_byte)background->blue; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2950 | } |
| 2951 | } |
| 2952 | } |
| 2953 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2954 | else /* if (row_info->bit_depth == 16) */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2955 | { |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 2956 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2957 | if (gamma_16 != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2958 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 2959 | sp = row; |
| 2960 | for (i = 0; i < row_width; i++, sp += 6) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2961 | { |
Glenn Randers-Pehrson | 860ab2b | 1999-10-14 07:43:10 -0500 | [diff] [blame] | 2962 | png_uint_16 r = (png_uint_16)(((*sp) << 8) + *(sp + 1)); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2963 | |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2964 | png_uint_16 g = (png_uint_16)(((*(sp + 2)) << 8) |
| 2965 | + *(sp + 3)); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2966 | |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 2967 | png_uint_16 b = (png_uint_16)(((*(sp + 4)) << 8) |
| 2968 | + *(sp + 5)); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2969 | |
Glenn Randers-Pehrson | 56f6396 | 2008-10-06 10:16:17 -0500 | [diff] [blame] | 2970 | if (r == trans_color->red && g == trans_color->green && |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 2971 | b == trans_color->blue) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2972 | { |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 2973 | /* Background is already in screen gamma */ |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2974 | *sp = (png_byte)((background->red >> 8) & 0xff); |
| 2975 | *(sp + 1) = (png_byte)(background->red & 0xff); |
| 2976 | *(sp + 2) = (png_byte)((background->green >> 8) & 0xff); |
| 2977 | *(sp + 3) = (png_byte)(background->green & 0xff); |
| 2978 | *(sp + 4) = (png_byte)((background->blue >> 8) & 0xff); |
| 2979 | *(sp + 5) = (png_byte)(background->blue & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2980 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2981 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2982 | else |
| 2983 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 2984 | png_uint_16 v = gamma_16[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2985 | *sp = (png_byte)((v >> 8) & 0xff); |
Guy Schalnat | 4ee97b0 | 1996-01-16 01:51:56 -0600 | [diff] [blame] | 2986 | *(sp + 1) = (png_byte)(v & 0xff); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2987 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2988 | v = gamma_16[*(sp + 3) >> gamma_shift][*(sp + 2)]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2989 | *(sp + 2) = (png_byte)((v >> 8) & 0xff); |
| 2990 | *(sp + 3) = (png_byte)(v & 0xff); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2991 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 2992 | v = gamma_16[*(sp + 5) >> gamma_shift][*(sp + 4)]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 2993 | *(sp + 4) = (png_byte)((v >> 8) & 0xff); |
| 2994 | *(sp + 5) = (png_byte)(v & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2995 | } |
| 2996 | } |
| 2997 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 2998 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 2999 | else |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3000 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3001 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3002 | sp = row; |
| 3003 | for (i = 0; i < row_width; i++, sp += 6) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3004 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3005 | png_uint_16 r = (png_uint_16)(((*sp) << 8) + *(sp + 1)); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3006 | |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3007 | png_uint_16 g = (png_uint_16)(((*(sp + 2)) << 8) |
| 3008 | + *(sp + 3)); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3009 | |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3010 | png_uint_16 b = (png_uint_16)(((*(sp + 4)) << 8) |
| 3011 | + *(sp + 5)); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3012 | |
Glenn Randers-Pehrson | 56f6396 | 2008-10-06 10:16:17 -0500 | [diff] [blame] | 3013 | if (r == trans_color->red && g == trans_color->green && |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 3014 | b == trans_color->blue) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3015 | { |
| 3016 | *sp = (png_byte)((background->red >> 8) & 0xff); |
| 3017 | *(sp + 1) = (png_byte)(background->red & 0xff); |
| 3018 | *(sp + 2) = (png_byte)((background->green >> 8) & 0xff); |
| 3019 | *(sp + 3) = (png_byte)(background->green & 0xff); |
| 3020 | *(sp + 4) = (png_byte)((background->blue >> 8) & 0xff); |
| 3021 | *(sp + 5) = (png_byte)(background->blue & 0xff); |
| 3022 | } |
| 3023 | } |
| 3024 | } |
| 3025 | } |
| 3026 | break; |
| 3027 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3028 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3029 | case PNG_COLOR_TYPE_GRAY_ALPHA: |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3030 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3031 | if (row_info->bit_depth == 8) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3032 | { |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 3033 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3034 | if (gamma_to_1 != NULL && gamma_from_1 != NULL && |
| 3035 | gamma_table != NULL) |
| 3036 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3037 | sp = row; |
| 3038 | dp = row; |
| 3039 | for (i = 0; i < row_width; i++, sp += 2, dp++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3040 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 3041 | png_uint_16 a = *(sp + 1); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3042 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3043 | if (a == 0xff) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3044 | *dp = gamma_table[*sp]; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 3045 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3046 | else if (a == 0) |
| 3047 | { |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3048 | /* Background is already in screen gamma */ |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3049 | *dp = (png_byte)background->gray; |
| 3050 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3051 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3052 | else |
| 3053 | { |
| 3054 | png_byte v, w; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3055 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3056 | v = gamma_to_1[*sp]; |
| 3057 | png_composite(w, v, a, background_1->gray); |
| 3058 | *dp = gamma_from_1[w]; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3059 | } |
| 3060 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3061 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3062 | else |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3063 | #endif |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3064 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3065 | sp = row; |
| 3066 | dp = row; |
| 3067 | for (i = 0; i < row_width; i++, sp += 2, dp++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3068 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 3069 | png_byte a = *(sp + 1); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3070 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3071 | if (a == 0xff) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3072 | *dp = *sp; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 3073 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 3074 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3075 | else if (a == 0) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3076 | *dp = (png_byte)background->gray; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 3077 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3078 | else |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3079 | png_composite(*dp, *sp, a, background_1->gray); |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 3080 | |
Glenn Randers-Pehrson | 5a0be34 | 2001-10-18 20:55:13 -0500 | [diff] [blame] | 3081 | #else |
| 3082 | *dp = (png_byte)background->gray; |
| 3083 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3084 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3085 | } |
| 3086 | } |
| 3087 | else /* if (png_ptr->bit_depth == 16) */ |
| 3088 | { |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 3089 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3090 | if (gamma_16 != NULL && gamma_16_from_1 != NULL && |
| 3091 | gamma_16_to_1 != NULL) |
| 3092 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3093 | sp = row; |
| 3094 | dp = row; |
| 3095 | for (i = 0; i < row_width; i++, sp += 4, dp += 2) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3096 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3097 | png_uint_16 a = (png_uint_16)(((*(sp + 2)) << 8) |
| 3098 | + *(sp + 3)); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3099 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3100 | if (a == (png_uint_16)0xffff) |
| 3101 | { |
| 3102 | png_uint_16 v; |
| 3103 | |
| 3104 | v = gamma_16[*(sp + 1) >> gamma_shift][*sp]; |
| 3105 | *dp = (png_byte)((v >> 8) & 0xff); |
| 3106 | *(dp + 1) = (png_byte)(v & 0xff); |
| 3107 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3108 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 3109 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3110 | else if (a == 0) |
Glenn Randers-Pehrson | 5a0be34 | 2001-10-18 20:55:13 -0500 | [diff] [blame] | 3111 | #else |
| 3112 | else |
| 3113 | #endif |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3114 | { |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3115 | /* Background is already in screen gamma */ |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3116 | *dp = (png_byte)((background->gray >> 8) & 0xff); |
| 3117 | *(dp + 1) = (png_byte)(background->gray & 0xff); |
| 3118 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3119 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 3120 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3121 | else |
| 3122 | { |
| 3123 | png_uint_16 g, v, w; |
| 3124 | |
| 3125 | g = gamma_16_to_1[*(sp + 1) >> gamma_shift][*sp]; |
| 3126 | png_composite_16(v, g, a, background_1->gray); |
| 3127 | w = gamma_16_from_1[(v&0xff) >> gamma_shift][v >> 8]; |
| 3128 | *dp = (png_byte)((w >> 8) & 0xff); |
| 3129 | *(dp + 1) = (png_byte)(w & 0xff); |
| 3130 | } |
Glenn Randers-Pehrson | 5a0be34 | 2001-10-18 20:55:13 -0500 | [diff] [blame] | 3131 | #endif |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3132 | } |
| 3133 | } |
| 3134 | else |
| 3135 | #endif |
| 3136 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3137 | sp = row; |
| 3138 | dp = row; |
| 3139 | for (i = 0; i < row_width; i++, sp += 4, dp += 2) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3140 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3141 | png_uint_16 a = (png_uint_16)(((*(sp + 2)) << 8) |
| 3142 | + *(sp + 3)); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3143 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3144 | if (a == (png_uint_16)0xffff) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3145 | png_memcpy(dp, sp, 2); |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 3146 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 3147 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3148 | else if (a == 0) |
Glenn Randers-Pehrson | 5a0be34 | 2001-10-18 20:55:13 -0500 | [diff] [blame] | 3149 | #else |
| 3150 | else |
| 3151 | #endif |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3152 | { |
| 3153 | *dp = (png_byte)((background->gray >> 8) & 0xff); |
| 3154 | *(dp + 1) = (png_byte)(background->gray & 0xff); |
| 3155 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3156 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 3157 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3158 | else |
| 3159 | { |
| 3160 | png_uint_16 g, v; |
| 3161 | |
Glenn Randers-Pehrson | 860ab2b | 1999-10-14 07:43:10 -0500 | [diff] [blame] | 3162 | g = (png_uint_16)(((*sp) << 8) + *(sp + 1)); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3163 | png_composite_16(v, g, a, background_1->gray); |
| 3164 | *dp = (png_byte)((v >> 8) & 0xff); |
| 3165 | *(dp + 1) = (png_byte)(v & 0xff); |
| 3166 | } |
Glenn Randers-Pehrson | 5a0be34 | 2001-10-18 20:55:13 -0500 | [diff] [blame] | 3167 | #endif |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3168 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3169 | } |
| 3170 | } |
| 3171 | break; |
| 3172 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3173 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3174 | case PNG_COLOR_TYPE_RGB_ALPHA: |
| 3175 | { |
| 3176 | if (row_info->bit_depth == 8) |
| 3177 | { |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 3178 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3179 | if (gamma_to_1 != NULL && gamma_from_1 != NULL && |
| 3180 | gamma_table != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3181 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3182 | sp = row; |
| 3183 | dp = row; |
| 3184 | for (i = 0; i < row_width; i++, sp += 4, dp += 3) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3185 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 3186 | png_byte a = *(sp + 3); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3187 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3188 | if (a == 0xff) |
| 3189 | { |
| 3190 | *dp = gamma_table[*sp]; |
| 3191 | *(dp + 1) = gamma_table[*(sp + 1)]; |
| 3192 | *(dp + 2) = gamma_table[*(sp + 2)]; |
| 3193 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3194 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3195 | else if (a == 0) |
| 3196 | { |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3197 | /* Background is already in screen gamma */ |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3198 | *dp = (png_byte)background->red; |
| 3199 | *(dp + 1) = (png_byte)background->green; |
| 3200 | *(dp + 2) = (png_byte)background->blue; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3201 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3202 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3203 | else |
| 3204 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3205 | png_byte v, w; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3206 | |
| 3207 | v = gamma_to_1[*sp]; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3208 | png_composite(w, v, a, background_1->red); |
| 3209 | *dp = gamma_from_1[w]; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3210 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3211 | v = gamma_to_1[*(sp + 1)]; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3212 | png_composite(w, v, a, background_1->green); |
| 3213 | *(dp + 1) = gamma_from_1[w]; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3214 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3215 | v = gamma_to_1[*(sp + 2)]; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3216 | png_composite(w, v, a, background_1->blue); |
| 3217 | *(dp + 2) = gamma_from_1[w]; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3218 | } |
| 3219 | } |
| 3220 | } |
| 3221 | else |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3222 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3223 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3224 | sp = row; |
| 3225 | dp = row; |
| 3226 | for (i = 0; i < row_width; i++, sp += 4, dp += 3) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3227 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 3228 | png_byte a = *(sp + 3); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3229 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3230 | if (a == 0xff) |
| 3231 | { |
| 3232 | *dp = *sp; |
| 3233 | *(dp + 1) = *(sp + 1); |
| 3234 | *(dp + 2) = *(sp + 2); |
| 3235 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3236 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3237 | else if (a == 0) |
| 3238 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3239 | *dp = (png_byte)background->red; |
| 3240 | *(dp + 1) = (png_byte)background->green; |
| 3241 | *(dp + 2) = (png_byte)background->blue; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3242 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3243 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3244 | else |
| 3245 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3246 | png_composite(*dp, *sp, a, background->red); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3247 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3248 | png_composite(*(dp + 1), *(sp + 1), a, |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 3249 | background->green); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3250 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3251 | png_composite(*(dp + 2), *(sp + 2), a, |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 3252 | background->blue); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3253 | } |
| 3254 | } |
| 3255 | } |
| 3256 | } |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3257 | else /* if (row_info->bit_depth == 16) */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3258 | { |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 3259 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3260 | if (gamma_16 != NULL && gamma_16_from_1 != NULL && |
| 3261 | gamma_16_to_1 != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3262 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3263 | sp = row; |
| 3264 | dp = row; |
| 3265 | for (i = 0; i < row_width; i++, sp += 8, dp += 6) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3266 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 3267 | png_uint_16 a = (png_uint_16)(((png_uint_16)(*(sp + 6)) |
| 3268 | << 8) + (png_uint_16)(*(sp + 7))); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3269 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3270 | if (a == (png_uint_16)0xffff) |
| 3271 | { |
| 3272 | png_uint_16 v; |
| 3273 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3274 | v = gamma_16[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3275 | *dp = (png_byte)((v >> 8) & 0xff); |
| 3276 | *(dp + 1) = (png_byte)(v & 0xff); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3277 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3278 | v = gamma_16[*(sp + 3) >> gamma_shift][*(sp + 2)]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3279 | *(dp + 2) = (png_byte)((v >> 8) & 0xff); |
| 3280 | *(dp + 3) = (png_byte)(v & 0xff); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3281 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3282 | v = gamma_16[*(sp + 5) >> gamma_shift][*(sp + 4)]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3283 | *(dp + 4) = (png_byte)((v >> 8) & 0xff); |
| 3284 | *(dp + 5) = (png_byte)(v & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3285 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3286 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3287 | else if (a == 0) |
| 3288 | { |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3289 | /* Background is already in screen gamma */ |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3290 | *dp = (png_byte)((background->red >> 8) & 0xff); |
| 3291 | *(dp + 1) = (png_byte)(background->red & 0xff); |
| 3292 | *(dp + 2) = (png_byte)((background->green >> 8) & 0xff); |
| 3293 | *(dp + 3) = (png_byte)(background->green & 0xff); |
| 3294 | *(dp + 4) = (png_byte)((background->blue >> 8) & 0xff); |
| 3295 | *(dp + 5) = (png_byte)(background->blue & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3296 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3297 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3298 | else |
| 3299 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3300 | png_uint_16 v, w, x; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3301 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3302 | v = gamma_16_to_1[*(sp + 1) >> gamma_shift][*sp]; |
Glenn Randers-Pehrson | c6de22d | 2002-02-23 18:55:25 -0600 | [diff] [blame] | 3303 | png_composite_16(w, v, a, background_1->red); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3304 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3305 | x = gamma_16_from_1[((w&0xff) >> gamma_shift)][w >> 8]; |
| 3306 | *dp = (png_byte)((x >> 8) & 0xff); |
| 3307 | *(dp + 1) = (png_byte)(x & 0xff); |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 3308 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3309 | v = gamma_16_to_1[*(sp + 3) >> gamma_shift][*(sp + 2)]; |
Glenn Randers-Pehrson | c6de22d | 2002-02-23 18:55:25 -0600 | [diff] [blame] | 3310 | png_composite_16(w, v, a, background_1->green); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3311 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3312 | x = gamma_16_from_1[((w&0xff) >> gamma_shift)][w >> 8]; |
| 3313 | *(dp + 2) = (png_byte)((x >> 8) & 0xff); |
| 3314 | *(dp + 3) = (png_byte)(x & 0xff); |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 3315 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3316 | v = gamma_16_to_1[*(sp + 5) >> gamma_shift][*(sp + 4)]; |
Glenn Randers-Pehrson | c6de22d | 2002-02-23 18:55:25 -0600 | [diff] [blame] | 3317 | png_composite_16(w, v, a, background_1->blue); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3318 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3319 | x = gamma_16_from_1[(w & 0xff) >> gamma_shift][w >> 8]; |
| 3320 | *(dp + 4) = (png_byte)((x >> 8) & 0xff); |
| 3321 | *(dp + 5) = (png_byte)(x & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3322 | } |
| 3323 | } |
| 3324 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3325 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3326 | else |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3327 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3328 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3329 | sp = row; |
| 3330 | dp = row; |
| 3331 | for (i = 0; i < row_width; i++, sp += 8, dp += 6) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3332 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 3333 | png_uint_16 a = (png_uint_16)(((png_uint_16)(*(sp + 6)) |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3334 | << 8) + (png_uint_16)(*(sp + 7))); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3335 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3336 | if (a == (png_uint_16)0xffff) |
| 3337 | { |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3338 | png_memcpy(dp, sp, 6); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3339 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3340 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3341 | else if (a == 0) |
| 3342 | { |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3343 | *dp = (png_byte)((background->red >> 8) & 0xff); |
| 3344 | *(dp + 1) = (png_byte)(background->red & 0xff); |
| 3345 | *(dp + 2) = (png_byte)((background->green >> 8) & 0xff); |
| 3346 | *(dp + 3) = (png_byte)(background->green & 0xff); |
| 3347 | *(dp + 4) = (png_byte)((background->blue >> 8) & 0xff); |
| 3348 | *(dp + 5) = (png_byte)(background->blue & 0xff); |
| 3349 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3350 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3351 | else |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3352 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 3353 | png_uint_16 v; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3354 | |
Glenn Randers-Pehrson | 860ab2b | 1999-10-14 07:43:10 -0500 | [diff] [blame] | 3355 | png_uint_16 r = (png_uint_16)(((*sp) << 8) + *(sp + 1)); |
| 3356 | png_uint_16 g = (png_uint_16)(((*(sp + 2)) << 8) |
| 3357 | + *(sp + 3)); |
| 3358 | png_uint_16 b = (png_uint_16)(((*(sp + 4)) << 8) |
| 3359 | + *(sp + 5)); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3360 | |
| 3361 | png_composite_16(v, r, a, background->red); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3362 | *dp = (png_byte)((v >> 8) & 0xff); |
| 3363 | *(dp + 1) = (png_byte)(v & 0xff); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3364 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3365 | png_composite_16(v, g, a, background->green); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3366 | *(dp + 2) = (png_byte)((v >> 8) & 0xff); |
| 3367 | *(dp + 3) = (png_byte)(v & 0xff); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3368 | |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 3369 | png_composite_16(v, b, a, background->blue); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3370 | *(dp + 4) = (png_byte)((v >> 8) & 0xff); |
| 3371 | *(dp + 5) = (png_byte)(v & 0xff); |
| 3372 | } |
| 3373 | } |
| 3374 | } |
| 3375 | } |
| 3376 | break; |
| 3377 | } |
| 3378 | } |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3379 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3380 | if (row_info->color_type & PNG_COLOR_MASK_ALPHA) |
| 3381 | { |
| 3382 | row_info->color_type &= ~PNG_COLOR_MASK_ALPHA; |
Guy Schalnat | e5a3779 | 1996-06-05 15:50:50 -0500 | [diff] [blame] | 3383 | row_info->channels--; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3384 | row_info->pixel_depth = (png_byte)(row_info->channels * |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 3385 | row_info->bit_depth); |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 3386 | row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3387 | } |
| 3388 | } |
| 3389 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3390 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3391 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 3392 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3393 | /* Gamma correct the image, avoiding the alpha channel. Make sure |
Glenn Randers-Pehrson | 345bc27 | 1998-06-14 14:43:31 -0500 | [diff] [blame] | 3394 | * you do this after you deal with the transparency issue on grayscale |
Glenn Randers-Pehrson | 352ca6b | 1999-09-18 15:49:20 -0500 | [diff] [blame] | 3395 | * or RGB images. If your bit depth is 8, use gamma_table, if it |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 3396 | * is 16, use gamma_16_table and gamma_shift. Build these with |
| 3397 | * build_gamma_table(). |
| 3398 | */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 3399 | void /* PRIVATE */ |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 3400 | png_do_gamma(png_row_infop row_info, png_bytep row, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3401 | png_bytep gamma_table, png_uint_16pp gamma_16_table, |
| 3402 | int gamma_shift) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3403 | { |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 3404 | png_bytep sp; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3405 | png_uint_32 i; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3406 | png_uint_32 row_width=row_info->width; |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 3407 | |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 3408 | png_debug(1, "in png_do_gamma"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 3409 | |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3410 | if (((row_info->bit_depth <= 8 && gamma_table != NULL) || |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3411 | (row_info->bit_depth == 16 && gamma_16_table != NULL))) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3412 | { |
| 3413 | switch (row_info->color_type) |
| 3414 | { |
| 3415 | case PNG_COLOR_TYPE_RGB: |
| 3416 | { |
| 3417 | if (row_info->bit_depth == 8) |
| 3418 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3419 | sp = row; |
| 3420 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3421 | { |
| 3422 | *sp = gamma_table[*sp]; |
| 3423 | sp++; |
| 3424 | *sp = gamma_table[*sp]; |
| 3425 | sp++; |
| 3426 | *sp = gamma_table[*sp]; |
| 3427 | sp++; |
| 3428 | } |
| 3429 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3430 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3431 | else /* if (row_info->bit_depth == 16) */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3432 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3433 | sp = row; |
| 3434 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3435 | { |
| 3436 | png_uint_16 v; |
| 3437 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3438 | v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3439 | *sp = (png_byte)((v >> 8) & 0xff); |
| 3440 | *(sp + 1) = (png_byte)(v & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3441 | sp += 2; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 3442 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3443 | v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3444 | *sp = (png_byte)((v >> 8) & 0xff); |
| 3445 | *(sp + 1) = (png_byte)(v & 0xff); |
| 3446 | sp += 2; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 3447 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3448 | v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3449 | *sp = (png_byte)((v >> 8) & 0xff); |
| 3450 | *(sp + 1) = (png_byte)(v & 0xff); |
| 3451 | sp += 2; |
| 3452 | } |
| 3453 | } |
| 3454 | break; |
| 3455 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3456 | |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3457 | case PNG_COLOR_TYPE_RGB_ALPHA: |
| 3458 | { |
| 3459 | if (row_info->bit_depth == 8) |
| 3460 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3461 | sp = row; |
| 3462 | for (i = 0; i < row_width; i++) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3463 | { |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3464 | *sp = gamma_table[*sp]; |
| 3465 | sp++; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 3466 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3467 | *sp = gamma_table[*sp]; |
| 3468 | sp++; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 3469 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3470 | *sp = gamma_table[*sp]; |
| 3471 | sp++; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 3472 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3473 | sp++; |
| 3474 | } |
| 3475 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3476 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3477 | else /* if (row_info->bit_depth == 16) */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3478 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3479 | sp = row; |
| 3480 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3481 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 3482 | png_uint_16 v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3483 | *sp = (png_byte)((v >> 8) & 0xff); |
| 3484 | *(sp + 1) = (png_byte)(v & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3485 | sp += 2; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 3486 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3487 | v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3488 | *sp = (png_byte)((v >> 8) & 0xff); |
| 3489 | *(sp + 1) = (png_byte)(v & 0xff); |
| 3490 | sp += 2; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 3491 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3492 | v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3493 | *sp = (png_byte)((v >> 8) & 0xff); |
| 3494 | *(sp + 1) = (png_byte)(v & 0xff); |
| 3495 | sp += 4; |
| 3496 | } |
| 3497 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3498 | break; |
| 3499 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3500 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3501 | case PNG_COLOR_TYPE_GRAY_ALPHA: |
| 3502 | { |
| 3503 | if (row_info->bit_depth == 8) |
| 3504 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3505 | sp = row; |
| 3506 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3507 | { |
| 3508 | *sp = gamma_table[*sp]; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3509 | sp += 2; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3510 | } |
| 3511 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3512 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3513 | else /* if (row_info->bit_depth == 16) */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3514 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3515 | sp = row; |
| 3516 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3517 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 3518 | png_uint_16 v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3519 | *sp = (png_byte)((v >> 8) & 0xff); |
| 3520 | *(sp + 1) = (png_byte)(v & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3521 | sp += 4; |
| 3522 | } |
| 3523 | } |
| 3524 | break; |
| 3525 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3526 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3527 | case PNG_COLOR_TYPE_GRAY: |
| 3528 | { |
Glenn Randers-Pehrson | 2687fcc | 1998-01-07 20:54:20 -0600 | [diff] [blame] | 3529 | if (row_info->bit_depth == 2) |
| 3530 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3531 | sp = row; |
| 3532 | for (i = 0; i < row_width; i += 4) |
Glenn Randers-Pehrson | 2687fcc | 1998-01-07 20:54:20 -0600 | [diff] [blame] | 3533 | { |
| 3534 | int a = *sp & 0xc0; |
| 3535 | int b = *sp & 0x30; |
| 3536 | int c = *sp & 0x0c; |
| 3537 | int d = *sp & 0x03; |
| 3538 | |
Glenn Randers-Pehrson | 860ab2b | 1999-10-14 07:43:10 -0500 | [diff] [blame] | 3539 | *sp = (png_byte)( |
Glenn Randers-Pehrson | e3f3c4e | 2010-02-07 18:08:50 -0600 | [diff] [blame] | 3540 | ((((int)gamma_table[a|(a>>2)|(a>>4)|(a>>6)]) ) & 0xc0)| |
| 3541 | ((((int)gamma_table[(b<<2)|b|(b>>2)|(b>>4)])>>2) & 0x30)| |
| 3542 | ((((int)gamma_table[(c<<4)|(c<<2)|c|(c>>2)])>>4) & 0x0c)| |
| 3543 | ((((int)gamma_table[(d<<6)|(d<<4)|(d<<2)|d])>>6) )); |
Glenn Randers-Pehrson | 2687fcc | 1998-01-07 20:54:20 -0600 | [diff] [blame] | 3544 | sp++; |
| 3545 | } |
| 3546 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3547 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3548 | if (row_info->bit_depth == 4) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3549 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3550 | sp = row; |
| 3551 | for (i = 0; i < row_width; i += 2) |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3552 | { |
| 3553 | int msb = *sp & 0xf0; |
| 3554 | int lsb = *sp & 0x0f; |
| 3555 | |
Glenn Randers-Pehrson | 860ab2b | 1999-10-14 07:43:10 -0500 | [diff] [blame] | 3556 | *sp = (png_byte)((((int)gamma_table[msb | (msb >> 4)]) & 0xf0) |
Glenn Randers-Pehrson | e3f3c4e | 2010-02-07 18:08:50 -0600 | [diff] [blame] | 3557 | | (((int)gamma_table[(lsb << 4) | lsb]) >> 4)); |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3558 | sp++; |
| 3559 | } |
| 3560 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3561 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3562 | else if (row_info->bit_depth == 8) |
| 3563 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3564 | sp = row; |
| 3565 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3566 | { |
| 3567 | *sp = gamma_table[*sp]; |
| 3568 | sp++; |
| 3569 | } |
| 3570 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3571 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3572 | else if (row_info->bit_depth == 16) |
| 3573 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3574 | sp = row; |
| 3575 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3576 | { |
Glenn Randers-Pehrson | 1d96361 | 1998-05-02 12:52:25 -0500 | [diff] [blame] | 3577 | png_uint_16 v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp]; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3578 | *sp = (png_byte)((v >> 8) & 0xff); |
| 3579 | *(sp + 1) = (png_byte)(v & 0xff); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3580 | sp += 2; |
| 3581 | } |
| 3582 | } |
| 3583 | break; |
| 3584 | } |
| 3585 | } |
| 3586 | } |
| 3587 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3588 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3589 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 3590 | #ifdef PNG_READ_EXPAND_SUPPORTED |
Glenn Randers-Pehrson | 352ca6b | 1999-09-18 15:49:20 -0500 | [diff] [blame] | 3591 | /* Expands a palette row to an RGB or RGBA row depending |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 3592 | * upon whether you supply trans and num_trans. |
| 3593 | */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 3594 | void /* PRIVATE */ |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 3595 | png_do_expand_palette(png_row_infop row_info, png_bytep row, |
Glenn Randers-Pehrson | 6abea75 | 2009-08-08 16:52:06 -0500 | [diff] [blame] | 3596 | png_colorp palette, png_bytep trans_alpha, int num_trans) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3597 | { |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3598 | int shift, value; |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 3599 | png_bytep sp, dp; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3600 | png_uint_32 i; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3601 | png_uint_32 row_width=row_info->width; |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 3602 | |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 3603 | png_debug(1, "in png_do_expand_palette"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 3604 | |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3605 | if (row_info->color_type == PNG_COLOR_TYPE_PALETTE) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3606 | { |
| 3607 | if (row_info->bit_depth < 8) |
| 3608 | { |
| 3609 | switch (row_info->bit_depth) |
| 3610 | { |
| 3611 | case 1: |
| 3612 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3613 | sp = row + (png_size_t)((row_width - 1) >> 3); |
| 3614 | dp = row + (png_size_t)row_width - 1; |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 3615 | shift = 7 - (int)((row_width + 7) & 0x07); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3616 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3617 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 3618 | if ((*sp >> shift) & 0x01) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3619 | *dp = 1; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 3620 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3621 | else |
| 3622 | *dp = 0; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 3623 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3624 | if (shift == 7) |
| 3625 | { |
| 3626 | shift = 0; |
| 3627 | sp--; |
| 3628 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3629 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3630 | else |
| 3631 | shift++; |
| 3632 | |
| 3633 | dp--; |
| 3634 | } |
| 3635 | break; |
| 3636 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3637 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3638 | case 2: |
| 3639 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3640 | sp = row + (png_size_t)((row_width - 1) >> 2); |
| 3641 | dp = row + (png_size_t)row_width - 1; |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 3642 | shift = (int)((3 - ((row_width + 3) & 0x03)) << 1); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3643 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3644 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 3645 | value = (*sp >> shift) & 0x03; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3646 | *dp = (png_byte)value; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3647 | if (shift == 6) |
| 3648 | { |
| 3649 | shift = 0; |
| 3650 | sp--; |
| 3651 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3652 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3653 | else |
| 3654 | shift += 2; |
| 3655 | |
| 3656 | dp--; |
| 3657 | } |
| 3658 | break; |
| 3659 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3660 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3661 | case 4: |
| 3662 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3663 | sp = row + (png_size_t)((row_width - 1) >> 1); |
| 3664 | dp = row + (png_size_t)row_width - 1; |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 3665 | shift = (int)((row_width & 0x01) << 2); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3666 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3667 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 3668 | value = (*sp >> shift) & 0x0f; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3669 | *dp = (png_byte)value; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3670 | if (shift == 4) |
| 3671 | { |
| 3672 | shift = 0; |
| 3673 | sp--; |
| 3674 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3675 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3676 | else |
| 3677 | shift += 4; |
| 3678 | |
| 3679 | dp--; |
| 3680 | } |
| 3681 | break; |
| 3682 | } |
| 3683 | } |
| 3684 | row_info->bit_depth = 8; |
| 3685 | row_info->pixel_depth = 8; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3686 | row_info->rowbytes = row_width; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3687 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3688 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3689 | switch (row_info->bit_depth) |
| 3690 | { |
| 3691 | case 8: |
| 3692 | { |
Glenn Randers-Pehrson | 6abea75 | 2009-08-08 16:52:06 -0500 | [diff] [blame] | 3693 | if (trans_alpha != NULL) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3694 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3695 | sp = row + (png_size_t)row_width - 1; |
| 3696 | dp = row + (png_size_t)(row_width << 2) - 1; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3697 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3698 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3699 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3700 | if ((int)(*sp) >= num_trans) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3701 | *dp-- = 0xff; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 3702 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3703 | else |
Glenn Randers-Pehrson | 6abea75 | 2009-08-08 16:52:06 -0500 | [diff] [blame] | 3704 | *dp-- = trans_alpha[*sp]; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 3705 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3706 | *dp-- = palette[*sp].blue; |
| 3707 | *dp-- = palette[*sp].green; |
| 3708 | *dp-- = palette[*sp].red; |
| 3709 | sp--; |
| 3710 | } |
| 3711 | row_info->bit_depth = 8; |
| 3712 | row_info->pixel_depth = 32; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3713 | row_info->rowbytes = row_width * 4; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3714 | row_info->color_type = 6; |
| 3715 | row_info->channels = 4; |
| 3716 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3717 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3718 | else |
| 3719 | { |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3720 | sp = row + (png_size_t)row_width - 1; |
| 3721 | dp = row + (png_size_t)(row_width * 3) - 1; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3722 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3723 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3724 | { |
| 3725 | *dp-- = palette[*sp].blue; |
| 3726 | *dp-- = palette[*sp].green; |
| 3727 | *dp-- = palette[*sp].red; |
| 3728 | sp--; |
| 3729 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3730 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3731 | row_info->bit_depth = 8; |
| 3732 | row_info->pixel_depth = 24; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3733 | row_info->rowbytes = row_width * 3; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3734 | row_info->color_type = 2; |
| 3735 | row_info->channels = 3; |
| 3736 | } |
| 3737 | break; |
| 3738 | } |
| 3739 | } |
| 3740 | } |
| 3741 | } |
| 3742 | |
Glenn Randers-Pehrson | 1ce0836 | 2006-03-08 23:35:59 -0600 | [diff] [blame] | 3743 | /* If the bit depth < 8, it is expanded to 8. Also, if the already |
| 3744 | * expanded transparency value is supplied, an alpha channel is built. |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 3745 | */ |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 3746 | void /* PRIVATE */ |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 3747 | png_do_expand(png_row_infop row_info, png_bytep row, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3748 | png_color_16p trans_value) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3749 | { |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3750 | int shift, value; |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 3751 | png_bytep sp, dp; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3752 | png_uint_32 i; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3753 | png_uint_32 row_width=row_info->width; |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 3754 | |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 3755 | png_debug(1, "in png_do_expand"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 3756 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3757 | { |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3758 | if (row_info->color_type == PNG_COLOR_TYPE_GRAY) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3759 | { |
Glenn Randers-Pehrson | 860ab2b | 1999-10-14 07:43:10 -0500 | [diff] [blame] | 3760 | png_uint_16 gray = (png_uint_16)(trans_value ? trans_value->gray : 0); |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3761 | |
| 3762 | if (row_info->bit_depth < 8) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3763 | { |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3764 | switch (row_info->bit_depth) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3765 | { |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3766 | case 1: |
| 3767 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3768 | gray = (png_uint_16)((gray & 0x01) * 0xff); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3769 | sp = row + (png_size_t)((row_width - 1) >> 3); |
| 3770 | dp = row + (png_size_t)row_width - 1; |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 3771 | shift = 7 - (int)((row_width + 7) & 0x07); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3772 | for (i = 0; i < row_width; i++) |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3773 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 3774 | if ((*sp >> shift) & 0x01) |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3775 | *dp = 0xff; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 3776 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3777 | else |
| 3778 | *dp = 0; |
Glenn Randers-Pehrson | f1eb918 | 2010-02-08 15:36:41 -0600 | [diff] [blame] | 3779 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3780 | if (shift == 7) |
| 3781 | { |
| 3782 | shift = 0; |
| 3783 | sp--; |
| 3784 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3785 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3786 | else |
| 3787 | shift++; |
| 3788 | |
| 3789 | dp--; |
| 3790 | } |
| 3791 | break; |
| 3792 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3793 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3794 | case 2: |
| 3795 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3796 | gray = (png_uint_16)((gray & 0x03) * 0x55); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3797 | sp = row + (png_size_t)((row_width - 1) >> 2); |
| 3798 | dp = row + (png_size_t)row_width - 1; |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 3799 | shift = (int)((3 - ((row_width + 3) & 0x03)) << 1); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3800 | for (i = 0; i < row_width; i++) |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3801 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 3802 | value = (*sp >> shift) & 0x03; |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3803 | *dp = (png_byte)(value | (value << 2) | (value << 4) | |
| 3804 | (value << 6)); |
| 3805 | if (shift == 6) |
| 3806 | { |
| 3807 | shift = 0; |
| 3808 | sp--; |
| 3809 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3810 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3811 | else |
| 3812 | shift += 2; |
| 3813 | |
| 3814 | dp--; |
| 3815 | } |
| 3816 | break; |
| 3817 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3818 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3819 | case 4: |
| 3820 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3821 | gray = (png_uint_16)((gray & 0x0f) * 0x11); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3822 | sp = row + (png_size_t)((row_width - 1) >> 1); |
| 3823 | dp = row + (png_size_t)row_width - 1; |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 3824 | shift = (int)((1 - ((row_width + 1) & 0x01)) << 2); |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3825 | for (i = 0; i < row_width; i++) |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3826 | { |
Glenn Randers-Pehrson | 61c32d9 | 2000-02-04 23:40:16 -0600 | [diff] [blame] | 3827 | value = (*sp >> shift) & 0x0f; |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3828 | *dp = (png_byte)(value | (value << 4)); |
| 3829 | if (shift == 4) |
| 3830 | { |
| 3831 | shift = 0; |
| 3832 | sp--; |
| 3833 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3834 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3835 | else |
| 3836 | shift = 4; |
| 3837 | |
| 3838 | dp--; |
| 3839 | } |
| 3840 | break; |
| 3841 | } |
| 3842 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3843 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3844 | row_info->bit_depth = 8; |
| 3845 | row_info->pixel_depth = 8; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3846 | row_info->rowbytes = row_width; |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3847 | } |
| 3848 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3849 | if (trans_value != NULL) |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3850 | { |
| 3851 | if (row_info->bit_depth == 8) |
| 3852 | { |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 3853 | gray = gray & 0xff; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3854 | sp = row + (png_size_t)row_width - 1; |
| 3855 | dp = row + (png_size_t)(row_width << 1) - 1; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3856 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3857 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3858 | { |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3859 | if (*sp == gray) |
| 3860 | *dp-- = 0; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3861 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3862 | else |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3863 | *dp-- = 0xff; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3864 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3865 | *dp-- = *sp--; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3866 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3867 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3868 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3869 | else if (row_info->bit_depth == 16) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3870 | { |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 3871 | png_byte gray_high = (gray >> 8) & 0xff; |
| 3872 | png_byte gray_low = gray & 0xff; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3873 | sp = row + row_info->rowbytes - 1; |
| 3874 | dp = row + (row_info->rowbytes << 1) - 1; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3875 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3876 | { |
Glenn Randers-Pehrson | 79134c6 | 2009-02-14 10:32:18 -0600 | [diff] [blame] | 3877 | if (*(sp - 1) == gray_high && *(sp) == gray_low) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3878 | { |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3879 | *dp-- = 0; |
| 3880 | *dp-- = 0; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3881 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3882 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3883 | else |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3884 | { |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3885 | *dp-- = 0xff; |
| 3886 | *dp-- = 0xff; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3887 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3888 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3889 | *dp-- = *sp--; |
| 3890 | *dp-- = *sp--; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3891 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3892 | } |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3893 | |
Andreas Dilger | 02ad0ef | 1997-01-17 01:34:35 -0600 | [diff] [blame] | 3894 | row_info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA; |
| 3895 | row_info->channels = 2; |
| 3896 | row_info->pixel_depth = (png_byte)(row_info->bit_depth << 1); |
Glenn Randers-Pehrson | 272489d | 2004-08-04 06:34:52 -0500 | [diff] [blame] | 3897 | row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, |
| 3898 | row_width); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3899 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3900 | } |
| 3901 | else if (row_info->color_type == PNG_COLOR_TYPE_RGB && trans_value) |
| 3902 | { |
| 3903 | if (row_info->bit_depth == 8) |
| 3904 | { |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 3905 | png_byte red = trans_value->red & 0xff; |
| 3906 | png_byte green = trans_value->green & 0xff; |
| 3907 | png_byte blue = trans_value->blue & 0xff; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3908 | sp = row + (png_size_t)row_info->rowbytes - 1; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3909 | dp = row + (png_size_t)(row_width << 2) - 1; |
| 3910 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3911 | { |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 3912 | if (*(sp - 2) == red && *(sp - 1) == green && *(sp) == blue) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3913 | *dp-- = 0; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3914 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3915 | else |
| 3916 | *dp-- = 0xff; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3917 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3918 | *dp-- = *sp--; |
| 3919 | *dp-- = *sp--; |
| 3920 | *dp-- = *sp--; |
| 3921 | } |
| 3922 | } |
| 3923 | else if (row_info->bit_depth == 16) |
| 3924 | { |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 3925 | png_byte red_high = (trans_value->red >> 8) & 0xff; |
| 3926 | png_byte green_high = (trans_value->green >> 8) & 0xff; |
| 3927 | png_byte blue_high = (trans_value->blue >> 8) & 0xff; |
| 3928 | png_byte red_low = trans_value->red & 0xff; |
| 3929 | png_byte green_low = trans_value->green & 0xff; |
| 3930 | png_byte blue_low = trans_value->blue & 0xff; |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 3931 | sp = row + row_info->rowbytes - 1; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3932 | dp = row + (png_size_t)(row_width << 3) - 1; |
| 3933 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3934 | { |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 3935 | if (*(sp - 5) == red_high && |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 3936 | *(sp - 4) == red_low && |
| 3937 | *(sp - 3) == green_high && |
| 3938 | *(sp - 2) == green_low && |
| 3939 | *(sp - 1) == blue_high && |
| 3940 | *(sp ) == blue_low) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3941 | { |
| 3942 | *dp-- = 0; |
| 3943 | *dp-- = 0; |
| 3944 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3945 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3946 | else |
| 3947 | { |
| 3948 | *dp-- = 0xff; |
| 3949 | *dp-- = 0xff; |
| 3950 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 3951 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3952 | *dp-- = *sp--; |
| 3953 | *dp-- = *sp--; |
| 3954 | *dp-- = *sp--; |
| 3955 | *dp-- = *sp--; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3956 | *dp-- = *sp--; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3957 | *dp-- = *sp--; |
| 3958 | } |
| 3959 | } |
| 3960 | row_info->color_type = PNG_COLOR_TYPE_RGB_ALPHA; |
| 3961 | row_info->channels = 4; |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 3962 | row_info->pixel_depth = (png_byte)(row_info->bit_depth << 2); |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 3963 | row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3964 | } |
| 3965 | } |
| 3966 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3967 | #endif |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3968 | |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 3969 | #ifdef PNG_READ_QUANTIZE_SUPPORTED |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 3970 | void /* PRIVATE */ |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 3971 | png_do_quantize(png_row_infop row_info, png_bytep row, |
| 3972 | png_bytep palette_lookup, png_bytep quantize_lookup) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3973 | { |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 3974 | png_bytep sp, dp; |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 3975 | png_uint_32 i; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3976 | png_uint_32 row_width=row_info->width; |
Guy Schalnat | 6d76471 | 1995-12-19 03:22:19 -0600 | [diff] [blame] | 3977 | |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 3978 | png_debug(1, "in png_do_quantize"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 3979 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3980 | { |
| 3981 | if (row_info->color_type == PNG_COLOR_TYPE_RGB && |
| 3982 | palette_lookup && row_info->bit_depth == 8) |
| 3983 | { |
| 3984 | int r, g, b, p; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3985 | sp = row; |
| 3986 | dp = row; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 3987 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 3988 | { |
| 3989 | r = *sp++; |
| 3990 | g = *sp++; |
| 3991 | b = *sp++; |
| 3992 | |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 3993 | /* This looks real messy, but the compiler will reduce |
| 3994 | * it down to a reasonable formula. For example, with |
| 3995 | * 5 bits per color, we get: |
| 3996 | * p = (((r >> 3) & 0x1f) << 10) | |
| 3997 | * (((g >> 3) & 0x1f) << 5) | |
| 3998 | * ((b >> 3) & 0x1f); |
| 3999 | */ |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 4000 | p = (((r >> (8 - PNG_QUANTIZE_RED_BITS)) & |
| 4001 | ((1 << PNG_QUANTIZE_RED_BITS) - 1)) << |
| 4002 | (PNG_QUANTIZE_GREEN_BITS + PNG_QUANTIZE_BLUE_BITS)) | |
| 4003 | (((g >> (8 - PNG_QUANTIZE_GREEN_BITS)) & |
| 4004 | ((1 << PNG_QUANTIZE_GREEN_BITS) - 1)) << |
| 4005 | (PNG_QUANTIZE_BLUE_BITS)) | |
| 4006 | ((b >> (8 - PNG_QUANTIZE_BLUE_BITS)) & |
| 4007 | ((1 << PNG_QUANTIZE_BLUE_BITS) - 1)); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4008 | |
| 4009 | *dp++ = palette_lookup[p]; |
| 4010 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 4011 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4012 | row_info->color_type = PNG_COLOR_TYPE_PALETTE; |
| 4013 | row_info->channels = 1; |
| 4014 | row_info->pixel_depth = row_info->bit_depth; |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 4015 | row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4016 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 4017 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4018 | else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA && |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 4019 | palette_lookup != NULL && row_info->bit_depth == 8) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4020 | { |
| 4021 | int r, g, b, p; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4022 | sp = row; |
| 4023 | dp = row; |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4024 | for (i = 0; i < row_width; i++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4025 | { |
| 4026 | r = *sp++; |
| 4027 | g = *sp++; |
| 4028 | b = *sp++; |
| 4029 | sp++; |
| 4030 | |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 4031 | p = (((r >> (8 - PNG_QUANTIZE_RED_BITS)) & |
| 4032 | ((1 << PNG_QUANTIZE_RED_BITS) - 1)) << |
| 4033 | (PNG_QUANTIZE_GREEN_BITS + PNG_QUANTIZE_BLUE_BITS)) | |
| 4034 | (((g >> (8 - PNG_QUANTIZE_GREEN_BITS)) & |
| 4035 | ((1 << PNG_QUANTIZE_GREEN_BITS) - 1)) << |
| 4036 | (PNG_QUANTIZE_BLUE_BITS)) | |
| 4037 | ((b >> (8 - PNG_QUANTIZE_BLUE_BITS)) & |
| 4038 | ((1 << PNG_QUANTIZE_BLUE_BITS) - 1)); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4039 | |
| 4040 | *dp++ = palette_lookup[p]; |
| 4041 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 4042 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4043 | row_info->color_type = PNG_COLOR_TYPE_PALETTE; |
| 4044 | row_info->channels = 1; |
| 4045 | row_info->pixel_depth = row_info->bit_depth; |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 4046 | row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4047 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 4048 | |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4049 | else if (row_info->color_type == PNG_COLOR_TYPE_PALETTE && |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 4050 | quantize_lookup && row_info->bit_depth == 8) |
Guy Schalnat | b2e01bd | 1996-01-26 01:38:47 -0600 | [diff] [blame] | 4051 | { |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4052 | sp = row; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 4053 | |
Glenn Randers-Pehrson | 896239b | 1998-04-21 15:03:57 -0500 | [diff] [blame] | 4054 | for (i = 0; i < row_width; i++, sp++) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4055 | { |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 4056 | *sp = quantize_lookup[*sp]; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4057 | } |
| 4058 | } |
| 4059 | } |
| 4060 | } |
Glenn Randers-Pehrson | 3cd7cff | 2010-04-16 19:27:08 -0500 | [diff] [blame] | 4061 | #endif /* PNG_READ_QUANTIZE_SUPPORTED */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4062 | |
Glenn Randers-Pehrson | 166c5a3 | 1999-12-10 09:43:02 -0600 | [diff] [blame] | 4063 | #ifdef PNG_FLOATING_POINT_SUPPORTED |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 4064 | #ifdef PNG_READ_GAMMA_SUPPORTED |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 4065 | static PNG_CONST int png_gamma_shift[] = |
| 4066 | {0x10, 0x21, 0x42, 0x84, 0x110, 0x248, 0x550, 0xff0, 0x00}; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4067 | |
Andreas Dilger | 47a0c42 | 1997-05-16 02:46:07 -0500 | [diff] [blame] | 4068 | /* 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] | 4069 | * tables, we don't make a full table if we are reducing to 8-bit in |
| 4070 | * the future. Note also how the gamma_16 tables are segmented so that |
| 4071 | * we don't need to allocate > 64K chunks for a full 16-bit table. |
Glenn Randers-Pehrson | bc7156d | 2009-07-06 09:11:54 -0500 | [diff] [blame] | 4072 | * |
| 4073 | * See the PNG extensions document for an integer algorithm for creating |
| 4074 | * the gamma tables. Maybe we will implement that here someday. |
| 4075 | * |
| 4076 | * We should only reach this point if |
| 4077 | * |
| 4078 | * the file_gamma is known (i.e., the gAMA or sRGB chunk is present, |
| 4079 | * or the application has provided a file_gamma) |
| 4080 | * |
| 4081 | * AND |
| 4082 | * { |
| 4083 | * the screen_gamma is known |
| 4084 | * |
| 4085 | * OR |
| 4086 | * |
| 4087 | * RGB_to_gray transformation is being performed |
| 4088 | * } |
| 4089 | * |
| 4090 | * AND |
| 4091 | * { |
| 4092 | * the screen_gamma is different from the reciprocal of the |
| 4093 | * file_gamma by more than the specified threshold |
| 4094 | * |
| 4095 | * OR |
| 4096 | * |
| 4097 | * a background color has been specified and the file_gamma |
| 4098 | * and screen_gamma are not 1.0, within the specified threshold. |
| 4099 | * } |
Glenn Randers-Pehrson | b6ce43d | 1998-01-01 07:13:13 -0600 | [diff] [blame] | 4100 | */ |
Glenn Randers-Pehrson | a2567be | 2009-10-19 20:31:31 -0500 | [diff] [blame] | 4101 | |
Glenn Randers-Pehrson | 7529457 | 2000-05-06 14:09:57 -0500 | [diff] [blame] | 4102 | void /* PRIVATE */ |
Glenn Randers-Pehrson | ffa8924 | 2009-12-13 08:14:40 -0600 | [diff] [blame] | 4103 | png_build_gamma_table(png_structp png_ptr, png_byte bit_depth) |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4104 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 4105 | png_debug(1, "in png_build_gamma_table"); |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4106 | |
Glenn Randers-Pehrson | ffa8924 | 2009-12-13 08:14:40 -0600 | [diff] [blame] | 4107 | if (bit_depth <= 8) |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 4108 | { |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4109 | int i; |
| 4110 | double g; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4111 | |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4112 | if (png_ptr->screen_gamma > .000001) |
| 4113 | g = 1.0 / (png_ptr->gamma * png_ptr->screen_gamma); |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4114 | |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4115 | else |
| 4116 | g = 1.0; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4117 | |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 4118 | png_ptr->gamma_table = (png_bytep)png_malloc(png_ptr, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 4119 | (png_uint_32)256); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4120 | |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4121 | for (i = 0; i < 256; i++) |
| 4122 | { |
| 4123 | png_ptr->gamma_table[i] = (png_byte)(pow((double)i / 255.0, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 4124 | g) * 255.0 + .5); |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4125 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4126 | |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 4127 | #if defined(PNG_READ_BACKGROUND_SUPPORTED) || \ |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4128 | defined(PNG_READ_RGB_TO_GRAY_SUPPORTED) |
| 4129 | if (png_ptr->transformations & ((PNG_BACKGROUND) | PNG_RGB_TO_GRAY)) |
| 4130 | { |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 4131 | |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4132 | g = 1.0 / (png_ptr->gamma); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4133 | |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 4134 | png_ptr->gamma_to_1 = (png_bytep)png_malloc(png_ptr, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 4135 | (png_uint_32)256); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4136 | |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4137 | for (i = 0; i < 256; i++) |
| 4138 | { |
| 4139 | png_ptr->gamma_to_1[i] = (png_byte)(pow((double)i / 255.0, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 4140 | g) * 255.0 + .5); |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4141 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4142 | |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 4143 | png_ptr->gamma_from_1 = (png_bytep)png_malloc(png_ptr, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 4144 | (png_uint_32)256); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4145 | |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 4146 | if (png_ptr->screen_gamma > 0.000001) |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4147 | g = 1.0 / png_ptr->screen_gamma; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4148 | |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4149 | else |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 4150 | g = png_ptr->gamma; /* Probably doing rgb_to_gray */ |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 4151 | |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4152 | for (i = 0; i < 256; i++) |
| 4153 | { |
| 4154 | png_ptr->gamma_from_1[i] = (png_byte)(pow((double)i / 255.0, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 4155 | g) * 255.0 + .5); |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 4156 | |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4157 | } |
| 4158 | } |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 4159 | #endif /* PNG_READ_BACKGROUND_SUPPORTED || PNG_RGB_TO_GRAY_SUPPORTED */ |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4160 | } |
| 4161 | else |
| 4162 | { |
| 4163 | double g; |
| 4164 | int i, j, shift, num; |
| 4165 | int sig_bit; |
| 4166 | png_uint_32 ig; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4167 | |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4168 | if (png_ptr->color_type & PNG_COLOR_MASK_COLOR) |
| 4169 | { |
| 4170 | sig_bit = (int)png_ptr->sig_bit.red; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4171 | |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4172 | if ((int)png_ptr->sig_bit.green > sig_bit) |
| 4173 | sig_bit = png_ptr->sig_bit.green; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4174 | |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4175 | if ((int)png_ptr->sig_bit.blue > sig_bit) |
| 4176 | sig_bit = png_ptr->sig_bit.blue; |
| 4177 | } |
| 4178 | else |
| 4179 | { |
| 4180 | sig_bit = (int)png_ptr->sig_bit.gray; |
| 4181 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4182 | |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4183 | if (sig_bit > 0) |
| 4184 | shift = 16 - sig_bit; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4185 | |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4186 | else |
| 4187 | shift = 0; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4188 | |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4189 | if (png_ptr->transformations & PNG_16_TO_8) |
| 4190 | { |
| 4191 | if (shift < (16 - PNG_MAX_GAMMA_8)) |
| 4192 | shift = (16 - PNG_MAX_GAMMA_8); |
| 4193 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4194 | |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4195 | if (shift > 8) |
| 4196 | shift = 8; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4197 | |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4198 | if (shift < 0) |
| 4199 | shift = 0; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4200 | |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4201 | png_ptr->gamma_shift = (png_byte)shift; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4202 | |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4203 | num = (1 << (8 - shift)); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4204 | |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4205 | if (png_ptr->screen_gamma > .000001) |
| 4206 | g = 1.0 / (png_ptr->gamma * png_ptr->screen_gamma); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 4207 | |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4208 | else |
| 4209 | g = 1.0; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4210 | |
Glenn Randers-Pehrson | 79134c6 | 2009-02-14 10:32:18 -0600 | [diff] [blame] | 4211 | png_ptr->gamma_16_table = (png_uint_16pp)png_calloc(png_ptr, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 4212 | (png_uint_32)(num * png_sizeof(png_uint_16p))); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4213 | |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4214 | if (png_ptr->transformations & (PNG_16_TO_8 | PNG_BACKGROUND)) |
| 4215 | { |
| 4216 | double fin, fout; |
| 4217 | png_uint_32 last, max; |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4218 | |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4219 | for (i = 0; i < num; i++) |
| 4220 | { |
| 4221 | png_ptr->gamma_16_table[i] = (png_uint_16p)png_malloc(png_ptr, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 4222 | (png_uint_32)(256 * png_sizeof(png_uint_16))); |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4223 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4224 | |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4225 | g = 1.0 / g; |
| 4226 | last = 0; |
| 4227 | for (i = 0; i < 256; i++) |
| 4228 | { |
| 4229 | fout = ((double)i + 0.5) / 256.0; |
| 4230 | fin = pow(fout, g); |
| 4231 | max = (png_uint_32)(fin * (double)((png_uint_32)num << 8)); |
| 4232 | while (last <= max) |
| 4233 | { |
| 4234 | png_ptr->gamma_16_table[(int)(last & (0xff >> shift))] |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 4235 | [(int)(last >> (8 - shift))] = (png_uint_16)( |
| 4236 | (png_uint_16)i | ((png_uint_16)i << 8)); |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4237 | last++; |
| 4238 | } |
| 4239 | } |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 4240 | |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4241 | while (last < ((png_uint_32)num << 8)) |
| 4242 | { |
| 4243 | png_ptr->gamma_16_table[(int)(last & (0xff >> shift))] |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 4244 | [(int)(last >> (8 - shift))] = (png_uint_16)65535L; |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4245 | last++; |
| 4246 | } |
| 4247 | } |
| 4248 | else |
| 4249 | { |
| 4250 | for (i = 0; i < num; i++) |
| 4251 | { |
| 4252 | png_ptr->gamma_16_table[i] = (png_uint_16p)png_malloc(png_ptr, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 4253 | (png_uint_32)(256 * png_sizeof(png_uint_16))); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4254 | |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4255 | ig = (((png_uint_32)i * (png_uint_32)png_gamma_shift[shift]) >> 4); |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4256 | |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4257 | for (j = 0; j < 256; j++) |
| 4258 | { |
| 4259 | png_ptr->gamma_16_table[i][j] = |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 4260 | (png_uint_16)(pow((double)(ig + ((png_uint_32)j << 8)) / |
| 4261 | 65535.0, g) * 65535.0 + .5); |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4262 | } |
| 4263 | } |
| 4264 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4265 | |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 4266 | #if defined(PNG_READ_BACKGROUND_SUPPORTED) || \ |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4267 | defined(PNG_READ_RGB_TO_GRAY_SUPPORTED) |
| 4268 | if (png_ptr->transformations & (PNG_BACKGROUND | PNG_RGB_TO_GRAY)) |
| 4269 | { |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 4270 | |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4271 | g = 1.0 / (png_ptr->gamma); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4272 | |
Glenn Randers-Pehrson | 79134c6 | 2009-02-14 10:32:18 -0600 | [diff] [blame] | 4273 | png_ptr->gamma_16_to_1 = (png_uint_16pp)png_calloc(png_ptr, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 4274 | (png_uint_32)(num * png_sizeof(png_uint_16p ))); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4275 | |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4276 | for (i = 0; i < num; i++) |
| 4277 | { |
| 4278 | png_ptr->gamma_16_to_1[i] = (png_uint_16p)png_malloc(png_ptr, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 4279 | (png_uint_32)(256 * png_sizeof(png_uint_16))); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4280 | |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4281 | ig = (((png_uint_32)i * |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 4282 | (png_uint_32)png_gamma_shift[shift]) >> 4); |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 4283 | |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4284 | for (j = 0; j < 256; j++) |
| 4285 | { |
| 4286 | png_ptr->gamma_16_to_1[i][j] = |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 4287 | (png_uint_16)(pow((double)(ig + ((png_uint_32)j << 8)) / |
| 4288 | 65535.0, g) * 65535.0 + .5); |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4289 | } |
| 4290 | } |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 4291 | |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 4292 | if (png_ptr->screen_gamma > 0.000001) |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4293 | g = 1.0 / png_ptr->screen_gamma; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4294 | |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4295 | else |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 4296 | g = png_ptr->gamma; /* Probably doing rgb_to_gray */ |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4297 | |
Glenn Randers-Pehrson | 79134c6 | 2009-02-14 10:32:18 -0600 | [diff] [blame] | 4298 | png_ptr->gamma_16_from_1 = (png_uint_16pp)png_calloc(png_ptr, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 4299 | (png_uint_32)(num * png_sizeof(png_uint_16p))); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4300 | |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4301 | for (i = 0; i < num; i++) |
| 4302 | { |
| 4303 | png_ptr->gamma_16_from_1[i] = (png_uint_16p)png_malloc(png_ptr, |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 4304 | (png_uint_32)(256 * png_sizeof(png_uint_16))); |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4305 | |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4306 | ig = (((png_uint_32)i * |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 4307 | (png_uint_32)png_gamma_shift[shift]) >> 4); |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4308 | |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4309 | for (j = 0; j < 256; j++) |
| 4310 | { |
| 4311 | png_ptr->gamma_16_from_1[i][j] = |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 4312 | (png_uint_16)(pow((double)(ig + ((png_uint_32)j << 8)) / |
| 4313 | 65535.0, g) * 65535.0 + .5); |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4314 | } |
| 4315 | } |
| 4316 | } |
Glenn Randers-Pehrson | 5c6aeb2 | 1998-12-29 11:47:59 -0600 | [diff] [blame] | 4317 | #endif /* PNG_READ_BACKGROUND_SUPPORTED || PNG_RGB_TO_GRAY_SUPPORTED */ |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4318 | } |
Guy Schalnat | 0d58058 | 1995-07-20 02:43:20 -0500 | [diff] [blame] | 4319 | } |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 4320 | #endif |
Glenn Randers-Pehrson | 166c5a3 | 1999-12-10 09:43:02 -0600 | [diff] [blame] | 4321 | /* To do: install integer version of png_build_gamma_table here */ |
| 4322 | #endif |
Guy Schalnat | 51f0eb4 | 1995-09-26 05:22:39 -0500 | [diff] [blame] | 4323 | |
Glenn Randers-Pehrson | e26c095 | 2009-09-23 11:22:08 -0500 | [diff] [blame] | 4324 | #ifdef PNG_MNG_FEATURES_SUPPORTED |
Glenn Randers-Pehrson | 4bb4d01 | 2009-05-20 12:45:29 -0500 | [diff] [blame] | 4325 | /* Undoes intrapixel differencing */ |
Glenn Randers-Pehrson | 2ad31ae | 2000-12-15 08:54:42 -0600 | [diff] [blame] | 4326 | void /* PRIVATE */ |
| 4327 | png_do_read_intrapixel(png_row_infop row_info, png_bytep row) |
| 4328 | { |
Glenn Randers-Pehrson | 51650b8 | 2008-08-05 07:44:42 -0500 | [diff] [blame] | 4329 | png_debug(1, "in png_do_read_intrapixel"); |
Glenn Randers-Pehrson | da00980 | 2009-08-15 13:25:47 -0500 | [diff] [blame] | 4330 | |
Glenn Randers-Pehrson | 2ad31ae | 2000-12-15 08:54:42 -0600 | [diff] [blame] | 4331 | if ( |
Glenn Randers-Pehrson | 2ad31ae | 2000-12-15 08:54:42 -0600 | [diff] [blame] | 4332 | (row_info->color_type & PNG_COLOR_MASK_COLOR)) |
| 4333 | { |
| 4334 | int bytes_per_pixel; |
| 4335 | png_uint_32 row_width = row_info->width; |
Glenn Randers-Pehrson | f24daf2 | 2010-05-06 09:44:04 -0500 | [diff] [blame^] | 4336 | |
Glenn Randers-Pehrson | 2ad31ae | 2000-12-15 08:54:42 -0600 | [diff] [blame] | 4337 | if (row_info->bit_depth == 8) |
| 4338 | { |
| 4339 | png_bytep rp; |
| 4340 | png_uint_32 i; |
| 4341 | |
| 4342 | if (row_info->color_type == PNG_COLOR_TYPE_RGB) |
| 4343 | bytes_per_pixel = 3; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4344 | |
Glenn Randers-Pehrson | 2ad31ae | 2000-12-15 08:54:42 -0600 | [diff] [blame] | 4345 | else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA) |
| 4346 | bytes_per_pixel = 4; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4347 | |
Glenn Randers-Pehrson | 2ad31ae | 2000-12-15 08:54:42 -0600 | [diff] [blame] | 4348 | else |
| 4349 | return; |
| 4350 | |
| 4351 | for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel) |
| 4352 | { |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 4353 | *(rp) = (png_byte)((256 + *rp + *(rp + 1)) & 0xff); |
| 4354 | *(rp+2) = (png_byte)((256 + *(rp + 2) + *(rp + 1)) & 0xff); |
Glenn Randers-Pehrson | 2ad31ae | 2000-12-15 08:54:42 -0600 | [diff] [blame] | 4355 | } |
| 4356 | } |
| 4357 | else if (row_info->bit_depth == 16) |
| 4358 | { |
| 4359 | png_bytep rp; |
| 4360 | png_uint_32 i; |
| 4361 | |
| 4362 | if (row_info->color_type == PNG_COLOR_TYPE_RGB) |
| 4363 | bytes_per_pixel = 6; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4364 | |
Glenn Randers-Pehrson | 2ad31ae | 2000-12-15 08:54:42 -0600 | [diff] [blame] | 4365 | else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA) |
| 4366 | bytes_per_pixel = 8; |
Glenn Randers-Pehrson glennrp@comcast.net | b1c0d33 | 2009-05-15 20:39:34 -0500 | [diff] [blame] | 4367 | |
Glenn Randers-Pehrson | 2ad31ae | 2000-12-15 08:54:42 -0600 | [diff] [blame] | 4368 | else |
| 4369 | return; |
| 4370 | |
| 4371 | for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel) |
| 4372 | { |
Glenn Randers-Pehrson | 145f5c8 | 2008-07-10 09:13:13 -0500 | [diff] [blame] | 4373 | png_uint_32 s0 = (*(rp ) << 8) | *(rp + 1); |
| 4374 | png_uint_32 s1 = (*(rp + 2) << 8) | *(rp + 3); |
| 4375 | png_uint_32 s2 = (*(rp + 4) << 8) | *(rp + 5); |
| 4376 | png_uint_32 red = (png_uint_32)((s0 + s1 + 65536L) & 0xffffL); |
| 4377 | png_uint_32 blue = (png_uint_32)((s2 + s1 + 65536L) & 0xffffL); |
Glenn Randers-Pehrson | 5b5dcf8 | 2004-07-17 22:45:44 -0500 | [diff] [blame] | 4378 | *(rp ) = (png_byte)((red >> 8) & 0xff); |
Glenn Randers-Pehrson | 3ea3675 | 2010-03-03 09:35:31 -0600 | [diff] [blame] | 4379 | *(rp + 1) = (png_byte)(red & 0xff); |
| 4380 | *(rp + 4) = (png_byte)((blue >> 8) & 0xff); |
| 4381 | *(rp + 5) = (png_byte)(blue & 0xff); |
Glenn Randers-Pehrson | 2ad31ae | 2000-12-15 08:54:42 -0600 | [diff] [blame] | 4382 | } |
| 4383 | } |
| 4384 | } |
| 4385 | } |
| 4386 | #endif /* PNG_MNG_FEATURES_SUPPORTED */ |
Glenn Randers-Pehrson | 9c3ab68 | 2006-02-20 22:09:05 -0600 | [diff] [blame] | 4387 | #endif /* PNG_READ_SUPPORTED */ |