Prefix all external symbols in Mozilla's libpng with MOZ_PNG_ to avoid runtime version conflicts with a system-installed libpng in static builds (bug 181936). Patch by glennrp@imagemagick.org, r=pavlov, sr=tor/bryner
This commit is contained in:
bryner%brianryner.com
Родитель
db80db9956
Коммит
804e3272b8
|
|
@ -9,3 +9,7 @@ Changes made to pristine png source by mozilla.org developers.
|
|||
2003/06/11 -- add mozpngconf.h (bug 208607)
|
||||
|
||||
2003/07/03 -- enable PNG_NO_WRITE_SUPPORTED in mozpngconf.h (bug 208607)
|
||||
|
||||
2003/07/29 -- Add "moz_" decoration on exported symbols (bug 181936). Set
|
||||
"PNG_NO_GLOBAL_ARRAYS" to reduce number of exported symbols.
|
||||
Remove some legacy (1.0.x) code from png.c and pngread.c
|
||||
|
|
|
|||
|
|
@ -37,6 +37,8 @@
|
|||
#ifndef MOZPNGCONF_H
|
||||
#define MOZPNGCONF_H
|
||||
|
||||
#define PNG_NO_GLOBAL_ARRAYS
|
||||
|
||||
#define PNG_NO_INFO_IMAGE
|
||||
#define PNG_NO_READ_BACKGROUND
|
||||
#define PNG_NO_READ_DITHER
|
||||
|
|
@ -70,4 +72,321 @@
|
|||
|
||||
#define PNG_NO_WRITE_SUPPORTED
|
||||
|
||||
/* Mangle names of exported libpng functions so different libpng versions
|
||||
can coexist. It is recommended that if you do this, you give your
|
||||
library a different name such as "mozlibpng" instead of "libpng". */
|
||||
|
||||
/* The following has been present since libpng-0.88, has never changed, and
|
||||
is unaffected by conditional compilation macros. It will not be mangled
|
||||
and it is the only choice for use in configure scripts for detecting the
|
||||
presence of any libpng version since 0.88.
|
||||
|
||||
png_get_io_ptr
|
||||
*/
|
||||
|
||||
/* Mozilla: mangle it anyway. */
|
||||
#define png_get_io_ptr MOZ_PNG_get_io_ptr
|
||||
|
||||
/* The following weren't present in libpng-0.88 but have never changed since
|
||||
they were first introduced and are not affected by any conditional compile
|
||||
choices and therefore don't need to be mangled. We'll mangle them anyway. */
|
||||
#define png_sig_cmp MOZ_PNG_sig_cmp /* 0.90 */
|
||||
#define png_memcpy_check MOZ_PNG_memcpy_ck /* 1.0.0 */
|
||||
#define png_memset_check MOZ_PNG_memset_ck /* 1.0.0 */
|
||||
#define png_access_version_number MOZ_PNG_access_vn /* 1.0.7 */
|
||||
|
||||
/* These have never changed since they were first introduced but they
|
||||
make direct reference to members of png_ptr that might have been moved,
|
||||
so they will be mangled. */
|
||||
|
||||
#define png_set_sig_bytes MOZ_PNG_set_sig_b /* 0.90 */
|
||||
#define png_reset_zstream MOZ_PNG_reset_zs /* 1.0.7 */
|
||||
|
||||
/* The following may have changed, or can be affected by conditional compilation
|
||||
choices, and will be mangled. */
|
||||
#define png_build_gamma_table MOZ_PNG_build_gamma_tab
|
||||
#define png_build_grayscale_palette MOZ_PNG_build_g_p
|
||||
#define png_calculate_crc MOZ_PNG_calc_crc
|
||||
#define png_check_chunk_name MOZ_PNG_ck_chunk_name
|
||||
#define png_check_sig MOZ_PNG_ck_sig
|
||||
#define png_chunk_error MOZ_PNG_chunk_err
|
||||
#define png_chunk_warning MOZ_PNG_chunk_warn
|
||||
#define png_combine_row MOZ_PNG_combine_row
|
||||
#define png_convert_from_struct_tm MOZ_PNG_cv_from_struct_tm
|
||||
#define png_convert_from_time_t MOZ_PNG_cv_from_time_t
|
||||
#define png_convert_to_rfc1123 MOZ_PNG_cv_to_rfc1123
|
||||
#define png_crc_error MOZ_PNG_crc_error
|
||||
#define png_crc_finish MOZ_PNG_crc_finish
|
||||
#define png_crc_read MOZ_PNG_crc_read
|
||||
#define png_create_info_struct MOZ_PNG_cr_info_str
|
||||
#define png_create_read_struct MOZ_PNG_cr_read_str
|
||||
#define png_create_read_struct_2 MOZ_PNG_cr_read_str_2
|
||||
#define png_create_struct MOZ_PNG_create_st
|
||||
#define png_create_struct_2 MOZ_PNG_create_s2
|
||||
#define png_create_write_struct MOZ_PNG_cr_write_str
|
||||
#define png_create_write_struct_2 MOZ_PNG_cr_write_str_2
|
||||
#define png_data_freer MOZ_PNG_data_freer
|
||||
#define png_decompress_chunk MOZ_PNG_decomp_chunk
|
||||
#define png_default_flush MOZ_PNG_def_flush
|
||||
#define png_default_read MOZ_PNG_def_read
|
||||
#define png_default_read_data MOZ_PNG_def_read_data
|
||||
#define png_default_write MOZ_PNG_def_write
|
||||
#define png_destroy_info_struct MOZ_PNG_dest_info_str
|
||||
#define png_destroy_read_struct MOZ_PNG_dest_read_str
|
||||
#define png_destroy_struct MOZ_PNG_dest_str
|
||||
#define png_destroy_struct_2 MOZ_PNG_dest_str_2
|
||||
#define png_destroy_write_struct MOZ_PNG_dest_write_str
|
||||
#define png_do_background MOZ_PNG_do_back
|
||||
#define png_do_bgr MOZ_PNG_do_bgr
|
||||
#define png_do_chop MOZ_PNG_do_chop
|
||||
#define png_do_dither MOZ_PNG_do_dith
|
||||
#define png_do_expand MOZ_PNG_do_expand
|
||||
#define png_do_expand_palette MOZ_PNG_do_expand_plte
|
||||
#define png_do_gamma MOZ_PNG_do_gamma
|
||||
#define png_do_gray_to_rgb MOZ_PNG_do_g_to_rgb
|
||||
#define png_do_invert MOZ_PNG_do_invert
|
||||
#define png_do_packswap MOZ_PNG_do_packswap
|
||||
#define png_do_read_filler MOZ_PNG_do_read_fill
|
||||
#define png_do_read_interlace MOZ_PNG_do_read_int
|
||||
#define png_do_read_intrapixel MOZ_PNG_do_read_intra
|
||||
#define png_do_read_invert_alpha MOZ_PNG_do_read_inv_alph
|
||||
#define png_do_read_swap_alpha MOZ_PNG_do_read_swap_alph
|
||||
#define png_do_read_transformations MOZ_PNG_do_read_trans
|
||||
#define png_do_rgb_to_gray MOZ_PNG_do_rgb_to_g
|
||||
#define png_do_strip_filler MOZ_PNG_do_strip_fill
|
||||
#define png_do_swap MOZ_PNG_do_swap
|
||||
#define png_do_unpack MOZ_PNG_do_unpack
|
||||
#define png_do_unshift MOZ_PNG_do_unshift
|
||||
#define png_error MOZ_PNG_error
|
||||
#define png_free MOZ_PNG_free
|
||||
#define png_free_data MOZ_PNG_free_data
|
||||
#define png_free_default MOZ_PNG_free_def
|
||||
#define png_get_IHDR MOZ_PNG_get_IHDR
|
||||
#define png_get_PLTE MOZ_PNG_get_PLTE
|
||||
#define png_get_asm_flagmask MOZ_PNG_get_asm_mask
|
||||
#define png_get_asm_flags MOZ_PNG_get_asm_flags
|
||||
#define png_get_bKGD MOZ_PNG_get_bKGD
|
||||
#define png_get_bit_depth MOZ_PNG_get_bit_depth
|
||||
#define png_get_cHRM MOZ_PNG_get_cHRM
|
||||
#define png_get_cHRM_fixed MOZ_PNG_get_cHRM_fixed
|
||||
#define png_get_channels MOZ_PNG_get_channels
|
||||
#define png_get_color_type MOZ_PNG_get_color_type
|
||||
#define png_get_compression_buffer_size MOZ_PNG_get_comp_buf_siz
|
||||
#define png_get_compression_type MOZ_PNG_get_comp_type
|
||||
#define png_get_copyright MOZ_PNG_get_copyright
|
||||
#define png_get_error_ptr MOZ_PNG_get_error_ptr
|
||||
#define png_get_filter_type MOZ_PNG_get_filter_type
|
||||
#define png_get_gAMA MOZ_PNG_get_gAMA
|
||||
#define png_get_gAMA_fixed MOZ_PNG_get_gAMA_fixed
|
||||
#define png_get_hIST MOZ_PNG_get_hIST
|
||||
#define png_get_header_ver MOZ_PNG_get_hdr_ver
|
||||
#define png_get_header_version MOZ_PNG_get_hdr_vn
|
||||
#define png_get_iCCP MOZ_PNG_get_iCCP
|
||||
#define png_get_image_height MOZ_PNG_get_image_h
|
||||
#define png_get_image_width MOZ_PNG_get_image_w
|
||||
#define png_get_int_32 MOZ_PNG_get_int_32
|
||||
#define png_get_interlace_type MOZ_PNG_get_interlace_type
|
||||
#define png_get_libpng_ver MOZ_PNG_get_libpng_ver
|
||||
#define png_get_mem_ptr MOZ_PNG_get_mem_ptr
|
||||
#define png_get_mmx_bitdepth_threshold MOZ_PNG_get_mmx_bitdepth_thr
|
||||
#define png_get_mmx_flagmask MOZ_PNG_get_mmx_flagmask
|
||||
#define png_get_mmx_rowbytes_threshold MOZ_PNG_get_mmx_rowbytes_thr
|
||||
#define png_get_oFFs MOZ_PNG_get_oFFs
|
||||
#define png_get_pCAL MOZ_PNG_get_pCAL
|
||||
#define png_get_pHYs MOZ_PNG_get_pHYs
|
||||
#define png_get_pixel_aspect_ratio MOZ_PNG_get_pixel_aspect_ratio
|
||||
#define png_get_pixels_per_meter MOZ_PNG_get_pixels_p_m
|
||||
#define png_get_progressive_ptr MOZ_PNG_get_progressive_ptr
|
||||
#define png_get_rgb_to_gray_status MOZ_PNG_get_rgb_to_gray_status
|
||||
#define png_get_rowbytes MOZ_PNG_get_rowbytes
|
||||
#define png_get_rows MOZ_PNG_get_rows
|
||||
#define png_get_sBIT MOZ_PNG_get_sBIT
|
||||
#define png_get_sCAL MOZ_PNG_get_sCAL
|
||||
#define png_get_sCAL_s MOZ_PNG_get_sCAL_s
|
||||
#define png_get_sPLT MOZ_PNG_get_sPLT
|
||||
#define png_get_sRGB MOZ_PNG_get_sRGB
|
||||
#define png_get_signature MOZ_PNG_get_signature
|
||||
#define png_get_tIME MOZ_PNG_get_tIME
|
||||
#define png_get_tRNS MOZ_PNG_get_tRNS
|
||||
#define png_get_text MOZ_PNG_get_text
|
||||
#define png_get_uint_16 MOZ_PNG_get_uint_16
|
||||
#define png_get_uint_32 MOZ_PNG_get_uint_32
|
||||
#define png_get_unknown_chunks MOZ_PNG_get_unk_chunks
|
||||
#define png_get_user_chunk_ptr MOZ_PNG_get_user_chunk_ptr
|
||||
#define png_get_user_transform_ptr MOZ_PNG_get_user_transform_ptr
|
||||
#define png_get_valid MOZ_PNG_get_valid
|
||||
#define png_get_x_offset_microns MOZ_PNG_get_x_offs_microns
|
||||
#define png_get_x_offset_pixels MOZ_PNG_get_x_offs_pixels
|
||||
#define png_get_x_pixels_per_meter MOZ_PNG_get_x_pix_per_meter
|
||||
#define png_get_y_offset_microns MOZ_PNG_get_y_offs_microns
|
||||
#define png_get_y_offset_pixels MOZ_PNG_get_y_offs_pixels
|
||||
#define png_get_y_pixels_per_meter MOZ_PNG_get_y_pix_per_meter
|
||||
#define png_handle_IEND MOZ_PNG_handle_IEND
|
||||
#define png_handle_IHDR MOZ_PNG_handle_IHDR
|
||||
#define png_handle_PLTE MOZ_PNG_handle_PLTE
|
||||
#define png_handle_as_unknown MOZ_PNG_handle_as_unknown
|
||||
#define png_handle_bKGD MOZ_PNG_handle_bKGD
|
||||
#define png_handle_cHRM MOZ_PNG_handle_cHRM
|
||||
#define png_handle_gAMA MOZ_PNG_handle_gAMA
|
||||
#define png_handle_hIST MOZ_PNG_handle_hIST
|
||||
#define png_handle_iCCP MOZ_PNG_handle_iCCP
|
||||
#define png_handle_oFFs MOZ_PNG_handle_oFFs
|
||||
#define png_handle_pCAL MOZ_PNG_handle_pCAL
|
||||
#define png_handle_pHYs MOZ_PNG_handle_pHYs
|
||||
#define png_handle_sBIT MOZ_PNG_handle_sBIT
|
||||
#define png_handle_sCAL MOZ_PNG_handle_sCAL
|
||||
#define png_handle_sPLT MOZ_PNG_handle_sPLT
|
||||
#define png_handle_sRGB MOZ_PNG_handle_sRGB
|
||||
#define png_handle_tEXt MOZ_PNG_handle_tEXt
|
||||
#define png_handle_tIME MOZ_PNG_handle_tIME
|
||||
#define png_handle_tRNS MOZ_PNG_handle_tRNS
|
||||
#define png_handle_unknown MOZ_PNG_handle_unknown
|
||||
#define png_handle_zTXt MOZ_PNG_handle_zTXt
|
||||
#define png_info_destroy MOZ_PNG_info_dest
|
||||
#define png_info_init MOZ_PNG_info_init
|
||||
#define png_info_init MOZ_PNG_info_init
|
||||
#define png_info_init_3 MOZ_PNG_info_init_3
|
||||
#define png_init_io MOZ_PNG_init_io
|
||||
#define png_init_mmx_flags MOZ_PNG_init_mmx_flags
|
||||
#define png_init_read_transformations MOZ_PNG_init_read_transf
|
||||
#define png_malloc MOZ_PNG_malloc
|
||||
#define png_malloc_default MOZ_PNG_malloc_default
|
||||
#define png_malloc_warn MOZ_PNG_malloc_warn
|
||||
#define png_mmx_support MOZ_PNG_mmx_support
|
||||
#define png_permit_empty_plte MOZ_PNG_permit_mng_empty_plte
|
||||
#define png_permit_mng_features MOZ_PNG_permit_mng_features
|
||||
#define png_process_IDAT_data MOZ_PNG_proc_IDAT_data
|
||||
#define png_process_data MOZ_PNG_process_data
|
||||
#define png_process_some_data MOZ_PNG_proc_some_data
|
||||
#define png_progressive_combine_row MOZ_PNG_progressive_combine_row
|
||||
#define png_push_crc_finish MOZ_PNG_push_crc_finish
|
||||
#define png_push_crc_skip MOZ_PNG_push_crc_skip
|
||||
#define png_push_fill_buffer MOZ_PNG_push_fill_buffer
|
||||
#define png_push_handle_tEXt MOZ_PNG_push_handle_tEXt
|
||||
#define png_push_handle_unknown MOZ_PNG_push_handle_unk
|
||||
#define png_push_handle_zTXt MOZ_PNG_push_handle_ztXt
|
||||
#define png_push_have_end MOZ_PNG_push_have_end
|
||||
#define png_push_have_info MOZ_PNG_push_have_info
|
||||
#define png_push_have_row MOZ_PNG_push_have_row
|
||||
#define png_push_process_row MOZ_PNG_push_proc_row
|
||||
#define png_push_read_IDAT MOZ_PNG_push_read_IDAT
|
||||
#define png_push_read_chunk MOZ_PNG_push_read_chunk
|
||||
#define png_push_read_sig MOZ_PNG_push_read_sig
|
||||
#define png_push_read_tEXt MOZ_PNG_push_read_tEXt
|
||||
#define png_push_read_zTXt MOZ_PNG_push_read_zTXt
|
||||
#define png_push_restore_buffer MOZ_PNG_push_rest_buf
|
||||
#define png_push_save_buffer MOZ_PNG_push_save_buf
|
||||
#define png_read_data MOZ_PNG_read_data
|
||||
#define png_read_destroy MOZ_PNG_read_dest
|
||||
#define png_read_end MOZ_PNG_read_end
|
||||
#define png_read_filter_row MOZ_PNG_read_filt_row
|
||||
#define png_read_finish_row MOZ_PNG_read_finish_row
|
||||
#define png_read_image MOZ_PNG_read_image
|
||||
#define png_read_info MOZ_PNG_read_info
|
||||
#define png_read_init MOZ_PNG_read_init
|
||||
#define png_read_init MOZ_PNG_read_init
|
||||
#define png_read_init_2 MOZ_PNG_read_init_2
|
||||
#define png_read_init_3 MOZ_PNG_read_init_3
|
||||
#define png_read_png MOZ_PNG_read_png
|
||||
#define png_read_push_finish_row MOZ_PNG_read_push_finish_row
|
||||
#define png_read_row MOZ_PNG_read_row
|
||||
#define png_read_rows MOZ_PNG_read_rows
|
||||
#define png_read_start_row MOZ_PNG_read_start_row
|
||||
#define png_read_transform_info MOZ_PNG_read_transform_info
|
||||
#define png_read_update_info MOZ_PNG_read_update_info
|
||||
#define png_reset_crc MOZ_PNG_reset_crc
|
||||
#define png_set_IHDR MOZ_PNG_set_IHDR
|
||||
#define png_set_PLTE MOZ_PNG_set_PLTE
|
||||
#define png_set_asm_flags MOZ_PNG_set_asm_flags
|
||||
#define png_set_bKGD MOZ_PNG_set_bKGD
|
||||
#define png_set_background MOZ_PNG_set_background
|
||||
#define png_set_bgr MOZ_PNG_set_bgr
|
||||
#define png_set_cHRM MOZ_PNG_set_cHRM
|
||||
#define png_set_cHRM_fixed MOZ_PNG_set_cHRM_fixed
|
||||
#define png_set_compression_buffer_size MOZ_PNG_set_comp_buf_siz
|
||||
#define png_set_compression_level MOZ_PNG_set_comp_level
|
||||
#define png_set_compression_mem_level MOZ_PNG_set_comp_mem_lev
|
||||
#define png_set_compression_method MOZ_PNG_set_comp_method
|
||||
#define png_set_compression_strategy MOZ_PNG_set_comp_strategy
|
||||
#define png_set_compression_window_bits MOZ_PNG_set_comp_win_bits
|
||||
#define png_set_crc_action MOZ_PNG_set_crc_action
|
||||
#define png_set_dither MOZ_PNG_set_dither
|
||||
#define png_set_error_fn MOZ_PNG_set_error_fn
|
||||
#define png_set_expand MOZ_PNG_set_expand
|
||||
#define png_set_filler MOZ_PNG_set_filler
|
||||
#define png_set_filter MOZ_PNG_set_filter
|
||||
#define png_set_filter_heuristics MOZ_PNG_set_filter_heur
|
||||
#define png_set_flush MOZ_PNG_set_flush
|
||||
#define png_set_gAMA MOZ_PNG_set_gAMA
|
||||
#define png_set_gAMA_fixed MOZ_PNG_set_gAMA_fixed
|
||||
#define png_set_gamma MOZ_PNG_set_gamma
|
||||
#define png_set_gray_1_2_4_to_8 MOZ_PNG_set_gray_1_2_4_to_8
|
||||
#define png_set_gray_to_rgb MOZ_PNG_set_gray_to_rgb
|
||||
#define png_set_hIST MOZ_PNG_set_hIST
|
||||
#define png_set_iCCP MOZ_PNG_set_iCCP
|
||||
#define png_set_interlace_handling MOZ_PNG_set_interlace_handling
|
||||
#define png_set_invalid MOZ_PNG_set_invalid
|
||||
#define png_set_invert_alpha MOZ_PNG_set_invert_alpha
|
||||
#define png_set_invert_mono MOZ_PNG_set_invert_mono
|
||||
#define png_set_keep_unknown_chunks MOZ_PNG_set_keep_unknown_chunks
|
||||
#define png_set_mem_fn MOZ_PNG_set_mem_fn
|
||||
#define png_set_mmx_thresholds MOZ_PNG_set_mmx_thr
|
||||
#define png_set_oFFs MOZ_PNG_set_oFFs
|
||||
#define png_set_pCAL MOZ_PNG_set_pCAL
|
||||
#define png_set_pHYs MOZ_PNG_set_pHYs
|
||||
#define png_set_packing MOZ_PNG_set_packing
|
||||
#define png_set_packswap MOZ_PNG_set_packswap
|
||||
#define png_set_palette_to_rgb MOZ_PNG_set_palette_to_rgb
|
||||
#define png_set_progressive_read_fn MOZ_PNG_set_progressive_read_fn
|
||||
#define png_set_read_fn MOZ_PNG_set_read_fn
|
||||
#define png_set_read_status_fn MOZ_PNG_set_read_status_fn
|
||||
#define png_set_read_user_chunk_fn MOZ_PNG_set_read_user_chunk_fn
|
||||
#define png_set_read_user_transform_fn MOZ_PNG_set_read_user_trans_fn
|
||||
#define png_set_rgb_to_gray MOZ_PNG_set_rgb_to_gray
|
||||
#define png_set_rgb_to_gray_fixed MOZ_PNG_set_rgb_to_gray_fixed
|
||||
#define png_set_rows MOZ_PNG_set_rows
|
||||
#define png_set_sBIT MOZ_PNG_set_sBIT
|
||||
#define png_set_sCAL MOZ_PNG_set_sCAL
|
||||
#define png_set_sCAL_s MOZ_PNG_set_sCAL_s
|
||||
#define png_set_sPLT MOZ_PNG_set_sPLT
|
||||
#define png_set_sRGB MOZ_PNG_set_sRGB
|
||||
#define png_set_sRGB_gAMA_and_cHRM MOZ_PNG_set_sRGB_gAMA_and_cHRM
|
||||
#define png_set_shift MOZ_PNG_set_shift
|
||||
#define png_set_strip_16 MOZ_PNG_set_strip_16
|
||||
#define png_set_strip_alpha MOZ_PNG_set_strip_alpha
|
||||
#define png_set_strip_error_numbers MOZ_PNG_set_strip_err_nums
|
||||
#define png_set_swap MOZ_PNG_set_swap
|
||||
#define png_set_swap_alpha MOZ_PNG_set_swap_alpha
|
||||
#define png_set_tIME MOZ_PNG_set_tIME
|
||||
#define png_set_tRNS MOZ_PNG_set_tRNS
|
||||
#define png_set_tRNS_to_alpha MOZ_PNG_set_tRNS_to_alpha
|
||||
#define png_set_text MOZ_PNG_set_text
|
||||
#define png_set_text_2 MOZ_PNG_set_text-2
|
||||
#define png_set_unknown_chunk_location MOZ_PNG_set_unknown_chunk_loc
|
||||
#define png_set_unknown_chunks MOZ_PNG_set_unknown_chunks
|
||||
#define png_set_user_transform_info MOZ_PNG_set_user_transform_info
|
||||
#define png_set_write_fn MOZ_PNG_set_write_fn
|
||||
#define png_set_write_status_fn MOZ_PNG_set_write_status_fn
|
||||
#define png_set_write_user_transform_fn MOZ_PNG_set_write_user_trans_fn
|
||||
#define png_sig_bytes MOZ_PNG_sig_bytes
|
||||
#define png_start_read_image MOZ_PNG_start_read_image
|
||||
#define png_warning MOZ_PNG_warning
|
||||
#define png_write_chunk MOZ_PNG_write_chunk
|
||||
#define png_write_chunk_data MOZ_PNG_write_chunk_data
|
||||
#define png_write_chunk_end MOZ_PNG_write_chunk_end
|
||||
#define png_write_chunk_start MOZ_PNG_write_chunk_start
|
||||
#define png_write_end MOZ_PNG_write_end
|
||||
#define png_write_flush MOZ_PNG_write_flush
|
||||
#define png_write_image MOZ_PNG_write_image
|
||||
#define png_write_info MOZ_PNG_write_info
|
||||
#define png_write_info_before_PLTE MOZ_PNG_write_info_before_PLTE
|
||||
#define png_write_init MOZ_PNG_write_init
|
||||
#define png_write_init_2 MOZ_PNG_write_init_2
|
||||
#define png_write_init_3 MOZ_PNG_write_init_3
|
||||
#define png_write_png MOZ_PNG_write_png
|
||||
#define png_write_row MOZ_PNG_write_row
|
||||
#define png_write_rows MOZ_PNG_write_rows
|
||||
#define png_zalloc MOZ_PNG_zalloc
|
||||
#define png_zfree MOZ_PNG_zfree
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -272,6 +272,7 @@ png_destroy_info_struct(png_structp png_ptr, png_infopp info_ptr_ptr)
|
|||
* and applications using it are urged to use png_create_info_struct()
|
||||
* instead.
|
||||
*/
|
||||
#if defined(PNG_1_0_X)
|
||||
#undef png_info_init
|
||||
void PNGAPI
|
||||
png_info_init(png_infop info_ptr)
|
||||
|
|
@ -279,6 +280,7 @@ png_info_init(png_infop info_ptr)
|
|||
/* We only come here via pre-1.0.12-compiled applications */
|
||||
png_info_init_3(&info_ptr, 0);
|
||||
}
|
||||
#endif
|
||||
|
||||
void PNGAPI
|
||||
png_info_init_3(png_infopp ptr_ptr, png_size_t png_info_struct_size)
|
||||
|
|
|
|||
|
|
@ -166,6 +166,7 @@ png_create_read_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,
|
|||
/* Initialize PNG structure for reading, and allocate any memory needed.
|
||||
This interface is deprecated in favour of the png_create_read_struct(),
|
||||
and it will eventually disappear. */
|
||||
#if defined(PNG_1_0_X)
|
||||
#undef png_read_init
|
||||
void PNGAPI
|
||||
png_read_init(png_structp png_ptr)
|
||||
|
|
@ -215,6 +216,7 @@ png_read_init_2(png_structp png_ptr, png_const_charp user_png_ver,
|
|||
}
|
||||
png_read_init_3(&png_ptr, user_png_ver, png_struct_size);
|
||||
}
|
||||
#endif
|
||||
|
||||
void PNGAPI
|
||||
png_read_init_3(png_structpp ptr_ptr, png_const_charp user_png_ver,
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче