Export the correct symbols from the Windows DLL when built with libjpeg v7 or v8b...

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@260 632fc199-4ca6-4c93-a231-07263d6284db

diff --git a/sharedlib/CMakeLists.txt b/sharedlib/CMakeLists.txt
index b70f9bd306c16d0c28247d3dd0141ed8345c3819..c4e294010fe12203ee6749a9c2ecf76264460f9b 100755 (executable)
--- a/sharedlib/CMakeLists.txt
+++ b/sharedlib/CMakeLists.txt
@@ -21,14 +21,13 @@ foreach(src ${JPEG_SOURCES})
   set(JPEG_SRCS ${JPEG_SRCS} ${CMAKE_SOURCE_DIR}/${src})\r
 endforeach()\r
 \r
-set(JPEG_DEF ../win/jpeg.def)\r
-\r
 if(WITH_SIMD)\r
   # This tells CMake that the "source" files haven't been generated yet\r
   set_source_files_properties(${SIMD_OBJS} PROPERTIES GENERATED 1)\r
 endif()\r
 \r
-add_library(jpeg SHARED ${JPEG_SRCS} ${SIMD_OBJS} ${JPEG_DEF})\r
+add_library(jpeg SHARED ${JPEG_SRCS} ${SIMD_OBJS}\r
+  ${CMAKE_SOURCE_DIR}/win/jpeg${DLL_VERSION}.def)\r
 if(MSVC)\r
   set_target_properties(jpeg PROPERTIES SUFFIX ${DLL_VERSION}.dll)\r
 elseif(MINGW OR CYGWIN)\r

diff --git a/win/jpeg.def b/win/jpeg62.def
similarity index 81%
rename from win/jpeg.def
rename to win/jpeg62.def
index 01d329fa267d0a749f6b50bd7b521fd1355e9b49..96a41c341250100c5f7497a340e19378fdb1eb4a 100755 (executable)
--- a/win/jpeg.def
+++ b/win/jpeg62.def
@@ -1,4 +1,3 @@
-; h:\mingw\3.3.1\bin\dlltool.exe --output-def=jpeg.def jcapimin.o jcapistd.o jctrans.o jcparam.o jdatadst.o jcinit.o jcmaster.o jcmarker.o jcmainct.o jcprepct.o jccoefct.o jccolor.o jcsample.o jchuff.o jcphuff.o jcdctmgr.o jfdctfst.o jfdctflt.o jfdctint.o jdapimin.o jdapistd.o jdtrans.o jdatasrc.o jdmaster.o jdinput.o jdmarker.o jdhuff.o jdphuff.o jdmainct.o jdcoefct.o jdpostct.o jddctmgr.o jidctfst.o jidctflt.o jidctint.o jidctred.o jdsample.o jdcolor.o jquant1.o jquant2.o jdmerge.o jcomapi.o jutils.o jerror.o jmemmgr.o jmemnobs.o jpeg-dllversion.o jpeg-dll-res.o\r
 EXPORTS\r
        jcopy_block_row @ 1 ; \r
        jcopy_sample_rows @ 2 ; \r

diff --git a/win/jpeg7.def b/win/jpeg7.def
new file mode 100644 (file)
index 0000000..cd533dc
--- /dev/null
+++ b/win/jpeg7.def
@@ -0,0 +1,104 @@
+EXPORTS\r
+       jcopy_block_row @ 1 ; \r
+       jcopy_sample_rows @ 2 ; \r
+       jdiv_round_up @ 3 ; \r
+       jinit_1pass_quantizer @ 4 ; \r
+       jinit_2pass_quantizer @ 5 ; \r
+       jinit_c_coef_controller @ 6 ; \r
+       jinit_c_main_controller @ 7 ; \r
+       jinit_c_master_control @ 8 ; \r
+       jinit_c_prep_controller @ 9 ; \r
+       jinit_color_converter @ 10 ; \r
+       jinit_color_deconverter @ 11 ; \r
+       jinit_compress_master @ 12 ; \r
+       jinit_d_coef_controller @ 13 ; \r
+       jinit_d_main_controller @ 14 ; \r
+       jinit_d_post_controller @ 15 ; \r
+       jinit_downsampler @ 16 ; \r
+       jinit_forward_dct @ 17 ; \r
+       jinit_huff_decoder @ 18 ; \r
+       jinit_huff_encoder @ 19 ; \r
+       jinit_input_controller @ 20 ; \r
+       jinit_inverse_dct @ 21 ; \r
+       jinit_marker_reader @ 22 ; \r
+       jinit_marker_writer @ 23 ; \r
+       jinit_master_decompress @ 24 ; \r
+       jinit_memory_mgr @ 25 ; \r
+       jinit_merged_upsampler @ 26 ; \r
+       jinit_phuff_decoder @ 27 ; \r
+       jinit_phuff_encoder @ 28 ; \r
+       jinit_upsampler @ 29 ; \r
+       jpeg_CreateCompress @ 30 ; \r
+       jpeg_CreateDecompress @ 31 ; \r
+       jpeg_abort @ 32 ; \r
+       jpeg_abort_compress @ 33 ; \r
+       jpeg_abort_decompress @ 34 ; \r
+       jpeg_add_quant_table @ 35 ; \r
+       jpeg_alloc_huff_table @ 36 ; \r
+       jpeg_alloc_quant_table @ 37 ; \r
+       jpeg_calc_jpeg_dimensions @ 38 ; \r
+       jpeg_calc_output_dimensions @ 39 ; \r
+       jpeg_consume_input @ 40 ; \r
+       jpeg_copy_critical_parameters @ 41 ; \r
+       jpeg_default_colorspace @ 42 ; \r
+       jpeg_default_qtables @ 43 ;\r
+       jpeg_destroy @ 44 ; \r
+       jpeg_destroy_compress @ 45 ; \r
+       jpeg_destroy_decompress @ 46 ; \r
+       jpeg_fdct_float @ 47 ; \r
+       jpeg_fdct_ifast @ 48 ; \r
+       jpeg_fdct_islow @ 49 ; \r
+       jpeg_fill_bit_buffer @ 50 ; \r
+       jpeg_finish_compress @ 51 ; \r
+       jpeg_finish_decompress @ 52 ; \r
+       jpeg_finish_output @ 53 ; \r
+       jpeg_free_large @ 54 ; \r
+       jpeg_free_small @ 55 ; \r
+       jpeg_gen_optimal_table @ 56 ; \r
+       jpeg_get_large @ 57 ; \r
+       jpeg_get_small @ 58 ; \r
+       jpeg_has_multiple_scans @ 59 ; \r
+       jpeg_huff_decode @ 60 ; \r
+       jpeg_idct_1x1 @ 61 ; \r
+       jpeg_idct_2x2 @ 62 ; \r
+       jpeg_idct_4x4 @ 63 ; \r
+       jpeg_idct_float @ 64 ; \r
+       jpeg_idct_ifast @ 65 ; \r
+       jpeg_idct_islow @ 66 ; \r
+       jpeg_input_complete @ 67 ; \r
+       jpeg_make_c_derived_tbl @ 68 ; \r
+       jpeg_make_d_derived_tbl @ 69 ; \r
+       jpeg_mem_available @ 70 ; \r
+       jpeg_mem_init @ 71 ; \r
+       jpeg_mem_term @ 72 ; \r
+       jpeg_new_colormap @ 73 ; \r
+       jpeg_open_backing_store @ 74 ; \r
+       jpeg_quality_scaling @ 75 ; \r
+       jpeg_read_coefficients @ 76 ; \r
+       jpeg_read_header @ 77 ; \r
+       jpeg_read_raw_data @ 78 ; \r
+       jpeg_read_scanlines @ 79 ; \r
+       jpeg_resync_to_restart @ 80 ; \r
+       jpeg_save_markers @ 81 ; \r
+       jpeg_set_colorspace @ 82 ; \r
+       jpeg_set_defaults @ 83 ; \r
+       jpeg_set_linear_quality @ 84 ; \r
+       jpeg_set_marker_processor @ 85 ; \r
+       jpeg_set_quality @ 86 ; \r
+       jpeg_simple_progression @ 87 ; \r
+       jpeg_start_compress @ 88 ; \r
+       jpeg_start_decompress @ 89 ; \r
+       jpeg_start_output @ 90 ; \r
+       jpeg_std_error @ 91 ; \r
+       jpeg_stdio_dest @ 92 ; \r
+       jpeg_stdio_src @ 93 ; \r
+       jpeg_suppress_tables @ 94 ; \r
+       jpeg_write_coefficients @ 95 ; \r
+       jpeg_write_m_byte @ 96 ; \r
+       jpeg_write_m_header @ 97 ; \r
+       jpeg_write_marker @ 98 ; \r
+       jpeg_write_raw_data @ 99 ; \r
+       jpeg_write_scanlines @ 100 ; \r
+       jpeg_write_tables @ 101 ; \r
+       jround_up @ 102 ; \r
+       jzero_far @ 103 ; \r

diff --git a/win/jpeg8.def b/win/jpeg8.def
new file mode 100644 (file)
index 0000000..8d82a3f
--- /dev/null
+++ b/win/jpeg8.def
@@ -0,0 +1,107 @@
+EXPORTS\r
+       jcopy_block_row @ 1 ; \r
+       jcopy_sample_rows @ 2 ; \r
+       jdiv_round_up @ 3 ; \r
+       jinit_1pass_quantizer @ 4 ; \r
+       jinit_2pass_quantizer @ 5 ; \r
+       jinit_c_coef_controller @ 6 ; \r
+       jinit_c_main_controller @ 7 ; \r
+       jinit_c_master_control @ 8 ; \r
+       jinit_c_prep_controller @ 9 ; \r
+       jinit_color_converter @ 10 ; \r
+       jinit_color_deconverter @ 11 ; \r
+       jinit_compress_master @ 12 ; \r
+       jinit_d_coef_controller @ 13 ; \r
+       jinit_d_main_controller @ 14 ; \r
+       jinit_d_post_controller @ 15 ; \r
+       jinit_downsampler @ 16 ; \r
+       jinit_forward_dct @ 17 ; \r
+       jinit_huff_decoder @ 18 ; \r
+       jinit_huff_encoder @ 19 ; \r
+       jinit_input_controller @ 20 ; \r
+       jinit_inverse_dct @ 21 ; \r
+       jinit_marker_reader @ 22 ; \r
+       jinit_marker_writer @ 23 ; \r
+       jinit_master_decompress @ 24 ; \r
+       jinit_memory_mgr @ 25 ; \r
+       jinit_merged_upsampler @ 26 ; \r
+       jinit_phuff_decoder @ 27 ; \r
+       jinit_phuff_encoder @ 28 ; \r
+       jinit_upsampler @ 29 ; \r
+       jpeg_CreateCompress @ 30 ; \r
+       jpeg_CreateDecompress @ 31 ; \r
+       jpeg_abort @ 32 ; \r
+       jpeg_abort_compress @ 33 ; \r
+       jpeg_abort_decompress @ 34 ; \r
+       jpeg_add_quant_table @ 35 ; \r
+       jpeg_alloc_huff_table @ 36 ; \r
+       jpeg_alloc_quant_table @ 37 ; \r
+       jpeg_calc_jpeg_dimensions @ 38 ; \r
+       jpeg_calc_output_dimensions @ 39 ; \r
+       jpeg_consume_input @ 40 ; \r
+       jpeg_copy_critical_parameters @ 41 ; \r
+       jpeg_core_output_dimensions @ 42 ; \r
+       jpeg_default_colorspace @ 43 ; \r
+       jpeg_default_qtables @ 44 ;\r
+       jpeg_destroy @ 45 ; \r
+       jpeg_destroy_compress @ 46 ; \r
+       jpeg_destroy_decompress @ 47 ; \r
+       jpeg_fdct_float @ 48 ; \r
+       jpeg_fdct_ifast @ 49 ; \r
+       jpeg_fdct_islow @ 50 ; \r
+       jpeg_fill_bit_buffer @ 51 ; \r
+       jpeg_finish_compress @ 52 ; \r
+       jpeg_finish_decompress @ 53 ; \r
+       jpeg_finish_output @ 54 ; \r
+       jpeg_free_large @ 55 ; \r
+       jpeg_free_small @ 56 ; \r
+       jpeg_gen_optimal_table @ 57 ; \r
+       jpeg_get_large @ 58 ; \r
+       jpeg_get_small @ 59 ; \r
+       jpeg_has_multiple_scans @ 60 ; \r
+       jpeg_huff_decode @ 61 ; \r
+       jpeg_idct_1x1 @ 62 ; \r
+       jpeg_idct_2x2 @ 63 ; \r
+       jpeg_idct_4x4 @ 64 ; \r
+       jpeg_idct_float @ 65 ; \r
+       jpeg_idct_ifast @ 66 ; \r
+       jpeg_idct_islow @ 67 ; \r
+       jpeg_input_complete @ 68 ; \r
+       jpeg_make_c_derived_tbl @ 69 ; \r
+       jpeg_make_d_derived_tbl @ 70 ; \r
+       jpeg_mem_available @ 71 ; \r
+       jpeg_mem_dest @ 72 ;\r
+       jpeg_mem_init @ 73 ; \r
+       jpeg_mem_src @ 74 ;\r
+       jpeg_mem_term @ 75 ; \r
+       jpeg_new_colormap @ 76 ; \r
+       jpeg_open_backing_store @ 77 ; \r
+       jpeg_quality_scaling @ 78 ; \r
+       jpeg_read_coefficients @ 79 ; \r
+       jpeg_read_header @ 80 ; \r
+       jpeg_read_raw_data @ 81 ; \r
+       jpeg_read_scanlines @ 82 ; \r
+       jpeg_resync_to_restart @ 83 ; \r
+       jpeg_save_markers @ 84 ; \r
+       jpeg_set_colorspace @ 85 ; \r
+       jpeg_set_defaults @ 86 ; \r
+       jpeg_set_linear_quality @ 87 ; \r
+       jpeg_set_marker_processor @ 88 ; \r
+       jpeg_set_quality @ 89 ; \r
+       jpeg_simple_progression @ 90 ; \r
+       jpeg_start_compress @ 91 ; \r
+       jpeg_start_decompress @ 92 ; \r
+       jpeg_start_output @ 93 ; \r
+       jpeg_std_error @ 94 ; \r
+       jpeg_stdio_dest @ 95 ; \r
+       jpeg_stdio_src @ 96 ; \r
+       jpeg_suppress_tables @ 97 ; \r
+       jpeg_write_coefficients @ 98 ; \r
+       jpeg_write_m_byte @ 99 ; \r
+       jpeg_write_m_header @ 100 ; \r
+       jpeg_write_marker @ 101 ; \r
+       jpeg_write_raw_data @ 102 ; \r
+       jpeg_write_scanlines @ 103 ; \r
+       jpeg_write_tables @ 104 ; \r
+       jround_up @ 105 ; \r
+       jzero_far @ 106 ; \r