Unix LF

git-svn-id: https://libjpeg-turbo.svn.sourceforge.net/svnroot/libjpeg-turbo@263 3789f03b-4d11-0410-bbf8-ca57d06f2519

5 files changed, 419 insertions, 419 deletions

diff --git a/trunk/sharedlib/CMakeLists.txt b/trunk/sharedlib/CMakeLists.txt
index c7e1eb0..2442664 100755
--- a/trunk/sharedlib/CMakeLists.txt
+++ b/trunk/sharedlib/CMakeLists.txt
@@ -1,55 +1,55 @@
-# Anything that must be linked against the shared C library on Windows must

-# be built in this subdirectory, because CMake doesn't allow us to override

-# the compiler flags for each build type except at directory scope.  Note

-# to CMake developers:  Add a COMPILE_FLAGS_<CONFIG> target property, or

-# better yet, provide a friendly way of configuring a Windows target to use the

-# static C library.

-

-if(MSVC)

-  # Build all configurations against shared C library

-  foreach(var CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE

-    CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO

-    CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE

-    CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)

-    if(${var} MATCHES "/MT")

-      string(REGEX REPLACE "/MT" "/MD" ${var} "${${var}}")

-    endif()

-  endforeach()

-endif()

-

-foreach(src ${JPEG_SOURCES})

-  set(JPEG_SRCS ${JPEG_SRCS} ${CMAKE_SOURCE_DIR}/${src})

-endforeach()

-

-if(WITH_SIMD)

-  # This tells CMake that the "source" files haven't been generated yet

-  set_source_files_properties(${SIMD_OBJS} PROPERTIES GENERATED 1)

-endif()

-

-add_library(jpeg SHARED ${JPEG_SRCS} ${SIMD_OBJS}

-  ${CMAKE_SOURCE_DIR}/win/jpeg${DLL_VERSION}.def)

