CCF_100/ncsa-mosaic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes to work with libpng > 1.5.0.

Browse Source
This commit is contained in:
Ian Jones 2021-10-13 01:34:13 +01:00 committed by Robert Clausecker
parent 294f1a2ccb
commit 3566a6a42b
1 changed files with 51 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
src/readPNG.c
View File

@ -97,11 +97,10 @@ ReadPNG(FILE *infile,int *width, int *height, XColor *colrs)
double screen_gamma; double screen_gamma;
png_byte *png_pixels=NULL, **row_pointers=NULL; png_byte *png_pixels=NULL, **row_pointers=NULL;
int i, j; int i, j, bit_depth, color_type, num_palette, interlace_type;
unsigned int packets;
png_color std_color_cube[216]; png_color std_color_cube[216];
png_colorp palette;
/* first check to see if its a valid PNG file. If not, return. */ /* first check to see if its a valid PNG file. If not, return. */
@ -176,20 +175,22 @@ ReadPNG(FILE *infile,int *width, int *height, XColor *colrs)
/* setup other stuff using the fields of png_info. */ /* setup other stuff using the fields of png_info. */
*width = (int)png_ptr->width; png_get_IHDR(png_ptr, info_ptr, width, height, &bit_depth, &color_type, &interlace_type, NULL, NULL);
*height = (int)png_ptr->height;
#ifndef DISABLE_TRACE #ifndef DISABLE_TRACE
if (srcTrace) { if (srcTrace) {
fprintf(stderr,"\n\nBEFORE\nheight = %d\n", (int)png_ptr->width); fprintf(stderr,"\n\nBEFORE\nwidth = %ls\n", width);
fprintf(stderr,"width = %d\n", (int)png_ptr->height); fprintf(stderr,"height = %ls\n", height);
fprintf(stderr,"bit depth = %d\n", info_ptr->bit_depth); fprintf(stderr,"bit depth = %d\n", bit_depth);
fprintf(stderr,"color type = %d\n", info_ptr->color_type); fprintf(stderr,"color type = %d\n", color_type);
fprintf(stderr,"interlace type = %d\n", interlace_type);
/*
fprintf(stderr,"compression type = %d\n", info_ptr->compression_type); fprintf(stderr,"compression type = %d\n", info_ptr->compression_type);
fprintf(stderr,"filter type = %d\n", info_ptr->filter_type); fprintf(stderr,"filter type = %d\n", info_ptr->filter_type);
fprintf(stderr,"interlace type = %d\n", info_ptr->interlace_type);
fprintf(stderr,"num colors = %d\n",info_ptr->num_palette); fprintf(stderr,"num colors = %d\n",info_ptr->num_palette);
fprintf(stderr,"rowbytes = %d\n", info_ptr->rowbytes); fprintf(stderr,"rowbytes = %d\n", info_ptr->rowbytes);
*/
} }
#endif #endif
@ -200,28 +201,28 @@ ReadPNG(FILE *infile,int *width, int *height, XColor *colrs)
/* its #if'ed out for now cause I don't have anything to /* its #if'ed out for now cause I don't have anything to
test it with */ test it with */
{ {
png_color_16 my_background; png_color_16 my_background, *image_background;
if (info_ptr->valid & PNG_INFO_bKGD) if (PNG_INFO_bKGD(png_ptr, info_ptr, &image_background) != 0)
png_set_background(png_ptr, &(info_ptr->background), png_set_background(png_ptr, image_background,
PNG_GAMMA_FILE, 1, 1.0); PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
else else
png_set_background(png_ptr, &my_background, png_set_background(png_ptr, &my_background,
PNG_GAMMA_SCREEN, 0, 1.0); PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0);
} }
#endif #endif
/* strip pixels in 16-bit images down to 8 bits */ /* strip pixels in 16-bit images down to 8 bits */
if (info_ptr->bit_depth == 16) if (bit_depth == 16)
png_set_strip_16(png_ptr); png_set_strip_16(png_ptr);
/* If it is a color image then check if it has a palette. If not /* If it is a color image then check if it has a palette. If not
then dither the image to 256 colors, and make up a palette */ then dither the image to 256 colors, and make up a palette */
if (info_ptr->color_type==PNG_COLOR_TYPE_RGB || if (color_type==PNG_COLOR_TYPE_RGB ||
info_ptr->color_type==PNG_COLOR_TYPE_RGB_ALPHA) { color_type==PNG_COLOR_TYPE_RGB_ALPHA) {
if(! (info_ptr->valid & PNG_INFO_PLTE)) { if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette) != 0) {
#ifndef DISABLE_TRACE #ifndef DISABLE_TRACE
if (srcTrace) { if (srcTrace) {
@ -239,7 +240,7 @@ ReadPNG(FILE *infile,int *width, int *height, XColor *colrs)
/* this should probably be dithering to /* this should probably be dithering to
Rdata.colors_per_inlined_image colors */ Rdata.colors_per_inlined_image colors */
png_set_dither(png_ptr, std_color_cube, png_set_quantize(png_ptr, std_color_cube,
216, 216,
216, NULL, 1); 216, NULL, 1);
@ -250,10 +251,12 @@ ReadPNG(FILE *infile,int *width, int *height, XColor *colrs)
} }
#endif #endif
png_set_dither(png_ptr, info_ptr->palette, png_uint_16p histogram = NULL;
info_ptr->num_palette, png_get_hIST(png_ptr, info_ptr, &histogram);
png_set_quantize(png_ptr, palette,
num_palette,
get_pref_int(eCOLORS_PER_INLINED_IMAGE), get_pref_int(eCOLORS_PER_INLINED_IMAGE),
info_ptr->hist, 1); histogram, 1);
} }
} }
@ -262,14 +265,14 @@ ReadPNG(FILE *infile,int *width, int *height, XColor *colrs)
small as they can. This expands pixels to 1 pixel per byte, and small as they can. This expands pixels to 1 pixel per byte, and
if a transparency value is supplied, an alpha channel is if a transparency value is supplied, an alpha channel is
built.*/ built.*/
if (info_ptr->bit_depth < 8) if (bit_depth < 8)
png_set_packing(png_ptr); png_set_packing(png_ptr);
/* have libpng handle the gamma conversion */ /* have libpng handle the gamma conversion */
if (get_pref_boolean(eUSE_SCREEN_GAMMA)) { /*SWP*/ if (get_pref_boolean(eUSE_SCREEN_GAMMA)) { /*SWP*/
if (info_ptr->bit_depth != 16) { /* temporary .. glennrp */ if (bit_depth != 16) { /* temporary .. glennrp */
screen_gamma=(double)(get_pref_float(eSCREEN_GAMMA)); screen_gamma=(double)(get_pref_float(eSCREEN_GAMMA));
#ifndef DISABLE_TRACE #ifndef DISABLE_TRACE
@ -277,13 +280,14 @@ ReadPNG(FILE *infile,int *width, int *height, XColor *colrs)
fprintf(stderr,"screen gamma=%f\n",screen_gamma); fprintf(stderr,"screen gamma=%f\n",screen_gamma);
} }
#endif #endif
if (info_ptr->valid & PNG_INFO_gAMA) { double image_gamma;
if (png_get_gAMA(png_ptr, info_ptr, &image_gamma) != 0) {
#ifndef DISABLE_TRACE #ifndef DISABLE_TRACE
if (srcTrace) { if (srcTrace) {
printf("setting gamma=%f\n",info_ptr->gamma); printf("setting gamma=%f\n", image_gamma);
} }
#endif #endif
png_set_gamma(png_ptr, screen_gamma, (double)info_ptr->gamma); png_set_gamma(png_ptr, screen_gamma, image_gamma);
} }
else { else {
#ifndef DISABLE_TRACE #ifndef DISABLE_TRACE
@ -291,39 +295,42 @@ ReadPNG(FILE *infile,int *width, int *height, XColor *colrs)
fprintf(stderr,"setting gamma=%f\n",0.45); fprintf(stderr,"setting gamma=%f\n",0.45);
} }
#endif #endif
png_set_gamma(png_ptr, screen_gamma, (double)0.45); png_set_gamma(png_ptr, screen_gamma, 0.45);
} }
} }
} }
if (info_ptr->interlace_type) if (interlace_type)
png_set_interlace_handling(png_ptr); png_set_interlace_handling(png_ptr);
png_read_update_info(png_ptr, info_ptr); png_read_update_info(png_ptr, info_ptr);
#ifndef DISABLE_TRACE #ifndef DISABLE_TRACE
if (srcTrace) { if (srcTrace) {
fprintf(stderr,"\n\nAFTER\nheight = %d\n", (int)png_ptr->width); fprintf(stderr,"\n\nAFTER\nwidth = %ls\n", width);
fprintf(stderr,"width = %d\n", (int)png_ptr->height); fprintf(stderr,"height = %ls\n", height);
fprintf(stderr,"bit depth = %d\n", info_ptr->bit_depth); fprintf(stderr,"bit depth = %d\n", bit_depth);
fprintf(stderr,"color type = %d\n", info_ptr->color_type); fprintf(stderr,"color type = %d\n", color_type);
fprintf(stderr,"interlace type = %d\n", interlace_type);
/*
fprintf(stderr,"compression type = %d\n", info_ptr->compression_type); fprintf(stderr,"compression type = %d\n", info_ptr->compression_type);
fprintf(stderr,"filter type = %d\n", info_ptr->filter_type); fprintf(stderr,"filter type = %d\n", info_ptr->filter_type);
fprintf(stderr,"interlace type = %d\n", info_ptr->interlace_type);
fprintf(stderr,"num colors = %d\n",info_ptr->num_palette); fprintf(stderr,"num colors = %d\n",info_ptr->num_palette);
fprintf(stderr,"rowbytes = %d\n", info_ptr->rowbytes); fprintf(stderr,"rowbytes = %d\n", info_ptr->rowbytes);
*/
} }
#endif #endif
/* allocate the pixel grid which we will need to send to /* allocate the pixel grid which we will need to send to
png_read_image(). */ png_read_image(). */
png_pixels = (png_byte *)malloc(info_ptr->rowbytes * int rowbytes = png_get_rowbytes(png_ptr, info_ptr);
png_pixels = (png_byte *)malloc(rowbytes *
(*height) * sizeof(png_byte)); (*height) * sizeof(png_byte));
row_pointers = (png_byte **) malloc((*height) * sizeof(png_byte *)); row_pointers = (png_byte **) malloc((*height) * sizeof(png_byte *));
for (i=0; i < *height; i++) for (i=0; i < *height; i++)
row_pointers[i]=png_pixels+(info_ptr->rowbytes*i); row_pointers[i]=png_pixels+(rowbytes*i);
/* FINALLY - read the darn thing. */ /* FINALLY - read the darn thing. */
@ -332,13 +339,13 @@ ReadPNG(FILE *infile,int *width, int *height, XColor *colrs)
/* now that we have the (transformed to 8-bit RGB) image, we have /* now that we have the (transformed to 8-bit RGB) image, we have
to copy the resulting palette to our colormap. */ to copy the resulting palette to our colormap. */
if (info_ptr->color_type & PNG_COLOR_MASK_COLOR) { if (color_type & PNG_COLOR_MASK_COLOR) {
if (info_ptr->valid & PNG_INFO_PLTE) { if (png_get_PLTE(png_ptr, info_ptr, palette, num_palette) != 0) {
for (i=0; i < info_ptr->num_palette; i++) { for (i=0; i < num_palette; i++) {
colrs[i].red = info_ptr->palette[i].red << 8; colrs[i].red = palette[i].red << 8;
colrs[i].green = info_ptr->palette[i].green << 8; colrs[i].green = palette[i].green << 8;
colrs[i].blue = info_ptr->palette[i].blue << 8; colrs[i].blue = palette[i].blue << 8;
colrs[i].pixel = i; colrs[i].pixel = i;
colrs[i].flags = DoRed|DoGreen|DoBlue; colrs[i].flags = DoRed|DoGreen|DoBlue;
} }
@ -373,7 +380,7 @@ ReadPNG(FILE *infile,int *width, int *height, XColor *colrs)
/* if there is an alpha channel, we have to get rid of it in the /* if there is an alpha channel, we have to get rid of it in the
pixmap, since I don't do anything with it yet */ pixmap, since I don't do anything with it yet */
if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA) { if (color_type & PNG_COLOR_MASK_ALPHA) {
#ifndef DISABLE_TRACE #ifndef DISABLE_TRACE
if (srcTrace) { if (srcTrace) {