diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-19 23:13:24 (GMT) |
---|---|---|
committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-19 23:13:24 (GMT) |
commit | 840dab97ee4bd68dcf75cfd2edd5e58c38040ae1 (patch) | |
tree | 04270ec3cad3bfb3d2cb48f6c6455b49aee02b53 /src/3rdparty/libpng/scripts/pngos2.def | |
parent | 46e84339a9eaf1587528c20a4c9e05bc1b549afd (diff) | |
parent | 01498eb9a44f3b15e517e81b309087fbbf1b93bf (diff) | |
download | Qt-840dab97ee4bd68dcf75cfd2edd5e58c38040ae1.zip Qt-840dab97ee4bd68dcf75cfd2edd5e58c38040ae1.tar.gz Qt-840dab97ee4bd68dcf75cfd2edd5e58c38040ae1.tar.bz2 |
Merge remote branch 'origin/master' into mobility-master
Conflicts:
src/network/access/qnetworkaccessmanager.cpp
Diffstat (limited to 'src/3rdparty/libpng/scripts/pngos2.def')
-rw-r--r-- | src/3rdparty/libpng/scripts/pngos2.def | 40 |
1 files changed, 17 insertions, 23 deletions
diff --git a/src/3rdparty/libpng/scripts/pngos2.def b/src/3rdparty/libpng/scripts/pngos2.def index 0f371c8..2d80eb4 100644 --- a/src/3rdparty/libpng/scripts/pngos2.def +++ b/src/3rdparty/libpng/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.40 +; Version 1.4.0 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" @@ -11,9 +11,7 @@ DATA PRELOAD MOVEABLE MULTIPLE EXPORTS - png_build_grayscale_palette - png_check_sig png_chunk_error png_chunk_warning png_convert_from_struct_tm @@ -80,15 +78,11 @@ EXPORTS png_get_y_offset_pixels png_get_y_pixels_per_meter png_malloc - png_memcpy_check - png_memset_check - png_permit_empty_plte png_process_data png_progressive_combine_row png_read_end png_read_image png_read_info -; png_read_init ; deprecated png_read_png png_read_row png_read_rows @@ -108,7 +102,6 @@ EXPORTS png_set_compression_strategy png_set_compression_window_bits png_set_crc_action - png_set_dither png_set_error_fn png_set_expand png_set_filler @@ -118,7 +111,6 @@ EXPORTS png_set_gAMA png_set_gAMA_fixed png_set_gamma -; png_set_gray_1_2_4_to_8 ; deprecated as of libpng-1.2.9 png_set_gray_to_rgb png_set_hIST png_set_iCCP @@ -173,28 +165,18 @@ EXPORTS png_write_image png_write_info png_write_info_before_PLTE -; png_write_init ; deprecated png_write_png png_write_row png_write_rows - png_read_init_2 - png_write_init_2 + png_write_sig png_access_version_number png_init_io png_convert_to_rfc1123 png_set_invalid ; Added at version 1.2.0: - png_mmx_support png_permit_empty_plte png_permit_mng_features - png_get_mmx_flagmask - png_get_asm_flagmask - png_get_asm_flags - png_get_mmx_bitdepth_threshold - png_get_mmx_rowbytes_threshold - png_set_asm_flags - png_init_mmx_flags ; Added at version 1.2.2: png_handle_as_unknown @@ -214,16 +196,28 @@ EXPORTS png_set_add_alpha ; Added at version 1.2.9 - png_get_uint_32 png_save_uint_32 - png_get_uint_16 png_save_uint_16 - png_get_int_32 png_save_int_32 png_get_uint_31 png_set_expand_gray_1_2_4_to_8 +; 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_set_premultiply_alpha + png_get_chunk_cache_max + png_set_chunk_cache_max + png_check_cHRM_fixed + png_calloc + png_set_longjmp_fn + ; 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 |