+# Anything that must be linked against the shared C library on Windows must
+# be built in this subdirectory, because CMake doesn't allow us to override
+# the compiler flags for each build type except at directory scope.  Note
+# to CMake developers:  Add a COMPILE_FLAGS_<CONFIG> target property, or
+# better yet, provide a friendly way of configuring a Windows target to use the
+# static C library.
+
+if(MSVC)
+  # Build all configurations against shared C library
+  foreach(var CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
+    CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO
+    CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
+    CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
+    if(${var} MATCHES "/MT")
+      string(REGEX REPLACE "/MT" "/MD" ${var} "${${var}}")
+    endif()
+  endforeach()
+endif()
+
+foreach(src ${JPEG_SOURCES})
+  set(JPEG_SRCS ${JPEG_SRCS} ${CMAKE_SOURCE_DIR}/${src})
+endforeach()
+
+if(WITH_SIMD)
+  # This tells CMake that the "source" files haven't been generated yet
+  set_source_files_properties(${SIMD_OBJS} PROPERTIES GENERATED 1)
+endif()
+
+add_library(jpeg SHARED ${JPEG_SRCS} ${SIMD_OBJS}
+  ${CMAKE_SOURCE_DIR}/win/jpeg${DLL_VERSION}.def)
 set_target_properties(jpeg PROPERTIES SOVERSION ${DLL_VERSION}
   VERSION ${FULLVERSION})
-if(MSVC)

-  set_target_properties(jpeg PROPERTIES SUFFIX ${DLL_VERSION}.dll)

-elseif(MINGW OR CYGWIN)

-  set_target_properties(jpeg PROPERTIES SUFFIX -${DLL_VERSION}.dll)

-endif(MSVC)

-if(WITH_SIMD)

-  add_dependencies(jpeg simd)

-endif()

-

-add_executable(cjpeg ../cjpeg.c ../cdjpeg.c ../rdbmp.c ../rdgif.c ../rdppm.c

-  ../rdswitch.c ../rdtarga.c)

-set_property(TARGET cjpeg PROPERTY COMPILE_FLAGS

-  "-DBMP_SUPPORTED -DGIF_SUPPORTED -DPPM_SUPPORTED -DTARGA_SUPPORTED")

-target_link_libraries(cjpeg jpeg)

-

-add_executable(djpeg ../djpeg.c ../cdjpeg.c ../rdcolmap.c ../rdswitch.c

-  ../wrbmp.c ../wrgif.c ../wrppm.c ../wrtarga.c)

-set_property(TARGET djpeg PROPERTY COMPILE_FLAGS

-  "-DBMP_SUPPORTED -DGIF_SUPPORTED -DPPM_SUPPORTED -DTARGA_SUPPORTED")

-target_link_libraries(djpeg jpeg)

-

-add_executable(jpegtran ../jpegtran.c ../cdjpeg.c ../rdswitch.c ../transupp.c)

-target_link_libraries(jpegtran jpeg)

+if(MSVC)
+  set_target_properties(jpeg PROPERTIES SUFFIX ${DLL_VERSION}.dll)
+elseif(MINGW OR CYGWIN)
+  set_target_properties(jpeg PROPERTIES SUFFIX -${DLL_VERSION}.dll)
+endif(MSVC)
+if(WITH_SIMD)
+  add_dependencies(jpeg simd)
+endif()
+
+add_executable(cjpeg ../cjpeg.c ../cdjpeg.c ../rdbmp.c ../rdgif.c ../rdppm.c
+  ../rdswitch.c ../rdtarga.c)
+set_property(TARGET cjpeg PROPERTY COMPILE_FLAGS
+  "-DBMP_SUPPORTED -DGIF_SUPPORTED -DPPM_SUPPORTED -DTARGA_SUPPORTED")
+target_link_libraries(cjpeg jpeg)
+
+add_executable(djpeg ../djpeg.c ../cdjpeg.c ../rdcolmap.c ../rdswitch.c
+  ../wrbmp.c ../wrgif.c ../wrppm.c ../wrtarga.c)
+set_property(TARGET djpeg PROPERTY COMPILE_FLAGS
+  "-DBMP_SUPPORTED -DGIF_SUPPORTED -DPPM_SUPPORTED -DTARGA_SUPPORTED")
+target_link_libraries(djpeg jpeg)
+
+add_executable(jpegtran ../jpegtran.c ../cdjpeg.c ../rdswitch.c ../transupp.c)
+target_link_libraries(jpegtran jpeg)
diff --git a/trunk/simd/CMakeLists.txt b/trunk/simd/CMakeLists.txt
index 275a0e5..b40320c 100755
--- a/trunk/simd/CMakeLists.txt
+++ b/trunk/simd/CMakeLists.txt
@@ -1,53 +1,53 @@
-if(NOT DEFINED NASM)

-  set(NASM nasm)

-endif()

-

-if(SIMD_X86_64)

-  set(NAFLAGS -fwin64 -DWIN64 -D__x86_64__ -I${CMAKE_SOURCE_DIR}/win/

-    -I${CMAKE_CURRENT_SOURCE_DIR}/)

-else()

-  set(NAFLAGS -fwin32 -DWIN32 -I${CMAKE_SOURCE_DIR}/win/

-    -I${CMAKE_CURRENT_SOURCE_DIR}/)

-endif()

-

-if(MSVC)

-  set(NAFLAGS ${NAFLAGS} -DMSVC)

-endif()

-

-# This only works if building from the command line.  There is currently no way

-# to set a variable's value based on the build type when using the MSVC IDE.

-if(CMAKE_BUILD_TYPE STREQUAL "Debug"

-  OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")

-  set(NAFLAGS ${NAFLAGS} -g)

-endif()

-

-if(SIMD_X86_64)

-  set(SIMD_BASENAMES jfsseflt-64 jccolss2-64 jdcolss2-64 jcsamss2-64

-    jdsamss2-64 jdmerss2-64 jcqnts2i-64 jfss2fst-64 jfss2int-64 jiss2red-64

-    jiss2int-64 jiss2fst-64 jcqnts2f-64 jiss2flt-64)

-  message(STATUS "Building x86_64 SIMD extensions")

-else()

-  set(SIMD_BASENAMES jsimdcpu jccolmmx jdcolmmx jcsammmx jdsammmx jdmermmx

-    jcqntmmx jfmmxfst jfmmxint jimmxred jimmxint jimmxfst jcqnt3dn jf3dnflt

-    ji3dnflt jcqntsse jfsseflt jisseflt jccolss2 jdcolss2 jcsamss2 jdsamss2

-    jdmerss2 jcqnts2i jfss2fst jfss2int jiss2red jiss2int jiss2fst jcqnts2f

-    jiss2flt)

-  message(STATUS "Building i386 SIMD extensions")

-endif()

-

-if(MSVC_IDE)

-  set(OBJDIR "${CMAKE_CURRENT_BINARY_DIR}/$(OutDir)")

-else()

-  set(OBJDIR ${CMAKE_CURRENT_BINARY_DIR})

-endif()

-

-foreach(file ${SIMD_BASENAMES})

-  set(SIMD_SRC ${CMAKE_CURRENT_SOURCE_DIR}/${file}.asm)

-  set(SIMD_OBJ ${OBJDIR}/${file}.obj)

-  add_custom_command(OUTPUT ${SIMD_OBJ} DEPENDS ${SIMD_SRC} *.inc

-    COMMAND ${NASM} ${NAFLAGS} ${SIMD_SRC} -o${SIMD_OBJ})

-  set(SIMD_OBJS ${SIMD_OBJS} ${SIMD_OBJ})

-endforeach()

-

-set(SIMD_OBJS ${SIMD_OBJS} PARENT_SCOPE)

-add_custom_target(simd DEPENDS ${SIMD_OBJS})

+if(NOT DEFINED NASM)
+  set(NASM nasm)
+endif()
+
+if(SIMD_X86_64)
+  set(NAFLAGS -fwin64 -DWIN64 -D__x86_64__ -I${CMAKE_SOURCE_DIR}/win/
+    -I${CMAKE_CURRENT_SOURCE_DIR}/)
+else()
+  set(NAFLAGS -fwin32 -DWIN32 -I${CMAKE_SOURCE_DIR}/win/
+    -I${CMAKE_CURRENT_SOURCE_DIR}/)
+endif()
+
+if(MSVC)
+  set(NAFLAGS ${NAFLAGS} -DMSVC)
+endif()
+
+# This only works if building from the command line.  There is currently no way
+# to set a variable's value based on the build type when using the MSVC IDE.
+if(CMAKE_BUILD_TYPE STREQUAL "Debug"
+  OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
+  set(NAFLAGS ${NAFLAGS} -g)
+endif()
+
+if(SIMD_X86_64)
+  set(SIMD_BASENAMES jfsseflt-64 jccolss2-64 jdcolss2-64 jcsamss2-64
+    jdsamss2-64 jdmerss2-64 jcqnts2i-64 jfss2fst-64 jfss2int-64 jiss2red-64
+    jiss2int-64 jiss2fst-64 jcqnts2f-64 jiss2flt-64)
+  message(STATUS "Building x86_64 SIMD extensions")
+else()
+  set(SIMD_BASENAMES jsimdcpu jccolmmx jdcolmmx jcsammmx jdsammmx jdmermmx
+    jcqntmmx jfmmxfst jfmmxint jimmxred jimmxint jimmxfst jcqnt3dn jf3dnflt
+    ji3dnflt jcqntsse jfsseflt jisseflt jccolss2 jdcolss2 jcsamss2 jdsamss2
+    jdmerss2 jcqnts2i jfss2fst jfss2int jiss2red jiss2int jiss2fst jcqnts2f
+    jiss2flt)
+  message(STATUS "Building i386 SIMD extensions")
+endif()
+
+if(MSVC_IDE)
+  set(OBJDIR "${CMAKE_CURRENT_BINARY_DIR}/$(OutDir)")
+else()
+  set(OBJDIR ${CMAKE_CURRENT_BINARY_DIR})
+endif()
+
+foreach(file ${SIMD_BASENAMES})
+  set(SIMD_SRC ${CMAKE_CURRENT_SOURCE_DIR}/${file}.asm)
+  set(SIMD_OBJ ${OBJDIR}/${file}.obj)
+  add_custom_command(OUTPUT ${SIMD_OBJ} DEPENDS ${SIMD_SRC} *.inc
+    COMMAND ${NASM} ${NAFLAGS} ${SIMD_SRC} -o${SIMD_OBJ})
+  set(SIMD_OBJS ${SIMD_OBJS} ${SIMD_OBJ})
+endforeach()
+
+set(SIMD_OBJS ${SIMD_OBJS} PARENT_SCOPE)
+add_custom_target(simd DEPENDS ${SIMD_OBJS})
diff --git a/trunk/win/jpeg62.def b/trunk/win/jpeg62.def
index 96a41c3..3c33fbf 100755
--- a/trunk/win/jpeg62.def
+++ b/trunk/win/jpeg62.def
@@ -1,102 +1,102 @@
-EXPORTS

-	jcopy_block_row @ 1 ; 

-	jcopy_sample_rows @ 2 ; 

-	jdiv_round_up @ 3 ; 

-	jinit_1pass_quantizer @ 4 ; 

-	jinit_2pass_quantizer @ 5 ; 

-	jinit_c_coef_controller @ 6 ; 

-	jinit_c_main_controller @ 7 ; 

-	jinit_c_master_control @ 8 ; 

-	jinit_c_prep_controller @ 9 ; 

-	jinit_color_converter @ 10 ; 

-	jinit_color_deconverter @ 11 ; 

-	jinit_compress_master @ 12 ; 

-	jinit_d_coef_controller @ 13 ; 

-	jinit_d_main_controller @ 14 ; 

-	jinit_d_post_controller @ 15 ; 

-	jinit_downsampler @ 16 ; 

-	jinit_forward_dct @ 17 ; 

-	jinit_huff_decoder @ 18 ; 

-	jinit_huff_encoder @ 19 ; 

-	jinit_input_controller @ 20 ; 

-	jinit_inverse_dct @ 21 ; 

-	jinit_marker_reader @ 22 ; 

-	jinit_marker_writer @ 23 ; 

-	jinit_master_decompress @ 24 ; 

-	jinit_memory_mgr @ 25 ; 

-	jinit_merged_upsampler @ 26 ; 

-	jinit_phuff_decoder @ 27 ; 

-	jinit_phuff_encoder @ 28 ; 

-	jinit_upsampler @ 29 ; 

-	jpeg_CreateCompress @ 30 ; 

-	jpeg_CreateDecompress @ 31 ; 

-	jpeg_abort @ 32 ; 

-	jpeg_abort_compress @ 33 ; 

-	jpeg_abort_decompress @ 34 ; 

-	jpeg_add_quant_table @ 35 ; 

-	jpeg_alloc_huff_table @ 36 ; 

-	jpeg_alloc_quant_table @ 37 ; 

-	jpeg_calc_output_dimensions @ 38 ; 

-	jpeg_consume_input @ 39 ; 

-	jpeg_copy_critical_parameters @ 40 ; 

-	jpeg_default_colorspace @ 41 ; 

-	jpeg_destroy @ 42 ; 

-	jpeg_destroy_compress @ 43 ; 

-	jpeg_destroy_decompress @ 44 ; 

-	jpeg_fdct_float @ 45 ; 

-	jpeg_fdct_ifast @ 46 ; 

-	jpeg_fdct_islow @ 47 ; 

-	jpeg_fill_bit_buffer @ 48 ; 

-	jpeg_finish_compress @ 49 ; 

-	jpeg_finish_decompress @ 50 ; 

-	jpeg_finish_output @ 51 ; 

-	jpeg_free_large @ 52 ; 

-	jpeg_free_small @ 53 ; 

-	jpeg_gen_optimal_table @ 54 ; 

-	jpeg_get_large @ 55 ; 

-	jpeg_get_small @ 56 ; 

-	jpeg_has_multiple_scans @ 57 ; 

-	jpeg_huff_decode @ 58 ; 

-	jpeg_idct_1x1 @ 59 ; 

-	jpeg_idct_2x2 @ 60 ; 

-	jpeg_idct_4x4 @ 61 ; 

-	jpeg_idct_float @ 62 ; 

-	jpeg_idct_ifast @ 63 ; 

-	jpeg_idct_islow @ 64 ; 

-	jpeg_input_complete @ 65 ; 

-	jpeg_make_c_derived_tbl @ 66 ; 

-	jpeg_make_d_derived_tbl @ 67 ; 

-	jpeg_mem_available @ 68 ; 

-	jpeg_mem_init @ 69 ; 

-	jpeg_mem_term @ 70 ; 

-	jpeg_new_colormap @ 71 ; 

-	jpeg_open_backing_store @ 72 ; 

-	jpeg_quality_scaling @ 73 ; 

-	jpeg_read_coefficients @ 74 ; 

-	jpeg_read_header @ 75 ; 

-	jpeg_read_raw_data @ 76 ; 

-	jpeg_read_scanlines @ 77 ; 

-	jpeg_resync_to_restart @ 78 ; 

-	jpeg_save_markers @ 79 ; 

-	jpeg_set_colorspace @ 80 ; 

-	jpeg_set_defaults @ 81 ; 

-	jpeg_set_linear_quality @ 82 ; 

-	jpeg_set_marker_processor @ 83 ; 

-	jpeg_set_quality @ 84 ; 

-	jpeg_simple_progression @ 85 ; 

-	jpeg_start_compress @ 86 ; 

-	jpeg_start_decompress @ 87 ; 

-	jpeg_start_output @ 88 ; 

-	jpeg_std_error @ 89 ; 

-	jpeg_stdio_dest @ 90 ; 

-	jpeg_stdio_src @ 91 ; 

-	jpeg_suppress_tables @ 92 ; 

-	jpeg_write_coefficients @ 93 ; 

-	jpeg_write_m_byte @ 94 ; 

-	jpeg_write_m_header @ 95 ; 

-	jpeg_write_marker @ 96 ; 

-	jpeg_write_raw_data @ 97 ; 

-	jpeg_write_scanlines @ 98 ; 

-	jpeg_write_tables @ 99 ; 

-	jround_up @ 100 ; 

-	jzero_far @ 101 ; 

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

-	jcopy_block_row @ 1 ; 

-	jcopy_sample_rows @ 2 ; 

-	jdiv_round_up @ 3 ; 

-	jinit_1pass_quantizer @ 4 ; 

-	jinit_2pass_quantizer @ 5 ; 

-	jinit_c_coef_controller @ 6 ; 

-	jinit_c_main_controller @ 7 ; 

-	jinit_c_master_control @ 8 ; 

-	jinit_c_prep_controller @ 9 ; 

-	jinit_color_converter @ 10 ; 

-	jinit_color_deconverter @ 11 ; 

-	jinit_compress_master @ 12 ; 

-	jinit_d_coef_controller @ 13 ; 

-	jinit_d_main_controller @ 14 ; 

-	jinit_d_post_controller @ 15 ; 

-	jinit_downsampler @ 16 ; 

-	jinit_forward_dct @ 17 ; 

-	jinit_huff_decoder @ 18 ; 

-	jinit_huff_encoder @ 19 ; 

-	jinit_input_controller @ 20 ; 

-	jinit_inverse_dct @ 21 ; 

-	jinit_marker_reader @ 22 ; 

-	jinit_marker_writer @ 23 ; 

-	jinit_master_decompress @ 24 ; 

-	jinit_memory_mgr @ 25 ; 

-	jinit_merged_upsampler @ 26 ; 

-	jinit_phuff_decoder @ 27 ; 

-	jinit_phuff_encoder @ 28 ; 

-	jinit_upsampler @ 29 ; 

-	jpeg_CreateCompress @ 30 ; 

-	jpeg_CreateDecompress @ 31 ; 

-	jpeg_abort @ 32 ; 

-	jpeg_abort_compress @ 33 ; 

-	jpeg_abort_decompress @ 34 ; 

-	jpeg_add_quant_table @ 35 ; 

-	jpeg_alloc_huff_table @ 36 ; 

-	jpeg_alloc_quant_table @ 37 ; 

-	jpeg_calc_jpeg_dimensions @ 38 ; 

-	jpeg_calc_output_dimensions @ 39 ; 

-	jpeg_consume_input @ 40 ; 

-	jpeg_copy_critical_parameters @ 41 ; 

-	jpeg_default_colorspace @ 42 ; 

-	jpeg_default_qtables @ 43 ;

-	jpeg_destroy @ 44 ; 

-	jpeg_destroy_compress @ 45 ; 

-	jpeg_destroy_decompress @ 46 ; 

-	jpeg_fdct_float @ 47 ; 

-	jpeg_fdct_ifast @ 48 ; 

-	jpeg_fdct_islow @ 49 ; 

-	jpeg_fill_bit_buffer @ 50 ; 

-	jpeg_finish_compress @ 51 ; 

-	jpeg_finish_decompress @ 52 ; 

-	jpeg_finish_output @ 53 ; 

-	jpeg_free_large @ 54 ; 

-	jpeg_free_small @ 55 ; 

-	jpeg_gen_optimal_table @ 56 ; 

-	jpeg_get_large @ 57 ; 

-	jpeg_get_small @ 58 ; 

-	jpeg_has_multiple_scans @ 59 ; 

-	jpeg_huff_decode @ 60 ; 

-	jpeg_idct_1x1 @ 61 ; 

-	jpeg_idct_2x2 @ 62 ; 

-	jpeg_idct_4x4 @ 63 ; 

-	jpeg_idct_float @ 64 ; 

-	jpeg_idct_ifast @ 65 ; 

-	jpeg_idct_islow @ 66 ; 

-	jpeg_input_complete @ 67 ; 

-	jpeg_make_c_derived_tbl @ 68 ; 

-	jpeg_make_d_derived_tbl @ 69 ; 

-	jpeg_mem_available @ 70 ; 

-	jpeg_mem_init @ 71 ; 

-	jpeg_mem_term @ 72 ; 

-	jpeg_new_colormap @ 73 ; 

-	jpeg_open_backing_store @ 74 ; 

-	jpeg_quality_scaling @ 75 ; 

-	jpeg_read_coefficients @ 76 ; 

-	jpeg_read_header @ 77 ; 

-	jpeg_read_raw_data @ 78 ; 

-	jpeg_read_scanlines @ 79 ; 

-	jpeg_resync_to_restart @ 80 ; 

-	jpeg_save_markers @ 81 ; 

-	jpeg_set_colorspace @ 82 ; 

-	jpeg_set_defaults @ 83 ; 

-	jpeg_set_linear_quality @ 84 ; 

-	jpeg_set_marker_processor @ 85 ; 

-	jpeg_set_quality @ 86 ; 

-	jpeg_simple_progression @ 87 ; 

-	jpeg_start_compress @ 88 ; 

-	jpeg_start_decompress @ 89 ; 

-	jpeg_start_output @ 90 ; 

-	jpeg_std_error @ 91 ; 

-	jpeg_stdio_dest @ 92 ; 

-	jpeg_stdio_src @ 93 ; 

-	jpeg_suppress_tables @ 94 ; 

-	jpeg_write_coefficients @ 95 ; 

-	jpeg_write_m_byte @ 96 ; 

-	jpeg_write_m_header @ 97 ; 

-	jpeg_write_marker @ 98 ; 

-	jpeg_write_raw_data @ 99 ; 

-	jpeg_write_scanlines @ 100 ; 

-	jpeg_write_tables @ 101 ; 

-	jround_up @ 102 ; 

-	jzero_far @ 103 ; 

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

-	jcopy_block_row @ 1 ; 

-	jcopy_sample_rows @ 2 ; 

-	jdiv_round_up @ 3 ; 

-	jinit_1pass_quantizer @ 4 ; 

-	jinit_2pass_quantizer @ 5 ; 

-	jinit_c_coef_controller @ 6 ; 

-	jinit_c_main_controller @ 7 ; 

-	jinit_c_master_control @ 8 ; 

-	jinit_c_prep_controller @ 9 ; 

-	jinit_color_converter @ 10 ; 

-	jinit_color_deconverter @ 11 ; 

-	jinit_compress_master @ 12 ; 

-	jinit_d_coef_controller @ 13 ; 

-	jinit_d_main_controller @ 14 ; 

-	jinit_d_post_controller @ 15 ; 

-	jinit_downsampler @ 16 ; 

-	jinit_forward_dct @ 17 ; 

-	jinit_huff_decoder @ 18 ; 

-	jinit_huff_encoder @ 19 ; 

-	jinit_input_controller @ 20 ; 

-	jinit_inverse_dct @ 21 ; 

-	jinit_marker_reader @ 22 ; 

-	jinit_marker_writer @ 23 ; 

-	jinit_master_decompress @ 24 ; 

-	jinit_memory_mgr @ 25 ; 

-	jinit_merged_upsampler @ 26 ; 

-	jinit_phuff_decoder @ 27 ; 

-	jinit_phuff_encoder @ 28 ; 

-	jinit_upsampler @ 29 ; 

-	jpeg_CreateCompress @ 30 ; 

-	jpeg_CreateDecompress @ 31 ; 

-	jpeg_abort @ 32 ; 

-	jpeg_abort_compress @ 33 ; 

-	jpeg_abort_decompress @ 34 ; 

-	jpeg_add_quant_table @ 35 ; 

-	jpeg_alloc_huff_table @ 36 ; 

-	jpeg_alloc_quant_table @ 37 ; 

-	jpeg_calc_jpeg_dimensions @ 38 ; 

-	jpeg_calc_output_dimensions @ 39 ; 

-	jpeg_consume_input @ 40 ; 

-	jpeg_copy_critical_parameters @ 41 ; 

-	jpeg_core_output_dimensions @ 42 ; 

-	jpeg_default_colorspace @ 43 ; 

-	jpeg_default_qtables @ 44 ;

-	jpeg_destroy @ 45 ; 

-	jpeg_destroy_compress @ 46 ; 

-	jpeg_destroy_decompress @ 47 ; 

-	jpeg_fdct_float @ 48 ; 

-	jpeg_fdct_ifast @ 49 ; 

-	jpeg_fdct_islow @ 50 ; 

-	jpeg_fill_bit_buffer @ 51 ; 

-	jpeg_finish_compress @ 52 ; 

-	jpeg_finish_decompress @ 53 ; 

-	jpeg_finish_output @ 54 ; 

-	jpeg_free_large @ 55 ; 

-	jpeg_free_small @ 56 ; 

-	jpeg_gen_optimal_table @ 57 ; 

-	jpeg_get_large @ 58 ; 

-	jpeg_get_small @ 59 ; 

-	jpeg_has_multiple_scans @ 60 ; 

-	jpeg_huff_decode @ 61 ; 

-	jpeg_idct_1x1 @ 62 ; 

-	jpeg_idct_2x2 @ 63 ; 

-	jpeg_idct_4x4 @ 64 ; 

-	jpeg_idct_float @ 65 ; 

-	jpeg_idct_ifast @ 66 ; 

-	jpeg_idct_islow @ 67 ; 

-	jpeg_input_complete @ 68 ; 

-	jpeg_make_c_derived_tbl @ 69 ; 

-	jpeg_make_d_derived_tbl @ 70 ; 

-	jpeg_mem_available @ 71 ; 

-	jpeg_mem_dest @ 72 ;

-	jpeg_mem_init @ 73 ; 

-	jpeg_mem_src @ 74 ;

-	jpeg_mem_term @ 75 ; 

-	jpeg_new_colormap @ 76 ; 

-	jpeg_open_backing_store @ 77 ; 

-	jpeg_quality_scaling @ 78 ; 

-	jpeg_read_coefficients @ 79 ; 

-	jpeg_read_header @ 80 ; 

-	jpeg_read_raw_data @ 81 ; 

-	jpeg_read_scanlines @ 82 ; 

-	jpeg_resync_to_restart @ 83 ; 

-	jpeg_save_markers @ 84 ; 

-	jpeg_set_colorspace @ 85 ; 

-	jpeg_set_defaults @ 86 ; 

-	jpeg_set_linear_quality @ 87 ; 

-	jpeg_set_marker_processor @ 88 ; 

-	jpeg_set_quality @ 89 ; 

-	jpeg_simple_progression @ 90 ; 

-	jpeg_start_compress @ 91 ; 

-	jpeg_start_decompress @ 92 ; 

-	jpeg_start_output @ 93 ; 

-	jpeg_std_error @ 94 ; 

-	jpeg_stdio_dest @ 95 ; 

-	jpeg_stdio_src @ 96 ; 

-	jpeg_suppress_tables @ 97 ; 

-	jpeg_write_coefficients @ 98 ; 

-	jpeg_write_m_byte @ 99 ; 

-	jpeg_write_m_header @ 100 ; 

-	jpeg_write_marker @ 101 ; 

-	jpeg_write_raw_data @ 102 ; 

-	jpeg_write_scanlines @ 103 ; 

-	jpeg_write_tables @ 104 ; 

-	jround_up @ 105 ; 

-	jzero_far @ 106 ; 

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