diff --git a/ANNOUNCE b/ANNOUNCE index 054ad26bb..dfa9a42a1 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.4.1alpha02 - November 29, 2009 +Libpng 1.4.1alpha02 - December 4, 2009 This is not intended to be a public release. It will be replaced within a few weeks by a public version or by another test version. @@ -29,10 +29,10 @@ Changes since the last public release (1.4.0beta107): version 1.4.1alpha01 [November 27, 2009] Based on 1.4.0beta107 -version 1.4.1alpha02 [November 29, 2009] +version 1.4.1alpha02 [December 4, 2009] Restored premultiplied alpha feature from version 1.4.0beta105. Added "double gamma" to parameters for png_set_premultiply_alpha(). - Added "float gamma_premultiply" member to the png_struct. + Added "float postmultiply_gamma" member to the png_struct. Moved PNG_DIVIDE_BY_255, PNG_8_BIT_PREMULTIPLY(), etc., from png.h to pngpriv.h Updated documentation about png_set_premultiply_alpha(). diff --git a/CHANGES b/CHANGES index de136070c..aebea20d9 100644 --- a/CHANGES +++ b/CHANGES @@ -2408,13 +2408,23 @@ version 1.4.0beta106 [November 27, 2009] version 1.4.0beta107 [November 27, 2009] Updated README +version 1.4.0beta107 [December 4, 2009] + Updated README + Added "#define PNG_NO_PEDANTIC_WARNINGS" in the libpng source files. + Removed "-DPNG_CONFIGURE_LIBPNG" from the makefiles and projects. + Revised scripts/makefile.netbsd, makefile.openbsd, and makefile.sco + to put png.h and pngconf.h in $prefix/include, like the other scripts, + instead of in $prefix/include/libpng. Also revised makefile.sco + to put them in $prefix/include/libpng14 instead of in + $prefix/include/libpng/libpng14. + version 1.4.1alpha01 [November 27, 2009] Based on 1.4.0beta107 -version 1.4.1alpha02 [November 29, 2009] +version 1.4.1alpha02 [December 4, 2009] Restored premultiplied alpha feature from version 1.4.0beta105. Added "double gamma" to parameters for png_set_premultiply_alpha(). - Added "float gamma_premultiply" member to the png_struct. + Added "float postmultiply_gamma" member to the png_struct. Moved PNG_DIVIDE_BY_255, PNG_8_BIT_PREMULTIPLY(), etc., from png.h to pngpriv.h Updated documentation about png_set_premultiply_alpha(). diff --git a/example.c b/example.c index 09e43b469..d1661d394 100644 --- a/example.c +++ b/example.c @@ -2,7 +2,7 @@ #if 0 /* in case someone actually tries to compile this */ /* example.c - an example of using libpng - * Last changed in libpng 1.4.0 [November 27, 2009] + * Last changed in libpng 1.4.0 [December 4, 2009] * This file has been placed in the public domain by the authors. * Maintained 1998-2009 Glenn Randers-Pehrson * Maintained 1996, 1997 Andreas Dilger) diff --git a/png.c b/png.c index 9029be5d6..8ca82eb60 100644 --- a/png.c +++ b/png.c @@ -1,7 +1,7 @@ /* png.c - location for general purpose libpng functions * - * Last changed in libpng 1.4.0 [November 27, 2009] + * Last changed in libpng 1.4.0 [December 4, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -12,6 +12,7 @@ */ #define PNG_NO_EXTERN +#define PNG_NO_PEDANTIC_WARNINGS #include "png.h" #include "pngpriv.h" @@ -547,13 +548,13 @@ png_get_copyright(png_structp png_ptr) #else #ifdef __STDC__ return ((png_charp) PNG_STRING_NEWLINE \ - "libpng version 1.4.1alpha02 - November 27, 2009" PNG_STRING_NEWLINE \ + "libpng version 1.4.1alpha02 - December 4, 2009" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2009 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \ "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \ "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \ PNG_STRING_NEWLINE); #else - return ((png_charp) "libpng version 1.4.1alpha02 - November 27, 2009\ + return ((png_charp) "libpng version 1.4.1alpha02 - December 4, 2009\ Copyright (c) 1998-2009 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."); diff --git a/png.h b/png.h index bd4f19c0a..15cae7367 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.4.1alpha02 - November 29, 2009 + * libpng version 1.4.1alpha02 - December 4, 2009 * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -11,7 +11,7 @@ * Authors and maintainers: * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.4.1alpha02 - November 29, 2009: Glenn + * libpng versions 0.97, January 1998, through 1.4.1alpha02 - December 4, 2009: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -131,7 +131,7 @@ * 1.4.0beta15-36 14 10400 14.so.0.0[.0] * 1.4.0beta37-87 14 10400 14.so.14.0[.0] * 1.4.0rc01 14 10400 14.so.14.0[.0] - * 1.4.0beta88-107 14 10400 14.so.14.0[.0] + * 1.4.0beta88-108 14 10400 14.so.14.0[.0] * 1.4.1alpha01-02 14 10401 14.so.14.0[.0] * * Henceforth the source version will match the shared-library major @@ -164,7 +164,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.4.1alpha02, November 29, 2009, are + * libpng versions 1.2.6, August 15, 2004, through 1.4.1alpha02, December 4, 2009, are * Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are * distributed according to the same disclaimer and license as libpng-1.2.5 * with the following individual added to the list of Contributing Authors: @@ -340,7 +340,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.4.1alpha02" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.4.1alpha02 - November 29, 2009\n" + " libpng version 1.4.1alpha02 - December 4, 2009\n" #define PNG_LIBPNG_VER_SONUM 14 #define PNG_LIBPNG_VER_DLLNUM 14 @@ -1332,15 +1332,10 @@ struct png_struct_def /* New member added in libpng-1.2.30 */ png_charp chunkdata PNG_DEPSTRUCT; /* buffer for reading chunk data */ -/* New member added in libpng-1.2.41 */ +/* New member added in libpng-1.4.0 */ #ifdef PNG_IO_STATE_SUPPORTED png_uint_32 io_state PNG_DEPSTRUCT; #endif - -/* New member added in libpng-1.4.1 */ -#ifdef PNG_READ_PREMULTIPLY_ALPHA_SUPPORTED - float gamma_premultiply PNG_DEPSTRUCT; -#endif }; @@ -1529,11 +1524,6 @@ extern PNG_EXPORT(void,png_set_swap_alpha) PNGARG((png_structp png_ptr)); extern PNG_EXPORT(void,png_set_invert_alpha) PNGARG((png_structp png_ptr)); #endif -#ifdef PNG_READ_PREMULTIPLY_ALPHA_SUPPORTED -extern PNG_EXPORT(void,png_set_premultiply_alpha) - PNGARG((png_structp png_ptr, double gamma)); -#endif - #if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED) /* Add a filler byte to 8-bit Gray or 24-bit RGB images. */ extern PNG_EXPORT(void,png_set_filler) PNGARG((png_structp png_ptr, diff --git a/pngconf.h b/pngconf.h index 463166f11..d00624f3a 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.4.1alpha02 - November 29, 2009 + * libpng version 1.4.1alpha02 - December 4, 2009 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -870,6 +870,7 @@ #endif /* PNG_READ_ANCILLARY_CHUNKS_SUPPORTED */ + #ifndef PNG_NO_READ_UNKNOWN_CHUNKS # define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED # ifndef PNG_UNKNOWN_CHUNKS_SUPPORTED @@ -1308,33 +1309,51 @@ typedef char FAR * FAR * FAR * png_charppp; * * Added at libpng-1.2.41. */ -#ifdef __GNUC__ -# ifndef PNG_DEPRECATED -# define PNG_DEPRECATED __attribute__((__deprecated__)) -# endif -# ifndef PNG_USE_RESULT -# define PNG_USE_RESULT __attribute__((__warn_unused_result__)) -# endif -# ifndef PNG_NORETURN -# define PNG_NORETURN __attribute__((__noreturn__)) -# endif -# ifndef PNG_ALLOCATED -# define PNG_ALLOCATED __attribute__((__malloc__)) -# endif -# ifndef PNG_CONFIGURE_LIBPNG +#ifndef PNG_NO_PEDANTIC_WARNINGS +# ifndef PNG_PEDANTIC_WARNINGS_SUPPORTED +# define PNG_PEDANTIC_WARNINGS_SUPPORTED +# endif +#endif + +#ifdef PNG_PEDANTIC_WARNINGS_SUPPORTED +/* Support for compiler specific function attributes. These are used + * so that where compiler support is available incorrect use of API + * functions in png.h will generate compiler warnings. Added at libpng + * version 1.2.41. + */ +# ifdef __GNUC__ +# ifndef PNG_USE_RESULT +# define PNG_USE_RESULT __attribute__((__warn_unused_result__)) +# endif +# ifndef PNG_NORETURN +# define PNG_NORETURN __attribute__((__noreturn__)) +# endif +# ifndef PNG_ALLOCATED +# define PNG_ALLOCATED __attribute__((__malloc__)) +# endif + /* This specifically protects structure members that should only be * accessed from within the library, therefore should be empty during * a library build. */ +# ifndef PNG_DEPRECATED +# define PNG_DEPRECATED __attribute__((__deprecated__)) +# endif # ifndef PNG_DEPSTRUCT # define PNG_DEPSTRUCT __attribute__((__deprecated__)) # endif # ifndef PNG_PRIVATE -# define PNG_PRIVATE __attribute__((__deprecated__)) -# endif -# endif -#endif +# if 0 /* Doesn't work so we use deprecated instead*/ +# define PNG_PRIVATE \ + __attribute__((warning("This function is not exported by libpng."))) +# else +# define PNG_PRIVATE \ + __attribute__((__deprecated__)) +# endif +# endif /* PNG_PRIVATE */ +# endif /* __GNUC__ */ +#endif /* PNG_PEDANTIC_WARNINGS */ #ifndef PNG_DEPRECATED # define PNG_DEPRECATED /* Use of this function is deprecated */ diff --git a/pngerror.c b/pngerror.c index 1a341ae5f..64e3e4928 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,7 +1,7 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * Last changed in libpng 1.4.0 [November 27, 2009] + * Last changed in libpng 1.4.0 [December 4, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -16,6 +16,7 @@ * at each function. */ +#define PNG_NO_PEDANTIC_WARNINGS #include "png.h" #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) #include "pngpriv.h" diff --git a/pngget.c b/pngget.c index 783bf4cc1..544988ff8 100644 --- a/pngget.c +++ b/pngget.c @@ -1,7 +1,7 @@ /* pngget.c - retrieval of values from info struct * - * Last changed in libpng 1.4.0 [November 27, 2009] + * Last changed in libpng 1.4.0 [December 4, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -12,6 +12,7 @@ * */ +#define PNG_NO_PEDANTIC_WARNINGS #include "png.h" #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) #include "pngpriv.h" diff --git a/pngmem.c b/pngmem.c index c21c17ca7..969fc686a 100644 --- a/pngmem.c +++ b/pngmem.c @@ -1,7 +1,7 @@ /* pngmem.c - stub functions for memory allocation * - * Last changed in libpng 1.4.0 [November 27, 2009] + * Last changed in libpng 1.4.0 [December 4, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -17,6 +17,7 @@ * identify the replacement functions. */ +#define PNG_NO_PEDANTIC_WARNINGS #include "png.h" #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) #include "pngpriv.h" diff --git a/pngpread.c b/pngpread.c index c28704955..c4dd73c94 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1,7 +1,7 @@ /* pngpread.c - read a png file in push mode * - * Last changed in libpng 1.4.0 [November 27, 2009] + * Last changed in libpng 1.4.0 [December 4, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -11,6 +11,7 @@ * and license in png.h */ +#define PNG_NO_PEDANTIC_WARNINGS #include "png.h" #ifdef PNG_PROGRESSIVE_READ_SUPPORTED #include "pngpriv.h" diff --git a/pngpriv.h b/pngpriv.h index f5d762dc7..a80544c04 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * libpng version 1.4.1alpha02 - November 28, 2009 + * libpng version 1.4.1alpha02 - December 4, 2009 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -554,7 +554,8 @@ PNG_EXTERN void png_do_strip_filler PNGARG((png_row_infop row_info, #ifdef PNG_READ_PREMULTIPLY_ALPHA_SUPPORTED PNG_EXTERN void png_do_read_premultiply_alpha - PNGARG((png_row_infop row_info, png_bytep row)); + PNGARG((png_row_infop row_info, png_bytep row, + png_uint_16pp gamma_16_to_1)); #endif #if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED) @@ -952,19 +953,13 @@ extern void *png_far_to_near PNGARG((png_structp png_ptr,png_voidp ptr, #ifdef PNG_READ_PREMULTIPLY_ALPHA_SUPPORTED # ifdef PNG_READ_COMPOSITE_NODIV_SUPPORTED -# define PNG_DIVIDE_BY_255(v) \ - ((png_byte)(((png_uint_16)(v) + \ - (((png_uint_16)(v) + 128) >> 8) + 128) >> 8)) # define PNG_DIVIDE_BY_65535(v) \ ((png_byte)(((png_uint_32)(v) + \ (((png_uint_32)(v) + 32768L) >> 16) + 32768L) >> 16)) # else -# define PNG_DIVIDE_BY_255(v) (((png_uint_16)(v))/255) # define PNG_DIVIDE_BY_65535(v) (((png_uint_32)(v))/65535L) # endif /* PNG_READ_COMPOSITE_NODIV_SUPPORTED */ -# define PNG_8_BIT_PREMULTIPLY(color,alpha) \ - PNG_DIVIDE_BY_255((color)*(alpha)) # define PNG_16_BIT_PREMULTIPLY(color,alpha)\ PNG_DIVIDE_BY_65535((color)*(alpha)) #endif /* PNG_READ_PREMULTIPLY_ALPHA_SUPPORTED */ diff --git a/pngread.c b/pngread.c index 40cdf50f3..04f723b2b 100644 --- a/pngread.c +++ b/pngread.c @@ -1,7 +1,7 @@ /* pngread.c - read a PNG file * - * Last changed in libpng 1.4.0 [November 27, 2009] + * Last changed in libpng 1.4.0 [December 4, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -14,6 +14,7 @@ * read a PNG file or stream. */ +#define PNG_NO_PEDANTIC_WARNINGS #include "png.h" #ifdef PNG_READ_SUPPORTED #include "pngpriv.h" diff --git a/pngrio.c b/pngrio.c index 9c8595037..c87097477 100644 --- a/pngrio.c +++ b/pngrio.c @@ -1,7 +1,7 @@ /* pngrio.c - functions for data input * - * Last changed in libpng 1.4.0 [November 27, 2009] + * Last changed in libpng 1.4.0 [December 4, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -18,6 +18,7 @@ * libpng use it at run time with png_set_read_fn(...). */ +#define PNG_NO_PEDANTIC_WARNINGS #include "png.h" #ifdef PNG_READ_SUPPORTED #include "pngpriv.h" diff --git a/pngrtran.c b/pngrtran.c index c5ec2b6a7..66448adc3 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1,7 +1,7 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * Last changed in libpng 1.4.0 [November 29, 2009] + * Last changed in libpng 1.4.0 [December 4, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -16,6 +16,7 @@ * in pngtrans.c. */ +#define PNG_NO_PEDANTIC_WARNINGS #include "png.h" #ifdef PNG_READ_SUPPORTED #include "pngpriv.h" @@ -142,21 +143,15 @@ png_set_strip_alpha(png_structp png_ptr) #ifdef PNG_READ_PREMULTIPLY_ALPHA_SUPPORTED void PNGAPI -png_set_premultiply_alpha(png_structp png_ptr, double gamma) +png_set_premultiply_alpha(png_structp png_ptr) { png_debug(1, "in png_set_premultiply_alpha"); if(png_ptr == NULL) return; png_ptr->transformations |= - (PNG_PREMULTIPLY_ALPHA | PNG_EXPAND_tRNS); - png_ptr->transformations |= - PNG_EXPAND; + (PNG_PREMULTIPLY_ALPHA | PNG_EXPAND_tRNS | PNG_EXPAND); png_ptr->flags &= ~PNG_FLAG_ROW_INIT; - /* Check for overflow */ - if (gamma == 0 || gamma > 21474.83) - png_error(png_ptr, "Invalid gamma for premultiply"); - png_ptr->gamma_premultiply = (float)gamma; } #endif @@ -758,7 +753,7 @@ png_set_read_user_transform_fn(png_structp png_ptr, png_user_transform_ptr #endif /* Initialize everything needed for the read. This includes modifying - * the palette. + * the palette and building any needed gamma tables. */ void /* PRIVATE */ png_init_read_transformations(png_structp png_ptr) @@ -1531,25 +1526,23 @@ png_do_read_transformations(png_structp png_ptr) #ifdef PNG_READ_PREMULTIPLY_ALPHA_SUPPORTED - /* TO DO: build 16-bit gamma tables */ - if (png_ptr->transformations & PNG_PREMULTIPLY_ALPHA) - png_do_read_premultiply_alpha(&(png_ptr->row_info), - png_ptr->row_buf + 1); + { + png_do_gamma(&(png_ptr->row_info), png_ptr->row_buf + 1, + png_ptr->gamma_table, png_ptr->gamma_16_table, + png_ptr->gamma_shift); - /* TO DO: apply png_ptr->gamma_premultiply to the premultiplied - * samples, using the 16-bit gamma table. We may need to set - * png_ptr->screen_gamma to our output gamma, even though it is - * not necessarily destined to a screen. - */ + png_do_read_premultiply_alpha(&(png_ptr->row_info), + png_ptr->row_buf + 1, png_ptr->gamma_16_to_1); # ifdef PNG_READ_16_TO_8_SUPPORTED - if (!(png_ptr->transformations & PNG_PREMULTIPLY_ALPHA)) - { - if (png_ptr->transformations & PNG_16_TO_8) - png_do_chop(&(png_ptr->row_info), png_ptr->row_buf + 1); - } + if (!(png_ptr->transformations & PNG_PREMULTIPLY_ALPHA)) + { + if (png_ptr->transformations & PNG_16_TO_8) + png_do_chop(&(png_ptr->row_info), png_ptr->row_buf + 1); + } # endif + } #endif @@ -2043,7 +2036,8 @@ png_do_read_invert_alpha(png_row_infop row_info, png_bytep row) #ifdef PNG_READ_PREMULTIPLY_ALPHA_SUPPORTED void /* PRIVATE */ -png_do_read_premultiply_alpha(png_row_infop row_info, png_bytep row) +png_do_read_premultiply_alpha(png_row_infop row_info, png_bytep row, + png_uint_16pp gamma_16_to_1) { /* TO DO: apply gamma before premultiply */ @@ -2063,9 +2057,12 @@ png_do_read_premultiply_alpha(png_row_infop row_info, png_bytep row) for (i = 0; i < row_width; i++) { a = *(--sp); --dp; - sp--; *(--dp) = PNG_16_BIT_PREMULTIPLY((*sp), a); - sp--; *(--dp) = PNG_16_BIT_PREMULTIPLY((*sp), a); - sp--; *(--dp) = PNG_16_BIT_PREMULTIPLY((*sp), a); + sp--; *(--dp) = gamma_16_to_1[(int)(*sp)]; + *(dp) = PNG_16_BIT_PREMULTIPLY((*dp), a); + sp--; *(--dp) = gamma_16_to_1[(int)(*sp)]; + *(dp) = PNG_16_BIT_PREMULTIPLY((*dp), a); + sp--; *(--dp) = gamma_16_to_1[*sp]; + *(dp) = PNG_16_BIT_PREMULTIPLY((*dp), a); } } } @@ -2080,7 +2077,8 @@ png_do_read_premultiply_alpha(png_row_infop row_info, png_bytep row) for (i = 0; i < row_width; i++) { a = *(--sp); --dp; - sp--; *(--dp) = PNG_16_BIT_PREMULTIPLY((*sp), a); + sp--; *(--dp) = gamma_16_to_1[*sp]; + *(dp) = PNG_16_BIT_PREMULTIPLY((*dp), a); } } } @@ -4022,17 +4020,23 @@ static PNG_CONST int png_gamma_shift[] = * OR * * RGB_to_gray transformation is being performed + * * } * * AND * { - * the screen_gamma is different from the reciprocal of the - * file_gamma by more than the specified threshold + * the screen_gamma is different from the reciprocal of + * the file_gamma by more than the specified threshold * * OR * * a background color has been specified and the file_gamma * and screen_gamma are not 1.0, within the specified threshold. + * + * OR + * + * premultiplication by alpha is being performed and the file_gamma + * and postmultiply_gamma are not 1.0, within the specified threshold. * } */ @@ -4096,7 +4100,12 @@ png_build_gamma_table(png_structp png_ptr) } #endif /* PNG_READ_BACKGROUND_SUPPORTED || PNG_RGB_TO_GRAY_SUPPORTED */ } + +#ifdef PNG_READ_PREMULTIPLY_ALPHA_SUPPORTED + if (png_ptr->transformations & PNG_PREMULTIPLY_ALPHA) +#else else +#endif { double g; int i, j, shift, num; @@ -4201,6 +4210,7 @@ png_build_gamma_table(png_structp png_ptr) #if defined(PNG_READ_BACKGROUND_SUPPORTED) || \ defined(PNG_READ_RGB_TO_GRAY_SUPPORTED) +/* PREMULTIPLY */ if (png_ptr->transformations & (PNG_BACKGROUND | PNG_RGB_TO_GRAY)) { diff --git a/pngrutil.c b/pngrutil.c index 98212bb97..aaeee0f17 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.4.0 [November 27, 2009] + * Last changed in libpng 1.4.0 [December 4, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -14,6 +14,7 @@ * libpng itself during the course of reading an image. */ +#define PNG_NO_PEDANTIC_WARNINGS #include "png.h" #ifdef PNG_READ_SUPPORTED #include "pngpriv.h" diff --git a/pngset.c b/pngset.c index 8bc5a0bf6..9c558c2f0 100644 --- a/pngset.c +++ b/pngset.c @@ -1,7 +1,7 @@ /* pngset.c - storage of image information into info struct * - * Last changed in libpng 1.4.0 [November 27, 2009] + * Last changed in libpng 1.4.0 [December 4, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -16,6 +16,7 @@ * info struct and allows us to change the structure in the future. */ +#define PNG_NO_PEDANTIC_WARNINGS #include "png.h" #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) #include "pngpriv.h" diff --git a/pngtest.c b/pngtest.c index c986e6a29..b813788d5 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1,7 +1,7 @@ /* pngtest.c - a simple test program to test libpng * - * Last changed in libpng 1.4.0 [November 27, 2009] + * Last changed in libpng 1.4.0 [December 4, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) diff --git a/pngtrans.c b/pngtrans.c index c797222f6..1c7829ad3 100644 --- a/pngtrans.c +++ b/pngtrans.c @@ -1,7 +1,7 @@ /* pngtrans.c - transforms the data in a row (used by both readers and writers) * - * Last changed in libpng 1.4.0 [November 27, 2009] + * Last changed in libpng 1.4.0 [December 4, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -11,6 +11,7 @@ * and license in png.h */ +#define PNG_NO_PEDANTIC_WARNINGS #include "png.h" #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) #include "pngpriv.h" diff --git a/pngwio.c b/pngwio.c index 69ed5b604..e79f15675 100644 --- a/pngwio.c +++ b/pngwio.c @@ -1,7 +1,7 @@ /* pngwio.c - functions for data output * - * Last changed in libpng 1.4.0 [November 27, 2009] + * Last changed in libpng 1.4.0 [December 4, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -18,6 +18,7 @@ * them at run time with png_set_write_fn(...). */ +#define PNG_NO_PEDANTIC_WARNINGS #include "png.h" #ifdef PNG_WRITE_SUPPORTED #include "pngpriv.h" diff --git a/pngwrite.c b/pngwrite.c index 110ee1fe5..def94b290 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1,7 +1,7 @@ /* pngwrite.c - general routines to write a PNG file * - * Last changed in libpng 1.4.0 [November 27, 2009] + * Last changed in libpng 1.4.0 [December 4, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -12,6 +12,7 @@ */ /* Get internal access to png.h */ +#define PNG_NO_PEDANTIC_WARNINGS #include "png.h" #ifdef PNG_WRITE_SUPPORTED #include "pngpriv.h" diff --git a/pngwtran.c b/pngwtran.c index 515193390..7ba8f9f1a 100644 --- a/pngwtran.c +++ b/pngwtran.c @@ -1,7 +1,7 @@ /* pngwtran.c - transforms the data in a row for PNG writers * - * Last changed in libpng 1.4.0 [November 27, 2009] + * Last changed in libpng 1.4.0 [December 4, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -11,6 +11,7 @@ * and license in png.h */ +#define PNG_NO_PEDANTIC_WARNINGS #include "png.h" #ifdef PNG_WRITE_SUPPORTED #include "pngpriv.h" diff --git a/pngwutil.c b/pngwutil.c index b507370d2..cd0a66eb6 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * Last changed in libpng 1.4.0 [November 27, 2009] + * Last changed in libpng 1.4.0 [December 4, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -11,6 +11,7 @@ * and license in png.h */ +#define PNG_NO_PEDANTIC_WARNINGS #include "png.h" #ifdef PNG_WRITE_SUPPORTED #include "pngpriv.h" diff --git a/projects/cbuilder5/README.txt b/projects/cbuilder5/README.txt index 4bb57e6ee..9efaa4b6c 100644 --- a/projects/cbuilder5/README.txt +++ b/projects/cbuilder5/README.txt @@ -4,7 +4,7 @@ It needs to depend on pngpriv.h It needs to *not* depend on pnggccrd.c or pngvcrd.c -It needs to DEFINE PNG_CONFIGURE_LIBPNG while building +It needs to DEFINE PNG_NO_PEDANTIC_WARNING while building the library, but not while building an application. If an updated version is not received, this project will diff --git a/projects/visualc6/libpng.dsp b/projects/visualc6/libpng.dsp index 5c7c0b7ab..6704255ab 100644 --- a/projects/visualc6/libpng.dsp +++ b/projects/visualc6/libpng.dsp @@ -8,22 +8,22 @@ CFG=libpng - Win32 DLL Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run -!MESSAGE +!MESSAGE !MESSAGE NMAKE /f "libpng.mak". -!MESSAGE +!MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE +!MESSAGE !MESSAGE NMAKE /f "libpng.mak" CFG="libpng - Win32 DLL Release" -!MESSAGE +!MESSAGE !MESSAGE Possible choices for configuration are: -!MESSAGE +!MESSAGE !MESSAGE "libpng - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "libpng - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "libpng - Win32 DLL VB" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "libpng - Win32 LIB Release" (based on "Win32 (x86) Static Library") !MESSAGE "libpng - Win32 LIB Debug" (based on "Win32 (x86) Static Library") -!MESSAGE +!MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 @@ -52,8 +52,8 @@ MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 RSC=rc.exe -# ADD BASE RSC /l 0x409 /d "PNG_CONFIGURE_LIBPNG" /d "NDEBUG" -# ADD RSC /l 0x409 /i "..\.." /d "PNG_CONFIGURE_LIBPNG" /d "NDEBUG" +# ADD BASE RSC /l 0x409 /d "PNG_NO_PEDANTIC_WARNINGS" /d "NDEBUG" +# ADD RSC /l 0x409 /i "..\.." /d "PNG_NO_PEDANTIC_WARNINGS" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -83,8 +83,8 @@ MTL=midl.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 RSC=rc.exe -# ADD BASE RSC /l 0x409 /d "PNG_CONFIGURE_LIBPNG" /d "_DEBUG" -# ADD RSC /l 0x409 /i "..\.." /d "PNG_CONFIGURE_LIBPNG" /d "_DEBUG" /d PNG_DEBUG=1 +# ADD BASE RSC /l 0x409 /d "PNG_NO_PEDANTIC_WARNINGS" /d "_DEBUG" +# ADD RSC /l 0x409 /i "..\.." /d "PNG_NO_PEDANTIC_WARNINGS" /d "_DEBUG" /d PNG_DEBUG=1 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -114,8 +114,8 @@ MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 RSC=rc.exe -# ADD BASE RSC /l 0x409 /d "PNG_CONFIGURE_LIBPNG" /d "NDEBUG" -# ADD RSC /l 0x409 /i "..\.." /d "PNG_CONFIGURE_LIBPNG" /d "NDEBUG" /dPNG_LIBPNG_DLLFNAME_POSTFIX=""""VB"""" /dPNG_LIBPNG_SPECIALBUILD=""""__stdcall calling convention used for exported functions"""" +# ADD BASE RSC /l 0x409 /d "PNG_NO_PEDANTIC_WARNINGS" /d "NDEBUG" +# ADD RSC /l 0x409 /i "..\.." /d "PNG_NO_PEDANTIC_WARNINGS" /d "NDEBUG" /dPNG_LIBPNG_DLLFNAME_POSTFIX=""""VB"""" /dPNG_LIBPNG_SPECIALBUILD=""""__stdcall calling convention used for exported functions"""" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -147,8 +147,8 @@ CPP=cl.exe # ADD CPP /nologo /MD /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /FD /c # SUBTRACT CPP /YX /Yc /Yu RSC=rc.exe -# ADD BASE RSC /l 0x409 /d "PNG_CONFIGURE_LIBPNG" /d "NDEBUG" -# ADD RSC /l 0x409 /i "..\.." /d "PNG_CONFIGURE_LIBPNG" /d "NDEBUG" +# ADD BASE RSC /l 0x409 /d "PNG_NO_PEDANTIC_WARNINGS" /d "NDEBUG" +# ADD RSC /l 0x409 /i "..\.." /d "PNG_NO_PEDANTIC_WARNINGS" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -174,8 +174,8 @@ CPP=cl.exe # ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D PNG_DEBUG=1 /FD /GZ /c # SUBTRACT CPP /YX /Yc /Yu RSC=rc.exe -# ADD BASE RSC /l 0x409 /d "PNG_CONFIGURE_LIBPNG" /d "_DEBUG" -# ADD RSC /l 0x409 /d "PNG_CONFIGURE_LIBPNG" /d "_DEBUG" +# ADD BASE RSC /l 0x409 /d "PNG_NO_PEDANTIC_WARNINGS" /d "_DEBUG" +# ADD RSC /l 0x409 /d "PNG_NO_PEDANTIC_WARNINGS" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/visualc71/libpng.vcproj b/projects/visualc71/libpng.vcproj index 750781a77..ce03e6832 100644 --- a/projects/visualc71/libpng.vcproj +++ b/projects/visualc71/libpng.vcproj @@ -138,7 +138,7 @@ Name="VCPreLinkEventTool"/> diff --git a/projects/xcode/README.txt b/projects/xcode/README.txt index de852e40d..440149d67 100644 --- a/projects/xcode/README.txt +++ b/projects/xcode/README.txt @@ -2,7 +2,7 @@ The xcode project has not been entirely updated to libpng-1.4.0. It needs to *not* depend on pnggccrd.c or pngvcrd.c -It needs to PNG_CONFIGURE_LIBPNG in the CFLAGS while building +It needs to PNG_NO_PEDANTIC_WARNINGS in the CFLAGS while building the library, but not while building an application. If an updated version is not received, this project will diff --git a/scripts/README.txt b/scripts/README.txt index a7fbe8202..bc0a6eaf4 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,5 +1,5 @@ -Makefiles for libpng version 1.4.1alpha02 - November 27, 2009 +Makefiles for libpng version 1.4.1alpha02 - December 4, 2009 makefile.linux => Linux/ELF makefile (gcc, creates libpng14.so.14.1.4.1alpha02) diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index ad4064861..1b79ce830 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -49,7 +49,7 @@ ZLIBINC=/usr/include WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ -Wmissing-declarations -Wtraditional -Wcast-align \ -Wstrict-prototypes -Wmissing-prototypes #-Wconversion -CFLAGS=-DPNG_CONFIGURE_LIBPNG -I$(ZLIBINC) $(SUN_CC_FLAGS) \ +CFLAGS=-I$(ZLIBINC) $(SUN_CC_FLAGS) \ # $(WARNMORE) -g -DPNG_DEBUG=5 LDFLAGS=$(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) libpng.a -lz -lm diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 22a430d93..4a2433cba 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -49,7 +49,7 @@ ZLIBINC=/usr/include WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ -Wmissing-declarations -Wtraditional -Wcast-align \ -Wstrict-prototypes -Wmissing-prototypes #-Wconversion -CFLAGS=-DPNG_CONFIGURE_LIBPNG -I$(ZLIBINC) $(SUN_CC_FLAGS) \ +CFLAGS=-I$(ZLIBINC) $(SUN_CC_FLAGS) \ # $(WARNMORE) -g -DPNG_DEBUG=5 LDFLAGS=-L. -R. $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng14 -lz -lm diff --git a/scripts/makefile.acorn b/scripts/makefile.acorn index e2630d733..a0e577b24 100644 --- a/scripts/makefile.acorn +++ b/scripts/makefile.acorn @@ -2,7 +2,7 @@ # Toolflags: -CCflags = -DPNG_CONFIGURE_LIBPNG -c -depend !Depend -IC:,Zlib: -g -throwback -DRISCOS -fnah +CCflags = -c -depend !Depend -IC:,Zlib: -g -throwback -DRISCOS -fnah C++flags = -c -depend !Depend -IC: -throwback Linkflags = -aif -c++ -o $@ ObjAsmflags = -throwback -NoCache -depend !Depend diff --git a/scripts/makefile.aix b/scripts/makefile.aix index d14432abe..6d31888f3 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -48,7 +48,7 @@ LDDEBUG = CRELEASE = -O2 LDRELEASE = -s WARNMORE=-W -Wall -CFLAGS = -DPNG_CONFIGURE_LIBPNG -I$(ZLIBINC) $(WARNMORE) $(CRELEASE) +CFLAGS = -I$(ZLIBINC) $(WARNMORE) $(CRELEASE) LDFLAGS = -L. -L$(ZLIBLIB) -lpng14 -lz -lm $(LDRELEASE) # File extensions diff --git a/scripts/makefile.amiga b/scripts/makefile.amiga index 6a64260ac..8bf0f455f 100644 --- a/scripts/makefile.amiga +++ b/scripts/makefile.amiga @@ -15,7 +15,7 @@ CC=sc #compiler flags # WARNING: a bug in V6.51 causes bad code with OPTGO # So use V6.55 or set NOOPTGO!!!!!!!!! -CFLAGS= -DPNG_CONFIGURE_LIBPNG NOSTKCHK PARMS=REG OPTIMIZE OPTGO OPTPEEP OPTINLOCAL OPTINL\ +CFLAGS= NOSTKCHK PARMS=REG OPTIMIZE OPTGO OPTPEEP OPTINLOCAL OPTINL\ OPTLOOP OPTRDEP=4 OPTDEP=4 OPTCOMP=4 INCLUDEDIR=$(ZLIB) \ DEFINE=PNG_INTERNAL #linker flags diff --git a/scripts/makefile.atari b/scripts/makefile.atari index d26552486..0e1ca72cf 100644 --- a/scripts/makefile.atari +++ b/scripts/makefile.atari @@ -9,7 +9,7 @@ # Modified for LC56/ATARI assumes libz.lib is in same dir and uses default # rules for library management # -CFLAGS=-DPNG_CONFIGURE_LIBPNG -I..\zlib -O +CFLAGS=-I..\zlib -O LBR = png.lib LDFLAGS=-lpng -lz -lm diff --git a/scripts/makefile.bc32 b/scripts/makefile.bc32 index 9e85f13a1..2020e6e75 100644 --- a/scripts/makefile.bc32 +++ b/scripts/makefile.bc32 @@ -43,7 +43,7 @@ LDEBUG=$(LDEBUG) -N # -d merge duplicate strings # -k- turn off standard stack frame # -w display all warnings -CFLAGS=-DPNG_CONFIGURE_LIBPNG -I$(ZLIB_DIR) -O2 -d -k- -w $(TARGET_CPU) $(CDEBUG) +CFLAGS=-I$(ZLIB_DIR) -O2 -d -k- -w $(TARGET_CPU) $(CDEBUG) # -M generate map file LDFLAGS=-L$(ZLIB_DIR) -M $(LDEBUG) diff --git a/scripts/makefile.beos b/scripts/makefile.beos index c1df4b0aa..a7e92e08a 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -44,7 +44,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ # On BeOS, -O1 is actually better than -O3. This is a known bug but it's # still here in R4.5 -CFLAGS=-DPNG_CONFIGURE_LIBPNG -I$(ZLIBINC) -W -Wall -O1 -funroll-loops \ +CFLAGS=-I$(ZLIBINC) -W -Wall -O1 -funroll-loops \ $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5 # LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng -lz LDFLAGS=-L. -Wl,-soname=$(LIBSOMAJ) -L$(ZLIBLIB) -lz diff --git a/scripts/makefile.bor b/scripts/makefile.bor index 8029dbed8..dcc3c633c 100644 --- a/scripts/makefile.bor +++ b/scripts/makefile.bor @@ -51,7 +51,7 @@ LDEBUG=$(LDEBUG) -N # -w set all warnings on # -O2 optimize for speed # -Z global optimization -CFLAGS=-DPNG_CONFIGURE_LIBPNG -O2 -Z -X- -w -I$(ZLIB_DIR) -$(TARGET_CPU) $(MODEL_ARG) $(CDEBUG) +CFLAGS=-O2 -Z -X- -w -I$(ZLIB_DIR) -$(TARGET_CPU) $(MODEL_ARG) $(CDEBUG) # -M generate map file LDFLAGS=-M -L$(ZLIB_DIR) $(MODEL_ARG) $(LDEBUG) diff --git a/scripts/makefile.cegcc b/scripts/makefile.cegcc index 662bad450..e45e60a38 100644 --- a/scripts/makefile.cegcc +++ b/scripts/makefile.cegcc @@ -64,7 +64,7 @@ copy-src: compilation: @echo " * Compilation of $(PACKAGE)" - cd $(PACKAGE) && CPPFLAGS="$(CPPFLAGS) -DPNG_BUILD_DLL -DPNG_CONSOLE_IO_SUPPORTED -DPNG_NO_MMX_CODE -D_WIN32_WCE=0x0420" CFLAGS="$(CFLAGS) -DPNG_CONFIGURE_LIBPNG -mms-bitfields -O3 -pipe -fomit-frame-pointer" LDFLAGS="$(LDFLAGS) -Wl,--enable-auto-import -Wl,-s" ./configure --prefix=/opt/wince --host=arm-mingw32ce && make + cd $(PACKAGE) && CPPFLAGS="$(CPPFLAGS) -DPNG_BUILD_DLL -DPNG_CONSOLE_IO_SUPPORTED -DPNG_NO_MMX_CODE -D_WIN32_WCE=0x0420" CFLAGS="$(CFLAGS) -mms-bitfields -O3 -pipe -fomit-frame-pointer" LDFLAGS="$(LDFLAGS) -Wl,--enable-auto-import -Wl,-s" ./configure --prefix=/opt/wince --host=arm-mingw32ce && make copy: @echo " * Copy of binary and development files" diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 04255f019..6fba24ef1 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -36,7 +36,7 @@ DESTDIR= CC=gcc ifdef MINGW -MINGW_CCFLAGS=-DPNG_CONFIGURE_LIBPNG -mno-cygwin -I/usr/include/mingw +MINGW_CCFLAGS=-mno-cygwin -I/usr/include/mingw MINGW_LDFLAGS=-mno-cygwin -L/usr/lib/mingw endif diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 03274115a..f0dc8eedd 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -41,8 +41,8 @@ LN_SF=ln -sf RANLIB=ranlib RM_F=/bin/rm -f -# CFLAGS=--DPNG_CONFIGURE_LIBPNG I$(ZLIBINC) -W -Wall -O3 -funroll-loops -CFLAGS=-DPNG_CONFIGURE_LIBPNG -I$(ZLIBINC) -W -Wall -O -funroll-loops +# CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops +CFLAGS=-I$(ZLIBINC) -W -Wall -O -funroll-loops LDFLAGS=-L. -L$(ZLIBLIB) -lpng14 -lz INCPATH=$(prefix)/include diff --git a/scripts/makefile.dec b/scripts/makefile.dec index cf6f7f0e6..2220d9857 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -57,7 +57,7 @@ DM=$(DESTDIR)$(MANPATH) ZLIBLIB=../zlib ZLIBINC=../zlib -CFLAGS=-DPNG_CONFIGURE_LIBPNG -std -w1 -I$(ZLIBINC) -O # -g -DPNG_DEBUG=1 +CFLAGS=-std -w1 -I$(ZLIBINC) -O # -g -DPNG_DEBUG=1 LDFLAGS=-L$(ZLIBLIB) -rpath $(ZLIBLIB) libpng.a -lz -lm OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ diff --git a/scripts/makefile.dj2 b/scripts/makefile.dj2 index 86ca5c460..021e969cf 100644 --- a/scripts/makefile.dj2 +++ b/scripts/makefile.dj2 @@ -13,7 +13,7 @@ INCPATH=$(prefix)/include LIBPATH=$(prefix)/lib CC=gcc -CFLAGS=-DPNG_CONFIGURE_LIBPNG -I../zlib -O +CFLAGS=-I../zlib -O LDFLAGS=-L. -L../zlib/ -lpng -lz -lm RANLIB=ranlib diff --git a/scripts/makefile.elf b/scripts/makefile.elf index f6ff10433..5d0e29195 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -57,7 +57,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ # for pgcc version 2.95.1, -O3 is buggy; don't use it. -CFLAGS=-DPNG_CONFIGURE_LIBPNG -W -Wall -D_REENTRANT -O2 \ +CFLAGS=-W -Wall -D_REENTRANT -O2 \ $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5 LDFLAGS=-L. -lpng14 diff --git a/scripts/makefile.freebsd b/scripts/makefile.freebsd index 0f1e337f8..c0014afbd 100644 --- a/scripts/makefile.freebsd +++ b/scripts/makefile.freebsd @@ -27,7 +27,7 @@ SYMLINKS= libpng/png.h ${INCSDIR}/../png.h \ LDADD+= -lm -lz DPADD+= ${LIBM} ${LIBZ} -CFLAGS+= -DPNG_CONFIGURE_LIBPNG -I. +CFLAGS+= -I. SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ diff --git a/scripts/makefile.gcc b/scripts/makefile.gcc index f1aa61802..b31adee60 100644 --- a/scripts/makefile.gcc +++ b/scripts/makefile.gcc @@ -22,8 +22,8 @@ CDEBUG = -g -DPNG_DEBUG=5 LDDEBUG = CRELEASE = -O2 LDRELEASE = -s -#CFLAGS = -DPNG_CONFIGURE_LIBPNG -W -Wall $(CDEBUG) -CFLAGS = -DPNG_CONFIGURE_LIBPNG -W -Wall $(CRELEASE) +#CFLAGS = -W -Wall $(CDEBUG) +CFLAGS = -W -Wall $(CRELEASE) #LDFLAGS = $(LDDEBUG) LDFLAGS = $(LDRELEASE) LIBS = -lz -lm diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index 3ea5fd9f8..d389e9a8b 100644 --- a/scripts/makefile.hp64 +++ b/scripts/makefile.hp64 @@ -14,7 +14,7 @@ ZLIBINC=/opt/zlib/include # Note that if you plan to build a libpng shared library, zlib must also # be a shared library, which zlib's configure does not do. After running # zlib's configure, edit the appropriate lines of makefile to read: -# CFLAGS=-DPNG_CONFIGURE_LIBPNG -O1 -DHAVE_UNISTD -DUSE_MAP -fPIC \ +# CFLAGS=-O1 -DHAVE_UNISTD -DUSE_MAP -fPIC \ # LDSHARED=ld -b # SHAREDLIB=libz.sl @@ -40,10 +40,10 @@ LN_SF=ln -sf RANLIB=ranlib RM_F=/bin/rm -f -CFLAGS=-DPNG_CONFIGURE_LIBPNG -I$(ZLIBINC) -O -Ae -Wl,+vnocompatwarnings +DD64 \ +CFLAGS=-I$(ZLIBINC) -O -Ae -Wl,+vnocompatwarnings +DD64 \ -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 +Z -DHAVE_UNISTD_H -DUSE_MMAP # Caution: be sure you have built zlib with the same CFLAGS. -CCFLAGS=-DPNG_CONFIGURE_LIBPNG -I$(ZLIBINC) -O -Ae -Wl,+vnocompatwarnings +DD64 \ +CCFLAGS=-I$(ZLIBINC) -O -Ae -Wl,+vnocompatwarnings +DD64 \ -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 +Z -DHAVE_UNISTD_H -DUSE_MMAP LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index ed7c33c64..39b0058f0 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -56,7 +56,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ # for pgcc version 2.95.1, -O3 is buggy; don't use it. -CFLAGS=-DPNG_CONFIGURE_LIBPNG -I$(ZLIBINC) -W -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE \ +CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE \ $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5 #LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng14 -lz -lm LDFLAGS=-L. -L$(ZLIBLIB) -lpng14 -lz -lm diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 699298f23..37ebca2a9 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -48,9 +48,9 @@ LIBPATH=$(exec_prefix)/lib MANPATH=$(prefix)/man BINPATH=$(exec_prefix)/bin -CFLAGS=-DPNG_CONFIGURE_LIBPNG -I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0 +CFLAGS=-I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0 # Caution: be sure you have built zlib with the same CFLAGS. -CCFLAGS=-DPNG_CONFIGURE_LIBPNG -I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0 +CCFLAGS=-I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0 LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm # override DESTDIR= on the make install command line to easily support diff --git a/scripts/makefile.ibmc b/scripts/makefile.ibmc index ace5f6231..b0b445ab2 100644 --- a/scripts/makefile.ibmc +++ b/scripts/makefile.ibmc @@ -23,7 +23,7 @@ LD = ilink AR = ilib RM = del -CFLAGS = -DPNG_CONFIGURE_LIBPNG -I$(ZLIBINC) -Mc -O2 -W3 +CFLAGS = -I$(ZLIBINC) -Mc -O2 -W3 LDFLAGS = # File extensions diff --git a/scripts/makefile.intel b/scripts/makefile.intel index 498561c09..fb705e121 100644 --- a/scripts/makefile.intel +++ b/scripts/makefile.intel @@ -32,7 +32,7 @@ CALLING=r # __fastcall # -------------------------------------------------------------------------- CC=icl -c -CFLAGS=-DPNG_CONFIGURE_LIBPNG -O2 -G$(CPU)$(CALLING) -Qip -Qunroll4 -I$(ZLIBINC) -nologo +CFLAGS=-O2 -G$(CPU)$(CALLING) -Qip -Qunroll4 -I$(ZLIBINC) -nologo LD=link LDFLAGS=/SUBSYSTEM:CONSOLE /NOLOGO diff --git a/scripts/makefile.knr b/scripts/makefile.knr index 59bc2bcb3..75cb1b58a 100644 --- a/scripts/makefile.knr +++ b/scripts/makefile.knr @@ -27,7 +27,7 @@ LIBPATH=$(prefix)/lib DESTDIR= CC=cc -CFLAGS=-DPNG_CONFIGURE_LIBPNG -I../zlib -O +CFLAGS=-I../zlib -O LDFLAGS=-L. -L../zlib/ -lpng -lz -lm # flags for ansi2knr ANSI2KNRFLAGS= diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 858017f89..980ae4cee 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -51,7 +51,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ # for pgcc version 2.95.1, -O3 is buggy; don't use it. -CFLAGS=-DPNG_CONFIGURE_LIBPNG -I$(ZLIBINC) -W -Wall -O3 -funroll-loops \ +CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops \ $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5 LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng14 -lz -lm diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index 463f6d0d8..b922ec822 100644 --- a/scripts/makefile.mingw +++ b/scripts/makefile.mingw @@ -61,7 +61,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ -Wmissing-declarations -Wtraditional -Wcast-align \ -Wstrict-prototypes -Wmissing-prototypes #-Wconversion -CFLAGS= -DPNG_CONFIGURE_LIBPNG $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ +CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ -W -Wall -O3 $(ALIGN) -funroll-loops \ -fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5 diff --git a/scripts/makefile.mips b/scripts/makefile.mips index 21a9ca684..5e1040ed4 100644 --- a/scripts/makefile.mips +++ b/scripts/makefile.mips @@ -22,8 +22,8 @@ LIBPATH=$(prefix)/lib DESTDIR= CC=cc -CFLAGS=-DPNG_CONFIGURE_LIBPNG -I../zlib -O -systype sysv -DSYSV -w -Dmips -#CFLAGS=-DPNG_CONFIGURE_LIBPNG -O +CFLAGS=-I../zlib -O -systype sysv -DSYSV -w -Dmips +#CFLAGS=-O LDFLAGS=-L. -L../zlib/ -lpng -lz -lm #RANLIB=ranlib diff --git a/scripts/makefile.msc b/scripts/makefile.msc index 212c38f71..e74464440 100644 --- a/scripts/makefile.msc +++ b/scripts/makefile.msc @@ -10,7 +10,7 @@ # -------- Microsoft C 5.1 and later, does not use assembler code -------- MODEL=L -CFLAGS=-DPNG_CONFIGURE_LIBPNG -Oait -Gs -nologo -W3 -A$(MODEL) -I..\zlib +CFLAGS=-Oait -Gs -nologo -W3 -A$(MODEL) -I..\zlib #-Ox generates bad code with MSC 5.1 CC=cl LD=link diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd index f1e7f9a19..e1000e54e 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -2,18 +2,18 @@ # make obj && make depend && make && make test # make includes && make install # Copyright (C) 2002 Patrick R.L. Welche -# Copyright (C) 2007, 2009 Glenn Randers-Pehrson +# Copyright (C) 2007-2009 Glenn Randers-Pehrson # # This code is released under the libpng license. # For conditions of distribution and use, see the disclaimer # and license in png.h -# You should also run makefile.ne0bsd +# You should also run makefile.ne14bsd LOCALBASE?=/usr/local LIBDIR= ${LOCALBASE}/lib MANDIR= ${LOCALBASE}/man -INCSDIR=${LOCALBASE}/include/libpng +INCSDIR=${LOCALBASE}/include LIB= png SHLIB_MAJOR= 3 diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 867fb4864..1c4813350 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -1,6 +1,6 @@ # makefile for libpng # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. -# Copyright (C) 2007-2008 Glenn Randers-Pehrson +# Copyright (C) 2007-2009 Glenn Randers-Pehrson # # This code is released under the libpng license. # For conditions of distribution and use, see the disclaimer @@ -20,7 +20,7 @@ SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ HDRS= png.h pngconf.h -CFLAGS+= -DPNG_CONFIGURE_LIBPNG -W -Wall +CFLAGS+= -W -Wall CPPFLAGS+= -I${.CURDIR} NOPROFILE= Yes @@ -42,7 +42,7 @@ test: pngtest beforeinstall: if [ ! -d ${DESTDIR}${PREFIX}/include/libpng ]; then \ - ${INSTALL} -d -o root -g wheel ${DESTDIR}${PREFIX}/include/libpng; \ + ${INSTALL} -d -o root -g wheel ${DESTDIR}${PREFIX}/include; \ fi if [ ! -d ${DESTDIR}${LIBDIR} ]; then \ ${INSTALL} -d -o root -g wheel ${DESTDIR}${LIBDIR}; \ @@ -67,7 +67,7 @@ afterinstall: @rm -f ${DESTDIR}${PREFIX}/include/pngconf.h @rmdir ${DESTDIR}${LIBDIR}/debug 2>/dev/null || true ${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \ - -m ${NONBINMODE} ${HDRS} ${DESTDIR}${PREFIX}/include/libpng + -m ${NONBINMODE} ${HDRS} ${DESTDIR}${PREFIX}/include ${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \ -m ${NONBINMODE} ${HDRS} ${DESTDIR}${PREFIX}/include ${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \ diff --git a/scripts/makefile.os2 b/scripts/makefile.os2 index e3fd36d77..affb03c1a 100644 --- a/scripts/makefile.os2 +++ b/scripts/makefile.os2 @@ -15,7 +15,7 @@ ZLIBINC=../zlib WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ -Wmissing-declarations -Wtraditional -Wcast-align \ -Wstrict-prototypes -Wmissing-prototypes #-Wconversion -CFLAGS=--DPNG_CONFIGURE_LIBPNG I$(ZLIBINC) -W -Wall -O6 -funroll-loops -malign-loops=2 \ +CFLAGS=-I$(ZLIBINC) -W -Wall -O6 -funroll-loops -malign-loops=2 \ -malign-functions=2 #$(WARNMORE) -g -DPNG_DEBUG=5 LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lzdll -Zcrtdll AR=emxomfar diff --git a/scripts/makefile.sco b/scripts/makefile.sco index 4c7d370df..c1df68d37 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -41,10 +41,10 @@ exec_prefix=$(prefix) ZLIBLIB=../zlib ZLIBINC=../zlib -CFLAGS= -DPNG_CONFIGURE_LIBPNG -dy -belf -I$(ZLIBINC) -O3 +CFLAGS= -dy -belf -I$(ZLIBINC) -O3 LDFLAGS=-L. -L$(ZLIBLIB) -lpng14 -lz -lm -INCPATH=$(prefix)/include/libpng +INCPATH=$(prefix)/include LIBPATH=$(exec_prefix)/lib MANPATH=$(prefix)/man BINPATH=$(exec_prefix)/bin diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 794ada1d2..c314623a8 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -47,7 +47,7 @@ ZLIBINC=../zlib ABI= WARNMORE= # -g -DPNG_DEBUG=5 -CFLAGS=-DPNG_CONFIGURE_LIBPNG $(ABI) -I$(ZLIBINC) -O $(WARNMORE) -fPIC -mabi=n32 +CFLAGS=$(ABI) -I$(ZLIBINC) -O $(WARNMORE) -fPIC -mabi=n32 LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm LDSHARED=cc $(ABI) -shared -soname $(LIBSOMAJ) \ -set_version sgi$(PNGMAJ).0 diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 68cf14f34..39584d12e 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -48,8 +48,8 @@ ABI= WARNMORE=-fullwarn # Note: -KPIC is the default anyhow -#CFLAGS= -DPNG_CONFIGURE_LIBPNG $(ABI) -I$(ZLIBINC) -O $(WARNMORE) -KPIC # -g -DPNG_DEBUG=5 -CFLAGS=-DPNG_CONFIGURE_LIBPNG $(ABI) -I$(ZLIBINC) -O $(WARNMORE) +#CFLAGS= $(ABI) -I$(ZLIBINC) -O $(WARNMORE) -KPIC # -g -DPNG_DEBUG=5 +CFLAGS=$(ABI) -I$(ZLIBINC) -O $(WARNMORE) LDFLAGS_A=$(ABI) -L. -L$(ZLIBLIB) -lpng14 -lz -lm LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm LDSHARED=cc $(ABI) -shared -soname $(LIBSOMAJ) \ diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 65e59a796..5f7c87e0a 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -50,8 +50,8 @@ ZLIBINC=/usr/include #WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ -Wmissing-declarations -Wtraditional -Wcast-align \ -Wstrict-prototypes -Wmissing-prototypes #-Wconversion -#CFLAGS=-DPNG_CONFIGURE_LIBPNG -I$(ZLIBINC) -W -Wall -O3 $(WARNMORE) -g -DPNG_DEBUG=5 -DPNG_NO_MMX_CODE -CFLAGS=-DPNG_CONFIGURE_LIBPNG -I$(ZLIBINC) -O3 -DPNG_NO_MMX_CODE +#CFLAGS=-I$(ZLIBINC) -W -Wall -O3 $(WARNMORE) -g -DPNG_DEBUG=5 -DPNG_NO_MMX_CODE +CFLAGS=-I$(ZLIBINC) -O3 -DPNG_NO_MMX_CODE LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng14 -lz -lm INCPATH=$(prefix)/include diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index e9334790b..99e943234 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -46,7 +46,7 @@ ZLIBINC=/usr/local/include WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ -Wmissing-declarations -Wtraditional -Wcast-align \ -Wstrict-prototypes -Wmissing-prototypes #-Wconversion -CFLAGS=-DPNG_CONFIGURE_LIBPNG -I$(ZLIBINC) -W -Wall -O \ +CFLAGS=-I$(ZLIBINC) -W -Wall -O \ # $(WARNMORE) -g -DPNG_DEBUG=5 LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng14 -lz -lm diff --git a/scripts/makefile.std b/scripts/makefile.std index 60f7c0d8b..afb885ad0 100644 --- a/scripts/makefile.std +++ b/scripts/makefile.std @@ -34,7 +34,7 @@ LN_SF=ln -sf RANLIB=ranlib RM_F=rm -f -CFLAGS=-DPNG_CONFIGURE_LIBPNG -I$(ZLIBINC) -O # -g -DPNG_DEBUG=5 +CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=5 LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ diff --git a/scripts/makefile.sunos b/scripts/makefile.sunos index 898665c56..984379c0c 100644 --- a/scripts/makefile.sunos +++ b/scripts/makefile.sunos @@ -39,7 +39,7 @@ LN_SF=ln -f -s RANLIB=ranlib RM_F=/bin/rm -f -CFLAGS=-DPNG_CONFIGURE_LIBPNG -I$(ZLIBINC) -O # $(WARNMORE) -DPNG_DEBUG=5 +CFLAGS=-I$(ZLIBINC) -O # $(WARNMORE) -DPNG_DEBUG=5 LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ diff --git a/scripts/makefile.tc3 b/scripts/makefile.tc3 index eb5616952..bf6ade6d5 100644 --- a/scripts/makefile.tc3 +++ b/scripts/makefile.tc3 @@ -6,8 +6,8 @@ # ----- Turbo C 3.00 (can be modified to work with earlier versions) ----- MODEL=l -CFLAGS=-DPNG_CONFIGURE_LIBPNG -O2 -Z -m$(MODEL) -I..\zlib -#CFLAGS=-DPNG_CONFIGURE_LIBPNG -D_NO_PROTO -O2 -Z -m$(MODEL) -I..\zlib # Turbo C older than 3.00 +CFLAGS=-O2 -Z -m$(MODEL) -I..\zlib +#CFLAGS=-D_NO_PROTO -O2 -Z -m$(MODEL) -I..\zlib # Turbo C older than 3.00 CC=tcc LD=tcc LIB=tlib diff --git a/scripts/makefile.vcwin32 b/scripts/makefile.vcwin32 index 15a377ee5..a65f1c112 100644 --- a/scripts/makefile.vcwin32 +++ b/scripts/makefile.vcwin32 @@ -15,7 +15,7 @@ CC = cl LD = link AR = lib -CFLAGS = -DPNG_CONFIGURE_LIBPNG -nologo -MD -O2 -W3 -I..\zlib +CFLAGS = -nologo -MD -O2 -W3 -I..\zlib LDFLAGS = -nologo ARFLAGS = -nologo RM = del diff --git a/scripts/makefile.watcom b/scripts/makefile.watcom index 228261d51..db4d534f4 100644 --- a/scripts/makefile.watcom +++ b/scripts/makefile.watcom @@ -36,7 +36,7 @@ CALLING=r # registers CC=wcc386 -CFLAGS=-DPNG_CONFIGURE_LIBPNG -$(CPU)$(CALLING) -fp$(CPU) -fpi87 -oneatx -mf -bt=$(OS) -i=$(ZLIBINC) -zq +CFLAGS=-$(CPU)$(CALLING) -fp$(CPU) -fpi87 -oneatx -mf -bt=$(OS) -i=$(ZLIBINC) -zq LD=wcl386 LDFLAGS=-zq