diff --git a/Makefile.am b/Makefile.am index 13ff62a44..1370465b7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -75,7 +75,7 @@ SCRIPT_CLEANFILES=scripts/*.out scripts/*.chk scripts/pnglibconf.dfn CLEANFILES= dfn.c dfn?.out pngout.png libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc \ libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config libpng.vers libpng.sym \ - pngwin.def check.new pnglibconf.* symbols.new pngtest-log.txt \ + check.new pnglibconf.* symbols.new pngtest-log.txt \ $(SCRIPT_CLEANFILES) MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \ @@ -90,7 +90,7 @@ $(PNGLIB_BASENAME)-config: libpng-config cp libpng-config $@ scripts/sym.out scripts/vers.out: png.h pngconf.h pnglibconf.h -scripts/symbols.out scripts/pngwin.out: png.h pngconf.h scripts/pnglibconf.h.prebuilt +scripts/symbols.out: png.h pngconf.h scripts/pnglibconf.h.prebuilt libpng.sym: scripts/sym.out rm -f $@ @@ -98,9 +98,6 @@ libpng.sym: scripts/sym.out libpng.vers: scripts/vers.out rm -f $@ cp $? $@ -pngwin.def: scripts/pngwin.out - rm -f $@ - cp $? $@ pnglibconf.h: pnglibconf.out rm -f $@ cp $? $@ @@ -140,7 +137,6 @@ pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk mv dfn2.out $@ # Symbol checks (.def and .out files should match) -scripts/pngwin.chk: scripts/checksym.awk scripts/pngwin.def scripts/pngwin.out scripts/symbols.chk: scripts/checksym.awk scripts/symbols.def scripts/symbols.out .out.chk: rm -f $@ symbols.new @@ -166,7 +162,7 @@ $(libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_OBJECTS): png.h pngconf.h \ test: check-am # Extra checks -check: scripts/symbols.chk scripts/pngwin.chk +check: scripts/symbols.chk # Don't distribute the generated script files dist-hook: diff --git a/Makefile.in b/Makefile.in index f350b5f2d..9d4463397 100644 --- a/Makefile.in +++ b/Makefile.in @@ -341,7 +341,7 @@ EXTRA_DIST = \ SCRIPT_CLEANFILES = scripts/*.out scripts/*.chk scripts/pnglibconf.dfn CLEANFILES = dfn.c dfn?.out pngout.png libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc \ libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config libpng.vers libpng.sym \ - pngwin.def check.new pnglibconf.* symbols.new pngtest-log.txt \ + check.new pnglibconf.* symbols.new pngtest-log.txt \ $(SCRIPT_CLEANFILES) MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \ @@ -1253,7 +1253,7 @@ $(PNGLIB_BASENAME)-config: libpng-config cp libpng-config $@ scripts/sym.out scripts/vers.out: png.h pngconf.h pnglibconf.h -scripts/symbols.out scripts/pngwin.out: png.h pngconf.h scripts/pnglibconf.h.prebuilt +scripts/symbols.out: png.h pngconf.h scripts/pnglibconf.h.prebuilt libpng.sym: scripts/sym.out rm -f $@ @@ -1261,9 +1261,6 @@ libpng.sym: scripts/sym.out libpng.vers: scripts/vers.out rm -f $@ cp $? $@ -pngwin.def: scripts/pngwin.out - rm -f $@ - cp $? $@ pnglibconf.h: pnglibconf.out rm -f $@ cp $? $@ @@ -1299,7 +1296,6 @@ pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk mv dfn2.out $@ # Symbol checks (.def and .out files should match) -scripts/pngwin.chk: scripts/checksym.awk scripts/pngwin.def scripts/pngwin.out scripts/symbols.chk: scripts/checksym.awk scripts/symbols.def scripts/symbols.out .out.chk: rm -f $@ symbols.new @@ -1325,7 +1321,7 @@ $(libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_OBJECTS): png.h pngconf.h \ test: check-am # Extra checks -check: scripts/symbols.chk scripts/pngwin.chk +check: scripts/symbols.chk # Don't distribute the generated script files dist-hook: diff --git a/def.dfn b/def.dfn new file mode 100644 index 000000000..33cd78852 --- /dev/null +++ b/def.dfn @@ -0,0 +1,38 @@ +/* def.dfn - define format of libpng.def + * + * Last changed in libpng version 1.5.0 [(PENDING RELEASE)] + * Copyright (c) 2010-2010 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 + */ + +/* These macros exist to make the header and trailer shorter below: */ +#define S PNG_DEFN_MAGIC +#define E PNG_DEFN_END + +/* Write the export file header: */ +S-;---------------------------------------------------------------E +S-; LIBPNG module definition file for OS/2-E +S-;---------------------------------------------------------------E +S--E +S-; If you give the library an explicit name one or other files-E +S-; may need modifying to support the new name on one or more-E +S-; systems.-E +S-LIBRARY-E +S-OS2 DESCRIPTION "PNG image compression library"-E +S-OS2 CODE PRELOAD MOVEABLE DISCARDABLE-E +S--E +S-EXPORTS-E +S-;Version 1.5.0beta58-E + +/* NOTE: @@@ is interpreted by the calling script as a signal to + * join the two things on either side, so we can do symbol + * substitution within the name, regular C ## joins the pp-tokens, + * not their final values. + */ +#define PNG_EXPORTA(ordinal, type, name, args, attributes)\ + PNG_DEFN_MAGIC- SYMBOL_PREFIX @@@ name-PNG_DEFN_END + +#include "../png.h" diff --git a/scripts/makefile.os2 b/scripts/makefile.os2 deleted file mode 100644 index 2512ec10e..000000000 --- a/scripts/makefile.os2 +++ /dev/null @@ -1,77 +0,0 @@ -# makefile for libpng on OS/2 with gcc -# -# This code is released under the libpng license. -# For conditions of distribution and use, see the disclaimer -# and license in png.h - -# Related files: scripts/pngwin.def - -CC=gcc -Zomf -s - -# Where the zlib library and include files are located -ZLIBLIB=../zlib -ZLIBINC=../zlib - -WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ - -Wmissing-declarations -Wtraditional -Wcast-align \ - -Wstrict-prototypes -Wmissing-prototypes #-Wconversion -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 - -PNGLIB=png.lib -IMPLIB=emximp -SHAREDLIB=png.dll -SHAREDLIBIMP=pngdll.lib - -OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ - pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ - pngwtran.o pngmem.o pngerror.o pngpread.o - -.SUFFIXES: .c .o - -all: $(PNGLIB) $(SHAREDLIB) $(SHAREDLIBIMP) - -# see scripts/pnglibconf.mak for more options -pnglibconf.h: scripts/pnglibconf.h.prebuilt - cp scripts/pnglibconf.h.prebuilt $@ - -$(PNGLIB): $(OBJS) - $(AR) rc $@ $(OBJS) - -$(SHAREDLIB): $(OBJS) scripts/pngwin.def - $(CC) $(LDFLAGS) -Zdll -o $@ $^ - -$(SHAREDLIBIMP): scripts/pngwin.def - $(IMPLIB) -o $@ $^ - -pngtest.exe: pngtest.o png.dll pngdll.lib - $(CC) -o $@ $(CFLAGS) $< $(LDFLAGS) - -test: pngtest.exe - ./pngtest.exe - -clean: - rm -f *.o $(PNGLIB) png.dll pngdll.lib pngtest.exe pngout.png \ - pnglibconf.h - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h -pngerror.o pngerror.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h -pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h -pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h -pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h -pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h -pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h -pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h -pngrtran.o pngrtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h -pngrutil.o pngrutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h -pngtrans.o pngtrans.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h -pngwrite.o pngwrite.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h -pngwtran.o pngwtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h -pngwutil.o pngwutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h -pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h - -pngtest.o: png.h pngconf.h pnglibconf.h diff --git a/scripts/pngwin.def b/scripts/pngwin.def deleted file mode 100644 index 3b0d4626c..000000000 --- a/scripts/pngwin.def +++ /dev/null @@ -1,233 +0,0 @@ -;-------------------------------------------------------------- -; LIBPNG module definition file for Windows, WindowsCE and OS/2 -; On OS/2 uncomment lines preceded by ;0S2 -;-------------------------------------------------------------- - -; make scripts/pngwin.chk will validate this file against the -; build of libpng, the following line tells the check code to -; ignore symbols (ordinal values) that are missing in both -; files. -;missing ignore - -; If you give the library an explicit name one or other files -; may need modifying to support the new name on one or more -; systems. -LIBRARY -;OS2 DESCRIPTION "PNG image compression library" -;OS2 CODE PRELOAD MOVEABLE DISCARDABLE - -EXPORTS -;Version 1.5.0rc03 - png_access_version_number @1 - png_set_sig_bytes @2 - png_sig_cmp @3 - png_create_read_struct @4 - png_create_write_struct @5 - png_get_compression_buffer_size @6 - png_set_compression_buffer_size @7 - png_set_longjmp_fn @8 - png_longjmp @9 - png_reset_zstream @10 - png_create_read_struct_2 @11 - png_create_write_struct_2 @12 - png_write_sig @13 - png_write_chunk @14 - png_write_chunk_start @15 - png_write_chunk_data @16 - png_write_chunk_end @17 - png_create_info_struct @18 - png_info_init_3 @19 - png_write_info_before_PLTE @20 - png_write_info @21 - png_read_info @22 - png_convert_to_rfc1123 @23 - png_convert_from_struct_tm @24 - png_convert_from_time_t @25 - png_set_expand @26 - png_set_expand_gray_1_2_4_to_8 @27 - png_set_palette_to_rgb @28 - png_set_tRNS_to_alpha @29 - png_set_bgr @30 - png_set_gray_to_rgb @31 - png_set_rgb_to_gray @32 - png_set_rgb_to_gray_fixed @33 - png_get_rgb_to_gray_status @34 - png_build_grayscale_palette @35 - png_set_strip_alpha @36 - png_set_swap_alpha @37 - png_set_invert_alpha @38 - png_set_filler @39 - png_set_add_alpha @40 - png_set_swap @41 - png_set_packing @42 - png_set_packswap @43 - png_set_shift @44 - png_set_interlace_handling @45 - png_set_invert_mono @46 - png_set_background @47 - png_set_strip_16 @48 - png_set_quantize @49 - png_set_gamma @50 - png_set_flush @51 - png_write_flush @52 - png_start_read_image @53 - png_read_update_info @54 - png_read_rows @55 - png_read_row @56 - png_read_image @57 - png_write_row @58 - png_write_rows @59 - png_write_image @60 - png_write_end @61 - png_read_end @62 - png_destroy_info_struct @63 - png_destroy_read_struct @64 - png_destroy_write_struct @65 - png_set_crc_action @66 - png_set_filter @67 - png_set_filter_heuristics @68 - png_set_compression_level @69 - png_set_compression_mem_level @70 - png_set_compression_strategy @71 - png_set_compression_window_bits @72 - png_set_compression_method @73 - png_init_io @74 - png_set_error_fn @75 - png_get_error_ptr @76 - png_set_write_fn @77 - png_set_read_fn @78 - png_get_io_ptr @79 - png_set_read_status_fn @80 - png_set_write_status_fn @81 - png_set_mem_fn @82 - png_get_mem_ptr @83 - png_set_read_user_transform_fn @84 - png_set_write_user_transform_fn @85 - png_set_user_transform_info @86 - png_get_user_transform_ptr @87 - png_set_read_user_chunk_fn @88 - png_get_user_chunk_ptr @89 - png_set_progressive_read_fn @90 - png_get_progressive_ptr @91 - png_process_data @92 - png_progressive_combine_row @93 - png_malloc @94 - png_calloc @95 - png_malloc_warn @96 - png_free @97 - png_free_data @98 - png_data_freer @99 - png_malloc_default @100 - png_free_default @101 - png_error @102 - png_chunk_error @103 - png_warning @105 - png_chunk_warning @106 - png_benign_error @107 - png_chunk_benign_error @108 - png_set_benign_errors @109 - png_get_valid @110 - png_get_rowbytes @111 - png_get_rows @112 - png_set_rows @113 - png_get_channels @114 - png_get_image_width @115 - png_get_image_height @116 - png_get_bit_depth @117 - png_get_color_type @118 - png_get_filter_type @119 - png_get_interlace_type @120 - png_get_compression_type @121 - png_get_pixels_per_meter @122 - png_get_x_pixels_per_meter @123 - png_get_y_pixels_per_meter @124 - png_get_pixel_aspect_ratio @125 - png_get_x_offset_pixels @126 - png_get_y_offset_pixels @127 - png_get_x_offset_microns @128 - png_get_y_offset_microns @129 - png_get_signature @130 - png_get_bKGD @131 - png_set_bKGD @132 - png_get_cHRM @133 - png_get_cHRM_fixed @134 - png_set_cHRM @135 - png_set_cHRM_fixed @136 - png_get_gAMA @137 - png_get_gAMA_fixed @138 - png_set_gAMA @139 - png_set_gAMA_fixed @140 - png_get_hIST @141 - png_set_hIST @142 - png_get_IHDR @143 - png_set_IHDR @144 - png_get_oFFs @145 - png_set_oFFs @146 - png_get_pCAL @147 - png_set_pCAL @148 - png_get_pHYs @149 - png_set_pHYs @150 - png_get_PLTE @151 - png_set_PLTE @152 - png_get_sBIT @153 - png_set_sBIT @154 - png_get_sRGB @155 - png_set_sRGB @156 - png_set_sRGB_gAMA_and_cHRM @157 - png_get_iCCP @158 - png_set_iCCP @159 - png_get_sPLT @160 - png_set_sPLT @161 - png_get_text @162 - png_set_text @163 - png_get_tIME @164 - png_set_tIME @165 - png_get_tRNS @166 - png_set_tRNS @167 - png_get_sCAL @168 - png_get_sCAL_s @169 - png_set_sCAL @170 - png_set_sCAL_s @171 - png_set_keep_unknown_chunks @172 - png_handle_as_unknown @173 - png_set_unknown_chunks @174 - png_set_unknown_chunk_location @175 - png_get_unknown_chunks @176 - png_set_invalid @177 - png_read_png @178 - png_write_png @179 - png_get_copyright @180 - png_get_header_ver @181 - png_get_header_version @182 - png_get_libpng_ver @183 - png_permit_mng_features @184 - png_set_user_limits @186 - png_get_user_width_max @187 - png_get_user_height_max @188 - png_set_chunk_cache_max @189 - png_get_chunk_cache_max @190 - png_set_chunk_malloc_max @191 - png_get_chunk_malloc_max @192 - png_get_pixels_per_inch @193 - png_get_x_pixels_per_inch @194 - png_get_y_pixels_per_inch @195 - png_get_x_offset_inches @196 - png_get_y_offset_inches @197 - png_get_pHYs_dpi @198 - png_get_io_state @199 - png_get_io_chunk_name @200 - png_get_uint_32 @201 - png_get_uint_16 @202 - png_get_int_32 @203 - png_get_uint_31 @204 - png_save_uint_32 @205 - png_save_int_32 @206 - png_save_uint_16 @207 - png_set_gamma_fixed @208 - png_set_filter_heuristics_fixed @209 - png_get_pixel_aspect_ratio_fixed @210 - png_get_x_offset_inches_fixed @211 - png_get_y_offset_inches_fixed @212 - png_set_sCAL_fixed @213 - png_get_sCAL_fixed @214 - png_set_background_fixed @215 diff --git a/scripts/pngwin.dfn b/scripts/pngwin.dfn deleted file mode 100644 index e3b4478c0..000000000 --- a/scripts/pngwin.dfn +++ /dev/null @@ -1,38 +0,0 @@ - -/* pngwin.dfn - define format of pngwin.def - * - * Last changed in libpng version 1.5.0 [(PENDING RELEASE)] - * Copyright (c) 1998-2010 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 - */ - -#define PNG_EXPORTA(ordinal, type, name, args, attributes)\ - PNG_DEFN_MAGIC- name @ordinal-PNG_DEFN_END -#define PNG_REMOVED(ordinal, type, name, args, attributes)\ - PNG_DEFN_MAGIC-; name @ordinal-PNG_DEFN_END -#define PNG_EXPORT_LAST_ORDINAL(ordinal)\ - PNG_DEFN_MAGIC-; @ordinal-PNG_DEFN_END - -PNG_DEFN_MAGIC-;---------------------------------------------------------------PNG_DEFN_END -PNG_DEFN_MAGIC-; LIBPNG module definition file for Windows, WindowsCE and OS/2-PNG_DEFN_END -PNG_DEFN_MAGIC-; On OS/2 uncomment lines preceded by ;0S2-PNG_DEFN_END -PNG_DEFN_MAGIC-;---------------------------------------------------------------PNG_DEFN_END -PNG_DEFN_MAGIC--PNG_DEFN_END -PNG_DEFN_MAGIC-; If you give the library an explicit name one or other files-PNG_DEFN_END -PNG_DEFN_MAGIC-; may need modifying to support the new name on one or more-PNG_DEFN_END -PNG_DEFN_MAGIC-; systems.-PNG_DEFN_END -PNG_DEFN_MAGIC-LIBRARY-PNG_DEFN_END -PNG_DEFN_MAGIC-;OS2 DESCRIPTION "PNG image compression library"-PNG_DEFN_END -PNG_DEFN_MAGIC-;OS2 CODE PRELOAD MOVEABLE DISCARDABLE-PNG_DEFN_END -PNG_DEFN_MAGIC--PNG_DEFN_END -PNG_DEFN_MAGIC-EXPORTS-PNG_DEFN_END -PNG_DEFN_MAGIC-;Version 1.5.0rc03-PNG_DEFN_END - -/* Read the defaults, but use scripts/pnglibconf.h.prebuilt; the 'standard' - * header file. - */ -#include "pnglibconf.h.prebuilt" -#include "../png.h"