archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

patch [#31355] 16-bit pngs are only read with 8-bit precision

Browse Source 
from David M (erwin94)
This commit is contained in:
Campbell Barton
2012-05-09 15:20:08 +00:00
parent 318b44fe5d
commit cb78ba16bf
1 changed files with 143 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

206
source/blender/imbuf/intern/png.c
View File

@@ -27,13 +27,14 @@
/** \file blender/imbuf/intern/png.c /** \file blender/imbuf/intern/png.c
* \ingroup imbuf * \ingroup imbuf
*
* \todo Save floats as 16 bits per pixel, currently readonly.
*/ */
#include "png.h" #include "png.h"
#include "BLI_blenlib.h" #include "BLI_blenlib.h"
#include "BLI_math.h"
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "imbuf.h" #include "imbuf.h"
@@ -306,12 +307,16 @@ struct ImBuf *imb_loadpng(unsigned char *mem, size_t size, int flags)
png_structp png_ptr; png_structp png_ptr;
png_infop info_ptr; png_infop info_ptr;
unsigned char *pixels = NULL; unsigned char *pixels = NULL;
unsigned short *pixels16 = NULL;
png_bytepp row_pointers = NULL; png_bytepp row_pointers = NULL;
png_uint_32 width, height; png_uint_32 width, height;
int bit_depth, color_type; int bit_depth, color_type;
PNGReadStruct ps; PNGReadStruct ps;
unsigned char *from, *to; unsigned char *from, *to;
unsigned short *from16;
float *to_float;
float tmp[4];
int i, bytesperpixel; int i, bytesperpixel;
if (imb_is_a_png(mem) == 0) return(NULL); if (imb_is_a_png(mem) == 0) return(NULL);
@@ -340,6 +345,7 @@ struct ImBuf *imb_loadpng(unsigned char *mem, size_t size, int flags)
if (setjmp(png_jmpbuf(png_ptr))) { if (setjmp(png_jmpbuf(png_ptr))) {
png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
if (pixels) MEM_freeN(pixels); if (pixels) MEM_freeN(pixels);
if (pixels16) MEM_freeN(pixels16);
if (row_pointers) MEM_freeN(row_pointers); if (row_pointers) MEM_freeN(row_pointers);
if (ibuf) IMB_freeImBuf(ibuf); if (ibuf) IMB_freeImBuf(ibuf);
return NULL; return NULL;
@@ -351,11 +357,6 @@ struct ImBuf *imb_loadpng(unsigned char *mem, size_t size, int flags)
png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth,
&color_type, NULL, NULL, NULL); &color_type, NULL, NULL, NULL);
if (bit_depth == 16) {
png_set_strip_16(png_ptr);
bit_depth = 8;
}
bytesperpixel = png_get_channels(png_ptr, info_ptr); bytesperpixel = png_get_channels(png_ptr, info_ptr);
switch (color_type) { switch (color_type) {
@@ -387,7 +388,10 @@ struct ImBuf *imb_loadpng(unsigned char *mem, size_t size, int flags)
if (ibuf) { if (ibuf) {
ibuf->ftype = PNG; ibuf->ftype = PNG;
ibuf->profile = IB_PROFILE_SRGB; if (bit_depth == 16)
ibuf->profile = IB_PROFILE_LINEAR_RGB;
else
ibuf->profile = IB_PROFILE_SRGB;
if (png_get_valid (png_ptr, info_ptr, PNG_INFO_pHYs)) { if (png_get_valid (png_ptr, info_ptr, PNG_INFO_pHYs)) {
int unit_type; int unit_type;
@@ -405,67 +409,138 @@ struct ImBuf *imb_loadpng(unsigned char *mem, size_t size, int flags)
} }
if (ibuf && ((flags & IB_test) == 0)) { if (ibuf && ((flags & IB_test) == 0)) {
imb_addrectImBuf(ibuf); if (bit_depth == 16) {
imb_addrectfloatImBuf(ibuf);
png_set_swap(png_ptr);
pixels = MEM_mallocN(ibuf->x * ibuf->y * bytesperpixel * sizeof(unsigned char), "pixels"); pixels16 = MEM_mallocN(ibuf->x * ibuf->y * bytesperpixel * sizeof(png_uint_16), "pixels");
if (pixels == NULL) { if (pixels16 == NULL) {
printf("Cannot allocate pixels array\n"); printf("Cannot allocate pixels array\n");
longjmp(png_jmpbuf(png_ptr), 1); longjmp(png_jmpbuf(png_ptr), 1);
}
// allocate memory for an array of row-pointers
row_pointers = (png_bytepp) MEM_mallocN(ibuf->y * sizeof(png_uint_16p), "row_pointers");
if (row_pointers == NULL) {
printf("Cannot allocate row-pointers array\n");
longjmp(png_jmpbuf(png_ptr), 1);
}
// set the individual row-pointers to point at the correct offsets
for (i = 0; i < ibuf->y; i++) {
row_pointers[ibuf->y - 1 - i] = (png_bytep)
((png_uint_16 *)pixels16 + (i * ibuf->x) * bytesperpixel);
}
png_read_image(png_ptr, row_pointers);
// copy image data
to_float = ibuf->rect_float;
from16 = pixels16;
switch (bytesperpixel) {
case 4:
for (i = ibuf->x * ibuf->y; i > 0; i--) {
tmp[0] = from16[0] / 65535.0;
tmp[1] = from16[1] / 65535.0;
tmp[2] = from16[2] / 65535.0;
tmp[3] = from16[3] / 65535.0;
srgb_to_linearrgb_v4(to_float, tmp);
to_float += 4; from16 += 4;
}
break;
case 3:
for (i = ibuf->x * ibuf->y; i > 0; i--) {
tmp[0] = from16[0] / 65535.0;
tmp[1] = from16[1] / 65535.0;
tmp[2] = from16[2] / 65535.0;
tmp[3] = 1.0;
srgb_to_linearrgb_v4(to_float, tmp);
to_float += 4; from16 += 3;
}
break;
case 2:
for (i = ibuf->x * ibuf->y; i > 0; i--) {
tmp[0] = tmp[1] = tmp[2] = from16[0] / 65535.0;
tmp[3] = from16[1] / 65535.0;
srgb_to_linearrgb_v4(to_float, tmp);
to_float += 4; from16 += 2;
}
break;
case 1:
for (i = ibuf->x * ibuf->y; i > 0; i--) {
tmp[0] = tmp[1] = tmp[2] = from16[0] / 65535.0;
tmp[3] = 1.0;
srgb_to_linearrgb_v4(to_float, tmp);
to_float += 4; from16++;
}
break;
}
} }
else {
imb_addrectImBuf(ibuf);
// allocate memory for an array of row-pointers pixels = MEM_mallocN(ibuf->x * ibuf->y * bytesperpixel * sizeof(unsigned char), "pixels");
row_pointers = (png_bytepp) MEM_mallocN(ibuf->y * sizeof(png_bytep), "row_pointers"); if (pixels == NULL) {
if (row_pointers == NULL) { printf("Cannot allocate pixels array\n");
printf("Cannot allocate row-pointers array\n"); longjmp(png_jmpbuf(png_ptr), 1);
longjmp(png_jmpbuf(png_ptr), 1);
}
// set the individual row-pointers to point at the correct offsets
for (i = 0; i < ibuf->y; i++) {
row_pointers[ibuf->y-1-i] = (png_bytep)
((unsigned char *)pixels + (i * ibuf->x) * bytesperpixel * sizeof(unsigned char));
}
png_read_image(png_ptr, row_pointers);
// copy image data
to = (unsigned char *) ibuf->rect;
from = pixels;
switch (bytesperpixel) {
case 4:
for (i = ibuf->x * ibuf->y; i > 0; i--) {
to[0] = from[0];
to[1] = from[1];
to[2] = from[2];
to[3] = from[3];
to += 4; from += 4;
} }
break;
case 3: // allocate memory for an array of row-pointers
for (i = ibuf->x * ibuf->y; i > 0; i--) { row_pointers = (png_bytepp) MEM_mallocN(ibuf->y * sizeof(png_bytep), "row_pointers");
to[0] = from[0]; if (row_pointers == NULL) {
to[1] = from[1]; printf("Cannot allocate row-pointers array\n");
to[2] = from[2]; longjmp(png_jmpbuf(png_ptr), 1);
to[3] = 0xff;
to += 4; from += 3;
} }
break;
case 2: // set the individual row-pointers to point at the correct offsets
for (i = ibuf->x * ibuf->y; i > 0; i--) { for (i = 0; i < ibuf->y; i++) {
to[0] = to[1] = to[2] = from[0]; row_pointers[ibuf->y-1-i] = (png_bytep)
to[3] = from[1]; ((unsigned char *)pixels + (i * ibuf->x) * bytesperpixel * sizeof(unsigned char));
to += 4; from += 2;
} }
break;
case 1: png_read_image(png_ptr, row_pointers);
for (i = ibuf->x * ibuf->y; i > 0; i--) {
to[0] = to[1] = to[2] = from[0]; // copy image data
to[3] = 0xff;
to += 4; from++; to = (unsigned char *) ibuf->rect;
from = pixels;
switch (bytesperpixel) {
case 4:
for (i = ibuf->x * ibuf->y; i > 0; i--) {
to[0] = from[0];
to[1] = from[1];
to[2] = from[2];
to[3] = from[3];
to += 4; from += 4;
}
break;
case 3:
for (i = ibuf->x * ibuf->y; i > 0; i--) {
to[0] = from[0];
to[1] = from[1];
to[2] = from[2];
to[3] = 0xff;
to += 4; from += 3;
}
break;
case 2:
for (i = ibuf->x * ibuf->y; i > 0; i--) {
to[0] = to[1] = to[2] = from[0];
to[3] = from[1];
to += 4; from += 2;
}
break;
case 1:
for (i = ibuf->x * ibuf->y; i > 0; i--) {
to[0] = to[1] = to[2] = from[0];
to[3] = 0xff;
to += 4; from++;
}
break;
} }
break;
} }
if (flags & IB_metadata) { if (flags & IB_metadata) {
@@ -474,14 +549,17 @@ struct ImBuf *imb_loadpng(unsigned char *mem, size_t size, int flags)
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
IMB_metadata_add_field(ibuf, text_chunks[i].key, text_chunks[i].text); IMB_metadata_add_field(ibuf, text_chunks[i].key, text_chunks[i].text);
ibuf->flags |= IB_metadata; ibuf->flags |= IB_metadata;
} }
} }
png_read_end(png_ptr, info_ptr); png_read_end(png_ptr, info_ptr);
} }
// clean up // clean up
MEM_freeN(pixels); if(pixels)
MEM_freeN(pixels);
if(pixels16)
MEM_freeN(pixels16);
MEM_freeN(row_pointers); MEM_freeN(row_pointers);
png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);