mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

[devel] Changed some errors to warnings, added missing "png_ptr" arg in

Browse Source 
some currently dead code in pngrtran.c that will be enabled in libpng-1.6
This commit is contained in:
Glenn Randers-Pehrson 2011-05-08 06:02:18 -05:00
parent 87952f0623
commit 8ba34667a1
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pngrtran.c
View File

@ -194,7 +194,10 @@ png_set_alpha_mode_fixed(png_structp png_ptr, int mode,
* values are reasonable this may have to be changed. * values are reasonable this may have to be changed.
*/ */
else if (output_gamma < 70000 || output_gamma > 300000) else if (output_gamma < 70000 || output_gamma > 300000)
png_error(png_ptr, "output gamma out of expected range"); {
png_warning(png_ptr, "ignoring output gamma out of expected range");
return;
}
/* The default file gamma is the inverse of the output gamma; the output /* The default file gamma is the inverse of the output gamma; the output
* gamma may be changed below so get the file value first: * gamma may be changed below so get the file value first:
@ -731,10 +734,16 @@ png_set_gamma_fixed(png_structp png_ptr, png_fixed_point scrn_gamma,
* undocumented API feature) it will only be made in 1.6. * undocumented API feature) it will only be made in 1.6.
*/ */
if (file_gamma <= 0) if (file_gamma <= 0)
png_error("invalid file gamma to png_set_gamma"); {
png_warning(png_ptr, "invalid file gamma to png_set_gamma");
return;
}
if (scrn_gamma <= 0) if (scrn_gamma <= 0)
png_error("invalid screen gamma to png_set_gamma"); {
png_warning(png_ptr, "invalid screen gamma to png_set_gamma");
return;
}
#endif #endif
/* Set the gamma values unconditionally - this overrides the value in the PNG /* Set the gamma values unconditionally - this overrides the value in the PNG
@ -891,8 +900,8 @@ png_set_rgb_to_gray_fixed(png_structp png_ptr, int error_action,
break; break;
default: default:
png_error(png_ptr, "invalid error action to rgb_to_gray"); png_warning(png_ptr, "invalid error action to rgb_to_gray");
break; return;
} }
if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
#ifdef PNG_READ_EXPAND_SUPPORTED #ifdef PNG_READ_EXPAND_SUPPORTED
@ -1572,7 +1581,8 @@ png_init_read_transformations(png_structp png_ptr)
break; break;
default: default:
png_error(png_ptr, "invalid background gamma type"); png_warning (png_ptr, "invalid background gamma type");
return;
} }
png_ptr->background_1.gray = png_gamma_correct(png_ptr, png_ptr->background_1.gray = png_gamma_correct(png_ptr,