From 300c8aea4dfcbf9512d51491be5368b6d5ae9ca0 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Thu, 11 Mar 2010 06:24:01 -0600 Subject: [PATCH] [devel] Corrected CE and OS/2 DEF files (scripts/png*def) for symbols removed and added ordinal numbers to the Windows DEF file, and corrected the duplicated ordinal numbers on CE symbols that are commented out. --- ANNOUNCE | 3 + CHANGES | 3 + scripts/png32ce.def | 45 ++--- scripts/pngos2.def | 43 +---- scripts/pngwin.def | 410 ++++++++++++++++++++++---------------------- 5 files changed, 237 insertions(+), 267 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 2fcffe589..392c03783 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -100,6 +100,9 @@ version 1.5.0beta13 [March 10, 2010] version 1.5.0beta14 [March 11, 2010] Removed direct access to png_ptr->io_ptr from the Windows code in pngtest.c Revised Makefile.am to account for recent additions and replacements. + Corrected CE and OS/2 DEF files (scripts/png*def) for symbols removed and + added ordinal numbers to the Windows DEF file and corrected the duplicated + ordinal numbers on CE symbols that are commented out. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 80c027786..386969093 100644 --- a/CHANGES +++ b/CHANGES @@ -2577,6 +2577,9 @@ version 1.5.0beta13 [March 10, 2010] version 1.5.0beta14 [March 11, 2010] Removed direct access to png_ptr->io_ptr from the Windows code in pngtest.c Revised Makefile.am to account for recent additions and replacements. + Corrected CE and OS/2 DEF files (scripts/png*def) for symbols removed and + added ordinal numbers to the Windows DEF file and corrected the duplicated + ordinal numbers on CE symbols that are commented out. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/scripts/png32ce.def b/scripts/png32ce.def index 546d3be2e..641438da2 100644 --- a/scripts/png32ce.def +++ b/scripts/png32ce.def @@ -1,18 +1,11 @@ -;------------------------------------------ -; LIBPNG module definition file for Windows -;------------------------------------------ +;--------------------------------------------- +; LIBPNG module definition file for Windows CE +;--------------------------------------------- -LIBRARY lpngce - - png_memcpy_check - png_memset_check - png_set_dither - png_read_init_3 - png_write_init_3 - png_set_strip_error_numbers - png_get_uint_32 - png_get_uint_16 - png_get_int_32 +; Warning: changing the name of the library from +; the default may require changes to other files, +; for example the '.la' file used by GNU libtool +LIBRARY EXPORTS ;Version 1.5.0beta14 @@ -86,14 +79,13 @@ EXPORTS png_malloc @68 ; png_memcpy_check @69 ; png_memset_check @70 - png_permit_empty_plte @71 +; png_permit_empty_plte @71 png_process_data @72 png_progressive_combine_row @73 png_read_end @74 png_read_image @75 png_read_info @76 -; png_read_init is deprecated - png_read_init @77 +; png_read_init @77 png_read_png @78 png_read_row @79 png_read_rows @80 @@ -123,7 +115,7 @@ EXPORTS png_set_gAMA @104 png_set_gAMA_fixed @105 png_set_gamma @106 - png_set_gray_1_2_4_to_8 @107 ; deprecated +; png_set_gray_1_2_4_to_8 @107 png_set_gray_to_rgb @108 png_set_hIST @109 png_set_iCCP @110 @@ -178,14 +170,12 @@ EXPORTS png_write_image @159 png_write_info @160 png_write_info_before_PLTE @161 -; png_write_init is deprecated - png_write_init @162 +; png_write_init @162 png_write_png @163 png_write_row @164 png_write_rows @165 -; png_read_init_2 and png_write_init_2 are deprecated. - png_read_init_2 @166 - png_write_init_2 @167 +; png_read_init_2 @166 +; png_write_init_2 @167 png_access_version_number @168 ; png_sig_bytes @169 ; png_libpng_ver @170 @@ -194,7 +184,7 @@ EXPORTS png_set_invalid @173 ; Added at version 1.0.12 ; For compatiblity with 1.0.7-1.0.11 - png_info_init @174 +; png_info_init @174 ; png_read_init_3 @175 ; png_write_init_3 @176 png_info_init_3 @177 @@ -244,9 +234,10 @@ EXPORTS png_set_expand_gray_1_2_4_to_8 @207 ; Added at version 1.2.41 png_write_sig @208 - png_benign_error @209 - png_benign_chunk_error @210 - png_set_benign_error @211 +; Uncomment these if you define PNG_BENIGN_ERRORS_SUPPORTED +; png_benign_error @209 +; png_benign_chunk_error @210 +; png_set_benign_errors @211 png_get_io_chunk_name @212 png_get_io_state @213 png_get_chunk_cache_max @215 diff --git a/scripts/pngos2.def b/scripts/pngos2.def index b0b6d3719..79d754c6a 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -175,7 +175,7 @@ EXPORTS png_set_invalid ; Added at version 1.2.0: - png_permit_empty_plte +; png_permit_empty_plte png_permit_mng_features ; Added at version 1.2.2: @@ -204,9 +204,10 @@ EXPORTS ; Added at version 1.2.41 png_write_sig -; png_benign_error -; png_benign_chunk_error -; png_set_benign_error +; Uncomment these if you define PNG_BENIGN_ERRORS_SUPPORTED +; png_benign_error @209 +; png_benign_chunk_error @210 +; png_set_benign_errors @211 png_get_io_chunk_name png_get_io_state png_get_chunk_cache_max @@ -219,37 +220,3 @@ EXPORTS png_set_chunk_malloc_max ; Added at version 1.5.0 png_longjmp - -; These are not present when libpng is compiled with PNG_NO_GLOBAL_ARRAYS - png_libpng_ver - png_pass_start - png_pass_inc - png_pass_ystart - png_pass_yinc - png_pass_mask - png_pass_dsp_mask -; png_pass_width -; png_pass_height - -; These are not present when libpng is compiled with PNG_NO_GLOBAL_ARRAYS - png_IHDR - png_IDAT - png_IEND - png_PLTE - png_bKGD - png_cHRM - png_gAMA - png_hIST - png_iCCP - png_iTXt - png_oFFs - png_pCAL - png_pHYs - png_sBIT - png_sCAL - png_sPLT - png_sRGB - png_tEXt - png_tIME - png_tRNS - png_zTXt diff --git a/scripts/pngwin.def b/scripts/pngwin.def index e55b5f469..29aeb10bc 100644 --- a/scripts/pngwin.def +++ b/scripts/pngwin.def @@ -1,216 +1,222 @@ -;------------------------------------------ -; LIBPNG module definition file for Windows -;------------------------------------------ +;-------------------------------------------------------------- +; LIBPNG module definition file for Windows, WindowsCE and OS/2 +; On OS/2 uncomment lines preceded by ;0S2 +;-------------------------------------------------------------- +; 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.0beta14 - png_build_grayscale_palette - png_chunk_error - png_chunk_warning - png_convert_from_struct_tm - png_convert_from_time_t - png_create_info_struct - png_create_read_struct - png_create_write_struct - png_data_freer - png_destroy_info_struct - png_destroy_read_struct - png_destroy_write_struct - png_error - png_free - png_free_data - png_get_IHDR - png_get_PLTE - png_get_bKGD - png_get_bit_depth - png_get_cHRM - png_get_cHRM_fixed - png_get_channels - png_get_color_type - png_get_compression_buffer_size - png_get_compression_type - png_get_copyright - png_get_error_ptr - png_get_filter_type - png_get_gAMA - png_get_gAMA_fixed - png_get_hIST - png_get_header_ver - png_get_header_version - png_get_iCCP - png_get_image_height - png_get_image_width - png_get_interlace_type - png_get_io_ptr - png_get_libpng_ver - png_get_oFFs - png_get_pCAL - png_get_pHYs - png_get_pixel_aspect_ratio - png_get_pixels_per_meter - png_get_progressive_ptr - png_get_rgb_to_gray_status - png_get_rowbytes - png_get_rows - png_get_sBIT - png_get_sCAL - png_get_sPLT - png_get_sRGB - png_get_signature - png_get_tIME - png_get_tRNS - png_get_text - png_get_unknown_chunks - png_get_user_chunk_ptr - png_get_user_transform_ptr - png_get_valid - png_get_x_offset_microns - png_get_x_offset_pixels - png_get_x_pixels_per_meter - png_get_y_offset_microns - png_get_y_offset_pixels - png_get_y_pixels_per_meter - png_malloc - png_process_data - png_progressive_combine_row - png_read_end - png_read_image - png_read_info - png_read_png - png_read_row - png_read_rows - png_read_update_info - png_reset_zstream - png_set_IHDR - png_set_PLTE - png_set_bKGD - png_set_background - png_set_bgr - png_set_cHRM - png_set_cHRM_fixed - png_set_compression_buffer_size - png_set_compression_level - png_set_compression_mem_level - png_set_compression_method - png_set_compression_strategy - png_set_compression_window_bits - png_set_crc_action - png_set_error_fn - png_set_expand - png_set_filler - png_set_filter - png_set_filter_heuristics - png_set_flush - png_set_gAMA - png_set_gAMA_fixed - png_set_gamma - png_set_gray_to_rgb - png_set_hIST - png_set_iCCP - png_set_interlace_handling - png_set_invert_alpha - png_set_invert_mono - png_set_keep_unknown_chunks - png_set_oFFs - png_set_pCAL - png_set_pHYs - png_set_packing - png_set_packswap - png_set_palette_to_rgb - png_set_progressive_read_fn - png_set_read_fn - png_set_read_status_fn - png_set_read_user_chunk_fn - png_set_read_user_transform_fn - png_set_rgb_to_gray - png_set_rgb_to_gray_fixed - png_set_rows - png_set_sBIT - png_set_sCAL - png_set_sPLT - png_set_sRGB - png_set_sRGB_gAMA_and_cHRM - png_set_shift - png_set_sig_bytes - png_set_strip_16 - png_set_strip_alpha - png_set_swap - png_set_swap_alpha - png_set_tIME - png_set_tRNS - png_set_tRNS_to_alpha - png_set_text - png_set_unknown_chunk_location - png_set_unknown_chunks - png_set_user_transform_info - png_set_write_fn - png_set_write_status_fn - png_set_write_user_transform_fn - png_sig_cmp - png_start_read_image - png_warning - png_write_chunk - png_write_chunk_data - png_write_chunk_end - png_write_chunk_start - png_write_end - png_write_flush - png_write_image - png_write_info - png_write_info_before_PLTE - png_write_png - png_write_row - png_write_rows - png_access_version_number - png_init_io - png_convert_to_rfc1123 - png_set_invalid -; Added at version 1.0.12 - png_info_init_3 - png_destroy_struct + png_build_grayscale_palette @1 + png_chunk_error @3 + png_chunk_warning @4 + png_convert_from_struct_tm @5 + png_convert_from_time_t @6 + png_create_info_struct @7 + png_create_read_struct @8 + png_create_write_struct @9 + png_data_freer @10 + png_destroy_info_struct @11 + png_destroy_read_struct @12 + png_destroy_write_struct @13 + png_error @14 + png_free @15 + png_free_data @16 + png_get_IHDR @17 + png_get_PLTE @18 + png_get_bKGD @19 + png_get_bit_depth @20 + png_get_cHRM @21 + png_get_cHRM_fixed @22 + png_get_channels @23 + png_get_color_type @24 + png_get_compression_buffer_size @25 + png_get_compression_type @26 + png_get_copyright @27 + png_get_error_ptr @28 + png_get_filter_type @29 + png_get_gAMA @30 + png_get_gAMA_fixed @31 + png_get_hIST @32 + png_get_header_ver @33 + png_get_header_version @34 + png_get_iCCP @35 + png_get_image_height @36 + png_get_image_width @37 + png_get_interlace_type @38 + png_get_io_ptr @39 + png_get_libpng_ver @40 + png_get_oFFs @41 + png_get_pCAL @42 + png_get_pHYs @43 + png_get_pixel_aspect_ratio @44 + png_get_pixels_per_meter @45 + png_get_progressive_ptr @46 + png_get_rgb_to_gray_status @47 + png_get_rowbytes @48 + png_get_rows @49 + png_get_sBIT @50 + png_get_sCAL @51 + png_get_sPLT @52 + png_get_sRGB @53 + png_get_signature @54 + png_get_tIME @55 + png_get_tRNS @56 + png_get_text @57 + png_get_unknown_chunks @58 + png_get_user_chunk_ptr @59 + png_get_user_transform_ptr @60 + png_get_valid @61 + png_get_x_offset_microns @62 + png_get_x_offset_pixels @63 + png_get_x_pixels_per_meter @64 + png_get_y_offset_microns @65 + png_get_y_offset_pixels @66 + png_get_y_pixels_per_meter @67 + png_malloc @68 + png_process_data @72 + png_progressive_combine_row @73 + png_read_end @74 + png_read_image @75 + png_read_info @76 + png_read_png @78 + png_read_row @79 + png_read_rows @80 + png_read_update_info @81 + png_reset_zstream @82 + png_set_IHDR @83 + png_set_PLTE @84 + png_set_bKGD @85 + png_set_background @86 + png_set_bgr @87 + png_set_cHRM @88 + png_set_cHRM_fixed @89 + png_set_compression_buffer_size @90 + png_set_compression_level @91 + png_set_compression_mem_level @92 + png_set_compression_method @93 + png_set_compression_strategy @94 + png_set_compression_window_bits @95 + png_set_crc_action @96 + png_set_error_fn @98 + png_set_expand @99 + png_set_filler @100 + png_set_filter @101 + png_set_filter_heuristics @102 + png_set_flush @103 + png_set_gAMA @104 + png_set_gAMA_fixed @105 + png_set_gamma @106 + png_set_gray_to_rgb @108 + png_set_hIST @109 + png_set_iCCP @110 + png_set_interlace_handling @111 + png_set_invert_alpha @112 + png_set_invert_mono @113 + png_set_keep_unknown_chunks @114 + png_set_oFFs @115 + png_set_pCAL @116 + png_set_pHYs @117 + png_set_packing @118 + png_set_packswap @119 + png_set_palette_to_rgb @120 + png_set_progressive_read_fn @121 + png_set_read_fn @122 + png_set_read_status_fn @123 + png_set_read_user_chunk_fn @124 + png_set_read_user_transform_fn @125 + png_set_rgb_to_gray @126 + png_set_rgb_to_gray_fixed @127 + png_set_rows @128 + png_set_sBIT @129 + png_set_sCAL @130 + png_set_sPLT @131 + png_set_sRGB @132 + png_set_sRGB_gAMA_and_cHRM @133 + png_set_shift @134 + png_set_sig_bytes @135 + png_set_strip_16 @136 + png_set_strip_alpha @137 + png_set_swap @138 + png_set_swap_alpha @139 + png_set_tIME @140 + png_set_tRNS @141 + png_set_tRNS_to_alpha @142 + png_set_text @143 + png_set_unknown_chunk_location @144 + png_set_unknown_chunks @145 + png_set_user_transform_info @146 + png_set_write_fn @147 + png_set_write_status_fn @148 + png_set_write_user_transform_fn @149 + png_sig_cmp @150 + png_start_read_image @151 + png_warning @152 + png_write_chunk @153 + png_write_chunk_data @154 + png_write_chunk_end @155 + png_write_chunk_start @156 + png_write_end @157 + png_write_flush @158 + png_write_image @159 + png_write_info @160 + png_write_info_before_PLTE @161 + png_write_png @163 + png_write_row @164 + png_write_rows @165 + png_access_version_number @168 + png_init_io @171 + png_convert_to_rfc1123 @172 + png_set_invalid @173 + png_info_init_3 @177 + png_destroy_struct @178 ; Added at version 1.2.0 ; For use with PNG_USER_MEM_SUPPORTED - png_destroy_struct_2 - png_create_read_struct_2 - png_create_write_struct_2 - png_malloc_default - png_free_default + png_destroy_struct_2 @194 + png_create_read_struct_2 @223 + png_create_write_struct_2 @224 + png_malloc_default @182 + png_free_default @183 ; MNG features - png_permit_mng_features + png_permit_mng_features @184 ; Added at version 1.2.2 - png_handle_as_unknown -; Added at version 1.2.2 and deleted from 1.2.3 -; png_zalloc -; png_zfree -; Added at version 1.2.4 - png_malloc_warn - png_get_user_height_max - png_get_user_width_max - png_set_user_limits + png_handle_as_unknown @179 + png_zalloc @180 + png_zfree @181 +; Added at version 1.2.6 + png_malloc_warn @195 + png_get_user_height_max @196 + png_get_user_width_max @197 + png_set_user_limits @198 ; Added at version 1.2.7 - png_set_add_alpha + png_set_add_alpha @199 ; Added at version 1.2.9 - png_save_uint_32 - png_save_uint_16 - png_save_int_32 - png_get_uint_31 - png_set_expand_gray_1_2_4_to_8 + png_save_uint_32 @201 + png_save_uint_16 @203 + png_save_int_32 @205 + png_get_uint_31 @206 + png_set_expand_gray_1_2_4_to_8 @207 ; Added at version 1.2.41 - png_write_sig -; png_benign_error -; png_benign_chunk_error -; png_set_benign_error - png_get_io_chunk_name - png_get_io_state - png_get_chunk_cache_max - png_set_chunk_cache_max - png_check_cHRM_fixed - png_calloc - png_set_longjmp_fn + png_write_sig @208 +; Uncomment these if you define PNG_BENIGN_ERRORS_SUPPORTED +; png_benign_error @209 +; png_benign_chunk_error @210 +; png_set_benign_errors @211 + png_get_io_chunk_name @212 + png_get_io_state @213 + png_get_chunk_cache_max @215 + png_set_chunk_cache_max @216 + png_check_cHRM_fixed @217 + png_calloc @218 + png_set_longjmp_fn @219 ; Added at version 1.4.1 - png_get_chunk_malloc_max - png_set_chunk_malloc_max + png_get_chunk_malloc_max @220 + png_set_chunk_malloc_max @221 ; Added at version 1.5.0 - png_longjmp + png_longjmp @222 +;NEXT: @225