Now that the TurboJPEG API is reporting libjpeg warnings as errors, an "Invalid SOS parameters for sequential JPEG" warning surfaced in tjDecodeYUV*(). This was caused by the Se member of jpeg_decompress_struct being set to 0 (it is normally set to a non-zero value when the start-of-scan markers are read, but there are no SOS markers in this case, because we're not actually decompressing a JPEG file.)

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.4.x@1564 632fc199-4ca6-4c93-a231-07263d6284db
Fix a segfault that occured in the MIPS DSPr2 fancy upsampling routine when downsampled_width==3. Because the DSPr2 code unrolls the loop for the middle columns (refer to jdsample.c), it has the effect of performing two column iterations, and that only works properly if the number of columns (minus the first and last) is >= 2. For the specific case of downsampled_width==3, this patch skips to the second iteration of the unrolled column loop.
2015-06-08 18:31:34 +00:00 · 2015-06-08 17:41:34 +00:00 · 2015-06-01 19:22:41 +00:00 · 2015-05-17 15:56:18 +00:00 · 2015-05-16 04:18:21 +00:00 · 2015-05-15 22:08:21 +00:00
484 changed files with 92924 additions and 37184 deletions
--- a/BUILDING.txt
+++ b/BUILDING.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -0,0 +1,856 @@
 #
 # Setup
 #
 cmake_minimum_required(VERSION 2.8.8)
 # Use LINK_INTERFACE_LIBRARIES instead of INTERFACE_LINK_LIBRARIES
 if(POLICY CMP0022)
  cmake_policy(SET CMP0022 OLD)
 endif()
 project(libjpeg-turbo C)
 set(VERSION 1.4.1)
 if(CYGWIN OR NOT CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
  execute_process(COMMAND "date" "+%Y%m%d" OUTPUT_VARIABLE BUILD)
  string(REGEX REPLACE "\n" "" BUILD ${BUILD})
 elseif(WIN32)
  execute_process(COMMAND "wmic.exe" "os" "get" "LocalDateTime" OUTPUT_VARIABLE
    BUILD)
  string(REGEX REPLACE "[^0-9]" "" BUILD "${BUILD}")
  if (BUILD STREQUAL "")
    execute_process(COMMAND "cmd.exe" "/C" "DATE" "/T" OUTPUT_VARIABLE BUILD)
    string(REGEX REPLACE ".*[ ]([0-9]*)[/.]([0-9]*)[/.]([0-9]*).*" "\\3\\2\\1" BUILD "${BUILD}")
  else()
    string(SUBSTRING "${BUILD}" 0 8 BUILD)
  endif()
 else()
  message(FATAL_ERROR "Platform not supported by this build system.  Use autotools instead.")
 endif()
 # This does nothing except when using MinGW.  CMAKE_BUILD_TYPE has no meaning
 # in Visual Studio, and it always defaults to Debug when using NMake.
 if(NOT CMAKE_BUILD_TYPE)
  set(CMAKE_BUILD_TYPE Release)
 endif()
 message(STATUS "CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}")
 # 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 Visual Studio.
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
  set(BUILD "${BUILD}d")
 endif()
 message(STATUS "VERSION = ${VERSION}, BUILD = ${BUILD}")
 option(WITH_SIMD "Include SIMD extensions" TRUE)
 option(WITH_ARITH_ENC "Include arithmetic encoding support" TRUE)
 option(WITH_ARITH_DEC "Include arithmetic decoding support" TRUE)
 option(WITH_JPEG7 "Emulate libjpeg v7 API/ABI (this makes libjpeg-turbo backward incompatible with libjpeg v6b)" FALSE)
 option(WITH_JPEG8 "Emulate libjpeg v8 API/ABI (this makes libjpeg-turbo backward incompatible with libjpeg v6b)" FALSE)
 option(WITH_MEM_SRCDST "Include in-memory source/destination manager functions when emulating the libjpeg v6b or v7 API/ABI" TRUE)
 option(WITH_TURBOJPEG "Include the TurboJPEG wrapper library and associated test programs" TRUE)
 option(WITH_JAVA "Build Java wrapper for the TurboJPEG library" FALSE)
 option(WITH_12BIT "Encode/decode JPEG images with 12-bit samples (implies WITH_SIMD=0 WITH_TURBOJPEG=0 WITH_ARITH_ENC=0 WITH_ARITH_DEC=0)" FALSE)
 option(ENABLE_STATIC "Build static libraries" TRUE)
 option(ENABLE_SHARED "Build shared libraries" TRUE)
 if(WITH_12BIT)
  set(WITH_SIMD FALSE)
  set(WITH_TURBOJPEG FALSE)
  set(WITH_ARITH_ENC FALSE)
  set(WITH_ARITH_DEC FALSE)
  set(BITS_IN_JSAMPLE 12)
  message(STATUS "12-bit JPEG support enabled")
 else()
  set(BITS_IN_JSAMPLE 8)
 endif()
 if(WITH_ARITH_ENC)
  set(C_ARITH_CODING_SUPPORTED 1)
  message(STATUS "Arithmetic encoding support enabled")
 else()
  message(STATUS "Arithmetic encoding support disabled")
 endif()
 if(WITH_ARITH_DEC)
  set(D_ARITH_CODING_SUPPORTED 1)
  message(STATUS "Arithmetic decoding support enabled")
 else()
  message(STATUS "Arithmetic decoding support disabled")
 endif()
 if(WITH_TURBOJPEG)
  message(STATUS "TurboJPEG C wrapper enabled")
 else()
  message(STATUS "TurboJPEG C wrapper disabled")
 endif()
 if(WITH_JAVA)
  message(STATUS "TurboJPEG Java wrapper enabled")
 else()
  message(STATUS "TurboJPEG Java wrapper disabled")
 endif()
 set(SO_AGE 0)
 if(WITH_MEM_SRCDST)
  set(SO_AGE 1)
 endif()
 set(JPEG_LIB_VERSION 62)
 set(DLL_VERSION ${JPEG_LIB_VERSION})
 set(FULLVERSION ${DLL_VERSION}.${SO_AGE}.0)
 if(WITH_JPEG8)
  set(JPEG_LIB_VERSION 80)
  set(DLL_VERSION 8)
  set(FULLVERSION ${DLL_VERSION}.0.2)
  message(STATUS "Emulating libjpeg v8 API/ABI")
 elseif(WITH_JPEG7)
  set(JPEG_LIB_VERSION 70)
  set(DLL_VERSION 7)
  set(FULLVERSION ${DLL_VERSION}.${SO_AGE}.0)
  message(STATUS "Emulating libjpeg v7 API/ABI")
 endif(WITH_JPEG8)
 if(WITH_MEM_SRCDST)
  set(MEM_SRCDST_SUPPORTED 1)
  message(STATUS "In-memory source/destination managers enabled")
 else()
  message(STATUS "In-memory source/destination managers disabled")
 endif()
 if(MSVC)
  option(WITH_CRT_DLL
    "Link all libjpeg-turbo libraries and executables with the C run-time DLL (msvcr*.dll) instead of the static C run-time library (libcmt*.lib.)  The default is to use the C run-time DLL only with the libraries and executables that need it."
    FALSE)
  if(NOT WITH_CRT_DLL)
    # Use the static C library for all build types
    foreach(var CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
      CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO)
      if(${var} MATCHES "/MD")
        string(REGEX REPLACE "/MD" "/MT" ${var} "${${var}}")
      endif()
    endforeach()
  endif()
  add_definitions(-W3 -wd4996)
 endif()
 # Detect whether compiler is 64-bit
 if(MSVC AND CMAKE_CL_64)
  set(SIMD_X86_64 1)
  set(64BIT 1)
 elseif(CMAKE_SIZEOF_VOID_P MATCHES 8)
  set(SIMD_X86_64 1)
  set(64BIT 1)
 endif()
 if(64BIT)
  message(STATUS "64-bit build")
 else()
  message(STATUS "32-bit build")
 endif()
 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
  if(MSVC)
    set(CMAKE_INSTALL_PREFIX_DEFAULT ${CMAKE_PROJECT_NAME})
  else()
    set(CMAKE_INSTALL_PREFIX_DEFAULT ${CMAKE_PROJECT_NAME}-gcc)
  endif()
  if(64BIT)
    set(CMAKE_INSTALL_PREFIX_DEFAULT ${CMAKE_INSTALL_PREFIX_DEFAULT}64)
  endif()
  set(CMAKE_INSTALL_PREFIX "c:/${CMAKE_INSTALL_PREFIX_DEFAULT}" CACHE PATH
    "Directory into which to install libjpeg-turbo (default: c:/${CMAKE_INSTALL_PREFIX_DEFAULT})"
    FORCE)
 endif()
 message(STATUS "Install directory = ${CMAKE_INSTALL_PREFIX}")
 configure_file(win/jconfig.h.in jconfig.h)
 configure_file(win/jconfigint.h.in jconfigint.h)
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR})
 if(WITH_JAVA)
  find_package(Java)
  find_package(JNI)
  if(DEFINED JAVACFLAGS)
    message(STATUS "Java compiler flags = ${JAVACFLAGS}")
  endif()
 endif()
 #
 # Targets
 #
 set(JPEG_SOURCES jcapimin.c jcapistd.c jccoefct.c jccolor.c jcdctmgr.c jchuff.c
  jcinit.c jcmainct.c jcmarker.c jcmaster.c jcomapi.c jcparam.c jcphuff.c
  jcprepct.c jcsample.c jctrans.c jdapimin.c jdapistd.c jdatadst.c jdatasrc.c
  jdcoefct.c jdcolor.c jddctmgr.c jdhuff.c jdinput.c jdmainct.c jdmarker.c
  jdmaster.c jdmerge.c jdphuff.c jdpostct.c jdsample.c jdtrans.c jerror.c
  jfdctflt.c jfdctfst.c jfdctint.c jidctflt.c jidctfst.c jidctint.c jidctred.c
  jquant1.c jquant2.c jutils.c jmemmgr.c jmemnobs.c)
 if(WITH_ARITH_ENC OR WITH_ARITH_DEC)
  set(JPEG_SOURCES ${JPEG_SOURCES} jaricom.c)
 endif()
 if(WITH_ARITH_ENC)
  set(JPEG_SOURCES ${JPEG_SOURCES} jcarith.c)
 endif()
 if(WITH_ARITH_DEC)
  set(JPEG_SOURCES ${JPEG_SOURCES} jdarith.c)
 endif()
 if(WITH_SIMD)
  add_definitions(-DWITH_SIMD)
  add_subdirectory(simd)
  if(SIMD_X86_64)
    set(JPEG_SOURCES ${JPEG_SOURCES} simd/jsimd_x86_64.c)
  else()
    set(JPEG_SOURCES ${JPEG_SOURCES} simd/jsimd_i386.c)
  endif()
  # This tells CMake that the "source" files haven't been generated yet
  set_source_files_properties(${SIMD_OBJS} PROPERTIES GENERATED 1)
 else()
  set(JPEG_SOURCES ${JPEG_SOURCES} jsimd_none.c)
  message(STATUS "Not using SIMD acceleration")
 endif()
 if(WITH_JAVA)
  add_subdirectory(java)
  set(ENABLE_SHARED TRUE)
 endif()
 if(ENABLE_SHARED)
  add_subdirectory(sharedlib)
 endif()
 if(ENABLE_STATIC OR WITH_TURBOJPEG)
  add_library(jpeg-static STATIC ${JPEG_SOURCES} ${SIMD_OBJS})
  if(NOT MSVC)
    set_target_properties(jpeg-static PROPERTIES OUTPUT_NAME jpeg)
  endif()
  if(WITH_SIMD)
    add_dependencies(jpeg-static simd)
  endif()
 endif()
 if(WITH_TURBOJPEG)
  set(TURBOJPEG_SOURCES turbojpeg.c transupp.c jdatadst-tj.c jdatasrc-tj.c)
  if(WITH_JAVA)
    set(TURBOJPEG_SOURCES ${TURBOJPEG_SOURCES} turbojpeg-jni.c)
    include_directories(${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
  endif()
  if(ENABLE_SHARED)
    add_library(turbojpeg SHARED ${TURBOJPEG_SOURCES})
    set_target_properties(turbojpeg PROPERTIES DEFINE_SYMBOL DLLDEFINE)
    if(MINGW)
      set_target_properties(turbojpeg PROPERTIES LINK_FLAGS -Wl,--kill-at)
    endif()
    target_link_libraries(turbojpeg jpeg-static)
    set_target_properties(turbojpeg PROPERTIES LINK_INTERFACE_LIBRARIES "")
    add_executable(tjunittest tjunittest.c tjutil.c)
    target_link_libraries(tjunittest turbojpeg)
    add_executable(tjbench tjbench.c bmp.c tjutil.c rdbmp.c rdppm.c wrbmp.c
      wrppm.c)
    target_link_libraries(tjbench turbojpeg jpeg-static)
    set_property(TARGET tjbench PROPERTY COMPILE_FLAGS
      "-DBMP_SUPPORTED -DPPM_SUPPORTED")
  endif()
  if(ENABLE_STATIC)
    add_library(turbojpeg-static STATIC ${JPEG_SOURCES} ${SIMD_OBJS}
      turbojpeg.c transupp.c jdatadst-tj.c jdatasrc-tj.c)
    if(NOT MSVC)
      set_target_properties(turbojpeg-static PROPERTIES OUTPUT_NAME turbojpeg)
    endif()
    if(WITH_SIMD)
      add_dependencies(turbojpeg-static simd)
    endif()
    add_executable(tjunittest-static tjunittest.c tjutil.c)
    target_link_libraries(tjunittest-static turbojpeg-static)
    add_executable(tjbench-static tjbench.c bmp.c tjutil.c rdbmp.c rdppm.c
      wrbmp.c wrppm.c)
    target_link_libraries(tjbench-static turbojpeg-static jpeg-static)
    set_property(TARGET tjbench-static PROPERTY COMPILE_FLAGS
      "-DBMP_SUPPORTED -DPPM_SUPPORTED")
  endif()
 endif()
 if(WITH_12BIT)
  set(COMPILE_FLAGS "-DGIF_SUPPORTED -DPPM_SUPPORTED -DUSE_SETMODE")
 else()
  set(COMPILE_FLAGS "-DBMP_SUPPORTED -DGIF_SUPPORTED -DPPM_SUPPORTED -DTARGA_SUPPORTED -DUSE_SETMODE")
 	set(CJPEG_BMP_SOURCES rdbmp.c rdtarga.c)
 	set(DJPEG_BMP_SOURCES wrbmp.c wrtarga.c)
 endif()
 if(ENABLE_STATIC)
  add_executable(cjpeg-static cjpeg.c cdjpeg.c rdgif.c rdppm.c rdswitch.c
    ${CJPEG_BMP_SOURCES})
  set_property(TARGET cjpeg-static PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
  target_link_libraries(cjpeg-static jpeg-static)
  add_executable(djpeg-static djpeg.c cdjpeg.c rdcolmap.c rdswitch.c wrgif.c
    wrppm.c ${DJPEG_BMP_SOURCES})
  set_property(TARGET djpeg-static PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
  target_link_libraries(djpeg-static jpeg-static)
  add_executable(jpegtran-static jpegtran.c cdjpeg.c rdswitch.c transupp.c)
  target_link_libraries(jpegtran-static jpeg-static)
  set_property(TARGET jpegtran-static PROPERTY COMPILE_FLAGS "-DUSE_SETMODE")
 endif()
 add_executable(rdjpgcom rdjpgcom.c)
 add_executable(wrjpgcom wrjpgcom.c)
 #
 # Tests
 #
 if(MSVC_IDE)
  set(OBJDIR "\${CTEST_CONFIGURATION_TYPE}/")
 else()
  set(OBJDIR "")
 endif()
 enable_testing()
 if(WITH_12BIT)
  set(TESTORIG testorig12.jpg)
  set(MD5_JPEG_RGB_ISLOW 9620f424569594bb9242b48498ad801f)
  set(MD5_PPM_RGB_ISLOW f3301d2219783b8b3d942b7239fa50c0)
  set(MD5_JPEG_422_IFAST_OPT 7322e3bd2f127f7de4b40d4480ce60e4)
  set(MD5_PPM_422_IFAST 79807fa552899e66a04708f533e16950)
  set(MD5_PPM_422M_IFAST 07737bfe8a7c1c87aaa393a0098d16b0)
  set(MD5_JPEG_420_IFAST_Q100_PROG a1da220b5604081863a504297ed59e55)
  set(MD5_PPM_420_Q100_IFAST 1b3730122709f53d007255e8dfd3305e)
  set(MD5_PPM_420M_Q100_IFAST 980a1a3c5bf9510022869d30b7d26566)
  set(MD5_JPEG_GRAY_ISLOW 235c90707b16e2e069f37c888b2636d9)
  set(MD5_PPM_GRAY_ISLOW 7213c10af507ad467da5578ca5ee1fca)
  set(MD5_PPM_GRAY_ISLOW_RGB e96ee81c30a6ed422d466338bd3de65d)
  set(MD5_JPEG_420S_IFAST_OPT 7af8e60be4d9c227ec63ac9b6630855e)
  set(MD5_JPEG_3x2_FLOAT_PROG a8c17daf77b457725ec929e215b603f8)
  set(MD5_PPM_3x2_FLOAT 42876ab9e5c2f76a87d08db5fbd57956)
  set(MD5_PPM_420M_ISLOW_2_1 4ca6be2a6f326ff9eaab63e70a8259c0)
  set(MD5_PPM_420M_ISLOW_15_8 12aa9f9534c1b3d7ba047322226365eb)
  set(MD5_PPM_420M_ISLOW_13_8 f7e22817c7b25e1393e4ec101e9d4e96)
  set(MD5_PPM_420M_ISLOW_11_8 800a16f9f4dc9b293197bfe11be10a82)
  set(MD5_PPM_420M_ISLOW_9_8 06b7a92a9bc69f4dc36ec40f1937d55c)
  set(MD5_PPM_420M_ISLOW_7_8 3ec444a14a4ab4eab88ffc49c48eca43)
  set(MD5_PPM_420M_ISLOW_3_4 3e726b7ea872445b19437d1c1d4f0d93)
  set(MD5_PPM_420M_ISLOW_5_8 a8a771abdc94301d20ffac119b2caccd)
  set(MD5_PPM_420M_ISLOW_1_2 b419124dd5568b085787234866102866)
  set(MD5_PPM_420M_ISLOW_3_8 343d19015531b7bbe746124127244fa8)
  set(MD5_PPM_420M_ISLOW_1_4 35fd59d866e44659edfa3c18db2a3edb)
  set(MD5_PPM_420M_ISLOW_1_8 ccaed48ac0aedefda5d4abe4013f4ad7)
  set(MD5_JPEG_CROP cdb35ff4b4519392690ea040c56ea99c)
 else()
  set(TESTORIG testorig.jpg)
  set(MD5_JPEG_RGB_ISLOW 768e970dd57b340ff1b83c9d3d47c77b)
  set(MD5_PPM_RGB_ISLOW 00a257f5393fef8821f2b88ac7421291)
  set(MD5_BMP_RGB_ISLOW_565 f07d2e75073e4bb10f6c6f4d36e2e3be)
  set(MD5_BMP_RGB_ISLOW_565D 4cfa0928ef3e6bb626d7728c924cfda4)
  set(MD5_JPEG_422_IFAST_OPT 2540287b79d913f91665e660303ab2c8)
  set(MD5_PPM_422_IFAST 35bd6b3f833bad23de82acea847129fa)
  set(MD5_PPM_422M_IFAST 8dbc65323d62cca7c91ba02dd1cfa81d)
  set(MD5_BMP_422M_IFAST_565 3294bd4d9a1f2b3d08ea6020d0db7065)
  set(MD5_BMP_422M_IFAST_565D da98c9c7b6039511be4a79a878a9abc1)
  set(MD5_JPEG_420_IFAST_Q100_PROG 990cbe0329c882420a2094da7e5adade)
  set(MD5_PPM_420_Q100_IFAST 5a732542015c278ff43635e473a8a294)
  set(MD5_PPM_420M_Q100_IFAST ff692ee9323a3b424894862557c092f1)
  set(MD5_JPEG_GRAY_ISLOW 72b51f894b8f4a10b3ee3066770aa38d)
  set(MD5_PPM_GRAY_ISLOW 8d3596c56eace32f205deccc229aa5ed)
  set(MD5_PPM_GRAY_ISLOW_RGB 116424ac07b79e5e801f00508eab48ec)
  set(MD5_BMP_GRAY_ISLOW_565 12f78118e56a2f48b966f792fedf23cc)
  set(MD5_BMP_GRAY_ISLOW_565D bdbbd616441a24354c98553df5dc82db)
  set(MD5_JPEG_420S_IFAST_OPT 388708217ac46273ca33086b22827ed8)
  if(WITH_SIMD)
    set(MD5_JPEG_3x2_FLOAT_PROG 343e3f8caf8af5986ebaf0bdc13b5c71)
    set(MD5_PPM_3x2_FLOAT 1a75f36e5904d6fc3a85a43da9ad89bb)
  else()
    set(MD5_JPEG_3x2_FLOAT_PROG 9bca803d2042bd1eb03819e2bf92b3e5)
    set(MD5_PPM_3x2_FLOAT f6bfab038438ed8f5522fbd33595dcdc)
  endif()
  set(MD5_JPEG_420_ISLOW_ARI e986fb0a637a8d833d96e8a6d6d84ea1)
  set(MD5_JPEG_444_ISLOW_PROGARI 0a8f1c8f66e113c3cf635df0a475a617)
  set(MD5_PPM_420M_IFAST_ARI 72b59a99bcf1de24c5b27d151bde2437)
  set(MD5_JPEG_420_ISLOW 9a68f56bc76e466aa7e52f415d0f4a5f)
  set(MD5_PPM_420M_ISLOW_2_1 9f9de8c0612f8d06869b960b05abf9c9)
  set(MD5_PPM_420M_ISLOW_15_8 b6875bc070720b899566cc06459b63b7)
  set(MD5_PPM_420M_ISLOW_13_8 bc3452573c8152f6ae552939ee19f82f)
  set(MD5_PPM_420M_ISLOW_11_8 d8cc73c0aaacd4556569b59437ba00a5)
  set(MD5_PPM_420M_ISLOW_9_8 d25e61bc7eac0002f5b393aa223747b6)
  set(MD5_PPM_420M_ISLOW_7_8 ddb564b7c74a09494016d6cd7502a946)
  set(MD5_PPM_420M_ISLOW_3_4 8ed8e68808c3fbc4ea764fc9d2968646)
  set(MD5_PPM_420M_ISLOW_5_8 a3363274999da2366a024efae6d16c9b)
  set(MD5_PPM_420M_ISLOW_1_2 e692a315cea26b988c8e8b29a5dbcd81)
  set(MD5_PPM_420M_ISLOW_3_8 79eca9175652ced755155c90e785a996)
  set(MD5_PPM_420M_ISLOW_1_4 79cd778f8bf1a117690052cacdd54eca)
  set(MD5_PPM_420M_ISLOW_1_8 391b3d4aca640c8567d6f8745eb2142f)
  set(MD5_BMP_420_ISLOW_256 4980185e3776e89bd931736e1cddeee6)
  set(MD5_BMP_420_ISLOW_565 bf9d13e16c4923b92e1faa604d7922cb)
  set(MD5_BMP_420_ISLOW_565D 6bde71526acc44bcff76f696df8638d2)
  set(MD5_BMP_420M_ISLOW_565 8dc0185245353cfa32ad97027342216f)
  set(MD5_BMP_420M_ISLOW_565D d1be3a3339166255e76fa50a0d70d73e)
  set(MD5_JPEG_CROP b4197f377e621c4e9b1d20471432610d)
 endif()
 if(WITH_JAVA)
  add_test(TJUnitTest
    ${JAVA_RUNTIME} -cp java/${OBJDIR}turbojpeg.jar
      -Djava.library.path=${CMAKE_CURRENT_BINARY_DIR}/${OBJDIR}
      TJUnitTest)
  add_test(TJUnitTest-yuv
    ${JAVA_RUNTIME} -cp java/${OBJDIR}turbojpeg.jar
      -Djava.library.path=${CMAKE_CURRENT_BINARY_DIR}/${OBJDIR}
      TJUnitTest -yuv)
  add_test(TJUnitTest-yuv-nopad
    ${JAVA_RUNTIME} -cp java/${OBJDIR}turbojpeg.jar
      -Djava.library.path=${CMAKE_CURRENT_BINARY_DIR}/${OBJDIR}
      TJUnitTest -yuv -noyuvpad)
  add_test(TJUnitTest-bi
    ${JAVA_RUNTIME} -cp java/${OBJDIR}turbojpeg.jar
      -Djava.library.path=${CMAKE_CURRENT_BINARY_DIR}/${OBJDIR}
      TJUnitTest -bi)
  add_test(TJUnitTest-bi-yuv
    ${JAVA_RUNTIME} -cp java/${OBJDIR}turbojpeg.jar
      -Djava.library.path=${CMAKE_CURRENT_BINARY_DIR}/${OBJDIR}
      TJUnitTest -bi -yuv)
  add_test(TJUnitTest-bi-yuv-nopad
    ${JAVA_RUNTIME} -cp java/${OBJDIR}turbojpeg.jar
      -Djava.library.path=${CMAKE_CURRENT_BINARY_DIR}/${OBJDIR}
      TJUnitTest -bi -yuv -noyuvpad)
 endif()
 set(TEST_LIBTYPES "")
 if(ENABLE_SHARED)
  set(TEST_LIBTYPES ${TEST_LIBTYPES} shared)
 endif()
 if(ENABLE_STATIC)
  set(TEST_LIBTYPES ${TEST_LIBTYPES} static)
 endif()
 foreach(libtype ${TEST_LIBTYPES})
  if(libtype STREQUAL "shared")
    set(dir sharedlib/)
  else()
    set(dir "")
    set(suffix -static)
  endif()
  if(WITH_TURBOJPEG)
    add_test(tjunittest${suffix} tjunittest${suffix})
    add_test(tjunittest${suffix}-alloc tjunittest${suffix} -alloc)
    add_test(tjunittest${suffix}-yuv tjunittest${suffix} -yuv)
    add_test(tjunittest${suffix}-yuv-alloc tjunittest${suffix} -yuv -alloc)
    add_test(tjunittest${suffix}-yuv-nopad tjunittest${suffix} -yuv -noyuvpad)
  endif()
  # These tests are carefully chosen to provide full coverage of as many of the
  # underlying algorithms as possible (including all of the SIMD-accelerated
  # ones.)
  # CC: null  SAMP: fullsize  FDCT: islow  ENT: huff
  add_test(cjpeg${suffix}-rgb-islow
    ${dir}cjpeg${suffix} -rgb -dct int -outfile testout_rgb_islow.jpg
      ${CMAKE_SOURCE_DIR}/testimages/testorig.ppm)
  add_test(cjpeg${suffix}-rgb-islow-cmp
    ${CMAKE_COMMAND} -DMD5=${MD5_JPEG_RGB_ISLOW} -DFILE=testout_rgb_islow.jpg
      -P ${CMAKE_SOURCE_DIR}/cmakescripts/md5cmp.cmake)
  # CC: null  SAMP: fullsize  IDCT: islow  ENT: huff
  add_test(djpeg${suffix}-rgb-islow
    ${dir}djpeg${suffix} -dct int -ppm -outfile testout_rgb_islow.ppm
      testout_rgb_islow.jpg)
  add_test(djpeg${suffix}-rgb-islow-cmp
    ${CMAKE_COMMAND} -DMD5=${MD5_PPM_RGB_ISLOW} -DFILE=testout_rgb_islow.ppm
      -P ${CMAKE_SOURCE_DIR}/cmakescripts/md5cmp.cmake)
  if(NOT WITH_12BIT)
    # CC: RGB->RGB565  SAMP: fullsize  IDCT: islow  ENT: huff
    add_test(djpeg${suffix}-rgb-islow-565
      ${dir}djpeg${suffix} -dct int -rgb565 -dither none -bmp
        -outfile testout_rgb_islow_565.bmp testout_rgb_islow.jpg)
    add_test(djpeg${suffix}-rgb-islow-565-cmp
      ${CMAKE_COMMAND} -DMD5=${MD5_BMP_RGB_ISLOW_565}
        -DFILE=testout_rgb_islow_565.bmp
        -P ${CMAKE_SOURCE_DIR}/cmakescripts/md5cmp.cmake)
    # CC: RGB->RGB565 (dithered)  SAMP: fullsize  IDCT: islow  ENT: huff
    add_test(djpeg${suffix}-rgb-islow-565D
      ${dir}djpeg${suffix} -dct int -rgb565 -bmp
        -outfile testout_rgb_islow_565D.bmp testout_rgb_islow.jpg)
    add_test(djpeg${suffix}-rgb-islow-565D-cmp
      ${CMAKE_COMMAND} -DMD5=${MD5_BMP_RGB_ISLOW_565D}
        -DFILE=testout_rgb_islow_565D.bmp
        -P ${CMAKE_SOURCE_DIR}/cmakescripts/md5cmp.cmake)
  endif()
  # CC: RGB->YCC  SAMP: fullsize/h2v1  FDCT: ifast  ENT: 2-pass huff
  add_test(cjpeg${suffix}-422-ifast-opt
    ${dir}cjpeg${suffix} -sample 2x1 -dct fast -opt
      -outfile testout_422_ifast_opt.jpg
      ${CMAKE_SOURCE_DIR}/testimages/testorig.ppm)
  add_test(cjpeg${suffix}-422-ifast-opt-cmp
    ${CMAKE_COMMAND} -DMD5=${MD5_JPEG_422_IFAST_OPT}
      -DFILE=testout_422_ifast_opt.jpg
      -P ${CMAKE_SOURCE_DIR}/cmakescripts/md5cmp.cmake)
  # CC: YCC->RGB  SAMP: fullsize/h2v1 fancy  IDCT: ifast  ENT: huff
  add_test(djpeg${suffix}-422-ifast
    ${dir}djpeg${suffix} -dct fast -outfile testout_422_ifast.ppm
      testout_422_ifast_opt.jpg)
  add_test(djpeg${suffix}-422-ifast-cmp
    ${CMAKE_COMMAND} -DMD5=${MD5_PPM_422_IFAST} -DFILE=testout_422_ifast.ppm
      -P ${CMAKE_SOURCE_DIR}/cmakescripts/md5cmp.cmake)
  # CC: YCC->RGB  SAMP: h2v1 merged  IDCT: ifast  ENT: huff
  add_test(djpeg${suffix}-422m-ifast
    ${dir}djpeg${suffix} -dct fast -nosmooth -outfile testout_422m_ifast.ppm
      testout_422_ifast_opt.jpg)
  add_test(djpeg${suffix}-422m-ifast-cmp
    ${CMAKE_COMMAND} -DMD5=${MD5_PPM_422M_IFAST} -DFILE=testout_422m_ifast.ppm
      -P ${CMAKE_SOURCE_DIR}/cmakescripts/md5cmp.cmake)
  if(NOT WITH_12BIT)
    # CC: YCC->RGB565  SAMP: h2v1 merged  IDCT: ifast  ENT: huff
    add_test(djpeg${suffix}-422m-ifast-565
      ${dir}djpeg${suffix} -dct int -nosmooth -rgb565 -dither none -bmp
        -outfile testout_422m_ifast_565.bmp testout_422_ifast_opt.jpg)
    add_test(djpeg${suffix}-422m-ifast-565-cmp
      ${CMAKE_COMMAND} -DMD5=${MD5_BMP_422M_IFAST_565}
        -DFILE=testout_422m_ifast_565.bmp
        -P ${CMAKE_SOURCE_DIR}/cmakescripts/md5cmp.cmake)
    # CC: YCC->RGB565 (dithered)  SAMP: h2v1 merged  IDCT: ifast  ENT: huff
    add_test(djpeg${suffix}-422m-ifast-565D
      ${dir}djpeg${suffix} -dct int -nosmooth -rgb565 -bmp
        -outfile testout_422m_ifast_565D.bmp testout_422_ifast_opt.jpg)
    add_test(djpeg${suffix}-422m-ifast-565D-cmp
      ${CMAKE_COMMAND} -DMD5=${MD5_BMP_422M_IFAST_565D}
        -DFILE=testout_422m_ifast_565D.bmp
        -P ${CMAKE_SOURCE_DIR}/cmakescripts/md5cmp.cmake)
  endif()
  # CC: RGB->YCC  SAMP: fullsize/h2v2  FDCT: ifast  ENT: prog huff
  add_test(cjpeg${suffix}-420-q100-ifast-prog
    ${dir}cjpeg${suffix} -sample 2x2 -quality 100 -dct fast -prog
      -outfile testout_420_q100_ifast_prog.jpg
      ${CMAKE_SOURCE_DIR}/testimages/testorig.ppm)
  add_test(cjpeg${suffix}-420-q100-ifast-prog-cmp
    ${CMAKE_COMMAND} -DMD5=${MD5_JPEG_420_IFAST_Q100_PROG}
      -DFILE=testout_420_q100_ifast_prog.jpg
      -P ${CMAKE_SOURCE_DIR}/cmakescripts/md5cmp.cmake)
  # CC: YCC->RGB  SAMP: fullsize/h2v2 fancy  IDCT: ifast  ENT: prog huff
  add_test(djpeg${suffix}-420-q100-ifast-prog
    ${dir}djpeg${suffix} -dct fast -outfile testout_420_q100_ifast.ppm
      testout_420_q100_ifast_prog.jpg)
  add_test(djpeg${suffix}-420-q100-ifast-prog-cmp
    ${CMAKE_COMMAND} -DMD5=${MD5_PPM_420_Q100_IFAST}
      -DFILE=testout_420_q100_ifast.ppm
      -P ${CMAKE_SOURCE_DIR}/cmakescripts/md5cmp.cmake)
  # CC: YCC->RGB  SAMP: h2v2 merged  IDCT: ifast  ENT: prog huff
  add_test(djpeg${suffix}-420m-q100-ifast-prog
    ${dir}djpeg${suffix} -dct fast -nosmooth
      -outfile testout_420m_q100_ifast.ppm testout_420_q100_ifast_prog.jpg)
  add_test(djpeg${suffix}-420m-q100-ifast-prog-cmp
    ${CMAKE_COMMAND} -DMD5=${MD5_PPM_420M_Q100_IFAST}
      -DFILE=testout_420m_q100_ifast.ppm
      -P ${CMAKE_SOURCE_DIR}/cmakescripts/md5cmp.cmake)
  # CC: RGB->Gray  SAMP: fullsize  FDCT: islow  ENT: huff
  add_test(cjpeg${suffix}-gray-islow
    ${dir}cjpeg${suffix} -gray -dct int -outfile testout_gray_islow.jpg
      ${CMAKE_SOURCE_DIR}/testimages/testorig.ppm)
  add_test(cjpeg${suffix}-gray-islow-cmp
    ${CMAKE_COMMAND} -DMD5=${MD5_JPEG_GRAY_ISLOW}
      -DFILE=testout_gray_islow.jpg
      -P ${CMAKE_SOURCE_DIR}/cmakescripts/md5cmp.cmake)
  # CC: Gray->Gray  SAMP: fullsize  IDCT: islow  ENT: huff
  add_test(djpeg${suffix}-gray-islow
    ${dir}djpeg${suffix} -dct int -outfile testout_gray_islow.ppm
      testout_gray_islow.jpg)
  add_test(djpeg${suffix}-gray-islow-cmp
    ${CMAKE_COMMAND} -DMD5=${MD5_PPM_GRAY_ISLOW}
      -DFILE=testout_gray_islow.ppm
      -P ${CMAKE_SOURCE_DIR}/cmakescripts/md5cmp.cmake)
  # CC: Gray->RGB  SAMP: fullsize  IDCT: islow  ENT: huff
  add_test(djpeg${suffix}-gray-islow-rgb
    ${dir}djpeg${suffix} -dct int -rgb -outfile testout_gray_islow_rgb.ppm
      testout_gray_islow.jpg)
  add_test(djpeg${suffix}-gray-islow-rgb-cmp
    ${CMAKE_COMMAND} -DMD5=${MD5_PPM_GRAY_ISLOW_RGB}
      -DFILE=testout_gray_islow_rgb.ppm
      -P ${CMAKE_SOURCE_DIR}/cmakescripts/md5cmp.cmake)
  if(NOT WITH_12BIT)
    # CC: Gray->RGB565  SAMP: fullsize  IDCT: islow  ENT: huff
    add_test(djpeg${suffix}-gray-islow-565
      ${dir}djpeg${suffix} -dct int -rgb565 -dither none -bmp
        -outfile testout_gray_islow_565.bmp testout_gray_islow.jpg)
    add_test(djpeg${suffix}-gray-islow-565-cmp
      ${CMAKE_COMMAND} -DMD5=${MD5_BMP_GRAY_ISLOW_565}
        -DFILE=testout_gray_islow_565.bmp
        -P ${CMAKE_SOURCE_DIR}/cmakescripts/md5cmp.cmake)
    # CC: Gray->RGB565 (dithered)  SAMP: fullsize  IDCT: islow  ENT: huff
    add_test(djpeg${suffix}-gray-islow-565D
      ${dir}djpeg${suffix} -dct int -rgb565 -bmp
        -outfile testout_gray_islow_565D.bmp testout_gray_islow.jpg)
    add_test(djpeg${suffix}-gray-islow-565D-cmp
      ${CMAKE_COMMAND} -DMD5=${MD5_BMP_GRAY_ISLOW_565D}
        -DFILE=testout_gray_islow_565D.bmp
        -P ${CMAKE_SOURCE_DIR}/cmakescripts/md5cmp.cmake)
  endif()
  # CC: RGB->YCC  SAMP: fullsize smooth/h2v2 smooth  FDCT: islow
  # ENT: 2-pass huff
  add_test(cjpeg${suffix}-420s-ifast-opt
    ${dir}cjpeg${suffix} -sample 2x2 -smooth 1 -dct int -opt -outfile
      testout_420s_ifast_opt.jpg ${CMAKE_SOURCE_DIR}/testimages/testorig.ppm)
  add_test(cjpeg${suffix}-420s-ifast-opt-cmp
    ${CMAKE_COMMAND} -DMD5=${MD5_JPEG_420S_IFAST_OPT}
      -DFILE=testout_420s_ifast_opt.jpg
      -P ${CMAKE_SOURCE_DIR}/cmakescripts/md5cmp.cmake)
  # CC: RGB->YCC  SAMP: fullsize/int  FDCT: float  ENT: prog huff
  add_test(cjpeg${suffix}-3x2-float-prog
    ${dir}cjpeg${suffix} -sample 3x2 -dct float -prog
      -outfile testout_3x2_float_prog.jpg
      ${CMAKE_SOURCE_DIR}/testimages/testorig.ppm)
  add_test(cjpeg${suffix}-3x2-float-prog-cmp
    ${CMAKE_COMMAND} -DMD5=${MD5_JPEG_3x2_FLOAT_PROG}
      -DFILE=testout_3x2_float_prog.jpg
      -P ${CMAKE_SOURCE_DIR}/cmakescripts/md5cmp.cmake)
  # CC: YCC->RGB  SAMP: fullsize/int  IDCT: float  ENT: prog huff
  add_test(djpeg${suffix}-3x2-float-prog
    ${dir}djpeg${suffix} -dct float -outfile testout_3x2_float.ppm
      testout_3x2_float_prog.jpg)
  add_test(djpeg${suffix}-3x2-float-prog-cmp
    ${CMAKE_COMMAND} -DMD5=${MD5_PPM_3x2_FLOAT} -DFILE=testout_3x2_float.ppm
      -P ${CMAKE_SOURCE_DIR}/cmakescripts/md5cmp.cmake)
  if(WITH_ARITH_ENC)
    # CC: YCC->RGB  SAMP: fullsize/h2v2  FDCT: islow  ENT: arith
    add_test(cjpeg${suffix}-420-islow-ari
      ${dir}cjpeg${suffix} -dct int -arithmetic
        -outfile testout_420_islow_ari.jpg
        ${CMAKE_SOURCE_DIR}/testimages/testorig.ppm)
    add_test(cjpeg${suffix}-420-islow-ari-cmp
      ${CMAKE_COMMAND} -DMD5=${MD5_JPEG_420_ISLOW_ARI}
        -DFILE=testout_420_islow_ari.jpg
        -P ${CMAKE_SOURCE_DIR}/cmakescripts/md5cmp.cmake)
    add_test(jpegtran${suffix}-420-islow-ari
      ${dir}jpegtran${suffix} -arithmetic
        -outfile testout_420_islow_ari.jpg
        ${CMAKE_SOURCE_DIR}/testimages/testimgint.jpg)
    add_test(jpegtran${suffix}-420-islow-ari-cmp
      ${CMAKE_COMMAND} -DMD5=${MD5_JPEG_420_ISLOW_ARI}
        -DFILE=testout_420_islow_ari.jpg
        -P ${CMAKE_SOURCE_DIR}/cmakescripts/md5cmp.cmake)
    # CC: YCC->RGB  SAMP: fullsize  FDCT: islow  ENT: prog arith
    add_test(cjpeg${suffix}-444-islow-progari
      ${dir}cjpeg${suffix} -sample 1x1 -dct int -progressive -arithmetic
        -outfile testout_444_islow_progari.jpg
        ${CMAKE_SOURCE_DIR}/testimages/testorig.ppm)
    add_test(cjpeg${suffix}-444-islow-progari-cmp
      ${CMAKE_COMMAND} -DMD5=${MD5_JPEG_444_ISLOW_PROGARI}
        -DFILE=testout_444_islow_progari.jpg
        -P ${CMAKE_SOURCE_DIR}/cmakescripts/md5cmp.cmake)
  endif()
  if(WITH_ARITH_DEC)
    # CC: RGB->YCC  SAMP: h2v2 merged  IDCT: ifast  ENT: arith
    add_test(djpeg${suffix}-420m-ifast-ari
      ${dir}djpeg${suffix} -fast -ppm -outfile testout_420m_ifast_ari.ppm
        ${CMAKE_SOURCE_DIR}/testimages/testimgari.jpg)
    add_test(djpeg${suffix}-420m-ifast-ari-cmp
      ${CMAKE_COMMAND} -DMD5=${MD5_PPM_420M_IFAST_ARI}
        -DFILE=testout_420m_ifast_ari.ppm
        -P ${CMAKE_SOURCE_DIR}/cmakescripts/md5cmp.cmake)
    add_test(jpegtran${suffix}-420-islow
      ${dir}jpegtran${suffix} -outfile testout_420_islow.jpg
        ${CMAKE_SOURCE_DIR}/testimages/testimgari.jpg)
    add_test(jpegtran${suffix}-420-islow-cmp
      ${CMAKE_COMMAND} -DMD5=${MD5_JPEG_420_ISLOW}
        -DFILE=testout_420_islow.jpg
        -P ${CMAKE_SOURCE_DIR}/cmakescripts/md5cmp.cmake)
  endif()
  # 2/1--   CC: YCC->RGB  SAMP: h2v2 merged  IDCT: 16x16 islow  ENT: huff
  # 15/8--  CC: YCC->RGB  SAMP: h2v2 merged  IDCT: 15x15 islow  ENT: huff
  # 13/8--  CC: YCC->RGB  SAMP: h2v2 merged  IDCT: 13x13 islow  ENT: huff
  # 11/8--  CC: YCC->RGB  SAMP: h2v2 merged  IDCT: 11x11 islow  ENT: huff
  # 9/8--   CC: YCC->RGB  SAMP: h2v2 merged  IDCT: 9x9 islow  ENT: huff
  # 7/8--   CC: YCC->RGB  SAMP: h2v2 merged  IDCT: 7x7 islow/14x14 islow
  #         ENT: huff
  # 3/4--   CC: YCC->RGB  SAMP: h2v2 merged  IDCT: 6x6 islow/12x12 islow
  #         ENT: huff
  # 5/8--   CC: YCC->RGB  SAMP: h2v2 merged  IDCT: 5x5 islow/10x10 islow
  #         ENT: huff
  # 1/2--   CC: YCC->RGB  SAMP: h2v2 merged  IDCT: 4x4 islow/8x8 islow
  #         ENT: huff
  # 3/8--   CC: YCC->RGB  SAMP: h2v2 merged  IDCT: 3x3 islow/6x6 islow
  #         ENT: huff
  # 1/4--   CC: YCC->RGB  SAMP: h2v2 merged  IDCT: 2x2 islow/4x4 islow
  #         ENT: huff
  # 1/8--   CC: YCC->RGB  SAMP: h2v2 merged  IDCT: 1x1 islow/2x2 islow
  #         ENT: huff
  foreach(scale 2_1 15_8 13_8 11_8 9_8 7_8 3_4 5_8 1_2 3_8 1_4 1_8)
    string(REGEX REPLACE "_" "/" scalearg ${scale})
    add_test(djpeg${suffix}-420m-islow-${scale}
      ${dir}djpeg${suffix} -dct int -scale ${scalearg} -nosmooth -ppm
        -outfile testout_420m_islow_${scale}.ppm
        ${CMAKE_SOURCE_DIR}/testimages/${TESTORIG})
    add_test(djpeg${suffix}-420m-islow-${scale}-cmp
      ${CMAKE_COMMAND} -DMD5=${MD5_PPM_420M_ISLOW_${scale}}
        -DFILE=testout_420m_islow_${scale}.ppm
        -P ${CMAKE_SOURCE_DIR}/cmakescripts/md5cmp.cmake)
  endforeach()
  if(NOT WITH_12BIT)
    # CC: YCC->RGB (dithered)  SAMP: h2v2 fancy  IDCT: islow  ENT: huff
    add_test(djpeg${suffix}-420-islow-256
      ${dir}djpeg${suffix} -dct int -colors 256 -bmp
        -outfile testout_420_islow_256.bmp
        ${CMAKE_SOURCE_DIR}/testimages/${TESTORIG})
    add_test(djpeg${suffix}-420-islow-256-cmp
      ${CMAKE_COMMAND} -DMD5=${MD5_BMP_420_ISLOW_256}
        -DFILE=testout_420_islow_256.bmp
        -P ${CMAKE_SOURCE_DIR}/cmakescripts/md5cmp.cmake)
    # CC: YCC->RGB565  SAMP: h2v2 fancy  IDCT: islow  ENT: huff
    add_test(djpeg${suffix}-420-islow-565
      ${dir}djpeg${suffix} -dct int -rgb565 -dither none -bmp
        -outfile testout_420_islow_565.bmp
        ${CMAKE_SOURCE_DIR}/testimages/${TESTORIG})
    add_test(djpeg${suffix}-420-islow-565-cmp
      ${CMAKE_COMMAND} -DMD5=${MD5_BMP_420_ISLOW_565}
        -DFILE=testout_420_islow_565.bmp
        -P ${CMAKE_SOURCE_DIR}/cmakescripts/md5cmp.cmake)
    # CC: YCC->RGB565 (dithered)  SAMP: h2v2 fancy  IDCT: islow  ENT: huff
    add_test(djpeg${suffix}-420-islow-565D
      ${dir}djpeg${suffix} -dct int -rgb565 -bmp
        -outfile testout_420_islow_565D.bmp
        ${CMAKE_SOURCE_DIR}/testimages/${TESTORIG})
    add_test(djpeg${suffix}-420-islow-565D-cmp
      ${CMAKE_COMMAND} -DMD5=${MD5_BMP_420_ISLOW_565D}
        -DFILE=testout_420_islow_565D.bmp
        -P ${CMAKE_SOURCE_DIR}/cmakescripts/md5cmp.cmake)
    # CC: YCC->RGB565  SAMP: h2v2 merged  IDCT: islow  ENT: huff
    add_test(djpeg${suffix}-420m-islow-565
      ${dir}djpeg${suffix} -dct int -nosmooth -rgb565 -dither none -bmp
        -outfile testout_420m_islow_565.bmp
        ${CMAKE_SOURCE_DIR}/testimages/${TESTORIG})
    add_test(djpeg${suffix}-420m-islow-565-cmp
      ${CMAKE_COMMAND} -DMD5=${MD5_BMP_420M_ISLOW_565}
        -DFILE=testout_420m_islow_565.bmp
        -P ${CMAKE_SOURCE_DIR}/cmakescripts/md5cmp.cmake)
    # CC: YCC->RGB565 (dithered)  SAMP: h2v2 merged  IDCT: islow  ENT: huff
    add_test(djpeg${suffix}-420m-islow-565D
      ${dir}djpeg${suffix} -dct int -nosmooth -rgb565 -bmp
        -outfile testout_420m_islow_565D.bmp
        ${CMAKE_SOURCE_DIR}/testimages/${TESTORIG})
    add_test(djpeg${suffix}-420m-islow-565D-cmp
      ${CMAKE_COMMAND} -DMD5=${MD5_BMP_420M_ISLOW_565D}
        -DFILE=testout_420m_islow_565D.bmp
        -P ${CMAKE_SOURCE_DIR}/cmakescripts/md5cmp.cmake)
  endif()
  add_test(jpegtran${suffix}-crop
    ${dir}jpegtran${suffix} -crop 120x90+20+50 -transpose -perfect
      -outfile testout_crop.jpg ${CMAKE_SOURCE_DIR}/testimages/${TESTORIG})
  add_test(jpegtran${suffix}-crop-cmp
    ${CMAKE_COMMAND} -DMD5=${MD5_JPEG_CROP} -DFILE=testout_crop.jpg
      -P ${CMAKE_SOURCE_DIR}/cmakescripts/md5cmp.cmake)
 endforeach()
 add_custom_target(testclean COMMAND ${CMAKE_COMMAND} -P
  ${CMAKE_SOURCE_DIR}/cmakescripts/testclean.cmake)
 #
 # Installer
 #
 if(MSVC)
  set(INST_PLATFORM "Visual C++")
  set(INST_NAME ${CMAKE_PROJECT_NAME}-${VERSION}-vc)
  set(INST_REG_NAME ${CMAKE_PROJECT_NAME})
 elseif(MINGW)
  set(INST_PLATFORM GCC)
  set(INST_NAME ${CMAKE_PROJECT_NAME}-${VERSION}-gcc)
  set(INST_REG_NAME ${CMAKE_PROJECT_NAME}-gcc)
  set(INST_DEFS -DGCC)
 endif()
 if(64BIT)
  set(INST_PLATFORM "${INST_PLATFORM} 64-bit")
  set(INST_NAME ${INST_NAME}64)
  set(INST_REG_NAME ${INST_DIR}64)
  set(INST_DEFS ${INST_DEFS} -DWIN64)
 endif()
 if(WITH_JAVA)
  set(INST_DEFS ${INST_DEFS} -DJAVA)
 endif()
 if(MSVC_IDE)
  set(INST_DEFS ${INST_DEFS} "-DBUILDDIR=${CMAKE_CFG_INTDIR}\\")
 else()
  set(INST_DEFS ${INST_DEFS} "-DBUILDDIR=")
 endif()
 STRING(REGEX REPLACE "/" "\\\\" INST_DIR ${CMAKE_INSTALL_PREFIX})
 configure_file(release/libjpeg-turbo.nsi.in libjpeg-turbo.nsi @ONLY)
 if(WITH_JAVA)
  set(JAVA_DEPEND java)
 endif()
 add_custom_target(installer
  makensis -nocd ${INST_DEFS} libjpeg-turbo.nsi
  DEPENDS jpeg jpeg-static turbojpeg turbojpeg-static rdjpgcom wrjpgcom
    cjpeg djpeg jpegtran tjbench ${JAVA_DEPEND}
  SOURCES libjpeg-turbo.nsi)
 if(WITH_TURBOJPEG)
  if(ENABLE_SHARED)
    install(TARGETS turbojpeg tjbench
      ARCHIVE DESTINATION lib
      LIBRARY DESTINATION lib
      RUNTIME DESTINATION bin)
  endif()
  if(ENABLE_STATIC)
    install(TARGETS turbojpeg-static ARCHIVE DESTINATION lib)
    if(NOT ENABLE_SHARED)
      install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/tjbench-static.exe
        DESTINATION bin RENAME tjbench.exe)
    endif()
  endif()
  install(FILES ${CMAKE_SOURCE_DIR}/turbojpeg.h DESTINATION include)
 endif()
 if(ENABLE_STATIC)
  install(TARGETS jpeg-static ARCHIVE DESTINATION lib)
  if(NOT ENABLE_SHARED)
    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/cjpeg-static.exe
      DESTINATION bin RENAME cjpeg.exe)
    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/djpeg-static.exe
      DESTINATION bin RENAME djpeg.exe)
    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/jpegtran-static.exe
      DESTINATION bin RENAME jpegtran.exe)
  endif()
 endif()
 install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION bin)
 install(FILES ${CMAKE_SOURCE_DIR}/README ${CMAKE_SOURCE_DIR}/README-turbo.txt
  ${CMAKE_SOURCE_DIR}/example.c ${CMAKE_SOURCE_DIR}/libjpeg.txt
  ${CMAKE_SOURCE_DIR}/structure.txt ${CMAKE_SOURCE_DIR}/usage.txt
  ${CMAKE_SOURCE_DIR}/wizard.txt
  DESTINATION doc)
 install(FILES ${CMAKE_BINARY_DIR}/jconfig.h ${CMAKE_SOURCE_DIR}/jerror.h
  ${CMAKE_SOURCE_DIR}/jmorecfg.h ${CMAKE_SOURCE_DIR}/jpeglib.h
  DESTINATION include)
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -0,0 +1,706 @@
 1.4.1
 =====
 [1] tjbench now properly handles CMYK/YCCK JPEG files.  Passing an argument of
 -cmyk (instead of, for instance, -rgb) will cause tjbench to internally convert
 the source bitmap to CMYK prior to compression, to generate YCCK JPEG files,
 and to internally convert the decompressed CMYK pixels back to RGB after
 decompression (the latter is done automatically if a CMYK or YCCK JPEG is
 passed to tjbench as a source image.)  The CMYK<->RGB conversion operation is
 not benchmarked.  NOTE: The quick & dirty CMYK<->RGB conversions that tjbench
 uses are suitable for testing only.  Proper conversion between CMYK and RGB
 requires a color management system.
 [2] 'make test' now performs additional bitwise regression tests using tjbench,
 mainly for the purpose of testing compression from/decompression to a subregion
 of a larger image buffer.
 [3] 'make test' no longer tests the regression of the floating point DCT/IDCT
 by default, since the results of those tests can vary if the algorithms in
 question are not implemented using SIMD instructions on a particular platform.
 See the comments in Makefile.am for information on how to re-enable the tests
 and to specify an expected result for them based on the particulars of your
 platform.
 [4] The NULL color conversion routines have been significantly optimized,
 which speeds up the compression of RGB and CMYK JPEGs by 5-20% when using
 64-bit code and 0-3% when using 32-bit code, and the decompression of those
 images by 10-30% when using 64-bit code and 3-12% when using 32-bit code.
 [5] Fixed an "illegal instruction" error that occurred when djpeg from a
 SIMD-enabled libjpeg-turbo MIPS build was executed with the -nosmooth option on
 a MIPS machine that lacked DSPr2 support.  The MIPS SIMD routines for h2v1 and
 h2v2 merged upsampling were not properly checking for the existence of DSPr2.
 [6] Performance has been improved significantly on 64-bit non-Linux and
 non-Windows platforms (generally 10-20% faster compression and 5-10% faster
 decompression.)  Due to an oversight, the 64-bit version of the accelerated
 Huffman codec was not being compiled in when libjpeg-turbo was built on
 platforms other than Windows or Linux.  Oops.
 [7] Fixed an extremely rare bug in the Huffman encoder that caused 64-bit
 builds of libjpeg-turbo to incorrectly encode a few specific test images when
 quality=98, an optimized Huffman table, and the slow integer forward DCT were
 used.
 [8] The Windows (CMake) build system now supports building only static or only
 shared libraries.  This is accomplished by adding either -DENABLE_STATIC=0 or
 -DENABLE_SHARED=0 to the CMake command line.
 [9] TurboJPEG API functions will now return an error code if a warning is
 triggered in the underlying libjpeg API.  For instance, if a JPEG file is
 corrupt, the TurboJPEG decompression functions will attempt to decompress
 as much of the image as possible, but those functions will now return -1 to
 indicate that the decompression was not entirely successful.
 [10] Fixed a bug in the MIPS DSPr2 4:2:2 fancy upsampling routine that caused a
 buffer overflow (and subsequent segfault) when decompressing a 4:2:2 JPEG image
 in which the right-most MCU was 5 or 6 pixels wide.
 1.4.0
 =====
 [1] Fixed a build issue on OS X PowerPC platforms (md5cmp failed to build
 because OS X does not provide the le32toh() and htole32() functions.)
 [2] The non-SIMD RGB565 color conversion code did not work correctly on big
 endian machines.  This has been fixed.
 [3] Fixed an issue in tjPlaneSizeYUV() whereby it would erroneously return 1
 instead of -1 if componentID was > 0 and subsamp was TJSAMP_GRAY.
 [3] Fixed an issue in tjBufSizeYUV2() whereby it would erroneously return 0
 instead of -1 if width was < 1.
 [5] The Huffman encoder now uses clz and bsr instructions for bit counting on
 ARM64 platforms (see 1.4 beta1 [5].)
 [6] The close() method in the TJCompressor and TJDecompressor Java classes is
 now idempotent.  Previously, that method would call the native tjDestroy()
 function even if the TurboJPEG instance had already been destroyed.  This
 caused an exception to be thrown during finalization, if the close() method had
 already been called.  The exception was caught, but it was still an expensive
 operation.
 [7] The TurboJPEG API previously generated an error ("Could not determine
 subsampling type for JPEG image") when attempting to decompress grayscale JPEG
 images that were compressed with a sampling factor other than 1 (for instance,
 with 'cjpeg -grayscale -sample 2x2').  Subsampling technically has no meaning
 with grayscale JPEGs, and thus the horizontal and vertical sampling factors
 for such images are ignored by the decompressor.  However, the TurboJPEG API
 was being too rigid and was expecting the sampling factors to be equal to 1
 before it treated the image as a grayscale JPEG.
 [8] cjpeg, djpeg, and jpegtran now accept an argument of -version, which will
 print the library version and exit.
 [9] Referring to 1.4 beta1 [15], another extremely rare circumstance was
 discovered under which the Huffman encoder's local buffer can be overrun
 when a buffered destination manager is being used and an
 extremely-high-frequency block (basically junk image data) is being encoded.
 Even though the Huffman local buffer was increased from 128 bytes to 136 bytes
 to address the previous issue, the new issue caused even the larger buffer to
 be overrun.  Further analysis reveals that, in the absolute worst case (such as
 setting alternating AC coefficients to 32767 and -32768 in the JPEG scanning
 order), the Huffman encoder can produce encoded blocks that approach double the
 size of the unencoded blocks.  Thus, the Huffman local buffer was increased to
 256 bytes, which should prevent any such issue from re-occurring in the future.
 [10] The new tjPlaneSizeYUV(), tjPlaneWidth(), and tjPlaneHeight() functions
 were not actually usable on any platform except OS X and Windows, because
 those functions were not included in the libturbojpeg mapfile.  This has been
 fixed.
 [11] Restored the JPP(), JMETHOD(), and FAR macros in the libjpeg-turbo header
 files.  The JPP() and JMETHOD() macros were originally implemented in libjpeg
 as a way of supporting non-ANSI compilers that lacked support for prototype
 parameters.  libjpeg-turbo has never supported such compilers, but some
 software packages still use the macros to define their own prototypes.
 Similarly, libjpeg-turbo has never supported MS-DOS and other platforms that
 have far symbols, but some software packages still use the FAR macro.  A pretty
 good argument can be made that this is a bad practice on the part of the
 software in question, but since this affects more than one package, it's just
 easier to fix it here.
 [12] Fixed issues that were preventing the ARM 64-bit SIMD code from compiling
 for iOS, and included an ARMv8 architecture in all of the binaries installed by
 the "official" libjpeg-turbo SDK for OS X.
 1.3.90 (1.4 beta1)
 ==================
 [1] New features in the TurboJPEG API:
 -- YUV planar images can now be generated with an arbitrary line padding
 (previously only 4-byte padding, which was compatible with X Video, was
 supported.)
 -- The decompress-to-YUV function has been extended to support image scaling.
 -- JPEG images can now be compressed from YUV planar source images.
 -- YUV planar images can now be decoded into RGB or grayscale images.
 -- 4:1:1 subsampling is now supported.  This is mainly included for
 compatibility, since 4:1:1 is not fully accelerated in libjpeg-turbo and has no
 significant advantages relative to 4:2:0.
 -- CMYK images are now supported.  This feature allows CMYK source images to be
 compressed to YCCK JPEGs and YCCK or CMYK JPEGs to be decompressed to CMYK
 destination images.  Conversion between CMYK/YCCK and RGB or YUV images is not
 supported.  Such conversion requires a color management system and is thus out
 of scope for a codec library.
 -- The handling of YUV images in the Java API has been significantly refactored
 and should now be much more intuitive.
 -- The Java API now supports encoding a YUV image from an arbitrary position in
 a large image buffer.
 -- All of the YUV functions now have a corresponding function that operates on
 separate image planes instead of a unified image buffer.  This allows for
 compressing/decoding from or decompressing/encoding to a subregion of a larger
 YUV image.  It also allows for handling YUV formats that swap the order of the
 U and V planes.
 [2] Added SIMD acceleration for DSPr2-capable MIPS platforms.  This speeds up
 the compression of full-color JPEGs by 70-80% on such platforms and
 decompression by 25-35%.
 [3] If an application attempts to decompress a Huffman-coded JPEG image whose
 header does not contain Huffman tables, libjpeg-turbo will now insert the
 default Huffman tables.  In order to save space, many motion JPEG video frames
 are encoded without the default Huffman tables, so these frames can now be
 successfully decompressed by libjpeg-turbo without additional work on the part
 of the application.  An application can still override the Huffman tables, for
 instance to re-use tables from a previous frame of the same video.
 [4] The Mac packaging system now uses pkgbuild and productbuild rather than
 PackageMaker (which is obsolete and no longer supported.)  This means that
 OS X 10.6 "Snow Leopard" or later must be used when packaging libjpeg-turbo,
 although the packages produced can be installed on OS X 10.5 "Leopard" or
 later.  OS X 10.4 "Tiger" is no longer supported.
 [5] The Huffman encoder now uses clz and bsr instructions for bit counting on
 ARM platforms rather than a lookup table.  This reduces the memory footprint
 by 64k, which may be important for some mobile applications.  Out of four
 Android devices that were tested, two demonstrated a small overall performance
 loss (~3-4% on average) with ARMv6 code and a small gain (also ~3-4%) with
 ARMv7 code when enabling this new feature, but the other two devices
 demonstrated a significant overall performance gain with both ARMv6 and ARMv7
 code (~10-20%) when enabling the feature.  Actual mileage may vary.
 [6] Worked around an issue with Visual C++ 2010 and later that caused incorrect
 pixels to be generated when decompressing a JPEG image to a 256-color bitmap,
 if compiler optimization was enabled when libjpeg-turbo was built.  This caused
 the regression tests to fail when doing a release build under Visual C++ 2010
 and later.
 [7] Improved the accuracy and performance of the non-SIMD implementation of the
 floating point inverse DCT (using code borrowed from libjpeg v8a and later.)
 The accuracy of this implementation now matches the accuracy of the SSE/SSE2
 implementation.  Note, however, that the floating point DCT/IDCT algorithms are
 mainly a legacy feature.  They generally do not produce significantly better
 accuracy than the slow integer DCT/IDCT algorithms, and they are quite a bit
 slower.
 [8] Added a new output colorspace (JCS_RGB565) to the libjpeg API that allows
 for decompressing JPEG images into RGB565 (16-bit) pixels.  If dithering is not
 used, then this code path is SIMD-accelerated on ARM platforms.
 [9] Numerous obsolete features, such as support for non-ANSI compilers and
 support for the MS-DOS memory model, were removed from the libjpeg code,
 greatly improving its readability and making it easier to maintain and extend.
 [10] Fixed a segfault that occurred when calling output_message() with msg_code
 set to JMSG_COPYRIGHT.
 [11] Fixed an issue whereby wrjpgcom was allowing comments longer than 65k
 characters to be passed on the command line, which was causing it to generate
 incorrect JPEG files.
 [12] Fixed a bug in the build system that was causing the Windows version of
 wrjpgcom to be built using the rdjpgcom source code.
 [13] Restored 12-bit-per-component JPEG support.  A 12-bit version of
 libjpeg-turbo can now be built by passing an argument of --with-12bit to
 configure (Unix) or -DWITH_12BIT=1 to cmake (Windows.)  12-bit JPEG support is
 included only for convenience.  Enabling this feature disables all of the
 performance features in libjpeg-turbo, as well as arithmetic coding and the
 TurboJPEG API.  The resulting library still contains the other libjpeg-turbo
 features (such as the colorspace extensions), but in general, it performs no
 faster than libjpeg v6b.
 [14] Added ARM 64-bit SIMD acceleration for the YCC-to-RGB color conversion
 and IDCT algorithms (both are used during JPEG decompression.)  For unknown
 reasons (probably related to clang), this code cannot currently be compiled for
 iOS.
 [15] Fixed an extremely rare bug that could cause the Huffman encoder's local
 buffer to overrun when a very high-frequency MCU is compressed using quality
 100 and no subsampling, and when the JPEG output buffer is being dynamically
 resized by the destination manager.  This issue was so rare that, even with a
 test program specifically designed to make the bug occur (by injecting random
 high-frequency YUV data into the compressor), it was reproducible only once in
 about every 25 million iterations.
 [16] Fixed an oversight in the TurboJPEG C wrapper:  if any of the JPEG
 compression functions was called repeatedly with the same
 automatically-allocated destination buffer, then TurboJPEG would erroneously
 assume that the jpegSize parameter was equal to the size of the buffer, when in
 fact that parameter was probably equal to the size of the most recently
 compressed JPEG image.  If the size of the previous JPEG image was not as large
 as the current JPEG image, then TurboJPEG would unnecessarily reallocate the
 destination buffer.
 1.3.1
 =====
 [1] On Un*x systems, 'make install' now installs the libjpeg-turbo libraries
 into /opt/libjpeg-turbo/lib32 by default on any 32-bit system, not just x86,
 and into /opt/libjpeg-turbo/lib64 by default on any 64-bit system, not just
 x86-64.  You can override this by overriding either the 'prefix' or 'libdir'
 configure variables.
 [2] The Windows installer now places a copy of the TurboJPEG DLLs in the same
 directory as the rest of the libjpeg-turbo binaries.  This was mainly done
 to support TurboVNC 1.3, which bundles the DLLs in its Windows installation.
 When using a 32-bit version of CMake on 64-bit Windows, it is impossible to
 access the c:\WINDOWS\system32 directory, which made it impossible for the
 TurboVNC build scripts to bundle the 64-bit TurboJPEG DLL.
 [3] Fixed a bug whereby attempting to encode a progressive JPEG with arithmetic
 entropy coding (by passing arguments of -progressive -arithmetic to cjpeg or
 jpegtran, for instance) would result in an error, "Requested feature was
 omitted at compile time".
 [4] Fixed a couple of issues whereby malformed JPEG images would cause
 libjpeg-turbo to use uninitialized memory during decompression.
 [5] Fixed an error ("Buffer passed to JPEG library is too small") that occurred
 when calling the TurboJPEG YUV encoding function with a very small (< 5x5)
 source image, and added a unit test to check for this error.
 [6] The Java classes should now build properly under Visual Studio 2010 and
 later.
 [7] Fixed an issue that prevented SRPMs generated using the in-tree packaging
 tools from being rebuilt on certain newer Linux distributions.
 [8] Numerous minor fixes to eliminate compilation and build/packaging system
 warnings, fix cosmetic issues, improve documentation clarity, and other general
 source cleanup.
 1.3.0
 =====
 [1] 'make test' now works properly on FreeBSD, and it no longer requires the
 md5sum executable to be present on other Un*x platforms.
 [2] Overhauled the packaging system:
 -- To avoid conflict with vendor-supplied libjpeg-turbo packages, the
 official RPMs and DEBs for libjpeg-turbo have been renamed to
 "libjpeg-turbo-official".
 -- The TurboJPEG libraries are now located under /opt/libjpeg-turbo in the
 official Linux and Mac packages, to avoid conflict with vendor-supplied
 packages and also to streamline the packaging system.
 -- Release packages are now created with the directory structure defined
 by the configure variables "prefix", "bindir", "libdir", etc. (Un*x) or by the
 CMAKE_INSTALL_PREFIX variable (Windows.)  The exception is that the docs are
 always located under the system default documentation directory on Un*x and Mac
 systems, and on Windows, the TurboJPEG DLL is always located in the Windows
 system directory.
 -- To avoid confusion, official libjpeg-turbo packages on Linux/Unix platforms
 (except for Mac) will always install the 32-bit libraries in
 /opt/libjpeg-turbo/lib32 and the 64-bit libraries in /opt/libjpeg-turbo/lib64.
 -- Fixed an issue whereby, in some cases, the libjpeg-turbo executables on Un*x
 systems were not properly linking with the shared libraries installed by the
 same package.
 -- Fixed an issue whereby building the "installer" target on Windows when
 WITH_JAVA=1 would fail if the TurboJPEG JAR had not been previously built.
 -- Building the "install" target on Windows now installs files into the same
 places that the installer does.
 [3] Fixed a Huffman encoder bug that prevented I/O suspension from working
 properly.
 1.2.90 (1.3 beta1)
 ==================
 [1] Added support for additional scaling factors (3/8, 5/8, 3/4, 7/8, 9/8, 5/4,
 11/8, 3/2, 13/8, 7/4, 15/8, and 2) when decompressing.  Note that the IDCT will
 not be SIMD-accelerated when using any of these new scaling factors.
 [2] The TurboJPEG dynamic library is now versioned.  It was not strictly
 necessary to do so, because TurboJPEG uses versioned symbols, and if a function
 changes in an ABI-incompatible way, that function is renamed and a legacy
 function is provided to maintain backward compatibility.  However, certain
 Linux distro maintainers have a policy against accepting any library that isn't
 versioned.
 [3] Extended the TurboJPEG Java API so that it can be used to compress a JPEG
 image from and decompress a JPEG image to an arbitrary position in a large
 image buffer.
 [4] The tjDecompressToYUV() function now supports the TJFLAG_FASTDCT flag.
 [5] The 32-bit supplementary package for amd64 Debian systems now provides
 symlinks in /usr/lib/i386-linux-gnu for the TurboJPEG libraries in /usr/lib32.
 This allows those libraries to be used on MultiArch-compatible systems (such as
 Ubuntu 11 and later) without setting the linker path.
 [6] The TurboJPEG Java wrapper should now find the JNI library on Mac systems
 without having to pass -Djava.library.path=/usr/lib to java.
 [7] TJBench has been ported to Java to provide a convenient way of validating
 the performance of the TurboJPEG Java API.  It can be run with
 'java -cp turbojpeg.jar TJBench'.
 [8] cjpeg can now be used to generate JPEG files with the RGB colorspace
 (feature ported from jpeg-8d.)
 [9] The width and height in the -crop argument passed to jpegtran can now be
 suffixed with "f" to indicate that, when the upper left corner of the cropping
 region is automatically moved to the nearest iMCU boundary, the bottom right
 corner should be moved by the same amount.  In other words, this feature causes
 jpegtran to strictly honor the specified width/height rather than the specified
 bottom right corner (feature ported from jpeg-8d.)
 [10] JPEG files using the RGB colorspace can now be decompressed into grayscale
 images (feature ported from jpeg-8d.)
 [11] Fixed a regression caused by 1.2.1[7] whereby the build would fail with
 multiple "Mismatch in operand sizes" errors when attempting to build the x86
 SIMD code with NASM 0.98.
 [12] The in-memory source/destination managers (jpeg_mem_src() and
 jpeg_mem_dest()) are now included by default when building libjpeg-turbo with
 libjpeg v6b or v7 emulation, so that programs can take advantage of these
 functions without requiring the use of the backward-incompatible libjpeg v8
 ABI.  The "age number" of the libjpeg-turbo library on Un*x systems has been
 incremented by 1 to reflect this.  You can disable this feature with a
 configure/CMake switch in order to retain strict API/ABI compatibility with the
 libjpeg v6b or v7 API/ABI (or with previous versions of libjpeg-turbo.)  See
 README-turbo.txt for more details.
 [13] Added ARMv7s architecture to libjpeg.a and libturbojpeg.a in the official
 libjpeg-turbo binary package for OS X, so that those libraries can be used to
 build applications that leverage the faster CPUs in the iPhone 5 and iPad 4.
 1.2.1
 =====
 [1] Creating or decoding a JPEG file that uses the RGB colorspace should now
 properly work when the input or output colorspace is one of the libjpeg-turbo
 colorspace extensions.
 [2] When libjpeg-turbo was built without SIMD support and merged (non-fancy)
 upsampling was used along with an alpha-enabled colorspace during
 decompression, the unused byte of the decompressed pixels was not being set to
 0xFF.  This has been fixed.  TJUnitTest has also been extended to test for the
 correct behavior of the colorspace extensions when merged upsampling is used.
 [3] Fixed a bug whereby the libjpeg-turbo SSE2 SIMD code would not preserve the
 upper 64 bits of xmm6 and xmm7 on Win64 platforms, which violated the Win64
 calling conventions.
 [4] Fixed a regression caused by 1.2.0[6] whereby decompressing corrupt JPEG
 images (specifically, images in which the component count was erroneously set
 to a large value) would cause libjpeg-turbo to segfault.
 [5] Worked around a severe performance issue with "Bobcat" (AMD Embedded APU)
 processors.  The MASKMOVDQU instruction, which was used by the libjpeg-turbo
 SSE2 SIMD code, is apparently implemented in microcode on AMD processors, and
 it is painfully slow on Bobcat processors in particular.  Eliminating the use
 of this instruction improved performance by an order of magnitude on Bobcat
 processors and by a small amount (typically 5%) on AMD desktop processors.
 [6] Added SIMD acceleration for performing 4:2:2 upsampling on NEON-capable ARM
 platforms.  This speeds up the decompression of 4:2:2 JPEGs by 20-25% on such
 platforms.
 [7] Fixed a regression caused by 1.2.0[2] whereby, on Linux/x86 platforms
 running the 32-bit SSE2 SIMD code in libjpeg-turbo, decompressing a 4:2:0 or
 4:2:2 JPEG image into a 32-bit (RGBX, BGRX, etc.) buffer without using fancy
 upsampling would produce several incorrect columns of pixels at the right-hand
 side of the output image if each row in the output image was not evenly
 divisible by 16 bytes.
 [8] Fixed an issue whereby attempting to build the SIMD extensions with Xcode
 4.3 on OS X platforms would cause NASM to return numerous errors of the form
 "'%define' expects a macro identifier".
 [9] Added flags to the TurboJPEG API that allow the caller to force the use of
 either the fast or the accurate DCT/IDCT algorithms in the underlying codec.
 1.2.0
 =====
 [1] Fixed build issue with YASM on Unix systems (the libjpeg-turbo build system
 was not adding the current directory to the assembler include path, so YASM
 was not able to find jsimdcfg.inc.)
 [2] Fixed out-of-bounds read in SSE2 SIMD code that occurred when decompressing
 a JPEG image to a bitmap buffer whose size was not a multiple of 16 bytes.
 This was more of an annoyance than an actual bug, since it did not cause any
 actual run-time problems, but the issue showed up when running libjpeg-turbo in
 valgrind.  See http://crbug.com/72399 for more information.
 [3] Added a compile-time macro (LIBJPEG_TURBO_VERSION) that can be used to
 check the version of libjpeg-turbo against which an application was compiled.
 [4] Added new RGBA/BGRA/ABGR/ARGB colorspace extension constants (libjpeg API)
 and pixel formats (TurboJPEG API), which allow applications to specify that,
 when decompressing to a 4-component RGB buffer, the unused byte should be set
 to 0xFF so that it can be interpreted as an opaque alpha channel.
 [5] Fixed regression issue whereby DevIL failed to build against libjpeg-turbo
 because libjpeg-turbo's distributed version of jconfig.h contained an INLINE
 macro, which conflicted with a similar macro in DevIL.  This macro is used only
 internally when building libjpeg-turbo, so it was moved into config.h.
 [6] libjpeg-turbo will now correctly decompress erroneous CMYK/YCCK JPEGs whose
 K component is assigned a component ID of 1 instead of 4.  Although these files
 are in violation of the spec, other JPEG implementations handle them
 correctly.
 [7] Added ARMv6 and ARMv7 architectures to libjpeg.a and libturbojpeg.a in
 the official libjpeg-turbo binary package for OS X, so that those libraries can
 be used to build both OS X and iOS applications.
 1.1.90 (1.2 beta1)
 ==================
 [1] Added a Java wrapper for the TurboJPEG API.  See java/README for more
 details.
 [2] The TurboJPEG API can now be used to scale down images during
 decompression.
 [3] Added SIMD routines for RGB-to-grayscale color conversion, which
 significantly improves the performance of grayscale JPEG compression from an
 RGB source image.
 [4] Improved the performance of the C color conversion routines, which are used
 on platforms for which SIMD acceleration is not available.
 [5] Added a function to the TurboJPEG API that performs lossless transforms.
 This function is implemented using the same back end as jpegtran, but it
 performs transcoding entirely in memory and allows multiple transforms and/or
 crop operations to be batched together, so the source coefficients only need to
 be read once.  This is useful when generating image tiles from a single source
 JPEG.
 [6] Added tests for the new TurboJPEG scaled decompression and lossless
 transform features to tjbench (the TurboJPEG benchmark, formerly called
 "jpgtest".)
 [7] Added support for 4:4:0 (transposed 4:2:2) subsampling in TurboJPEG, which
 was necessary in order for it to read 4:2:2 JPEG files that had been losslessly
 transposed or rotated 90 degrees.
 [8] All legacy VirtualGL code has been re-factored, and this has allowed
 libjpeg-turbo, in its entirety, to be re-licensed under a BSD-style license.
 [9] libjpeg-turbo can now be built with YASM.
 [10] Added SIMD acceleration for ARM Linux and iOS platforms that support
 NEON instructions.
 [11] Refactored the TurboJPEG C API and documented it using Doxygen.  The
 TurboJPEG 1.2 API uses pixel formats to define the size and component order of
 the uncompressed source/destination images, and it includes a more efficient
 version of TJBUFSIZE() that computes a worst-case JPEG size based on the level
 of chrominance subsampling.  The refactored implementation of the TurboJPEG API
 now uses the libjpeg memory source and destination managers, which allows the
 TurboJPEG compressor to grow the JPEG buffer as necessary.
 [12] Eliminated errors in the output of jpegtran on Windows that occurred when
 the application was invoked using I/O redirection
 (jpegtran <input.jpg >output.jpg).
 [13] The inclusion of libjpeg v7 and v8 emulation as well as arithmetic coding
 support in libjpeg-turbo v1.1.0 introduced several new error constants in
 jerror.h, and these were mistakenly enabled for all emulation modes, causing
 the error enum in libjpeg-turbo to sometimes have different values than the
 same enum in libjpeg.  This represents an ABI incompatibility, and it caused
 problems with rare applications that took specific action based on a particular
 error value.  The fix was to include the new error constants conditionally
 based on whether libjpeg v7 or v8 emulation was enabled.
 [14] Fixed an issue whereby Windows applications that used libjpeg-turbo would
 fail to compile if the Windows system headers were included before jpeglib.h.
 This issue was caused by a conflict in the definition of the INT32 type.
 [15] Fixed 32-bit supplementary package for amd64 Debian systems, which was
 broken by enhancements to the packaging system in 1.1.
 [16] When decompressing a JPEG image using an output colorspace of
 JCS_EXT_RGBX, JCS_EXT_BGRX, JCS_EXT_XBGR, or JCS_EXT_XRGB, libjpeg-turbo will
 now set the unused byte to 0xFF, which allows applications to interpret that
 byte as an alpha channel (0xFF = opaque).
 1.1.1
 =====
 [1] Fixed a 1-pixel error in row 0, column 21 of the luminance plane generated
 by tjEncodeYUV().
 [2] libjpeg-turbo's accelerated Huffman decoder previously ignored unexpected
 markers found in the middle of the JPEG data stream during decompression.  It
 will now hand off decoding of a particular block to the unaccelerated Huffman
 decoder if an unexpected marker is found, so that the unaccelerated Huffman
 decoder can generate an appropriate warning.
 [3] Older versions of MinGW64 prefixed symbol names with underscores by
 default, which differed from the behavior of 64-bit Visual C++.  MinGW64 1.0
 has adopted the behavior of 64-bit Visual C++ as the default, so to accommodate
 this, the libjpeg-turbo SIMD function names are no longer prefixed with an
 underscore when building with MinGW64.  This means that, when building
 libjpeg-turbo with older versions of MinGW64, you will now have to add
 -fno-leading-underscore to the CFLAGS.
 [4] Fixed a regression bug in the NSIS script that caused the Windows installer
 build to fail when using the Visual Studio IDE.
 [5] Fixed a bug in jpeg_read_coefficients() whereby it would not initialize
 cinfo->image_width and cinfo->image_height if libjpeg v7 or v8 emulation was
 enabled.  This specifically caused the jpegoptim program to fail if it was
 linked against a version of libjpeg-turbo that was built with libjpeg v7 or v8
 emulation.
 [6] Eliminated excessive I/O overhead that occurred when reading BMP files in
 cjpeg.
 [7] Eliminated errors in the output of cjpeg on Windows that occurred when the
 application was invoked using I/O redirection (cjpeg <inputfile >output.jpg).
 1.1.0
 =====
 [1] The algorithm used by the SIMD quantization function cannot produce correct
 results when the JPEG quality is >= 98 and the fast integer forward DCT is
 used.  Thus, the non-SIMD quantization function is now used for those cases,
 and libjpeg-turbo should now produce identical output to libjpeg v6b in all
 cases.
 [2] Despite the above, the fast integer forward DCT still degrades somewhat for
 JPEG qualities greater than 95, so the TurboJPEG wrapper will now automatically
 use the slow integer forward DCT when generating JPEG images of quality 96 or
 greater.  This reduces compression performance by as much as 15% for these
 high-quality images but is necessary to ensure that the images are perceptually
 lossless.  It also ensures that the library can avoid the performance pitfall
 created by [1].
 [3] Ported jpgtest.cxx to pure C to avoid the need for a C++ compiler.
 [4] Fixed visual artifacts in grayscale JPEG compression caused by a typo in
 the RGB-to-luminance lookup tables.
 [5] The Windows distribution packages now include the libjpeg run-time programs
 (cjpeg, etc.)
 [6] All packages now include jpgtest.
 [7] The TurboJPEG dynamic library now uses versioned symbols.
 [8] Added two new TurboJPEG API functions, tjEncodeYUV() and
 tjDecompressToYUV(), to replace the somewhat hackish TJ_YUV flag.
 1.0.90 (1.1 beta1)
 ==================
 [1] Added emulation of the libjpeg v7 and v8 APIs and ABIs.  See
 README-turbo.txt for more details.  This feature was sponsored by CamTrace SAS.
 [2] Created a new CMake-based build system for the Visual C++ and MinGW builds.
 [3] Grayscale bitmaps can now be compressed from/decompressed to using the
 TurboJPEG API.
 [4] jpgtest can now be used to test decompression performance with existing
 JPEG images.
 [5] If the default install prefix (/opt/libjpeg-turbo) is used, then
 'make install' now creates /opt/libjpeg-turbo/lib32 and
 /opt/libjpeg-turbo/lib64 sym links to duplicate the behavior of the binary
 packages.
 [6] All symbols in the libjpeg-turbo dynamic library are now versioned, even
 when the library is built with libjpeg v6b emulation.
 [7] Added arithmetic encoding and decoding support (can be disabled with
 configure or CMake options)
 [8] Added a TJ_YUV flag to the TurboJPEG API, which causes both the compressor
 and decompressor to output planar YUV images.
 [9] Added an extended version of tjDecompressHeader() to the TurboJPEG API,
 which allows the caller to determine the type of subsampling used in a JPEG
 image.
 [10] Added further protections against invalid Huffman codes.
 1.0.1
 =====
 [1] The Huffman decoder will now handle erroneous Huffman codes (for instance,
 from a corrupt JPEG image.)  Previously, these would cause libjpeg-turbo to
 crash under certain circumstances.
 [2] Fixed typo in SIMD dispatch routines that was causing 4:2:2 upsampling to
 be used instead of 4:2:0 when decompressing JPEG images using SSE2 code.
 [3] configure script will now automatically determine whether the
 INCOMPLETE_TYPES_BROKEN macro should be defined.
 1.0.0
 =====
 [1] 2983700: Further FreeBSD build tweaks (no longer necessary to specify
 --host when configuring on a 64-bit system)
 [2] Created symlinks in the Unix/Linux packages so that the TurboJPEG
 include file can always be found in /opt/libjpeg-turbo/include, the 32-bit
 static libraries can always be found in /opt/libjpeg-turbo/lib32, and the
 64-bit static libraries can always be found in /opt/libjpeg-turbo/lib64.
 [3] The Unix/Linux distribution packages now include the libjpeg run-time
 programs (cjpeg, etc.) and man pages.
 [4] Created a 32-bit supplementary package for amd64 Debian systems, which
 contains just the 32-bit libjpeg-turbo libraries.
 [5] Moved the libraries from */lib32 to */lib in the i386 Debian package.
 [6] Include distribution package for Cygwin
 [7] No longer necessary to specify --without-simd on non-x86 architectures, and
 unit tests now work on those architectures.
 0.0.93
 ======
 [1] 2982659, Fixed x86-64 build on FreeBSD systems
 [2] 2988188: Added support for Windows 64-bit systems
 0.0.91
 ======
 [1] Added documentation to .deb packages
 [2] 2968313: Fixed data corruption issues when decompressing large JPEG images
 and/or using buffered I/O with the libjpeg-turbo decompressor
 0.0.90
 ======
 Initial release
--- a/LGPL.txt
+++ b/LGPL.txt
@@ -1,504 +0,0 @@
 		  GNU LESSER GENERAL PUBLIC LICENSE
 		       Version 2.1, February 1999
 Copyright (C) 1991, 1999 Free Software Foundation, Inc.
     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
 [This is the first released version of the Lesser GPL.  It also counts
 as the successor of the GNU Library Public License, version 2, hence
 the version number 2.1.]
 			    Preamble
  The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
 Licenses are intended to guarantee your freedom to share and change
 free software--to make sure the software is free for all its users.
  This license, the Lesser General Public License, applies to some
 specially designated software packages--typically libraries--of the
 Free Software Foundation and other authors who decide to use it.  You
 can use it too, but we suggest you first think carefully about whether
 this license or the ordinary General Public License is the better
 strategy to use in any particular case, based on the explanations below.
  When we speak of free software, we are referring to freedom of use,
 not price.  Our General Public Licenses are designed to make sure that
 you have the freedom to distribute copies of free software (and charge
 for this service if you wish); that you receive source code or can get
 it if you want it; that you can change the software and use pieces of
 it in new free programs; and that you are informed that you can do
 these things.
  To protect your rights, we need to make restrictions that forbid
 distributors to deny you these rights or to ask you to surrender these
 rights.  These restrictions translate to certain responsibilities for
 you if you distribute copies of the library or if you modify it.
  For example, if you distribute copies of the library, whether gratis
 or for a fee, you must give the recipients all the rights that we gave
 you.  You must make sure that they, too, receive or can get the source
 code.  If you link other code with the library, you must provide
 complete object files to the recipients, so that they can relink them
 with the library after making changes to the library and recompiling
 it.  And you must show them these terms so they know their rights.
  We protect your rights with a two-step method: (1) we copyright the
 library, and (2) we offer you this license, which gives you legal
 permission to copy, distribute and/or modify the library.
  To protect each distributor, we want to make it very clear that
 there is no warranty for the free library.  Also, if the library is
 modified by someone else and passed on, the recipients should know
 that what they have is not the original version, so that the original
 author's reputation will not be affected by problems that might be
 introduced by others.
  Finally, software patents pose a constant threat to the existence of
 any free program.  We wish to make sure that a company cannot
 effectively restrict the users of a free program by obtaining a
 restrictive license from a patent holder.  Therefore, we insist that
 any patent license obtained for a version of the library must be
 consistent with the full freedom of use specified in this license.
  Most GNU software, including some libraries, is covered by the
 ordinary GNU General Public License.  This license, the GNU Lesser
 General Public License, applies to certain designated libraries, and
 is quite different from the ordinary General Public License.  We use
 this license for certain libraries in order to permit linking those
 libraries into non-free programs.
  When a program is linked with a library, whether statically or using
 a shared library, the combination of the two is legally speaking a
 combined work, a derivative of the original library.  The ordinary
 General Public License therefore permits such linking only if the
 entire combination fits its criteria of freedom.  The Lesser General
 Public License permits more lax criteria for linking other code with
 the library.
  We call this license the "Lesser" General Public License because it
 does Less to protect the user's freedom than the ordinary General
 Public License.  It also provides other free software developers Less
 of an advantage over competing non-free programs.  These disadvantages
 are the reason we use the ordinary General Public License for many
 libraries.  However, the Lesser license provides advantages in certain
 special circumstances.
  For example, on rare occasions, there may be a special need to
 encourage the widest possible use of a certain library, so that it becomes
 a de-facto standard.  To achieve this, non-free programs must be
 allowed to use the library.  A more frequent case is that a free
 library does the same job as widely used non-free libraries.  In this
 case, there is little to gain by limiting the free library to free
 software only, so we use the Lesser General Public License.
  In other cases, permission to use a particular library in non-free
 programs enables a greater number of people to use a large body of
 free software.  For example, permission to use the GNU C Library in
 non-free programs enables many more people to use the whole GNU
 operating system, as well as its variant, the GNU/Linux operating
 system.
  Although the Lesser General Public License is Less protective of the
 users' freedom, it does ensure that the user of a program that is
 linked with the Library has the freedom and the wherewithal to run
 that program using a modified version of the Library.
  The precise terms and conditions for copying, distribution and
 modification follow.  Pay close attention to the difference between a
 "work based on the library" and a "work that uses the library".  The
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
 		  GNU LESSER GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
  0. This License Agreement applies to any software library or other
 program which contains a notice placed by the copyright holder or
 other authorized party saying it may be distributed under the terms of
 this Lesser General Public License (also called "this License").
 Each licensee is addressed as "you".
  A "library" means a collection of software functions and/or data
 prepared so as to be conveniently linked with application programs
 (which use some of those functions and data) to form executables.
  The "Library", below, refers to any such software library or work
 which has been distributed under these terms.  A "work based on the
 Library" means either the Library or any derivative work under
 copyright law: that is to say, a work containing the Library or a
 portion of it, either verbatim or with modifications and/or translated
 straightforwardly into another language.  (Hereinafter, translation is
 included without limitation in the term "modification".)
  "Source code" for a work means the preferred form of the work for
 making modifications to it.  For a library, complete source code means
 all the source code for all modules it contains, plus any associated
 interface definition files, plus the scripts used to control compilation
 and installation of the library.
  Activities other than copying, distribution and modification are not
 covered by this License; they are outside its scope.  The act of
 running a program using the Library is not restricted, and output from
 such a program is covered only if its contents constitute a work based
 on the Library (independent of the use of the Library in a tool for
 writing it).  Whether that is true depends on what the Library does
 and what the program that uses the Library does.
  1. You may copy and distribute verbatim copies of the Library's
 complete source code as you receive it, in any medium, provided that
 you conspicuously and appropriately publish on each copy an
 appropriate copyright notice and disclaimer of warranty; keep intact
 all the notices that refer to this License and to the absence of any
 warranty; and distribute a copy of this License along with the
 Library.
  You may charge a fee for the physical act of transferring a copy,
 and you may at your option offer warranty protection in exchange for a
 fee.
  2. You may modify your copy or copies of the Library or any portion
 of it, thus forming a work based on the Library, and copy and
 distribute such modifications or work under the terms of Section 1
 above, provided that you also meet all of these conditions:
    a) The modified work must itself be a software library.
    b) You must cause the files modified to carry prominent notices
    stating that you changed the files and the date of any change.
    c) You must cause the whole of the work to be licensed at no
    charge to all third parties under the terms of this License.
    d) If a facility in the modified Library refers to a function or a
    table of data to be supplied by an application program that uses
    the facility, other than as an argument passed when the facility
    is invoked, then you must make a good faith effort to ensure that,
    in the event an application does not supply such function or
    table, the facility still operates, and performs whatever part of
    its purpose remains meaningful.
    (For example, a function in a library to compute square roots has
    a purpose that is entirely well-defined independent of the
    application.  Therefore, Subsection 2d requires that any
    application-supplied function or table used by this function must
    be optional: if the application does not supply it, the square
    root function must still compute square roots.)
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Library,
 and can be reasonably considered independent and separate works in
 themselves, then this License, and its terms, do not apply to those
 sections when you distribute them as separate works.  But when you
 distribute the same sections as part of a whole which is a work based
 on the Library, the distribution of the whole must be on the terms of
 this License, whose permissions for other licensees extend to the
 entire whole, and thus to each and every part regardless of who wrote
 it.
 Thus, it is not the intent of this section to claim rights or contest
 your rights to work written entirely by you; rather, the intent is to
 exercise the right to control the distribution of derivative or
 collective works based on the Library.
 In addition, mere aggregation of another work not based on the Library
 with the Library (or with a work based on the Library) on a volume of
 a storage or distribution medium does not bring the other work under
 the scope of this License.
  3. You may opt to apply the terms of the ordinary GNU General Public
 License instead of this License to a given copy of the Library.  To do
 this, you must alter all the notices that refer to this License, so
 that they refer to the ordinary GNU General Public License, version 2,
 instead of to this License.  (If a newer version than version 2 of the
 ordinary GNU General Public License has appeared, then you can specify
 that version instead if you wish.)  Do not make any other change in
 these notices.
  Once this change is made in a given copy, it is irreversible for
 that copy, so the ordinary GNU General Public License applies to all
 subsequent copies and derivative works made from that copy.
  This option is useful when you wish to copy part of the code of
 the Library into a program that is not a library.
  4. You may copy and distribute the Library (or a portion or
 derivative of it, under Section 2) in object code or executable form
 under the terms of Sections 1 and 2 above provided that you accompany
 it with the complete corresponding machine-readable source code, which
 must be distributed under the terms of Sections 1 and 2 above on a
 medium customarily used for software interchange.
  If distribution of object code is made by offering access to copy
 from a designated place, then offering equivalent access to copy the
 source code from the same place satisfies the requirement to
 distribute the source code, even though third parties are not
 compelled to copy the source along with the object code.
  5. A program that contains no derivative of any portion of the
 Library, but is designed to work with the Library by being compiled or
 linked with it, is called a "work that uses the Library".  Such a
 work, in isolation, is not a derivative work of the Library, and
 therefore falls outside the scope of this License.
  However, linking a "work that uses the Library" with the Library
 creates an executable that is a derivative of the Library (because it
 contains portions of the Library), rather than a "work that uses the
 library".  The executable is therefore covered by this License.
 Section 6 states terms for distribution of such executables.
  When a "work that uses the Library" uses material from a header file
 that is part of the Library, the object code for the work may be a
 derivative work of the Library even though the source code is not.
 Whether this is true is especially significant if the work can be
 linked without the Library, or if the work is itself a library.  The
 threshold for this to be true is not precisely defined by law.
  If such an object file uses only numerical parameters, data
 structure layouts and accessors, and small macros and small inline
 functions (ten lines or less in length), then the use of the object
 file is unrestricted, regardless of whether it is legally a derivative
 work.  (Executables containing this object code plus portions of the
 Library will still fall under Section 6.)
  Otherwise, if the work is a derivative of the Library, you may
 distribute the object code for the work under the terms of Section 6.
 Any executables containing that work also fall under Section 6,
 whether or not they are linked directly with the Library itself.
  6. As an exception to the Sections above, you may also combine or
 link a "work that uses the Library" with the Library to produce a
 work containing portions of the Library, and distribute that work
 under terms of your choice, provided that the terms permit
 modification of the work for the customer's own use and reverse
 engineering for debugging such modifications.
  You must give prominent notice with each copy of the work that the
 Library is used in it and that the Library and its use are covered by
 this License.  You must supply a copy of this License.  If the work
 during execution displays copyright notices, you must include the
 copyright notice for the Library among them, as well as a reference
 directing the user to the copy of this License.  Also, you must do one
 of these things:
    a) Accompany the work with the complete corresponding
    machine-readable source code for the Library including whatever
    changes were used in the work (which must be distributed under
    Sections 1 and 2 above); and, if the work is an executable linked
    with the Library, with the complete machine-readable "work that
    uses the Library", as object code and/or source code, so that the
    user can modify the Library and then relink to produce a modified
    executable containing the modified Library.  (It is understood
    that the user who changes the contents of definitions files in the
    Library will not necessarily be able to recompile the application
    to use the modified definitions.)
    b) Use a suitable shared library mechanism for linking with the
    Library.  A suitable mechanism is one that (1) uses at run time a
    copy of the library already present on the user's computer system,
    rather than copying library functions into the executable, and (2)
    will operate properly with a modified version of the library, if
    the user installs one, as long as the modified version is
    interface-compatible with the version that the work was made with.
    c) Accompany the work with a written offer, valid for at
    least three years, to give the same user the materials
    specified in Subsection 6a, above, for a charge no more
    than the cost of performing this distribution.
    d) If distribution of the work is made by offering access to copy
    from a designated place, offer equivalent access to copy the above
    specified materials from the same place.
    e) Verify that the user has already received a copy of these
    materials or that you have already sent this user a copy.
  For an executable, the required form of the "work that uses the
 Library" must include any data and utility programs needed for
 reproducing the executable from it.  However, as a special exception,
 the materials to be distributed need not include anything that is
 normally distributed (in either source or binary form) with the major
 components (compiler, kernel, and so on) of the operating system on
 which the executable runs, unless that component itself accompanies
 the executable.
  It may happen that this requirement contradicts the license
 restrictions of other proprietary libraries that do not normally
 accompany the operating system.  Such a contradiction means you cannot
 use both them and the Library together in an executable that you
 distribute.
  7. You may place library facilities that are a work based on the
 Library side-by-side in a single library together with other library
 facilities not covered by this License, and distribute such a combined
 library, provided that the separate distribution of the work based on
 the Library and of the other library facilities is otherwise
 permitted, and provided that you do these two things:
    a) Accompany the combined library with a copy of the same work
    based on the Library, uncombined with any other library
    facilities.  This must be distributed under the terms of the
    Sections above.
    b) Give prominent notice with the combined library of the fact
    that part of it is a work based on the Library, and explaining
    where to find the accompanying uncombined form of the same work.
  8. You may not copy, modify, sublicense, link with, or distribute
 the Library except as expressly provided under this License.  Any
 attempt otherwise to copy, modify, sublicense, link with, or
 distribute the Library is void, and will automatically terminate your
 rights under this License.  However, parties who have received copies,
 or rights, from you under this License will not have their licenses
 terminated so long as such parties remain in full compliance.
  9. You are not required to accept this License, since you have not
 signed it.  However, nothing else grants you permission to modify or
 distribute the Library or its derivative works.  These actions are
 prohibited by law if you do not accept this License.  Therefore, by
 modifying or distributing the Library (or any work based on the
 Library), you indicate your acceptance of this License to do so, and
 all its terms and conditions for copying, distributing or modifying
 the Library or works based on it.
  10. Each time you redistribute the Library (or any work based on the
 Library), the recipient automatically receives a license from the
 original licensor to copy, distribute, link with or modify the Library
 subject to these terms and conditions.  You may not impose any further
 restrictions on the recipients' exercise of the rights granted herein.
 You are not responsible for enforcing compliance by third parties with
 this License.
  11. If, as a consequence of a court judgment or allegation of patent
 infringement or for any other reason (not limited to patent issues),
 conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
 excuse you from the conditions of this License.  If you cannot
 distribute so as to satisfy simultaneously your obligations under this
 License and any other pertinent obligations, then as a consequence you
 may not distribute the Library at all.  For example, if a patent
 license would not permit royalty-free redistribution of the Library by
 all those who receive copies directly or indirectly through you, then
 the only way you could satisfy both it and this License would be to
 refrain entirely from distribution of the Library.
 If any portion of this section is held invalid or unenforceable under any
 particular circumstance, the balance of the section is intended to apply,
 and the section as a whole is intended to apply in other circumstances.
 It is not the purpose of this section to induce you to infringe any
 patents or other property right claims or to contest validity of any
 such claims; this section has the sole purpose of protecting the
 integrity of the free software distribution system which is
 implemented by public license practices.  Many people have made
 generous contributions to the wide range of software distributed
 through that system in reliance on consistent application of that
 system; it is up to the author/donor to decide if he or she is willing
 to distribute software through any other system and a licensee cannot
 impose that choice.
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
  12. If the distribution and/or use of the Library is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Library under this License may add
 an explicit geographical distribution limitation excluding those countries,
 so that distribution is permitted only in or among countries not thus
 excluded.  In such case, this License incorporates the limitation as if
 written in the body of this License.
  13. The Free Software Foundation may publish revised and/or new
 versions of the Lesser General Public License from time to time.
 Such new versions will be similar in spirit to the present version,
 but may differ in detail to address new problems or concerns.
 Each version is given a distinguishing version number.  If the Library
 specifies a version number of this License which applies to it and
 "any later version", you have the option of following the terms and
 conditions either of that version or of any later version published by
 the Free Software Foundation.  If the Library does not specify a
 license version number, you may choose any version ever published by
 the Free Software Foundation.
  14. If you wish to incorporate parts of the Library into other free
 programs whose distribution conditions are incompatible with these,
 write to the author to ask for permission.  For software which is
 copyrighted by the Free Software Foundation, write to the Free
 Software Foundation; we sometimes make exceptions for this.  Our
 decision will be guided by the two goals of preserving the free status
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 			    NO WARRANTY
  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
 WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
 EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
 OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
 KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
 LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
 THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
 WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
 AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
 FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
 CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
 LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
 RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
 FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 		     END OF TERMS AND CONDITIONS
           How to Apply These Terms to Your New Libraries
  If you develop a new library, and you want it to be of the greatest
 possible use to the public, we recommend making it free software that
 everyone can redistribute and change.  You can do so by permitting
 redistribution under these terms (or, alternatively, under the terms of the
 ordinary General Public License).
  To apply these terms, attach the following notices to the library.  It is
 safest to attach them to the start of each source file to most effectively
 convey the exclusion of warranty; and each file should have at least the
 "copyright" line and a pointer to where the full notice is found.
    <one line to give the library's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
    version 2.1 of the License, or (at your option) any later version.
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 Also add information on how to contact you by electronic and paper mail.
 You should also get your employer (if you work as a programmer) or your
 school, if any, to sign a "copyright disclaimer" for the library, if
 necessary.  Here is a sample; alter the names:
  Yoyodyne, Inc., hereby disclaims all copyright interest in the
  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
  <signature of Ty Coon>, 1 April 1990
  Ty Coon, President of Vice
 That's all there is to it!
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,53 +0,0 @@
                wxWindows Library Licence, Version 3.1
                ======================================
  Copyright (C) 1998-2005 Julian Smart, Robert Roebling et al
  Everyone is permitted to copy and distribute verbatim copies
  of this licence document, but changing it is not allowed.
                       WXWINDOWS LIBRARY LICENCE
     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
  This library is free software; you can redistribute it and/or modify it
  under the terms of the GNU Library General Public Licence as published by
  the Free Software Foundation; either version 2 of the Licence, or (at
  your option) any later version.
  This library is distributed in the hope that it will be useful, but
  WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library
  General Public Licence for more details.
  You should have received a copy of the GNU Library General Public Licence
  along with this software, usually in a file named COPYING.LIB.  If not,
  write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  Boston, MA 02111-1307 USA.
  EXCEPTION NOTICE
  1. As a special exception, the copyright holders of this library give
  permission for additional uses of the text contained in this release of
  the library as licenced under the wxWindows Library Licence, applying
  either version 3.1 of the Licence, or (at your option) any later version of
  the Licence as published by the copyright holders of version
  3.1 of the Licence document.
  2. The exception is that you may use, copy, link, modify and distribute
  under your own terms, binary object code versions of works based
  on the Library.
  3. If you copy code from files distributed under the terms of the GNU
  General Public Licence or the GNU Library General Public Licence into a
  copy of this library, as this licence permits, the exception does not
  apply to the code that you add in this way.  To avoid misleading anyone as
  to the status of such modified files, you must delete this exception
  notice from such code and/or adjust the licensing conditions notice
  accordingly.
  4. If you write modifications of your own for this library, it is your
  choice whether to permit this exception to apply to your modifications. 
  If you do not wish that, you must delete the exception notice from such
  code and/or adjust the licensing conditions notice accordingly.
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,19 @@
-lib_LTLIBRARIES = libjpeg.la libturbojpeg.la
+lib_LTLIBRARIES = libjpeg.la
-libjpeg_la_LDFLAGS = -version-number 62:0:0 -no-undefined
+libjpeg_la_LDFLAGS = -version-info ${LIBTOOL_CURRENT}:${SO_MINOR_VERSION}:${SO_AGE} -no-undefined
-libturbojpeg_la_LDFLAGS = -avoid-version -no-undefined
+include_HEADERS = jerror.h jmorecfg.h jpeglib.h
-include_HEADERS = jerror.h jmorecfg.h jpeglib.h turbojpeg.h
+
 if WITH_TURBOJPEG
 lib_LTLIBRARIES += libturbojpeg.la
 libturbojpeg_la_LDFLAGS = -version-info 1:0:1 -no-undefined
 include_HEADERS += turbojpeg.h
 endif
 nodist_include_HEADERS = jconfig.h
 HDRS = jchuff.h jdct.h jdhuff.h jerror.h jinclude.h jmemsys.h jmorecfg.h \
-	jpegint.h jpeglib.h jversion.h jsimd.h jsimddct.h
+	jpegint.h jpeglib.h jversion.h jsimd.h jsimddct.h jpegcomp.h \
 	jpeg_nbits_table.h
 libjpeg_la_SOURCES = $(HDRS) jcapimin.c jcapistd.c jccoefct.c jccolor.c \
 	jcdctmgr.c jchuff.c jcinit.c jcmainct.c jcmarker.c jcmaster.c \
@@ -16,18 +24,56 @@ libjpeg_la_SOURCES = $(HDRS) jcapimin.c jcapistd.c jccoefct.c jccolor.c \
 	jfdctflt.c jfdctfst.c jfdctint.c jidctflt.c jidctfst.c jidctint.c \
 	jidctred.c jquant1.c jquant2.c jutils.c jmemmgr.c jmemnobs.c
-libturbojpeg_la_SOURCES = $(libjpeg_la_SOURCES) turbojpegl.c turbojpeg.h \
+if WITH_ARITH
-	turbojpeg-mapfile
+libjpeg_la_SOURCES += jaricom.c
 endif
-if VERSION_SCRIPT
+if WITH_ARITH_ENC
 libjpeg_la_SOURCES += jcarith.c
 endif
-libturbojpeg_la_LDFLAGS += $(VERSION_SCRIPT_FLAG)$(srcdir)/turbojpeg-mapfile
+if WITH_ARITH_DEC
 libjpeg_la_SOURCES += jdarith.c
 endif
 SUBDIRS = java
 if WITH_TURBOJPEG
 libturbojpeg_la_SOURCES = $(libjpeg_la_SOURCES) turbojpeg.c turbojpeg.h \
 	transupp.c transupp.h jdatadst-tj.c jdatasrc-tj.c
 if WITH_JAVA
 libturbojpeg_la_SOURCES += turbojpeg-jni.c
 libturbojpeg_la_CFLAGS = ${JNI_CFLAGS}
 TJMAPFILE = turbojpeg-mapfile.jni
 else
 TJMAPFILE = turbojpeg-mapfile
 endif
 libturbojpeg_la_SOURCES += $(TJMAPFILE)
 if VERSION_SCRIPT
 libturbojpeg_la_LDFLAGS += $(VERSION_SCRIPT_FLAG)$(srcdir)/$(TJMAPFILE)
 endif
 endif
 if VERSION_SCRIPT
 libjpeg_la_LDFLAGS += $(VERSION_SCRIPT_FLAG)libjpeg.map
 endif
 if WITH_SIMD
-SUBDIRS = simd
+SUBDIRS += simd
 libjpeg_la_LIBADD = simd/libsimd.la
 libturbojpeg_la_LIBADD = simd/libsimd.la
@@ -37,33 +83,59 @@ libjpeg_la_SOURCES += jsimd_none.c
 endif
 TSTHDRS = rrutil.h rrtimer.h
-noinst_PROGRAMS = jpgtest jpegut cjpeg djpeg jpegtran rdjpgcom wrjpgcom
+bin_PROGRAMS = cjpeg djpeg jpegtran rdjpgcom wrjpgcom
 noinst_PROGRAMS = jcstest
 jpgtest_SOURCES = $(TSTHDRS) jpgtest.cxx bmp.h bmp.c
-jpgtest_LDADD = libturbojpeg.la
+if WITH_TURBOJPEG
-jpegut_SOURCES = $(TSTHDRS) jpegut.c bmp.h bmp.c
+bin_PROGRAMS += tjbench
-jpegut_LDADD = libturbojpeg.la
+noinst_PROGRAMS += tjunittest
-cjpeg_SOURCES = cdjpeg.h cderror.h cdjpeg.c cjpeg.c rdbmp.c rdgif.c \
+tjbench_SOURCES = tjbench.c bmp.h bmp.c tjutil.h tjutil.c rdbmp.c rdppm.c \
-	rdppm.c rdswitch.c rdtarga.c 
+	wrbmp.c wrppm.c
 tjbench_LDADD = libturbojpeg.la libjpeg.la -lm
 tjbench_CFLAGS = -DBMP_SUPPORTED -DPPM_SUPPORTED
 tjunittest_SOURCES = tjunittest.c tjutil.h tjutil.c
 tjunittest_LDADD = libturbojpeg.la
 endif
 cjpeg_SOURCES = cdjpeg.h cderror.h cdjpeg.c cjpeg.c rdgif.c rdppm.c rdswitch.c
 if WITH_12BIT
 else
 cjpeg_SOURCES += rdbmp.c rdtarga.c
 endif
 cjpeg_LDADD = libjpeg.la
-cjpeg_CFLAGS = -DBMP_SUPPORTED -DGIF_SUPPORTED -DPPM_SUPPORTED \
+cjpeg_CFLAGS = -DGIF_SUPPORTED -DPPM_SUPPORTED
-	-DTARGA_SUPPORTED
+if WITH_12BIT
 else
 cjpeg_CFLAGS += -DBMP_SUPPORTED -DTARGA_SUPPORTED
 endif
 djpeg_SOURCES = cdjpeg.h cderror.h cdjpeg.c djpeg.c rdcolmap.c rdswitch.c \
-	wrbmp.c wrgif.c wrppm.c wrtarga.c
+	wrgif.c wrppm.c
 if WITH_12BIT
 else
 djpeg_SOURCES += wrbmp.c wrtarga.c
 endif
 djpeg_LDADD = libjpeg.la
-djpeg_CFLAGS = -DBMP_SUPPORTED -DGIF_SUPPORTED -DPPM_SUPPORTED \
+djpeg_CFLAGS = -DGIF_SUPPORTED -DPPM_SUPPORTED
-	-DTARGA_SUPPORTED
+if WITH_12BIT
 else
 djpeg_CFLAGS += -DBMP_SUPPORTED -DTARGA_SUPPORTED
 endif
 jpegtran_SOURCES = jpegtran.c rdswitch.c cdjpeg.c transupp.c transupp.h
@@ -77,95 +149,558 @@ wrjpgcom_SOURCES = wrjpgcom.c
 wrjpgcom_LDADD = libjpeg.la
 jcstest_SOURCES = jcstest.c
-DISTMANS= cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 wrjpgcom.1
+jcstest_LDADD = libjpeg.la
-DOCS= README install.doc usage.doc wizard.doc example.c libjpeg.doc \
+dist_man1_MANS = cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 wrjpgcom.1
 	structure.doc coderules.doc filelist.doc jconfig.doc change.log \
 	README-turbo.txt rdrle.c wrrle.c LICENSE.txt LGPL.txt BUILDING.txt
-TESTFILES= testorig.jpg testorig.ppm testimg.bmp testimgflt.jpg \
+DOCS= coderules.txt jconfig.txt change.log rdrle.c wrrle.c BUILDING.txt \
-	testimgfst.jpg testimgint.jpg testimgp.jpg testimgfst.ppm testimgint.ppm
+	ChangeLog.txt
-EXTRA_DIST = win release $(DOCS) $(DISTMANS) $(TESTFILES)
+dist_doc_DATA = README README-turbo.txt libjpeg.txt structure.txt usage.txt \
 	wizard.txt
 exampledir = $(docdir)
 dist_example_DATA = example.c
 EXTRA_DIST = win release $(DOCS) testimages CMakeLists.txt \
 	sharedlib/CMakeLists.txt cmakescripts libjpeg.map.in doc doxygen.config \
 	doxygen-extra.css jccolext.c jdcolext.c jdcol565.c jdmrgext.c jdmrg565.c \
 	jstdhuff.c
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
-test: testclean cjpeg djpeg jpegtran jpegut
+SUBDIRS += md5
 	./jpegut
 	./cjpeg -dct int -outfile testoutint.jpg $(srcdir)/testorig.ppm
 	./cjpeg -dct fast -opt -outfile testoutfst.jpg $(srcdir)/testorig.ppm
 	./cjpeg -dct float -outfile testoutflt.jpg $(srcdir)/testorig.ppm
 	cmp $(srcdir)/testimgint.jpg testoutint.jpg
 	cmp $(srcdir)/testimgfst.jpg testoutfst.jpg
 	cmp $(srcdir)/testimgflt.jpg testoutflt.jpg
 	./djpeg -dct int -fast -ppm -outfile testoutint.ppm $(srcdir)/testorig.jpg
 	./djpeg -dct fast -ppm -outfile testoutfst.ppm $(srcdir)/testorig.jpg
 	./djpeg -dct float -ppm -outfile testoutflt.ppm $(srcdir)/testorig.jpg
 	cmp $(srcdir)/testimgint.ppm testoutint.ppm
 	cmp $(srcdir)/testimgfst.ppm testoutfst.ppm
 	cmp $(srcdir)/testorig.ppm testoutflt.ppm
 	./djpeg -dct int -bmp -colors 256 -outfile testout.bmp  $(srcdir)/testorig.jpg
 	cmp $(srcdir)/testimg.bmp testout.bmp
 	./cjpeg -dct int -progressive -outfile testoutp.jpg $(srcdir)/testorig.ppm
 	cmp $(srcdir)/testimgp.jpg testoutp.jpg
 	./jpegtran -outfile testoutt.jpg testoutp.jpg
 	cmp $(srcdir)/testimgint.jpg testoutt.jpg
-testclean:
+if WITH_12BIT
 	$(RM) testout*
 	$(RM) *_GRAYQ[0-9]*.bmp
 	$(RM) *_GRAYQ[0-9]*.ppm
 	$(RM) *_GRAYQ[0-9]*.jpg
 	$(RM) *_420Q[0-9]*.bmp
 	$(RM) *_420Q[0-9]*.ppm
 	$(RM) *_420Q[0-9]*.jpg
 	$(RM) *_422Q[0-9]*.bmp
 	$(RM) *_422Q[0-9]*.ppm
 	$(RM) *_422Q[0-9]*.jpg
 	$(RM) *_444Q[0-9]*.bmp
 	$(RM) *_444Q[0-9]*.ppm
 	$(RM) *_444Q[0-9]*.jpg
-rpm: all
+TESTORIG = testorig12.jpg
-	sh $(srcdir)/release/makerpm ${PACKAGE_NAME} ${VERSION} ${BUILD} \
+MD5_JPEG_RGB_ISLOW = 9620f424569594bb9242b48498ad801f
-		${RPMARCH} ${srcdir}
+MD5_PPM_RGB_ISLOW = f3301d2219783b8b3d942b7239fa50c0
-
+MD5_JPEG_422_IFAST_OPT = 7322e3bd2f127f7de4b40d4480ce60e4
-srpm: dist-gzip
+MD5_PPM_422_IFAST = 79807fa552899e66a04708f533e16950
-	sh $(srcdir)/release/makesrpm ${PACKAGE_NAME} ${VERSION} ${BUILD} ${srcdir}
+MD5_PPM_422M_IFAST = 07737bfe8a7c1c87aaa393a0098d16b0
-
+MD5_JPEG_420_IFAST_Q100_PROG = a1da220b5604081863a504297ed59e55
-deb: all
+MD5_PPM_420_Q100_IFAST = 1b3730122709f53d007255e8dfd3305e
-	sh $(srcdir)/release/makedpkg ${PACKAGE_NAME} ${VERSION} ${BUILD} \
+MD5_PPM_420M_Q100_IFAST = 980a1a3c5bf9510022869d30b7d26566
-		${DEBARCH} ${srcdir}
+MD5_JPEG_GRAY_ISLOW = 235c90707b16e2e069f37c888b2636d9
-
+MD5_PPM_GRAY_ISLOW = 7213c10af507ad467da5578ca5ee1fca
-if X86_64
+MD5_PPM_GRAY_ISLOW_RGB = e96ee81c30a6ed422d466338bd3de65d
-
+MD5_JPEG_420S_IFAST_OPT = 7af8e60be4d9c227ec63ac9b6630855e
-udmg: all
+MD5_JPEG_3x2_FLOAT_PROG_SSE = a8c17daf77b457725ec929e215b603f8
-	sh $(srcdir)/release/makemacpkg ${PACKAGE_NAME} ${VERSION} ${BUILD} \
+MD5_PPM_3x2_FLOAT_SSE = 42876ab9e5c2f76a87d08db5fbd57956
-		${srcdir} universal
+MD5_JPEG_3x2_FLOAT_PROG_32BIT = a8c17daf77b457725ec929e215b603f8
-
+MD5_PPM_3x2_FLOAT_32BIT = 42876ab9e5c2f76a87d08db5fbd57956
-endif
+MD5_PPM_3x2_FLOAT_64BIT = d6fbc71153b3d8ded484dbc17c7b9cf4
-
+MD5_JPEG_3x2_IFAST_PROG = 1396cc2b7185cfe943d408c9d305339e
-dmg: all
+MD5_PPM_3x2_IFAST = 3975985ef6eeb0a2cdc58daa651ccc00
-	sh $(srcdir)/release/makemacpkg ${PACKAGE_NAME} ${VERSION} ${BUILD} ${srcdir}
+MD5_PPM_420M_ISLOW_2_1 = 4ca6be2a6f326ff9eaab63e70a8259c0
-
+MD5_PPM_420M_ISLOW_15_8 = 12aa9f9534c1b3d7ba047322226365eb
-if X86_64
+MD5_PPM_420M_ISLOW_13_8 = f7e22817c7b25e1393e4ec101e9d4e96
-
+MD5_PPM_420M_ISLOW_11_8 = 800a16f9f4dc9b293197bfe11be10a82
-sunpkg: all
+MD5_PPM_420M_ISLOW_9_8 = 06b7a92a9bc69f4dc36ec40f1937d55c
-	sh $(srcdir)/release/makesunpkg ${PACKAGE_NAME} ${VERSION} ${BUILD} \
+MD5_PPM_420M_ISLOW_7_8 = 3ec444a14a4ab4eab88ffc49c48eca43
-		${DEBARCH} ${srcdir} $(CC) $(CXX) combined
+MD5_PPM_420M_ISLOW_3_4 = 3e726b7ea872445b19437d1c1d4f0d93
 MD5_PPM_420M_ISLOW_5_8 = a8a771abdc94301d20ffac119b2caccd
 MD5_PPM_420M_ISLOW_1_2 = b419124dd5568b085787234866102866
 MD5_PPM_420M_ISLOW_3_8 = 343d19015531b7bbe746124127244fa8
 MD5_PPM_420M_ISLOW_1_4 = 35fd59d866e44659edfa3c18db2a3edb
 MD5_PPM_420M_ISLOW_1_8 = ccaed48ac0aedefda5d4abe4013f4ad7
 MD5_JPEG_CROP = cdb35ff4b4519392690ea040c56ea99c
 else
-sunpkg: all
+TESTORIG = testorig.jpg
-	sh $(srcdir)/release/makesunpkg ${PACKAGE_NAME} ${VERSION} ${BUILD} \
+MD5_JPEG_RGB_ISLOW = 768e970dd57b340ff1b83c9d3d47c77b
-		${DEBARCH} ${srcdir} $(CC) $(CXX)
+MD5_PPM_RGB_ISLOW = 00a257f5393fef8821f2b88ac7421291
 MD5_BMP_RGB_ISLOW_565 = f07d2e75073e4bb10f6c6f4d36e2e3be
 MD5_BMP_RGB_ISLOW_565D = 4cfa0928ef3e6bb626d7728c924cfda4
 MD5_JPEG_422_IFAST_OPT = 2540287b79d913f91665e660303ab2c8
 MD5_PPM_422_IFAST = 35bd6b3f833bad23de82acea847129fa
 MD5_PPM_422M_IFAST = 8dbc65323d62cca7c91ba02dd1cfa81d
 MD5_BMP_422M_IFAST_565 = 3294bd4d9a1f2b3d08ea6020d0db7065
 MD5_BMP_422M_IFAST_565D = da98c9c7b6039511be4a79a878a9abc1
 MD5_JPEG_420_IFAST_Q100_PROG = 990cbe0329c882420a2094da7e5adade
 MD5_PPM_420_Q100_IFAST = 5a732542015c278ff43635e473a8a294
 MD5_PPM_420M_Q100_IFAST = ff692ee9323a3b424894862557c092f1
 MD5_JPEG_GRAY_ISLOW = 72b51f894b8f4a10b3ee3066770aa38d
 MD5_PPM_GRAY_ISLOW = 8d3596c56eace32f205deccc229aa5ed
 MD5_PPM_GRAY_ISLOW_RGB = 116424ac07b79e5e801f00508eab48ec
 MD5_BMP_GRAY_ISLOW_565 = 12f78118e56a2f48b966f792fedf23cc
 MD5_BMP_GRAY_ISLOW_565D = bdbbd616441a24354c98553df5dc82db
 MD5_JPEG_420S_IFAST_OPT = 388708217ac46273ca33086b22827ed8
 # See README-turbo.txt for more details on why this next bit is necessary.
 MD5_JPEG_3x2_FLOAT_PROG_SSE = 343e3f8caf8af5986ebaf0bdc13b5c71
 MD5_PPM_3x2_FLOAT_SSE = 1a75f36e5904d6fc3a85a43da9ad89bb
 MD5_JPEG_3x2_FLOAT_PROG_32BIT = 9bca803d2042bd1eb03819e2bf92b3e5
 MD5_PPM_3x2_FLOAT_32BIT = f6bfab038438ed8f5522fbd33595dcdc
 MD5_PPM_3x2_FLOAT_64BIT = 0e917a34193ef976b679a6b069b1be26
 MD5_JPEG_3x2_IFAST_PROG = 1ee5d2c1a77f2da495f993c8c7cceca5
 MD5_PPM_3x2_IFAST = fd283664b3b49127984af0a7f118fccd
 MD5_JPEG_420_ISLOW_ARI = e986fb0a637a8d833d96e8a6d6d84ea1
 MD5_JPEG_444_ISLOW_PROGARI = 0a8f1c8f66e113c3cf635df0a475a617
 MD5_PPM_420M_IFAST_ARI = 72b59a99bcf1de24c5b27d151bde2437
 MD5_JPEG_420_ISLOW = 9a68f56bc76e466aa7e52f415d0f4a5f
 MD5_PPM_420M_ISLOW_2_1 = 9f9de8c0612f8d06869b960b05abf9c9
 MD5_PPM_420M_ISLOW_15_8 = b6875bc070720b899566cc06459b63b7
 MD5_PPM_420M_ISLOW_13_8 = bc3452573c8152f6ae552939ee19f82f
 MD5_PPM_420M_ISLOW_11_8 = d8cc73c0aaacd4556569b59437ba00a5
 MD5_PPM_420M_ISLOW_9_8 = d25e61bc7eac0002f5b393aa223747b6
 MD5_PPM_420M_ISLOW_7_8 = ddb564b7c74a09494016d6cd7502a946
 MD5_PPM_420M_ISLOW_3_4 = 8ed8e68808c3fbc4ea764fc9d2968646
 MD5_PPM_420M_ISLOW_5_8 = a3363274999da2366a024efae6d16c9b
 MD5_PPM_420M_ISLOW_1_2 = e692a315cea26b988c8e8b29a5dbcd81
 MD5_PPM_420M_ISLOW_3_8 = 79eca9175652ced755155c90e785a996
 MD5_PPM_420M_ISLOW_1_4 = 79cd778f8bf1a117690052cacdd54eca
 MD5_PPM_420M_ISLOW_1_8 = 391b3d4aca640c8567d6f8745eb2142f
 MD5_BMP_420_ISLOW_256 = 4980185e3776e89bd931736e1cddeee6
 MD5_BMP_420_ISLOW_565 = bf9d13e16c4923b92e1faa604d7922cb
 MD5_BMP_420_ISLOW_565D = 6bde71526acc44bcff76f696df8638d2
 MD5_BMP_420M_ISLOW_565 = 8dc0185245353cfa32ad97027342216f
 MD5_BMP_420M_ISLOW_565D =d1be3a3339166255e76fa50a0d70d73e
 MD5_JPEG_CROP = b4197f377e621c4e9b1d20471432610d
 endif
-nsi: all
+.PHONY: test
-	makensis -nocd -DVERSION=$(VERSION) -DAPPNAME=libjpeg-turbo-gcc \
+test: tjquicktest tjbittest bittest
-		-DWLIBDIR=.libs -DWSRCDIR=$(srcdir) -DWBLDDIR=. -DWHDRDIR=. \
+
-		-DPLATFORM="GCC" -DGCC $(srcdir)/release/libjpeg-turbo.nsi
+tjquicktest: testclean all
 if WITH_TURBOJPEG
 if WITH_JAVA
 	$(JAVA) -cp java/turbojpeg.jar -Djava.library.path=.libs TJUnitTest
 	$(JAVA) -cp java/turbojpeg.jar -Djava.library.path=.libs TJUnitTest -bi
 	$(JAVA) -cp java/turbojpeg.jar -Djava.library.path=.libs TJUnitTest -yuv
 	$(JAVA) -cp java/turbojpeg.jar -Djava.library.path=.libs TJUnitTest -yuv -noyuvpad
 	$(JAVA) -cp java/turbojpeg.jar -Djava.library.path=.libs TJUnitTest -yuv -bi
 	$(JAVA) -cp java/turbojpeg.jar -Djava.library.path=.libs TJUnitTest -yuv -bi -noyuvpad
 endif
 	./tjunittest
 	./tjunittest -alloc
 	./tjunittest -yuv
 	./tjunittest -yuv -alloc
 	./tjunittest -yuv -noyuvpad
 endif
 	echo GREAT SUCCESS!
 tjbittest: testclean all
 if WITH_TURBOJPEG
 MD5_PPM_GRAY_TILE = 89d3ca21213d9d864b50b4e4e7de4ca6
 MD5_PPM_420_8x8_TILE = 847fceab15c5b7b911cb986cf0f71de3
 MD5_PPM_420_16x16_TILE = ca45552a93687e078f7137cc4126a7b0
 MD5_PPM_420_32x32_TILE = d8676f1d6b68df358353bba9844f4a00
 MD5_PPM_420_64x64_TILE = 4e4c1a3d7ea4bace4f868bcbe83b7050
 MD5_PPM_420_128x128_TILE = f24c3429c52265832beab9df72a0ceae
 MD5_PPM_420M_8x8_TILE = bc25320e1f4c31ce2e610e43e9fd173c
 MD5_PPM_420M_TILE = 75ffdf14602258c5c189522af57fa605
 MD5_PPM_422_8x8_TILE = d83dacd9fc73b0a6f10c09acad64eb1e
 MD5_PPM_422_16x16_TILE = 35077fb610d72dd743b1eb0cbcfe10fb
 MD5_PPM_422_32x32_TILE = e6902ed8a449ecc0f0d6f2bf945f65f7
 MD5_PPM_422_64x64_TILE = 2b4502a8f316cedbde1da7bce3d2231e
 MD5_PPM_422_128x128_TILE = f0b5617d578f5e13c8eee215d64d4877
 MD5_PPM_422M_8x8_TILE = 828941d7f41cd6283abd6beffb7fd51d
 MD5_PPM_422M_TILE = e877ae1324c4a280b95376f7f018172f
 MD5_PPM_444_TILE = 7964e41e67cfb8d0a587c0aa4798f9c3
 # Test compressing from/decompressing to an arbitrary subregion of a larger
 # image buffer
 	cp $(srcdir)/testimages/testorig.ppm testout_tile.ppm
 	./tjbench testout_tile.ppm 95 -rgb -quiet -tile -benchtime 0.01 >/dev/null 2>&1
 	for i in 8 16 32 64 128; do \
 		md5/md5cmp $(MD5_PPM_GRAY_TILE) testout_tile_GRAY_Q95_$$i\x$$i.ppm; \
 	done
 	md5/md5cmp $(MD5_PPM_420_8x8_TILE) testout_tile_420_Q95_8x8.ppm
 	md5/md5cmp $(MD5_PPM_420_16x16_TILE) testout_tile_420_Q95_16x16.ppm
 	md5/md5cmp $(MD5_PPM_420_32x32_TILE) testout_tile_420_Q95_32x32.ppm
 	md5/md5cmp $(MD5_PPM_420_64x64_TILE) testout_tile_420_Q95_64x64.ppm
 	md5/md5cmp $(MD5_PPM_420_128x128_TILE) testout_tile_420_Q95_128x128.ppm
 	md5/md5cmp $(MD5_PPM_422_8x8_TILE) testout_tile_422_Q95_8x8.ppm
 	md5/md5cmp $(MD5_PPM_422_16x16_TILE) testout_tile_422_Q95_16x16.ppm
 	md5/md5cmp $(MD5_PPM_422_32x32_TILE) testout_tile_422_Q95_32x32.ppm
 	md5/md5cmp $(MD5_PPM_422_64x64_TILE) testout_tile_422_Q95_64x64.ppm
 	md5/md5cmp $(MD5_PPM_422_128x128_TILE) testout_tile_422_Q95_128x128.ppm
 	for i in 8 16 32 64 128; do \
 		md5/md5cmp $(MD5_PPM_444_TILE) testout_tile_444_Q95_$$i\x$$i.ppm; \
 	done
 	rm testout_tile_GRAY_* testout_tile_420_* testout_tile_422_* testout_tile_444_*
 	./tjbench testout_tile.ppm 95 -rgb -fastupsample -quiet -tile -benchtime 0.01 >/dev/null 2>&1
 	md5/md5cmp $(MD5_PPM_420M_8x8_TILE) testout_tile_420_Q95_8x8.ppm
 	for i in 16 32 64 128; do \
 		md5/md5cmp $(MD5_PPM_420M_TILE) testout_tile_420_Q95_$$i\x$$i.ppm; \
 	done
 	md5/md5cmp $(MD5_PPM_422M_8x8_TILE) testout_tile_422_Q95_8x8.ppm
 	for i in 16 32 64 128; do \
 		md5/md5cmp $(MD5_PPM_422M_TILE) testout_tile_422_Q95_$$i\x$$i.ppm; \
 	done
 	rm testout_tile_GRAY_* testout_tile_420_* testout_tile_422_* testout_tile_444_* testout_tile.ppm
 	echo GREAT SUCCESS!
 endif
 bittest: testclean all
 # These tests are carefully crafted to provide full coverage of as many of the
 # underlying algorithms as possible (including all of the SIMD-accelerated
 # ones.)
 # CC: null  SAMP: fullsize  FDCT: islow  ENT: huff
 	./cjpeg -rgb -dct int -outfile testout_rgb_islow.jpg $(srcdir)/testimages/testorig.ppm
 	md5/md5cmp $(MD5_JPEG_RGB_ISLOW) testout_rgb_islow.jpg
 # CC: null  SAMP: fullsize  IDCT: islow  ENT: huff
 	./djpeg -dct int -ppm -outfile testout_rgb_islow.ppm testout_rgb_islow.jpg
 	md5/md5cmp $(MD5_PPM_RGB_ISLOW) testout_rgb_islow.ppm
 	rm testout_rgb_islow.ppm
 if WITH_12BIT
 	rm testout_rgb_islow.jpg
 else
 # CC: RGB->RGB565  SAMP: fullsize  IDCT: islow  ENT: huff
 	./djpeg -dct int -rgb565 -dither none -bmp -outfile testout_rgb_islow_565.bmp testout_rgb_islow.jpg
 	md5/md5cmp $(MD5_BMP_RGB_ISLOW_565) testout_rgb_islow_565.bmp
 	rm testout_rgb_islow_565.bmp
 # CC: RGB->RGB565 (dithered)  SAMP: fullsize  IDCT: islow  ENT: huff
 	./djpeg -dct int -rgb565 -bmp -outfile testout_rgb_islow_565D.bmp testout_rgb_islow.jpg
 	md5/md5cmp $(MD5_BMP_RGB_ISLOW_565D) testout_rgb_islow_565D.bmp
 	rm testout_rgb_islow_565D.bmp testout_rgb_islow.jpg
 endif
 # CC: RGB->YCC  SAMP: fullsize/h2v1  FDCT: ifast  ENT: 2-pass huff
 	./cjpeg -sample 2x1 -dct fast -opt -outfile testout_422_ifast_opt.jpg $(srcdir)/testimages/testorig.ppm
 	md5/md5cmp $(MD5_JPEG_422_IFAST_OPT) testout_422_ifast_opt.jpg
 # CC: YCC->RGB  SAMP: fullsize/h2v1 fancy  IDCT: ifast  ENT: huff
 	./djpeg -dct fast -outfile testout_422_ifast.ppm testout_422_ifast_opt.jpg
 	md5/md5cmp $(MD5_PPM_422_IFAST) testout_422_ifast.ppm
 	rm testout_422_ifast.ppm
 # CC: YCC->RGB  SAMP: h2v1 merged  IDCT: ifast  ENT: huff
 	./djpeg -dct fast -nosmooth -outfile testout_422m_ifast.ppm testout_422_ifast_opt.jpg
 	md5/md5cmp $(MD5_PPM_422M_IFAST) testout_422m_ifast.ppm
 	rm testout_422m_ifast.ppm
 if WITH_12BIT
 	rm testout_422_ifast_opt.jpg
 else
 # CC: YCC->RGB565  SAMP: h2v1 merged  IDCT: ifast  ENT: huff
 	./djpeg -dct int -nosmooth -rgb565 -dither none -bmp -outfile testout_422m_ifast_565.bmp testout_422_ifast_opt.jpg
 	md5/md5cmp $(MD5_BMP_422M_IFAST_565) testout_422m_ifast_565.bmp
 	rm testout_422m_ifast_565.bmp
 # CC: YCC->RGB565 (dithered)  SAMP: h2v1 merged  IDCT: ifast  ENT: huff
 	./djpeg -dct int -nosmooth -rgb565 -bmp -outfile testout_422m_ifast_565D.bmp testout_422_ifast_opt.jpg
 	md5/md5cmp $(MD5_BMP_422M_IFAST_565D) testout_422m_ifast_565D.bmp
 	rm testout_422m_ifast_565D.bmp testout_422_ifast_opt.jpg
 endif
 # CC: RGB->YCC  SAMP: fullsize/h2v2  FDCT: ifast  ENT: prog huff
 	./cjpeg -sample 2x2 -quality 100 -dct fast -prog -outfile testout_420_q100_ifast_prog.jpg $(srcdir)/testimages/testorig.ppm
 	md5/md5cmp $(MD5_JPEG_420_IFAST_Q100_PROG) testout_420_q100_ifast_prog.jpg
 # CC: YCC->RGB  SAMP: fullsize/h2v2 fancy  IDCT: ifast  ENT: prog huff
 	./djpeg -dct fast -outfile testout_420_q100_ifast.ppm testout_420_q100_ifast_prog.jpg
 	md5/md5cmp $(MD5_PPM_420_Q100_IFAST) testout_420_q100_ifast.ppm
 	rm testout_420_q100_ifast.ppm
 # CC: YCC->RGB  SAMP: h2v2 merged  IDCT: ifast  ENT: prog huff
 	./djpeg -dct fast -nosmooth -outfile testout_420m_q100_ifast.ppm testout_420_q100_ifast_prog.jpg
 	md5/md5cmp $(MD5_PPM_420M_Q100_IFAST) testout_420m_q100_ifast.ppm
 	rm testout_420m_q100_ifast.ppm testout_420_q100_ifast_prog.jpg
 # CC: RGB->Gray  SAMP: fullsize  FDCT: islow  ENT: huff
 	./cjpeg -gray -dct int -outfile testout_gray_islow.jpg $(srcdir)/testimages/testorig.ppm
 	md5/md5cmp $(MD5_JPEG_GRAY_ISLOW) testout_gray_islow.jpg
 # CC: Gray->Gray  SAMP: fullsize  IDCT: islow  ENT: huff
 	./djpeg -dct int -outfile testout_gray_islow.ppm testout_gray_islow.jpg
 	md5/md5cmp $(MD5_PPM_GRAY_ISLOW) testout_gray_islow.ppm
 	rm testout_gray_islow.ppm
 # CC: Gray->RGB  SAMP: fullsize  IDCT: islow  ENT: huff
 	./djpeg -dct int -rgb -outfile testout_gray_islow_rgb.ppm testout_gray_islow.jpg
 	md5/md5cmp $(MD5_PPM_GRAY_ISLOW_RGB) testout_gray_islow_rgb.ppm
 	rm testout_gray_islow_rgb.ppm
 if WITH_12BIT
 	rm testout_gray_islow.jpg
 else
 # CC: Gray->RGB565  SAMP: fullsize  IDCT: islow  ENT: huff
 	./djpeg -dct int -rgb565 -dither none -bmp -outfile testout_gray_islow_565.bmp testout_gray_islow.jpg
 	md5/md5cmp $(MD5_BMP_GRAY_ISLOW_565) testout_gray_islow_565.bmp
 	rm testout_gray_islow_565.bmp
 # CC: Gray->RGB565 (dithered)  SAMP: fullsize  IDCT: islow  ENT: huff
 	./djpeg -dct int -rgb565 -bmp -outfile testout_gray_islow_565D.bmp testout_gray_islow.jpg
 	md5/md5cmp $(MD5_BMP_GRAY_ISLOW_565D) testout_gray_islow_565D.bmp
 	rm testout_gray_islow_565D.bmp testout_gray_islow.jpg
 endif
 # CC: RGB->YCC  SAMP: fullsize smooth/h2v2 smooth  FDCT: islow
 # ENT: 2-pass huff
 	./cjpeg -sample 2x2 -smooth 1 -dct int -opt -outfile testout_420s_ifast_opt.jpg $(srcdir)/testimages/testorig.ppm
 	md5/md5cmp $(MD5_JPEG_420S_IFAST_OPT) testout_420s_ifast_opt.jpg
 	rm testout_420s_ifast_opt.jpg
 # The output of the floating point tests is not validated by default, because
 # the output differs depending on the type of floating point math used, and
 # this is only deterministic if the DCT/IDCT are implemented using SIMD
 # instructions on a particular platform.  Pass one of the following on the make
 # command line to validate the floating point tests against one of the expected # results:
 #
 # FLOATTEST=sse  validate against the expected results from the libjpeg-turbo
 #                SSE SIMD extensions
 # FLOATTEST=32bit  validate against the expected results from the C code
 #                  when running on a 32-bit FPU (or when SSE is being used for
 #                  floating point math, which is generally the default with
 #                  x86-64 compilers)
 # FLOATTEST=64bit  validate against the exepected results from the C code
 #                  when running on a 64-bit FPU
 # CC: RGB->YCC  SAMP: fullsize/int  FDCT: float  ENT: prog huff
 	./cjpeg -sample 3x2 -dct float -prog -outfile testout_3x2_float_prog.jpg $(srcdir)/testimages/testorig.ppm
 	if [ "${FLOATTEST}" = "sse" ]; then \
 		md5/md5cmp $(MD5_JPEG_3x2_FLOAT_PROG_SSE) testout_3x2_float_prog.jpg; \
 	elif [ "${FLOATTEST}" = "32bit" -o "${FLOATTEST}" = "64bit" ]; then \
 		md5/md5cmp $(MD5_JPEG_3x2_FLOAT_PROG_32BIT) testout_3x2_float_prog.jpg; \
 	fi
 # CC: YCC->RGB  SAMP: fullsize/int  IDCT: float  ENT: prog huff
 	./djpeg -dct float -outfile testout_3x2_float.ppm testout_3x2_float_prog.jpg
 	if [ "${FLOATTEST}" = "sse" ]; then \
 		md5/md5cmp $(MD5_PPM_3x2_FLOAT_SSE) testout_3x2_float.ppm; \
 	elif [ "${FLOATTEST}" = "32bit" ]; then \
 		md5/md5cmp $(MD5_PPM_3x2_FLOAT_32BIT) testout_3x2_float.ppm; \
 	elif [ "${FLOATTEST}" = "64bit" ]; then \
 		md5/md5cmp $(MD5_PPM_3x2_FLOAT_64BIT) testout_3x2_float.ppm; \
 	fi
 	rm testout_3x2_float.ppm testout_3x2_float_prog.jpg
 # CC: RGB->YCC  SAMP: fullsize/int  FDCT: ifast  ENT: prog huff
 	./cjpeg -sample 3x2 -dct fast -prog -outfile testout_3x2_ifast_prog.jpg $(srcdir)/testimages/testorig.ppm
 	md5/md5cmp $(MD5_JPEG_3x2_IFAST_PROG) testout_3x2_ifast_prog.jpg
 # CC: YCC->RGB  SAMP: fullsize/int  IDCT: ifast  ENT: prog huff
 	./djpeg -dct fast -outfile testout_3x2_ifast.ppm testout_3x2_ifast_prog.jpg
 	md5/md5cmp $(MD5_PPM_3x2_IFAST) testout_3x2_ifast.ppm
 	rm testout_3x2_ifast.ppm testout_3x2_ifast_prog.jpg
 if WITH_ARITH_ENC
 # CC: YCC->RGB  SAMP: fullsize/h2v2  FDCT: islow  ENT: arith
 	./cjpeg -dct int -arithmetic -outfile testout_420_islow_ari.jpg $(srcdir)/testimages/testorig.ppm
 	md5/md5cmp $(MD5_JPEG_420_ISLOW_ARI) testout_420_islow_ari.jpg
 	rm testout_420_islow_ari.jpg
 	./jpegtran -arithmetic -outfile testout_420_islow_ari.jpg $(srcdir)/testimages/testimgint.jpg
 	md5/md5cmp $(MD5_JPEG_420_ISLOW_ARI) testout_420_islow_ari.jpg
 	rm testout_420_islow_ari.jpg
 # CC: YCC->RGB  SAMP: fullsize  FDCT: islow  ENT: prog arith
 	./cjpeg -sample 1x1 -dct int -progressive -arithmetic -outfile testout_444_islow_progari.jpg $(srcdir)/testimages/testorig.ppm
 	md5/md5cmp $(MD5_JPEG_444_ISLOW_PROGARI) testout_444_islow_progari.jpg
 	rm testout_444_islow_progari.jpg
 endif
 if WITH_ARITH_DEC
 # CC: RGB->YCC  SAMP: h2v2 merged  IDCT: ifast  ENT: arith
 	./djpeg -fast -ppm -outfile testout_420m_ifast_ari.ppm $(srcdir)/testimages/testimgari.jpg
 	md5/md5cmp $(MD5_PPM_420M_IFAST_ARI) testout_420m_ifast_ari.ppm
 	rm testout_420m_ifast_ari.ppm
 	./jpegtran -outfile testout_420_islow.jpg $(srcdir)/testimages/testimgari.jpg
 	md5/md5cmp $(MD5_JPEG_420_ISLOW) testout_420_islow.jpg
 	rm testout_420_islow.jpg
 endif
 # CC: YCC->RGB  SAMP: h2v2 merged  IDCT: 16x16 islow  ENT: huff
 	./djpeg -dct int -scale 2/1 -nosmooth -ppm -outfile testout_420m_islow_2_1.ppm $(srcdir)/testimages/$(TESTORIG)
 	md5/md5cmp $(MD5_PPM_420M_ISLOW_2_1) testout_420m_islow_2_1.ppm
 	rm testout_420m_islow_2_1.ppm
 # CC: YCC->RGB  SAMP: h2v2 merged  IDCT: 15x15 islow  ENT: huff
 	./djpeg -dct int -scale 15/8 -nosmooth -ppm -outfile testout_420m_islow_15_8.ppm $(srcdir)/testimages/$(TESTORIG)
 	md5/md5cmp $(MD5_PPM_420M_ISLOW_15_8) testout_420m_islow_15_8.ppm
 	rm testout_420m_islow_15_8.ppm
 # CC: YCC->RGB  SAMP: h2v2 merged  IDCT: 13x13 islow  ENT: huff
 	./djpeg -dct int -scale 13/8 -nosmooth -ppm -outfile testout_420m_islow_13_8.ppm $(srcdir)/testimages/$(TESTORIG)
 	md5/md5cmp $(MD5_PPM_420M_ISLOW_13_8) testout_420m_islow_13_8.ppm
 	rm testout_420m_islow_13_8.ppm
 # CC: YCC->RGB  SAMP: h2v2 merged  IDCT: 11x11 islow  ENT: huff
 	./djpeg -dct int -scale 11/8 -nosmooth -ppm -outfile testout_420m_islow_11_8.ppm $(srcdir)/testimages/$(TESTORIG)
 	md5/md5cmp $(MD5_PPM_420M_ISLOW_11_8) testout_420m_islow_11_8.ppm
 	rm testout_420m_islow_11_8.ppm
 # CC: YCC->RGB  SAMP: h2v2 merged  IDCT: 9x9 islow  ENT: huff
 	./djpeg -dct int -scale 9/8 -nosmooth -ppm -outfile testout_420m_islow_9_8.ppm $(srcdir)/testimages/$(TESTORIG)
 	md5/md5cmp $(MD5_PPM_420M_ISLOW_9_8) testout_420m_islow_9_8.ppm
 	rm testout_420m_islow_9_8.ppm
 # CC: YCC->RGB  SAMP: h2v2 merged  IDCT: 7x7 islow/14x14 islow  ENT: huff
 	./djpeg -dct int -scale 7/8 -nosmooth -ppm -outfile testout_420m_islow_7_8.ppm $(srcdir)/testimages/$(TESTORIG)
 	md5/md5cmp $(MD5_PPM_420M_ISLOW_7_8) testout_420m_islow_7_8.ppm
 	rm testout_420m_islow_7_8.ppm
 # CC: YCC->RGB  SAMP: h2v2 merged  IDCT: 6x6 islow/12x12 islow  ENT: huff
 	./djpeg -dct int -scale 3/4 -nosmooth -ppm -outfile testout_420m_islow_3_4.ppm $(srcdir)/testimages/$(TESTORIG)
 	md5/md5cmp $(MD5_PPM_420M_ISLOW_3_4) testout_420m_islow_3_4.ppm
 	rm testout_420m_islow_3_4.ppm
 # CC: YCC->RGB  SAMP: h2v2 merged  IDCT: 5x5 islow/10x10 islow  ENT: huff
 	./djpeg -dct int -scale 5/8 -nosmooth -ppm -outfile testout_420m_islow_5_8.ppm $(srcdir)/testimages/$(TESTORIG)
 	md5/md5cmp $(MD5_PPM_420M_ISLOW_5_8) testout_420m_islow_5_8.ppm
 	rm testout_420m_islow_5_8.ppm
 # CC: YCC->RGB  SAMP: h2v2 merged  IDCT: 4x4 islow/8x8 islow  ENT: huff
 	./djpeg -dct int -scale 1/2 -nosmooth -ppm -outfile testout_420m_islow_1_2.ppm $(srcdir)/testimages/$(TESTORIG)
 	md5/md5cmp $(MD5_PPM_420M_ISLOW_1_2) testout_420m_islow_1_2.ppm
 	rm testout_420m_islow_1_2.ppm
 # CC: YCC->RGB  SAMP: h2v2 merged  IDCT: 3x3 islow/6x6 islow  ENT: huff
 	./djpeg -dct int -scale 3/8 -nosmooth -ppm -outfile testout_420m_islow_3_8.ppm $(srcdir)/testimages/$(TESTORIG)
 	md5/md5cmp $(MD5_PPM_420M_ISLOW_3_8) testout_420m_islow_3_8.ppm
 	rm testout_420m_islow_3_8.ppm
 # CC: YCC->RGB  SAMP: h2v2 merged  IDCT: 2x2 islow/4x4 islow  ENT: huff
 	./djpeg -dct int -scale 1/4 -nosmooth -ppm -outfile testout_420m_islow_1_4.ppm $(srcdir)/testimages/$(TESTORIG)
 	md5/md5cmp $(MD5_PPM_420M_ISLOW_1_4) testout_420m_islow_1_4.ppm
 	rm testout_420m_islow_1_4.ppm
 # CC: YCC->RGB  SAMP: h2v2 merged  IDCT: 1x1 islow/2x2 islow  ENT: huff
 	./djpeg -dct int -scale 1/8 -nosmooth -ppm -outfile testout_420m_islow_1_8.ppm $(srcdir)/testimages/$(TESTORIG)
 	md5/md5cmp $(MD5_PPM_420M_ISLOW_1_8) testout_420m_islow_1_8.ppm
 	rm testout_420m_islow_1_8.ppm
 if WITH_12BIT
 else
 # CC: YCC->RGB (dithered)  SAMP: h2v2 fancy  IDCT: islow  ENT: huff
 	./djpeg -dct int -colors 256 -bmp -outfile testout_420_islow_256.bmp $(srcdir)/testimages/$(TESTORIG)
 	md5/md5cmp $(MD5_BMP_420_ISLOW_256) testout_420_islow_256.bmp
 	rm testout_420_islow_256.bmp
 # CC: YCC->RGB565  SAMP: h2v2 fancy  IDCT: islow  ENT: huff
 	./djpeg -dct int -rgb565 -dither none -bmp -outfile testout_420_islow_565.bmp $(srcdir)/testimages/$(TESTORIG)
 	md5/md5cmp $(MD5_BMP_420_ISLOW_565) testout_420_islow_565.bmp
 	rm testout_420_islow_565.bmp
 # CC: YCC->RGB565 (dithered)  SAMP: h2v2 fancy  IDCT: islow  ENT: huff
 	./djpeg -dct int -rgb565 -bmp -outfile testout_420_islow_565D.bmp $(srcdir)/testimages/$(TESTORIG)
 	md5/md5cmp $(MD5_BMP_420_ISLOW_565D) testout_420_islow_565D.bmp
 	rm testout_420_islow_565D.bmp
 # CC: YCC->RGB565  SAMP: h2v2 merged  IDCT: islow  ENT: huff
 	./djpeg -dct int -nosmooth -rgb565 -dither none -bmp -outfile testout_420m_islow_565.bmp $(srcdir)/testimages/$(TESTORIG)
 	md5/md5cmp $(MD5_BMP_420M_ISLOW_565) testout_420m_islow_565.bmp
 	rm testout_420m_islow_565.bmp
 # CC: YCC->RGB565 (dithered)  SAMP: h2v2 merged  IDCT: islow  ENT: huff
 	./djpeg -dct int -nosmooth -rgb565 -bmp -outfile testout_420m_islow_565D.bmp $(srcdir)/testimages/$(TESTORIG)
 	md5/md5cmp $(MD5_BMP_420M_ISLOW_565D) testout_420m_islow_565D.bmp
 	rm testout_420m_islow_565D.bmp
 endif
 	./jpegtran -crop 120x90+20+50 -transpose -perfect -outfile testout_crop.jpg $(srcdir)/testimages/$(TESTORIG)
 	md5/md5cmp $(MD5_JPEG_CROP) testout_crop.jpg
 	rm testout_crop.jpg
 	echo GREAT SUCCESS!
 testclean:
 	rm -f testout*
 	rm -f *_GRAY_*.bmp
 	rm -f *_GRAY_*.png
 	rm -f *_GRAY_*.ppm
 	rm -f *_GRAY_*.jpg
 	rm -f *_GRAY.yuv
 	rm -f *_420_*.bmp
 	rm -f *_420_*.png
 	rm -f *_420_*.ppm
 	rm -f *_420_*.jpg
 	rm -f *_420.yuv
 	rm -f *_422_*.bmp
 	rm -f *_422_*.png
 	rm -f *_422_*.ppm
 	rm -f *_422_*.jpg
 	rm -f *_422.yuv
 	rm -f *_444_*.bmp
 	rm -f *_444_*.png
 	rm -f *_444_*.ppm
 	rm -f *_444_*.jpg
 	rm -f *_444.yuv
 	rm -f *_440_*.bmp
 	rm -f *_440_*.png
 	rm -f *_440_*.ppm
 	rm -f *_440_*.jpg
 	rm -f *_440.yuv
 	rm -f *_411_*.bmp
 	rm -f *_411_*.png
 	rm -f *_411_*.ppm
 	rm -f *_411_*.jpg
 	rm -f *_411.yuv
 tjtest:
 	sh ./tjbenchtest
 	sh ./tjbenchtest -alloc
 	sh ./tjbenchtest -yuv
 	sh ./tjbenchtest -yuv -alloc
 if WITH_JAVA
 	sh ./tjbenchtest.java
 	sh ./tjbenchtest.java -yuv
 endif
 pkgscripts/libjpeg-turbo.spec: pkgscripts/libjpeg-turbo.spec.tmpl
 	cat pkgscripts/libjpeg-turbo.spec.tmpl | sed s@%{__prefix}@$(prefix)@g | \
 		sed s@%{__bindir}@$(bindir)@g | sed s@%{__datadir}@$(datadir)@g | \
 		sed s@%{__docdir}@$(docdir)@g | sed s@%{__includedir}@$(includedir)@g | \
 		sed s@%{__libdir}@$(libdir)@g | sed s@%{__mandir}@$(mandir)@g \
 		> pkgscripts/libjpeg-turbo.spec
 rpm: all pkgscripts/libjpeg-turbo.spec
 	TMPDIR=`mktemp -d /tmp/${PACKAGE_NAME}-build.XXXXXX`; \
 	mkdir -p $$TMPDIR/RPMS; \
 	ln -fs `pwd` $$TMPDIR/BUILD; \
 	rm -f ${PKGNAME}-${VERSION}.${RPMARCH}.rpm; \
 	rpmbuild -bb --define "_blddir $$TMPDIR/buildroot"  \
 		--define "_topdir $$TMPDIR" \
 		--target ${RPMARCH} pkgscripts/libjpeg-turbo.spec; \
 	cp $$TMPDIR/RPMS/${RPMARCH}/${PKGNAME}-${VERSION}-${BUILD}.${RPMARCH}.rpm \
 		${PKGNAME}-${VERSION}.${RPMARCH}.rpm; \
 	rm -rf $$TMPDIR
 srpm: dist-gzip pkgscripts/libjpeg-turbo.spec
 	TMPDIR=`mktemp -d /tmp/${PACKAGE_NAME}-build.XXXXXX`; \
 	mkdir -p $$TMPDIR/RPMS; \
 	mkdir -p $$TMPDIR/SRPMS; \
 	mkdir -p $$TMPDIR/BUILD; \
 	mkdir -p $$TMPDIR/SOURCES; \
 	mkdir -p $$TMPDIR/SPECS; \
 	rm -f ${PKGNAME}-${VERSION}.src.rpm; \
 	cp ${PACKAGE_NAME}-${VERSION}.tar.gz $$TMPDIR/SOURCES; \
 	cat pkgscripts/libjpeg-turbo.spec | sed s/%{_blddir}/%{_tmppath}/g \
 		| sed s/#--\>//g \
 		> $$TMPDIR/SPECS/libjpeg-turbo.spec; \
 	rpmbuild -bs --define "_topdir $$TMPDIR" $$TMPDIR/SPECS/libjpeg-turbo.spec; \
 	cp $$TMPDIR/SRPMS/${PKGNAME}-${VERSION}-${BUILD}.src.rpm \
 		${PKGNAME}-${VERSION}.src.rpm; \
 	rm -rf $$TMPDIR
 pkgscripts/makedpkg: pkgscripts/makedpkg.tmpl
 	cat pkgscripts/makedpkg.tmpl | sed s@%{__prefix}@$(prefix)@g | \
 		sed s@%{__docdir}@$(docdir)@g | sed s@%{__libdir}@$(libdir)@g \
 		> pkgscripts/makedpkg
 deb: all pkgscripts/makedpkg
 	sh pkgscripts/makedpkg
 pkgscripts/uninstall: pkgscripts/uninstall.tmpl
 	cat pkgscripts/uninstall.tmpl | sed s@%{__prefix}@$(prefix)@g | \
 		sed s@%{__bindir}@$(bindir)@g | sed s@%{__datadir}@$(datadir)@g | \
 		sed s@%{__includedir}@$(includedir)@g | sed s@%{__libdir}@$(libdir)@g | \
 		sed s@%{__mandir}@$(mandir)@g > pkgscripts/uninstall
 pkgscripts/makemacpkg: pkgscripts/makemacpkg.tmpl
 	cat pkgscripts/makemacpkg.tmpl | sed s@%{__prefix}@$(prefix)@g | \
 		sed s@%{__bindir}@$(bindir)@g | sed s@%{__docdir}@$(docdir)@g | \
 		sed s@%{__libdir}@$(libdir)@g > pkgscripts/makemacpkg
 if X86_64
 udmg: all pkgscripts/makemacpkg pkgscripts/uninstall
 	sh pkgscripts/makemacpkg -build32 ${BUILDDIR32}
 iosdmg: all pkgscripts/makemacpkg pkgscripts/uninstall
 	sh pkgscripts/makemacpkg -build32 ${BUILDDIR32} -buildarmv6 ${BUILDDIRARMV6} -buildarmv7 ${BUILDDIRARMV7} -buildarmv7s ${BUILDDIRARMV7S} -buildarmv8 ${BUILDDIRARMV8} -lipo "${LIPO}"
 else
 iosdmg: all pkgscripts/makemacpkg pkgscripts/uninstall
 	sh pkgscripts/makemacpkg -buildarmv6 ${BUILDDIRARMV6} -buildarmv7 ${BUILDDIRARMV7} -buildarmv7s ${BUILDDIRARMV7S} -buildarmv8 ${BUILDDIRARMV8} -lipo "${LIPO}"
 endif
 dmg: all pkgscripts/makemacpkg pkgscripts/uninstall
 	sh pkgscripts/makemacpkg
 pkgscripts/makecygwinpkg: pkgscripts/makecygwinpkg.tmpl
 	cat pkgscripts/makecygwinpkg.tmpl | sed s@%{__prefix}@$(prefix)@g | \
 		sed s@%{__docdir}@$(docdir)@g | sed s@%{__libdir}@$(libdir)@g \
 		> pkgscripts/makecygwinpkg
 cygwinpkg: all pkgscripts/makecygwinpkg
 	sh pkgscripts/makecygwinpkg
--- a/281
+++ b/281
@@ -1,31 +1,24 @@
-libjpeg-turbo note:  This is the legacy document from the original libjpeg v6b
+libjpeg-turbo note:  This file has been modified by The libjpeg-turbo Project
-release, which is included for reference.  The Internet addresses given below
+to include only information relevant to libjpeg-turbo, to wordsmith certain
-are likely non-functional.  For more information about the libjpeg project,
+sections, and to remove impolitic language that existed in the libjpeg v8
-please see http://www.ijg.org.  For more information about libjpeg-turbo,
+README.  It is included only for reference.  Please see README-turbo.txt for
-please see http://libjpeg-turbo.virtualgl.org.
+information specific to libjpeg-turbo.
 The Independent JPEG Group's JPEG software
 ==========================================
-README for release 6b of 27-Mar-1998
+This distribution contains a release of the Independent JPEG Group's free JPEG
-====================================
+software.  You are welcome to redistribute this software and to use it for any
 purpose, subject to the conditions under LEGAL ISSUES, below.
-This distribution contains the sixth public release of the Independent JPEG
+This software is the work of Tom Lane, Guido Vollbeding, Philip Gladstone,
-Group's free JPEG software.  You are welcome to redistribute this software and
+Bill Allombert, Jim Boucher, Lee Crocker, Bob Friesenhahn, Ben Jackson,
-to use it for any purpose, subject to the conditions under LEGAL ISSUES, below.
+Julian Minguillon, Luis Ortiz, George Phillips, Davide Rossi, Ge' Weijers,
 and other members of the Independent JPEG Group.
-Serious users of this software (particularly those incorporating it into
+IJG is not affiliated with the ISO/IEC JTC1/SC29/WG1 standards committee
-larger programs) should contact IJG at jpeg-info@uunet.uu.net to be added to
+(also known as JPEG, together with ITU-T SG16).
 our electronic mailing list.  Mailing list members are notified of updates
 and have a chance to participate in technical discussions, etc.
 This software is the work of Tom Lane, Philip Gladstone, Jim Boucher,
 Lee Crocker, Julian Minguillon, Luis Ortiz, George Phillips, Davide Rossi,
 Guido Vollbeding, Ge' Weijers, and other members of the Independent JPEG
 Group.
 IJG is not affiliated with the official ISO JPEG standards committee.
 DOCUMENTATION ROADMAP
@@ -37,29 +30,26 @@ OVERVIEW            General description of JPEG and the IJG software.
 LEGAL ISSUES        Copyright, lack of warranty, terms of distribution.
 REFERENCES          Where to learn more about JPEG.
 ARCHIVE LOCATIONS   Where to find newer versions of this software.
 RELATED SOFTWARE    Other stuff you should get.
 FILE FORMAT WARS    Software *not* to get.
 TO DO               Plans for future IJG releases.
 Other documentation files in the distribution are:
 User documentation:
-  install.doc       How to configure and install the IJG software.
+  usage.txt         Usage instructions for cjpeg, djpeg, jpegtran,
  usage.doc         Usage instructions for cjpeg, djpeg, jpegtran,
                    rdjpgcom, and wrjpgcom.
-  *.1               Unix-style man pages for programs (same info as usage.doc).
+  *.1               Unix-style man pages for programs (same info as usage.txt).
-  wizard.doc        Advanced usage instructions for JPEG wizards only.
+  wizard.txt        Advanced usage instructions for JPEG wizards only.
  change.log        Version-to-version change highlights.
 Programmer and internal documentation:
-  libjpeg.doc       How to use the JPEG library in your own programs.
+  libjpeg.txt       How to use the JPEG library in your own programs.
  example.c         Sample code for calling the JPEG library.
-  structure.doc     Overview of the JPEG library's internal structure.
+  structure.txt     Overview of the JPEG library's internal structure.
-  filelist.doc      Road map of IJG files.
+  coderules.txt     Coding style rules --- please read if you contribute code.
  coderules.doc     Coding style rules --- please read if you contribute code.
-Please read at least the files install.doc and usage.doc.  Useful information
+Please read at least usage.txt.  Some information can also be found in the JPEG
-can also be found in the JPEG FAQ (Frequently Asked Questions) article.  See
+FAQ (Frequently Asked Questions) article.  See ARCHIVE LOCATIONS below to find
-ARCHIVE LOCATIONS below to find out where to obtain the FAQ article.
+out where to obtain the FAQ article.
 If you want to understand how the JPEG code works, we suggest reading one or
 more of the REFERENCES, then looking at the documentation files (in roughly
@@ -69,24 +59,27 @@ the order listed) before diving into the code.
 OVERVIEW
 ========
-This package contains C software to implement JPEG image compression and
+This package contains C software to implement JPEG image encoding, decoding,
-decompression.  JPEG (pronounced "jay-peg") is a standardized compression
+and transcoding.  JPEG (pronounced "jay-peg") is a standardized compression
-method for full-color and gray-scale images.  JPEG is intended for compressing
+method for full-color and grayscale images.  JPEG's strong suit is compressing
-"real-world" scenes; line drawings, cartoons and other non-realistic images
+photographic images or other types of images that have smooth color and
-are not its strong suit.  JPEG is lossy, meaning that the output image is not
+brightness transitions between neighboring pixels.  Images with sharp lines or
-exactly identical to the input image.  Hence you must not use JPEG if you
+other abrupt features may not compress well with JPEG, and a higher JPEG
-have to have identical output bits.  However, on typical photographic images,
+quality may have to be used to avoid visible compression artifacts with such
-very good compression levels can be obtained with no visible change, and
+images.
-remarkably high compression levels are possible if you can tolerate a
+
-low-quality image.  For more details, see the references, or just experiment
+JPEG is lossy, meaning that the output pixels are not necessarily identical to
-with various compression settings.
+the input pixels.  However, on photographic content and other "smooth" images,
 very good compression ratios can be obtained with no visible compression
 artifacts, and extremely high compression ratios are possible if you are
 willing to sacrifice image quality (by reducing the "quality" setting in the
 compressor.)
 This software implements JPEG baseline, extended-sequential, and progressive
 compression processes.  Provision is made for supporting all variants of these
 processes, although some uncommon parameter settings aren't implemented yet.
-For legal reasons, we are not distributing code for the arithmetic-coding
+We have made no provision for supporting the hierarchical or lossless
-variants of JPEG; see LEGAL ISSUES.  We have made no provision for supporting
+processes defined in the standard.
 the hierarchical or lossless processes defined in the standard.
 We provide a set of library routines for reading and writing JPEG image files,
 plus two sample applications "cjpeg" and "djpeg", which use the library to
@@ -98,10 +91,11 @@ considerable functionality beyond the bare JPEG coding/decoding capability;
 for example, the color quantization modules are not strictly part of JPEG
 decoding, but they are essential for output to colormapped file formats or
 colormapped displays.  These extra functions can be compiled out of the
-library if not required for a particular application.  We have also included
+library if not required for a particular application.
-"jpegtran", a utility for lossless transcoding between different JPEG
+
-processes, and "rdjpgcom" and "wrjpgcom", two simple applications for
+We have also included "jpegtran", a utility for lossless transcoding between
-inserting and extracting textual comments in JFIF files.
+different JPEG processes, and "rdjpgcom" and "wrjpgcom", two simple
 applications for inserting and extracting textual comments in JFIF files.
 The emphasis in designing this software has been on achieving portability and
 flexibility, while also making it fast enough to be useful.  In particular,
@@ -134,7 +128,7 @@ with respect to this software, its quality, accuracy, merchantability, or
 fitness for a particular purpose.  This software is provided "AS IS", and you,
 its user, assume the entire risk as to its quality and accuracy.
-This software is copyright (C) 1991-1998, Thomas G. Lane.
+This software is copyright (C) 1991-2012, Thomas G. Lane, Guido Vollbeding.
 All Rights Reserved except as specified below.
 Permission is hereby granted to use, copy, modify, and distribute this
@@ -165,29 +159,11 @@ commercial products, provided that all warranty or liability claims are
 assumed by the product vendor.
 ansi2knr.c is included in this distribution by permission of L. Peter Deutsch,
 sole proprietor of its copyright holder, Aladdin Enterprises of Menlo Park, CA.
 ansi2knr.c is NOT covered by the above copyright and conditions, but instead
 by the usual distribution terms of the Free Software Foundation; principally,
 that you must include source code if you redistribute it.  (See the file
 ansi2knr.c for full details.)  However, since ansi2knr.c is not needed as part
 of any program generated from the IJG code, this does not limit you more than
 the foregoing paragraphs do.
 The Unix configuration script "configure" was produced with GNU Autoconf.
 It is copyright by the Free Software Foundation but is freely distributable.
 The same holds for its supporting scripts (config.guess, config.sub,
-ltconfig, ltmain.sh).  Another support script, install-sh, is copyright
+ltmain.sh).  Another support script, install-sh, is copyright by X Consortium
-by M.I.T. but is also freely distributable.
+but is also freely distributable.
 It appears that the arithmetic coding option of the JPEG spec is covered by
 patents owned by IBM, AT&T, and Mitsubishi.  Hence arithmetic coding cannot
 legally be used without obtaining one or more licenses.  For this reason,
 support for arithmetic coding has been removed from the free JPEG software.
 (Since arithmetic coding provides only a marginal gain over the unpatented
 Huffman mode, it is unlikely that very many implementations will support it.)
 So far as we are aware, there are no patent restrictions on the remaining
 code.
 The IJG distribution formerly included code to read and write GIF files.
 To avoid entanglement with the Unisys LZW patent, GIF reading support has
@@ -205,7 +181,7 @@ We are required to state that
 REFERENCES
 ==========
-We highly recommend reading one or more of these references before trying to
+We recommend reading one or more of these references before trying to
 understand the innards of the JPEG software.
 The best short technical introduction to the JPEG compression algorithm is
@@ -214,7 +190,7 @@ The best short technical introduction to the JPEG compression algorithm is
 (Adjacent articles in that issue discuss MPEG motion picture compression,
 applications of JPEG, and related topics.)  If you don't have the CACM issue
 handy, a PostScript file containing a revised version of Wallace's article is
-available at ftp://ftp.uu.net/graphics/jpeg/wallace.ps.gz.  The file (actually
+available at http://www.ijg.org/files/wallace.ps.gz.  The file (actually
 a preprint for an article that appeared in IEEE Trans. Consumer Electronics)
 omits the sample images that appeared in CACM, but it includes corrections
 and some added material.  Note: the Wallace article is copyright ACM and IEEE,
@@ -229,82 +205,53 @@ code but don't know much about data compression in general.  The book's JPEG
 sample code is far from industrial-strength, but when you are ready to look
 at a full implementation, you've got one here...
-The best full description of JPEG is the textbook "JPEG Still Image Data
+The best currently available description of JPEG is the textbook "JPEG Still
-Compression Standard" by William B. Pennebaker and Joan L. Mitchell, published
+Image Data Compression Standard" by William B. Pennebaker and Joan L.
-by Van Nostrand Reinhold, 1993, ISBN 0-442-01272-1.  Price US$59.95, 638 pp.
+Mitchell, published by Van Nostrand Reinhold, 1993, ISBN 0-442-01272-1.
-The book includes the complete text of the ISO JPEG standards (DIS 10918-1
+Price US$59.95, 638 pp.  The book includes the complete text of the ISO JPEG
-and draft DIS 10918-2).  This is by far the most complete exposition of JPEG
+standards (DIS 10918-1 and draft DIS 10918-2).
 in existence, and we highly recommend it.
-The JPEG standard itself is not available electronically; you must order a
+The original JPEG standard is divided into two parts, Part 1 being the actual
-paper copy through ISO or ITU.  (Unless you feel a need to own a certified
+specification, while Part 2 covers compliance testing methods.  Part 1 is
-official copy, we recommend buying the Pennebaker and Mitchell book instead;
+titled "Digital Compression and Coding of Continuous-tone Still Images,
 it's much cheaper and includes a great deal of useful explanatory material.)
 In the USA, copies of the standard may be ordered from ANSI Sales at (212)
 642-4900, or from Global Engineering Documents at (800) 854-7179.  (ANSI
 doesn't take credit card orders, but Global does.)  It's not cheap: as of
 1992, ANSI was charging $95 for Part 1 and $47 for Part 2, plus 7%
 shipping/handling.  The standard is divided into two parts, Part 1 being the
 actual specification, while Part 2 covers compliance testing methods.  Part 1
 is titled "Digital Compression and Coding of Continuous-tone Still Images,
 Part 1: Requirements and guidelines" and has document numbers ISO/IEC IS
 10918-1, ITU-T T.81.  Part 2 is titled "Digital Compression and Coding of
 Continuous-tone Still Images, Part 2: Compliance testing" and has document
 numbers ISO/IEC IS 10918-2, ITU-T T.83.
 Some extensions to the original JPEG standard are defined in JPEG Part 3,
 a newer ISO standard numbered ISO/IEC IS 10918-3 and ITU-T T.84.  IJG
 currently does not support any Part 3 extensions.
 The JPEG standard does not specify all details of an interchangeable file
 format.  For the omitted details we follow the "JFIF" conventions, revision
-1.02.  A copy of the JFIF spec is available from:
+1.02.  JFIF 1.02 has been adopted as an Ecma International Technical Report
-	Literature Department
+and thus received a formal publication status.  It is available as a free
-	C-Cube Microsystems, Inc.
+download in PDF format from
-	1778 McCarthy Blvd.
+http://www.ecma-international.org/publications/techreports/E-TR-098.htm.
-	Milpitas, CA 95035
+A PostScript version of the JFIF document is available at
-	phone (408) 944-6300,  fax (408) 944-6314
+http://www.ijg.org/files/jfif.ps.gz.  There is also a plain text version at
-A PostScript version of this document is available by FTP at
+http://www.ijg.org/files/jfif.txt.gz, but it is missing the figures.
 ftp://ftp.uu.net/graphics/jpeg/jfif.ps.gz.  There is also a plain text
 version at ftp://ftp.uu.net/graphics/jpeg/jfif.txt.gz, but it is missing
 the figures.
 The TIFF 6.0 file format specification can be obtained by FTP from
 ftp://ftp.sgi.com/graphics/tiff/TIFF6.ps.gz.  The JPEG incorporation scheme
 found in the TIFF 6.0 spec of 3-June-92 has a number of serious problems.
 IJG does not recommend use of the TIFF 6.0 design (TIFF Compression tag 6).
 Instead, we recommend the JPEG design proposed by TIFF Technical Note #2
-(Compression tag 7).  Copies of this Note can be obtained from ftp.sgi.com or
+(Compression tag 7).  Copies of this Note can be obtained from
-from ftp://ftp.uu.net/graphics/jpeg/.  It is expected that the next revision
+http://www.ijg.org/files/.  It is expected that the next revision
 of the TIFF spec will replace the 6.0 JPEG design with the Note's design.
 Although IJG's own code does not support TIFF/JPEG, the free libtiff library
-uses our library to implement TIFF/JPEG per the Note.  libtiff is available
+uses our library to implement TIFF/JPEG per the Note.
 from ftp://ftp.sgi.com/graphics/tiff/.
 ARCHIVE LOCATIONS
 =================
-The "official" archive site for this software is ftp.uu.net (Internet
+The "official" archive site for this software is www.ijg.org.
-address 192.48.96.9).  The most recent released version can always be found
+The most recent released version can always be found there in
-there in directory graphics/jpeg.  This particular version will be archived
+directory "files".  This particular version will be archived as
-as ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v6b.tar.gz.  If you don't have
+http://www.ijg.org/files/jpegsrc.v8d.tar.gz, and in Windows-compatible
-direct Internet access, UUNET's archives are also available via UUCP; contact
+"zip" archive format as http://www.ijg.org/files/jpegsr8d.zip.
 help@uunet.uu.net for information on retrieving files that way.
-Numerous Internet sites maintain copies of the UUNET files.  However, only
+The JPEG FAQ (Frequently Asked Questions) article is a source of some
-ftp.uu.net is guaranteed to have the latest official version.
+general information about JPEG.
 You can also obtain this software in DOS-compatible "zip" archive format from
 the SimTel archives (ftp://ftp.simtel.net/pub/simtelnet/msdos/graphics/), or
 on CompuServe in the Graphics Support forum (GO CIS:GRAPHSUP), library 12
 "JPEG Tools".  Again, these versions may sometimes lag behind the ftp.uu.net
 release.
 The JPEG FAQ (Frequently Asked Questions) article is a useful source of
 general information about JPEG.  It is updated constantly and therefore is
 not included in this distribution.  The FAQ is posted every two weeks to
 Usenet newsgroups comp.graphics.misc, news.answers, and other groups.
 It is available on the World Wide Web at http://www.faqs.org/faqs/jpeg-faq/
 and other news.answers archive sites, including the official news.answers
 archive at rtfm.mit.edu: ftp://rtfm.mit.edu/pub/usenet/news.answers/jpeg-faq/.
@@ -314,79 +261,21 @@ with body
 	send usenet/news.answers/jpeg-faq/part2
 RELATED SOFTWARE
 ================
 Numerous viewing and image manipulation programs now support JPEG.  (Quite a
 few of them use this library to do so.)  The JPEG FAQ described above lists
 some of the more popular free and shareware viewers, and tells where to
 obtain them on Internet.
 If you are on a Unix machine, we highly recommend Jef Poskanzer's free
 PBMPLUS software, which provides many useful operations on PPM-format image
 files.  In particular, it can convert PPM images to and from a wide range of
 other formats, thus making cjpeg/djpeg considerably more useful.  The latest
 version is distributed by the NetPBM group, and is available from numerous
 sites, notably ftp://wuarchive.wustl.edu/graphics/graphics/packages/NetPBM/.
 Unfortunately PBMPLUS/NETPBM is not nearly as portable as the IJG software is;
 you are likely to have difficulty making it work on any non-Unix machine.
 A different free JPEG implementation, written by the PVRG group at Stanford,
 is available from ftp://havefun.stanford.edu/pub/jpeg/.  This program
 is designed for research and experimentation rather than production use;
 it is slower, harder to use, and less portable than the IJG code, but it
 is easier to read and modify.  Also, the PVRG code supports lossless JPEG,
 which we do not.  (On the other hand, it doesn't do progressive JPEG.)
 FILE FORMAT WARS
 ================
-Some JPEG programs produce files that are not compatible with our library.
+The ISO/IEC JTC1/SC29/WG1 standards committee (also known as JPEG, together
-The root of the problem is that the ISO JPEG committee failed to specify a
+with ITU-T SG16) currently promotes different formats containing the name
-concrete file format.  Some vendors "filled in the blanks" on their own,
+"JPEG" which are incompatible with original DCT-based JPEG.  IJG therefore does
-creating proprietary formats that no one else could read.  (For example, none
+not support these formats (see REFERENCES).  Indeed, one of the original
-of the early commercial JPEG implementations for the Macintosh were able to
+reasons for developing this free software was to help force convergence on
-exchange compressed files.)
+common, interoperable format standards for JPEG files.
-
+Don't use an incompatible file format!
-The file format we have adopted is called JFIF (see REFERENCES).  This format
+(In any case, our decoder will remain capable of reading existing JPEG
-has been agreed to by a number of major commercial JPEG vendors, and it has
+image files indefinitely.)
 become the de facto standard.  JFIF is a minimal or "low end" representation.
 We recommend the use of TIFF/JPEG (TIFF revision 6.0 as modified by TIFF
 Technical Note #2) for "high end" applications that need to record a lot of
 additional data about an image.  TIFF/JPEG is fairly new and not yet widely
 supported, unfortunately.
 The upcoming JPEG Part 3 standard defines a file format called SPIFF.
 SPIFF is interoperable with JFIF, in the sense that most JFIF decoders should
 be able to read the most common variant of SPIFF.  SPIFF has some technical
 advantages over JFIF, but its major claim to fame is simply that it is an
 official standard rather than an informal one.  At this point it is unclear
 whether SPIFF will supersede JFIF or whether JFIF will remain the de-facto
 standard.  IJG intends to support SPIFF once the standard is frozen, but we
 have not decided whether it should become our default output format or not.
 (In any case, our decoder will remain capable of reading JFIF indefinitely.)
 Various proprietary file formats incorporating JPEG compression also exist.
 We have little or no sympathy for the existence of these formats.  Indeed,
 one of the original reasons for developing this free software was to help
 force convergence on common, open format standards for JPEG files.  Don't
 use a proprietary file format!
 TO DO
 =====
-The major thrust for v7 will probably be improvement of visual quality.
+Please send bug reports, offers of help, etc. to jpeg-info@jpegclub.org.
 The current method for scaling the quantization tables is known not to be
 very good at low Q values.  We also intend to investigate block boundary
 smoothing, "poor man's variable quantization", and other means of improving
 quality-vs-file-size performance without sacrificing compatibility.
 In future versions, we are considering supporting some of the upcoming JPEG
 Part 3 extensions --- principally, variable quantization and the SPIFF file
 format.
 As always, speeding things up is of great interest.
 Please send bug reports, offers of help, etc. to jpeg-info@uunet.uu.net.
--- a/README-turbo.txt
+++ b/README-turbo.txt
@@ -2,177 +2,92 @@
 **     Background
 *******************************************************************************
-libjpeg-turbo is a high-speed version of libjpeg for x86 and x86-64 processors
+libjpeg-turbo is a JPEG image codec that uses SIMD instructions (MMX, SSE2,
-which uses SIMD instructions (MMX, SSE2, etc.) to accelerate baseline JPEG
+NEON) to accelerate baseline JPEG compression and decompression on x86, x86-64,
-compression and decompression.  libjpeg-turbo is generally 2-4x as fast
+and ARM systems.  On such systems, libjpeg-turbo is generally 2-4x as fast as
-as the unmodified version of libjpeg, all else being equal.
+libjpeg, all else being equal.  On other types of systems, libjpeg-turbo can
 still outperform libjpeg by a significant amount, by virtue of its
 highly-optimized Huffman coding routines.  In many cases, the performance of
 libjpeg-turbo rivals that of proprietary high-speed JPEG codecs.
-libjpeg-turbo was originally based on libjpeg/SIMD by Miyasaka Masaru, but
+libjpeg-turbo implements both the traditional libjpeg API as well as the less
-the TigerVNC and VirtualGL projects made numerous enhancements to the codec,
+powerful but more straightforward TurboJPEG API.  libjpeg-turbo also features
-including improved support for Mac OS X, 64-bit support, support for 32-bit
+colorspace extensions that allow it to compress from/decompress to 32-bit and
-and big endian pixel formats, accelerated Huffman encoding/decoding, and
+big-endian pixel buffers (RGBX, XBGR, etc.), as well as a full-featured Java
-various bug fixes.  The goal was to produce a fully open source codec that
+interface.
 could replace the partially closed source TurboJPEG/IPP codec used by VirtualGL
 and TurboVNC.  libjpeg-turbo generally performs in the range of 80-120% of
 TurboJPEG/IPP.  It is faster in some areas but slower in others.
-It was decided to split libjpeg-turbo into a separate SDK so that other
+libjpeg-turbo was originally based on libjpeg/SIMD, an MMX-accelerated
-projects could take advantage of this technology.  The libjpeg-turbo shared
+derivative of libjpeg v6b developed by Miyasaka Masaru.  The TigerVNC and
-libraries can be used as drop-in replacements for libjpeg on most systems.
+VirtualGL projects made numerous enhancements to the codec in 2009, and in
 early 2010, libjpeg-turbo spun off into an independent project, with the goal
 of making high-speed JPEG compression/decompression technology available to a
 broader range of users and developers.
 *******************************************************************************
 **     License
 *******************************************************************************
-Some of the optimizations to the Huffman encoder/decoder were borrowed from
+Most of libjpeg-turbo inherits the non-restrictive, BSD-style license used by
-VirtualGL, and thus the libjpeg-turbo distribution, as a whole, falls under the
+libjpeg (see README.)  The TurboJPEG wrapper (both C and Java versions) and
-wxWindows Library Licence, Version 3.1.  A copy of this license can be found in
+associated test programs bear a similar license, which is reproduced below:
-this directory under LICENSE.txt.  The rest of the source code, apart from
+
-these modifications, falls under a less restrictive license (see README.)
+Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 - Redistributions of source code must retain the above copyright notice,
  this list of conditions and the following disclaimer.
 - Redistributions in binary form must reproduce the above copyright notice,
  this list of conditions and the following disclaimer in the documentation
  and/or other materials provided with the distribution.
 - Neither the name of the libjpeg-turbo Project nor the names of its
  contributors may be used to endorse or promote products derived from this
  software without specific prior written permission.
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS",
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
 LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 *******************************************************************************
 **     Using libjpeg-turbo
 *******************************************************************************
-=============================
+libjpeg-turbo includes two APIs that can be used to compress and decompress
-Replacing libjpeg at Run Time
+JPEG images:
 =============================
-If a Unix application is dynamically linked with libjpeg, then you can replace
+  TurboJPEG API:  This API provides an easy-to-use interface for compressing
-libjpeg with libjpeg-turbo at run time by manipulating the LD_LIBRARY_PATH.
+  and decompressing JPEG images in memory.  It also provides some functionality
-For instance:
+  that would not be straightforward to achieve using the underlying libjpeg
  API, such as generating planar YUV images and performing multiple
  simultaneous lossless transforms on an image.  The Java interface for
  libjpeg-turbo is written on top of the TurboJPEG API.
-  [Using libjpeg]
+  libjpeg API:  This is the de facto industry-standard API for compressing and
-  > time cjpeg <vgl_5674_0098.ppm >vgl_5674_0098.jpg
+  decompressing JPEG images.  It is more difficult to use than the TurboJPEG
-  real  0m0.392s
+  API but also more powerful.  The libjpeg API implementation in libjpeg-turbo
-  user  0m0.074s
+  is both API/ABI-compatible and mathematically compatible with libjpeg v6b.
-  sys   0m0.020s
+  It can also optionally be configured to be API/ABI-compatible with libjpeg v7
  and v8 (see below.)
-  [Using libjpeg-turbo]
+There is no significant performance advantage to either API when both are used
-  > export LD_LIBRARY_PATH=/opt/libjpeg-turbo/{lib}:$LD_LIBRARY_PATH
+to perform similar operations.
  > time cjpeg <vgl_5674_0098.ppm >vgl_5674_0098.jpg
  real  0m0.109s
  user  0m0.029s
  sys   0m0.010s
 NOTE: {lib} can be lib, lib32, lib64, or lib/amd64, depending on the O/S and
 architecture.
 System administrators can also replace the libjpeg sym links in /usr/{lib} with
 links to the libjpeg dynamic library located in /opt/libjpeg-turbo/{lib}.  This
 will effectively accelerate every dynamically linked libjpeg application on the
 system.
 The Windows distribution of the libjpeg-turbo SDK installs jpeg62.dll into
 c:\libjpeg-turbo\bin, and the PATH environment variable can be modified such
 that this directory is searched before any others that might contain
 jpeg62.dll.  However, if jpeg62.dll also exists in an application's install
 directory, then Windows will load the application's version of it first.  Thus,
 if an application ships with jpeg62.dll, then back up the application's version
 of jpeg62.dll and copy c:\libjpeg-turbo\bin\jpeg62.dll into the application's
 install directory to accelerate it.
 The version of jpeg62.dll distributed in the libjpeg-turbo SDK requires the
 Visual C++ 2008 C run time DLL (msvcr90.dll).  This library ships with more
 recent versions of Windows, but users of older versions can obtain it from the
 Visual C++ 2008 Redistributable Package, which is available as a free download
 from Microsoft's web site.
 NOTE:  Features of libjpeg which require passing a C run time structure, such
 as a file handle, from an application to libjpeg will probably not work with
 the distributed version of jpeg62.dll unless the application is also built to
 use the Visual C++ 2008 C run time DLL.  In particular, this affects
 jpeg_stdio_dest() and jpeg_stdio_src().
 Mac applications typically embed their own copies of libjpeg.62.dylib inside
 the (hidden) application bundle, so it is not possible to globally replace
 libjpeg on OS X systems.  If an application uses a shared library version of
 libjpeg, then it may be possible to replace the application's version of it.
 This would generally involve copying libjpeg.62.dylib into the appropriate
 place in the application bundle and using install_name_tool to repoint the
 dylib to the new directory.  This requires an advanced knowledge of OS X and
 would not survive an upgrade or a re-install of the application.  Thus, it is
 not recommended for most users.
 =======================
 Replacing TurboJPEG/IPP
 =======================
 libjpeg-turbo is a drop-in replacement for the TurboJPEG/IPP SDK used by
 VirtualGL 2.1.x (and prior) and TurboVNC.  libjpeg-turbo contains a wrapper
 library (TurboJPEG/OSS) that emulates the TurboJPEG API using libjpeg-turbo
 instead of the closed source Intel Performance Primitives.  You can replace the
 TurboJPEG/IPP package on Linux systems with the libjpeg-turbo package in order
 to make existing releases of VirtualGL 2.1.x and TurboVNC use the new codec at
 run time.  Note that the 64-bit libjpeg-turbo packages contain only 64-bit
 binaries, whereas the TurboJPEG/IPP 64-bit packages contain both 64-bit and
 32-bit binaries.  Thus, to replace a TurboJPEG/IPP 64-bit package, install
 both the 64-bit and 32-bit versions of libjpeg-turbo.
 You can also build the VirtualGL 2.1.x and TurboVNC source code with
 the libjpeg-turbo SDK instead of TurboJPEG/IPP.  It should work identically.
 libjpeg-turbo also includes static library versions of TurboJPEG/OSS, which
 are used to build VirtualGL 2.2 and later.
 ========================================
 Using libjpeg-turbo in Your Own Programs
 ========================================
 For the most part, libjpeg-turbo should work identically to libjpeg, so in
 most cases, an application can be built against libjpeg and then run against
 libjpeg-turbo.  On Unix systems, you can build against libjpeg-turbo instead
 of libjpeg by setting
  CPATH=/opt/libjpeg-turbo/include
  and
  LIBRARY_PATH=/opt/libjpeg-turbo/{lib}
 ({lib} = lib, lib32, lib64, or lib/amd64, as appropriate.)
 If using Cygwin, then set
  CPATH=/cygdrive/c/libjpeg-turbo-gcc/include
  and
  LIBRARY_PATH=/cygdrive/c/libjpeg-turbo-gcc/lib
 If using MinGW, then set
  CPATH=/c/libjpeg-turbo-gcc/include
  and
  LIBRARY_PATH=/c/libjpeg-turbo-gcc/lib
 Building against libjpeg-turbo is useful, for instance, if you want to build an
 application that leverages the libjpeg-turbo colorspace extensions (see below.)
 On Linux and Solaris systems, you would still need to manipulate the
 LD_LIBRARY_PATH or sym links appropriately to use libjpeg-turbo at run time.
 On such systems, you can pass -R /opt/libjpeg-turbo/{lib} to the linker to
 force the use of libjpeg-turbo at run time rather than libjpeg (also useful if
 you want to leverage the colorspace extensions), or you can link against the
 libjpeg-turbo static library.
 To force a Linux, Solaris, or MinGW application to link against the static
 version of libjpeg-turbo, you can use the following linker options:
  -Wl,-Bstatic -ljpeg -Wl,-Bdynamic
 On OS X, simply add /opt/libjpeg-turbo/{lib}/libjpeg.a to the linker command
 line (this also works on Linux and Solaris.)
 To build Visual C++ applications using libjpeg-turbo, add
 c:\libjpeg-turbo\include to your system or user INCLUDE environment variable
 and c:\libjpeg-turbo\lib to your system or user LIB environment variable, and
 then link against either jpeg.lib (to use jpeg62.dll) or jpeg-static.lib (to
 use the static version of libjpeg-turbo.)
 =====================
 Colorspace Extensions
 =====================
-libjpeg-turbo includes extensions which allow JPEG images to be compressed
+libjpeg-turbo includes extensions that allow JPEG images to be compressed
-directly from (and decompressed directly to) buffers which use BGR, BGRA,
+directly from (and decompressed directly to) buffers that use BGR, BGRX,
-RGBA, ABGR, and ARGB pixel ordering.  This is implemented with six new
+RGBX, XBGR, and XRGB pixel ordering.  This is implemented with ten new
 colorspace constants:
  JCS_EXT_RGB   /* red/green/blue */
@@ -181,16 +96,269 @@ colorspace constants:
  JCS_EXT_BGRX  /* blue/green/red/x */
  JCS_EXT_XBGR  /* x/blue/green/red */
  JCS_EXT_XRGB  /* x/red/green/blue */
  JCS_EXT_RGBA  /* red/green/blue/alpha */
  JCS_EXT_BGRA  /* blue/green/red/alpha */
  JCS_EXT_ABGR  /* alpha/blue/green/red */
  JCS_EXT_ARGB  /* alpha/red/green/blue */
 Setting cinfo.in_color_space (compression) or cinfo.out_color_space
 (decompression) to one of these values will cause libjpeg-turbo to read the
 red, green, and blue values from (or write them to) the appropriate position in
-the pixel when YUV conversion is performed.
+the pixel when compressing from/decompressing to an RGB buffer.
 Your application can check for the existence of these extensions at compile
 time with:
  #ifdef JCS_EXTENSIONS
-At run time, attempting to use these extensions with a version of libjpeg
+At run time, attempting to use these extensions with a libjpeg implementation
-that doesn't support them will result in a "Bogus input colorspace" error.
+that does not support them will result in a "Bogus input colorspace" error.
 Applications can trap this error in order to test whether run-time support is
 available for the colorspace extensions.
 When using the RGBX, BGRX, XBGR, and XRGB colorspaces during decompression, the
 X byte is undefined, and in order to ensure the best performance, libjpeg-turbo
 can set that byte to whatever value it wishes.  If an application expects the X
 byte to be used as an alpha channel, then it should specify JCS_EXT_RGBA,
 JCS_EXT_BGRA, JCS_EXT_ABGR, or JCS_EXT_ARGB.  When these colorspace constants
 are used, the X byte is guaranteed to be 0xFF, which is interpreted as opaque.
 Your application can check for the existence of the alpha channel colorspace
 extensions at compile time with:
  #ifdef JCS_ALPHA_EXTENSIONS
 jcstest.c, located in the libjpeg-turbo source tree, demonstrates how to check
 for the existence of the colorspace extensions at compile time and run time.
 ===================================
 libjpeg v7 and v8 API/ABI Emulation
 ===================================
 With libjpeg v7 and v8, new features were added that necessitated extending the
 compression and decompression structures.  Unfortunately, due to the exposed
 nature of those structures, extending them also necessitated breaking backward
 ABI compatibility with previous libjpeg releases.  Thus, programs that were
 built to use libjpeg v7 or v8 did not work with libjpeg-turbo, since it is
 based on the libjpeg v6b code base.  Although libjpeg v7 and v8 are not
 as widely used as v6b, enough programs (including a few Linux distros) made
 the switch that there was a demand to emulate the libjpeg v7 and v8 ABIs
 in libjpeg-turbo.  It should be noted, however, that this feature was added
 primarily so that applications that had already been compiled to use libjpeg
 v7+ could take advantage of accelerated baseline JPEG encoding/decoding
 without recompiling.  libjpeg-turbo does not claim to support all of the
 libjpeg v7+ features, nor to produce identical output to libjpeg v7+ in all
 cases (see below.)
 By passing an argument of --with-jpeg7 or --with-jpeg8 to configure, or an
 argument of -DWITH_JPEG7=1 or -DWITH_JPEG8=1 to cmake, you can build a version
 of libjpeg-turbo that emulates the libjpeg v7 or v8 ABI, so that programs
 that are built against libjpeg v7 or v8 can be run with libjpeg-turbo.  The
 following section describes which libjpeg v7+ features are supported and which
 aren't.
 Support for libjpeg v7 and v8 Features:
 ---------------------------------------
 Fully supported:
 -- libjpeg: IDCT scaling extensions in decompressor
   libjpeg-turbo supports IDCT scaling with scaling factors of 1/8, 1/4, 3/8,
   1/2, 5/8, 3/4, 7/8, 9/8, 5/4, 11/8, 3/2, 13/8, 7/4, 15/8, and 2/1 (only 1/4
   and 1/2 are SIMD-accelerated.)
 -- libjpeg: arithmetic coding
 -- libjpeg: In-memory source and destination managers
   See notes below.
 -- cjpeg: Separate quality settings for luminance and chrominance
   Note that the libpjeg v7+ API was extended to accommodate this feature only
   for convenience purposes.  It has always been possible to implement this
   feature with libjpeg v6b (see rdswitch.c for an example.)
 -- cjpeg: 32-bit BMP support
 -- cjpeg: -rgb option
 -- jpegtran: lossless cropping
 -- jpegtran: -perfect option
 -- jpegtran: forcing width/height when performing lossless crop
 -- rdjpgcom: -raw option
 -- rdjpgcom: locale awareness
 Not supported:
 NOTE:  As of this writing, extensive research has been conducted into the
 usefulness of DCT scaling as a means of data reduction and SmartScale as a
 means of quality improvement.  The reader is invited to peruse the research at
 http://www.libjpeg-turbo.org/About/SmartScale and draw his/her own conclusions,
 but it is the general belief of our project that these features have not
 demonstrated sufficient usefulness to justify inclusion in libjpeg-turbo.
 -- libjpeg: DCT scaling in compressor
   cinfo.scale_num and cinfo.scale_denom are silently ignored.
   There is no technical reason why DCT scaling could not be supported when
   emulating the libjpeg v7+ API/ABI, but without the SmartScale extension (see
   below), only scaling factors of 1/2, 8/15, 4/7, 8/13, 2/3, 8/11, 4/5, and
   8/9 would be available, which is of limited usefulness.
 -- libjpeg: SmartScale
   cinfo.block_size is silently ignored.
   SmartScale is an extension to the JPEG format that allows for DCT block
   sizes other than 8x8.  Providing support for this new format would be
   feasible (particularly without full acceleration.)  However, until/unless
   the format becomes either an official industry standard or, at minimum, an
   accepted solution in the community, we are hesitant to implement it, as
   there is no sense of whether or how it might change in the future.  It is
   our belief that SmartScale has not demonstrated sufficient usefulness as a
   lossless format nor as a means of quality enhancement, and thus, our primary
   interest in providing this feature would be as a means of supporting
   additional DCT scaling factors.
 -- libjpeg: Fancy downsampling in compressor
   cinfo.do_fancy_downsampling is silently ignored.
   This requires the DCT scaling feature, which is not supported.
 -- jpegtran: Scaling
   This requires both the DCT scaling and SmartScale features, which are not
   supported.
 -- Lossless RGB JPEG files
   This requires the SmartScale feature, which is not supported.
 What About libjpeg v9?
 ----------------------
 libjpeg v9 introduced yet another field to the JPEG compression structure
 (color_transform), thus making the ABI backward incompatible with that of
 libjpeg v8.  This new field was introduced solely for the purpose of supporting
 lossless SmartScale encoding.  Further, there was actually no reason to extend
 the API in this manner, as the color transform could have just as easily been
 activated by way of a new JPEG colorspace constant, thus preserving backward
 ABI compatibility.
 Our research (see link above) has shown that lossless SmartScale does not
 generally accomplish anything that can't already be accomplished better with
 existing, standard lossless formats.  Thus, at this time, it is our belief that
 there is not sufficient technical justification for software to upgrade from
 libjpeg v8 to libjpeg v9, and therefore, not sufficient technical justification
 for us to emulate the libjpeg v9 ABI.
 =====================================
 In-Memory Source/Destination Managers
 =====================================
 By default, libjpeg-turbo 1.3 and later includes the jpeg_mem_src() and
 jpeg_mem_dest() functions, even when not emulating the libjpeg v8 API/ABI.
 Previously, it was necessary to build libjpeg-turbo from source with libjpeg v8
 API/ABI emulation in order to use the in-memory source/destination managers,
 but several projects requested that those functions be included when emulating
 the libjpeg v6b API/ABI as well.  This allows the use of those functions by
 programs that need them without breaking ABI compatibility for programs that
 don't, and it allows those functions to be provided in the "official"
 libjpeg-turbo binaries.
 Those who are concerned about maintaining strict conformance with the libjpeg
 v6b or v7 API can pass an argument of --without-mem-srcdst to configure or
 an argument of -DWITH_MEM_SRCDST=0 to CMake prior to building libjpeg-turbo.
 This will restore the pre-1.3 behavior, in which jpeg_mem_src() and
 jpeg_mem_dest() are only included when emulating the libjpeg v8 API/ABI.
 On Un*x systems, including the in-memory source/destination managers changes
 the dynamic library version from 62.0.0 to 62.1.0 if using libjpeg v6b API/ABI
 emulation and from 7.0.0 to 7.1.0 if using libjpeg v7 API/ABI emulation.
 Note that, on most Un*x systems, the dynamic linker will not look for a
 function in a library until that function is actually used.  Thus, if a program
 is built against libjpeg-turbo 1.3+ and uses jpeg_mem_src() or jpeg_mem_dest(),
 that program will not fail if run against an older version of libjpeg-turbo or
 against libjpeg v7- until the program actually tries to call jpeg_mem_src() or
 jpeg_mem_dest().  Such is not the case on Windows.  If a program is built
 against the libjpeg-turbo 1.3+ DLL and uses jpeg_mem_src() or jpeg_mem_dest(),
 then it must use the libjpeg-turbo 1.3+ DLL at run time.
 Both cjpeg and djpeg have been extended to allow testing the in-memory
 source/destination manager functions.  See their respective man pages for more
 details.
 *******************************************************************************
 **     Mathematical Compatibility
 *******************************************************************************
 For the most part, libjpeg-turbo should produce identical output to libjpeg
 v6b.  The one exception to this is when using the floating point DCT/IDCT, in
 which case the outputs of libjpeg v6b and libjpeg-turbo can differ for the
 following reasons:
 -- The SSE/SSE2 floating point DCT implementation in libjpeg-turbo is ever so
   slightly more accurate than the implementation in libjpeg v6b, but not by
   any amount perceptible to human vision (generally in the range of 0.01 to
   0.08 dB gain in PNSR.)
 -- When not using the SIMD extensions, libjpeg-turbo uses the more accurate
   (and slightly faster) floating point IDCT algorithm introduced in libjpeg
   v8a as opposed to the algorithm used in libjpeg v6b.  It should be noted,
   however, that this algorithm basically brings the accuracy of the floating
   point IDCT in line with the accuracy of the slow integer IDCT.  The floating
   point DCT/IDCT algorithms are mainly a legacy feature, and they do not
   produce significantly more accuracy than the slow integer algorithms (to put
   numbers on this, the typical difference in PNSR between the two algorithms
   is less than 0.10 dB, whereas changing the quality level by 1 in the upper
   range of the quality scale is typically more like a 1.0 dB difference.)
 -- If the floating point algorithms in libjpeg-turbo are not implemented using
   SIMD instructions on a particular platform, then the accuracy of the
   floating point DCT/IDCT can depend on the compiler settings.
 While libjpeg-turbo does emulate the libjpeg v8 API/ABI, under the hood, it is
 still using the same algorithms as libjpeg v6b, so there are several specific
 cases in which libjpeg-turbo cannot be expected to produce the same output as
 libjpeg v8:
 -- When decompressing using scaling factors of 1/2 and 1/4, because libjpeg v8
   implements those scaling algorithms differently than libjpeg v6b does, and
   libjpeg-turbo's SIMD extensions are based on the libjpeg v6b behavior.
 -- When using chrominance subsampling, because libjpeg v8 implements this
   with its DCT/IDCT scaling algorithms rather than with a separate
   downsampling/upsampling algorithm.  In our testing, the subsampled/upsampled
   output of libjpeg v8 is less accurate than that of libjpeg v6b for this
   reason.
 -- When decompressing using a scaling factor > 1 and merged (AKA "non-fancy" or
   "non-smooth") chrominance upsampling, because libjpeg v8 does not support
   merged upsampling with scaling factors > 1.
 *******************************************************************************
 **     Performance Pitfalls
 *******************************************************************************
 ===============
 Restart Markers
 ===============
 The optimized Huffman decoder in libjpeg-turbo does not handle restart markers
 in a way that makes the rest of the libjpeg infrastructure happy, so it is
 necessary to use the slow Huffman decoder when decompressing a JPEG image that
 has restart markers.  This can cause the decompression performance to drop by
 as much as 20%, but the performance will still be much greater than that of
 libjpeg.  Many consumer packages, such as PhotoShop, use restart markers when
 generating JPEG images, so images generated by those programs will experience
 this issue.
 ===============================================
 Fast Integer Forward DCT at High Quality Levels
 ===============================================
 The algorithm used by the SIMD-accelerated quantization function cannot produce
 correct results whenever the fast integer forward DCT is used along with a JPEG
 quality of 98-100.  Thus, libjpeg-turbo must use the non-SIMD quantization
 function in those cases.  This causes performance to drop by as much as 40%.
 It is therefore strongly advised that you use the slow integer forward DCT
 whenever encoding images with a JPEG quality of 98 or higher.
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -3,7 +3,7 @@
 # Check that NASM exists and determine flags
 AC_DEFUN([AC_PROG_NASM],[
-AC_CHECK_PROGS(NASM, [nasm nasmw])
+AC_CHECK_PROGS(NASM, [nasm nasmw yasm])
 test -z "$NASM" && AC_MSG_ERROR([no nasm (Netwide Assembler) found])
 AC_MSG_CHECKING([for object file format of host system])
@@ -40,11 +40,18 @@ case "$host_os" in
        ;;
    esac
  ;;
-  freebsd* | netbsd* | openbsd*)
+  kfreebsd* | freebsd* | netbsd* | openbsd*)
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      objfmt='BSD-a.out'
    else
-      objfmt='ELF'
+      case "$host_cpu" in
        x86_64 | amd64)
          objfmt='ELF64'
          ;;
        *)
          objfmt='ELF'
          ;;
      esac
    fi
  ;;
  solaris* | sunos* | sysv* | sco*)
@@ -127,3 +134,114 @@ else
 fi
 ])
 # AC_CHECK_COMPATIBLE_ARM_ASSEMBLER_IFELSE
 # --------------------------
 # Test whether the assembler is suitable and supports NEON instructions
 AC_DEFUN([AC_CHECK_COMPATIBLE_ARM_ASSEMBLER_IFELSE],[
  ac_good_gnu_arm_assembler=no
  ac_save_CC="$CC"
  ac_save_CFLAGS="$CFLAGS"
  CFLAGS="$CCASFLAGS -x assembler-with-cpp"
  CC="$CCAS"
  AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
    .text
    .fpu neon
    .arch armv7a
    .object_arch armv4
    .arm
    pld [r0]
    vmovn.u16 d0, q0]])], ac_good_gnu_arm_assembler=yes)
  ac_use_gas_preprocessor=no
  if test "x$ac_good_gnu_arm_assembler" = "xno" ; then
    CC="gas-preprocessor.pl $CCAS"
    AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
      .text
      .fpu neon
      .arch armv7a
      .object_arch armv4
      .arm
      pld [r0]
      vmovn.u16 d0, q0]])], ac_use_gas_preprocessor=yes)
  fi
  CFLAGS="$ac_save_CFLAGS"
  CC="$ac_save_CC"
  if test "x$ac_use_gas_preprocessor" = "xyes" ; then
    CCAS="gas-preprocessor.pl $CCAS"
    AC_SUBST([CCAS])
    ac_good_gnu_arm_assembler=yes
  fi
  if test "x$ac_good_gnu_arm_assembler" = "xyes" ; then
    $1
  else
    $2
  fi
 ])
 # AC_CHECK_COMPATIBLE_MIPSEL_ASSEMBLER_IFELSE
 # --------------------------
 # Test whether the assembler is suitable and supports MIPS instructions
 AC_DEFUN([AC_CHECK_COMPATIBLE_MIPS_ASSEMBLER_IFELSE],[
  have_mips_dspr2=no
  ac_save_CFLAGS="$CFLAGS"
  CFLAGS="$CCASFLAGS -mdspr2"
  AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
  int main ()
  {
    int c = 0, a = 0, b = 0;
    __asm__ __volatile__ (
        "precr.qb.ph %[c], %[a], %[b]          \n\t"
        : [c] "=r" (c)
        : [a] "r" (a), [b] "r" (b)
    );
    return c;
  }
  ]])], have_mips_dspr2=yes)
  CFLAGS=$ac_save_CFLAGS
  if test "x$have_mips_dspr2" = "xyes" ; then
    $1
  else
    $2
  fi
 ])
 AC_DEFUN([AC_CHECK_COMPATIBLE_ARM64_ASSEMBLER_IFELSE],[
  ac_good_gnu_arm_assembler=no
  ac_save_CC="$CC"
  ac_save_CFLAGS="$CFLAGS"
  CFLAGS="$CCASFLAGS -x assembler-with-cpp"
  CC="$CCAS"
  AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
    .text
    .arch armv8-a+fp+simd
    movi v0.16b, #100]])], ac_good_gnu_arm_assembler=yes)
  ac_use_gas_preprocessor=no
  if test "x$ac_good_gnu_arm_assembler" = "xno" ; then
    CC="gas-preprocessor.pl $CCAS"
    AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
      .text
      .arch armv8-a+fp+simd
      movi v0.16b, #100]])], ac_use_gas_preprocessor=yes)
  fi
  CFLAGS="$ac_save_CFLAGS"
  CC="$ac_save_CC"
  if test "x$ac_use_gas_preprocessor" = "xyes" ; then
    CCAS="gas-preprocessor.pl $CCAS"
    AC_SUBST([CCAS])
    ac_good_gnu_arm_assembler=yes
  fi
  if test "x$ac_good_gnu_arm_assembler" = "xyes" ; then
    $1
  else
    $2
  fi
 ])
--- a/bmp.c
+++ b/bmp.c
@@ -1,370 +1,334 @@
-/* Copyright (C)2004 Landmark Graphics Corporation
+/*
- * Copyright (C)2005 Sun Microsystems, Inc.
+ * Copyright (C)2011, 2015 D. R. Commander.  All Rights Reserved.
 *
- * This library is free software and may be redistributed and/or modified under
+ * Redistribution and use in source and binary forms, with or without
- * the terms of the wxWindows Library License, Version 3.1 or (at your option)
+ * modification, are permitted provided that the following conditions are met:
 * any later version.  The full license is in the LICENSE.txt file included
 * with this distribution.
 *
- * This library is distributed in the hope that it will be useful,
+ * - Redistributions of source code must retain the above copyright notice,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   this list of conditions and the following disclaimer.
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * - Redistributions in binary form must reproduce the above copyright notice,
- * wxWindows Library License for more details.
+ *   this list of conditions and the following disclaimer in the documentation
-*/
+ *   and/or other materials provided with the distribution.
 * - Neither the name of the libjpeg-turbo Project nor the names of its
 *   contributors may be used to endorse or promote products derived from this
 *   software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS",
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 */
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#ifdef _WIN32
+#include <setjmp.h>
- #include <io.h>
+#include <errno.h>
-#else
+#include "cdjpeg.h"
- #include <unistd.h>
+#include <jpeglib.h>
-#endif
+#include <jpegint.h>
-#include "./rrutil.h"
+#include "tjutil.h"
-#include "./bmp.h"
+#include "bmp.h"
 #ifndef BI_BITFIELDS
 #define BI_BITFIELDS 3L
 #endif
 #ifndef BI_RGB
 #define BI_RGB 0L
 #endif
-#define BMPHDRSIZE 54
+/* This duplicates the functionality of the VirtualGL bitmap library using
-typedef struct _bmphdr
+   the components from cjpeg and djpeg */
 /* Error handling (based on example in example.c) */
 static char errStr[JMSG_LENGTH_MAX]="No error";
 struct my_error_mgr
 {
-	unsigned short bfType;
+	struct jpeg_error_mgr pub;
-	unsigned int bfSize;
+	jmp_buf setjmp_buffer;
-	unsigned short bfReserved1, bfReserved2;
+};
-	unsigned int bfOffBits;
+typedef struct my_error_mgr *my_error_ptr;
-	unsigned int biSize;
+static void my_error_exit(j_common_ptr cinfo)
 	int biWidth, biHeight;
 	unsigned short biPlanes, biBitCount;
 	unsigned int biCompression, biSizeImage;
 	int biXPelsPerMeter, biYPelsPerMeter;
 	unsigned int biClrUsed, biClrImportant;
 } bmphdr;
 static const char *__bmperr="No error";
 static const int ps[BMPPIXELFORMATS]={3, 4, 3, 4, 4, 4};
 static const int roffset[BMPPIXELFORMATS]={0, 0, 2, 2, 3, 1};
 static const int goffset[BMPPIXELFORMATS]={1, 1, 1, 1, 2, 2};
 static const int boffset[BMPPIXELFORMATS]={2, 2, 0, 0, 1, 3};
 #define _throw(m) {__bmperr=m;  retcode=-1;  goto finally;}
 #define _unix(f) {if((f)==-1) _throw(strerror(errno));}
 #define _catch(f) {if((f)==-1) {retcode=-1;  goto finally;}}
 #define readme(fd, addr, size) \
 	if((bytesread=read(fd, addr, (size)))==-1) _throw(strerror(errno)); \
 	if(bytesread!=(size)) _throw("Read error");
 void pixelconvert(unsigned char *srcbuf, enum BMPPIXELFORMAT srcformat,
 	int srcpitch, unsigned char *dstbuf, enum BMPPIXELFORMAT dstformat, int dstpitch,
 	int w, int h, int flip)
 {
-	unsigned char *srcptr, *srcptr0, *dstptr, *dstptr0;
+	my_error_ptr myerr=(my_error_ptr)cinfo->err;
-	int i, j;
+	(*cinfo->err->output_message)(cinfo);
-
+	longjmp(myerr->setjmp_buffer, 1);
 	srcptr=flip? &srcbuf[srcpitch*(h-1)]:srcbuf;
 	for(j=0, dstptr=dstbuf; j<h; j++,
 		srcptr+=flip? -srcpitch:srcpitch, dstptr+=dstpitch)
 	{
 		for(i=0, srcptr0=srcptr, dstptr0=dstptr; i<w; i++,
 			srcptr0+=ps[srcformat], dstptr0+=ps[dstformat])
 		{
 			dstptr0[roffset[dstformat]]=srcptr0[roffset[srcformat]];
 			dstptr0[goffset[dstformat]]=srcptr0[goffset[srcformat]];
 			dstptr0[boffset[dstformat]]=srcptr0[boffset[srcformat]];
 		}
 	}
 }
-int loadppm(int *fd, unsigned char **buf, int *w, int *h,
+/* Based on output_message() in jerror.c */
-	enum BMPPIXELFORMAT f, int align, int dstbottomup, int ascii)
+
 static void my_output_message(j_common_ptr cinfo)
 {
-	FILE *fs=NULL;  int retcode=0, scalefactor, dstpitch;
+	(*cinfo->err->format_message)(cinfo, errStr);
-	unsigned char *tempbuf=NULL;  char temps[255], temps2[255];
+}
 	int numread=0, totalread=0, pixel[3], i, j;
-	if((fs=fdopen(*fd, "r"))==NULL) _throw(strerror(errno));
+#define _throw(m) {snprintf(errStr, JMSG_LENGTH_MAX, "%s", m);  \
 	retval=-1;  goto bailout;}
 #define _throwunix(m) {snprintf(errStr, JMSG_LENGTH_MAX, "%s\n%s", m,  \
 	strerror(errno));  retval=-1;  goto bailout;}
-	do
+
 static void pixelconvert(unsigned char *srcbuf, int srcpf, int srcbottomup,
 	unsigned char *dstbuf, int dstpf, int dstbottomup, int w, int h)
 {
 	unsigned char *srcrowptr=srcbuf, *srccolptr;
 	int srcps=tjPixelSize[srcpf];
 	int srcstride=srcbottomup? -w*srcps:w*srcps;
 	unsigned char *dstrowptr=dstbuf, *dstcolptr;
 	int dstps=tjPixelSize[dstpf];
 	int dststride=dstbottomup? -w*dstps:w*dstps;
 	int row, col;
 	if(srcbottomup) srcrowptr=&srcbuf[w*srcps*(h-1)];
 	if(dstbottomup) dstrowptr=&dstbuf[w*dstps*(h-1)];
 	/* NOTE: These quick & dirty CMYK<->RGB conversion routines are for testing
 	   purposes only.  Properly converting between CMYK and RGB requires a color
 	   management system. */
 	if(dstpf==TJPF_CMYK)
 	{
-		if(!fgets(temps, 255, fs)) _throw("Read error");
+		for(row=0; row<h; row++, srcrowptr+=srcstride, dstrowptr+=dststride)
 		if(strlen(temps)==0 || temps[0]=='\n') continue;
 		if(sscanf(temps, "%s", temps2)==1 && temps2[1]=='#') continue;
 		switch(totalread)
 		{
-			case 0:
+			for(col=0, srccolptr=srcrowptr, dstcolptr=dstrowptr;
-				if((numread=sscanf(temps, "%d %d %d", w, h, &scalefactor))==EOF)
+				col<w; col++, srccolptr+=srcps)
 					_throw("Read error");
 				break;
 			case 1:
 				if((numread=sscanf(temps, "%d %d", h, &scalefactor))==EOF)
 					_throw("Read error");
 				break;
 			case 2:
 				if((numread=sscanf(temps, "%d", &scalefactor))==EOF)
 					_throw("Read error");
 				break;
 		}
 		totalread+=numread;
 	} while(totalread<3);
 	if((*w)<1 || (*h)<1 || scalefactor<1) _throw("Corrupt PPM header");
 	dstpitch=(((*w)*ps[f])+(align-1))&(~(align-1));
 	if((*buf=(unsigned char *)malloc(dstpitch*(*h)))==NULL)
 		_throw("Memory allocation error");
 	if(ascii)
 	{
 		for(j=0; j<*h; j++)
 		{
 			for(i=0; i<*w; i++)
 			{
-				if(fscanf(fs, "%d%d%d", &pixel[0], &pixel[1], &pixel[2])!=3)
+				double c=1.0-((double)(srccolptr[tjRedOffset[srcpf]])/255.);
-					_throw("Read error");
+				double m=1.0-((double)(srccolptr[tjGreenOffset[srcpf]])/255.);
-				(*buf)[j*dstpitch+i*ps[f]+roffset[f]]=(unsigned char)(pixel[0]*255/scalefactor);
+				double y=1.0-((double)(srccolptr[tjBlueOffset[srcpf]])/255.);
-				(*buf)[j*dstpitch+i*ps[f]+goffset[f]]=(unsigned char)(pixel[1]*255/scalefactor);
+				double k=min(min(c,m),min(y,1.0));
-				(*buf)[j*dstpitch+i*ps[f]+boffset[f]]=(unsigned char)(pixel[2]*255/scalefactor);
+				if(k==1.0) c=m=y=0.0;
 				else
 				{
 					c=(c-k)/(1.0-k);
 					m=(m-k)/(1.0-k);
 					y=(y-k)/(1.0-k);
 				}
 				if(c>1.0) c=1.0;  if(c<0.) c=0.;
 				if(m>1.0) m=1.0;  if(m<0.) m=0.;
 				if(y>1.0) y=1.0;  if(y<0.) y=0.;
 				if(k>1.0) k=1.0;  if(k<0.) k=0.;
 				*dstcolptr++=(unsigned char)(255.0-c*255.0+0.5);
 				*dstcolptr++=(unsigned char)(255.0-m*255.0+0.5);
 				*dstcolptr++=(unsigned char)(255.0-y*255.0+0.5);
 				*dstcolptr++=(unsigned char)(255.0-k*255.0+0.5);
 			}
 		}
 	}
 	else if(srcpf==TJPF_CMYK)
 	{
 		for(row=0; row<h; row++, srcrowptr+=srcstride, dstrowptr+=dststride)
 		{
 			for(col=0, srccolptr=srcrowptr, dstcolptr=dstrowptr;
 				col<w; col++, dstcolptr+=dstps)
 			{
 				double c=(double)(*srccolptr++);
 				double m=(double)(*srccolptr++);
 				double y=(double)(*srccolptr++);
 				double k=(double)(*srccolptr++);
 				double r=c*k/255.;
 				double g=m*k/255.;
 				double b=y*k/255.;
 				if(r>255.0) r=255.0;  if(r<0.) r=0.;
 				if(g>255.0) g=255.0;  if(g<0.) g=0.;
 				if(b>255.0) b=255.0;  if(b<0.) b=0.;
 				dstcolptr[tjRedOffset[dstpf]]=(unsigned char)(r+0.5);
 				dstcolptr[tjGreenOffset[dstpf]]=(unsigned char)(g+0.5);
 				dstcolptr[tjBlueOffset[dstpf]]=(unsigned char)(b+0.5);
 			}
 		}
 	}
 	else
 	{
-		if(scalefactor!=255)
+		for(row=0; row<h; row++, srcrowptr+=srcstride, dstrowptr+=dststride)
-			_throw("Binary PPMs must have 8-bit components");
+		{
-		if((tempbuf=(unsigned char *)malloc((*w)*(*h)*3))==NULL)
+			for(col=0, srccolptr=srcrowptr, dstcolptr=dstrowptr;
-			_throw("Memory allocation error");
+				col<w; col++, srccolptr+=srcps, dstcolptr+=dstps)
-		if(fread(tempbuf, (*w)*(*h)*3, 1, fs)!=1) _throw("Read error");
+			{
-		pixelconvert(tempbuf, BMP_RGB, (*w)*3, *buf, f, dstpitch, *w, *h, dstbottomup);
+				dstcolptr[tjRedOffset[dstpf]]=srccolptr[tjRedOffset[srcpf]];
 				dstcolptr[tjGreenOffset[dstpf]]=srccolptr[tjGreenOffset[srcpf]];
 				dstcolptr[tjBlueOffset[dstpf]]=srccolptr[tjBlueOffset[srcpf]];
 			}
 		}
 	}
 	finally:
 	if(fs) {fclose(fs);  *fd=-1;}
 	if(tempbuf) free(tempbuf);
 	return retcode;
 }
-int loadbmp(char *filename, unsigned char **buf, int *w, int *h, 
+int loadbmp(char *filename, unsigned char **buf, int *w, int *h,
-	enum BMPPIXELFORMAT f, int align, int dstbottomup)
+	int dstpf, int bottomup)
 {
-	int fd=-1, bytesread, srcpitch, srcbottomup=1, srcps, dstpitch,
+	int retval=0, dstps, srcpf, tempc;
-		retcode=0;
+	struct jpeg_compress_struct cinfo;
-	unsigned char *tempbuf=NULL;
+	struct my_error_mgr jerr;
-	bmphdr bh;  int flags=O_RDONLY;
+	cjpeg_source_ptr src;
 	FILE *file=NULL;
-	dstbottomup=dstbottomup? 1:0;
+	memset(&cinfo, 0, sizeof(struct jpeg_compress_struct));
 	#ifdef _WIN32
 	flags|=O_BINARY;
 	#endif
 	if(!filename || !buf || !w || !h || f<0 || f>BMPPIXELFORMATS-1 || align<1)
 		_throw("invalid argument to loadbmp()");
 	if((align&(align-1))!=0)
 		_throw("Alignment must be a power of 2");
 	_unix(fd=open(filename, flags));
-	readme(fd, &bh.bfType, sizeof(unsigned short));
+	if(!filename || !buf || !w || !h || dstpf<0 || dstpf>=TJ_NUMPF)
-	if(!littleendian())	bh.bfType=byteswap16(bh.bfType);
+		_throw("loadbmp(): Invalid argument");
-	if(bh.bfType==0x3650)
+	if((file=fopen(filename, "rb"))==NULL)
 		_throwunix("loadbmp(): Cannot open input file");
 	cinfo.err=jpeg_std_error(&jerr.pub);
 	jerr.pub.error_exit=my_error_exit;
 	jerr.pub.output_message=my_output_message;
 	if(setjmp(jerr.setjmp_buffer))
 	{
-		_catch(loadppm(&fd, buf, w, h, f, align, dstbottomup, 0));
+		/* If we get here, the JPEG code has signaled an error. */
-		goto finally;
+		retval=-1;  goto bailout;
 	}
 	if(bh.bfType==0x3350)
 	{
 		_catch(loadppm(&fd, buf, w, h, f, align, dstbottomup, 1));
 		goto finally;
 	}
-	readme(fd, &bh.bfSize, sizeof(unsigned int));
+	jpeg_create_compress(&cinfo);
-	readme(fd, &bh.bfReserved1, sizeof(unsigned short));
+	if((tempc=getc(file))<0 || ungetc(tempc, file)==EOF)
-	readme(fd, &bh.bfReserved2, sizeof(unsigned short));
+		_throwunix("loadbmp(): Could not read input file")
-	readme(fd, &bh.bfOffBits, sizeof(unsigned int));
+	else if(tempc==EOF) _throw("loadbmp(): Input file contains no data");
 	readme(fd, &bh.biSize, sizeof(unsigned int));
 	readme(fd, &bh.biWidth, sizeof(int));
 	readme(fd, &bh.biHeight, sizeof(int));
 	readme(fd, &bh.biPlanes, sizeof(unsigned short));
 	readme(fd, &bh.biBitCount, sizeof(unsigned short));
 	readme(fd, &bh.biCompression, sizeof(unsigned int));
 	readme(fd, &bh.biSizeImage, sizeof(unsigned int));
 	readme(fd, &bh.biXPelsPerMeter, sizeof(int));
 	readme(fd, &bh.biYPelsPerMeter, sizeof(int));
 	readme(fd, &bh.biClrUsed, sizeof(unsigned int));
 	readme(fd, &bh.biClrImportant, sizeof(unsigned int));
-	if(!littleendian())
+	if(tempc=='B')
 	{
-		bh.bfSize=byteswap(bh.bfSize);
+		if((src=jinit_read_bmp(&cinfo))==NULL)
-		bh.bfOffBits=byteswap(bh.bfOffBits);
+			_throw("loadbmp(): Could not initialize bitmap loader");
-		bh.biSize=byteswap(bh.biSize);
+	}
-		bh.biWidth=byteswap(bh.biWidth);
+	else if(tempc=='P')
-		bh.biHeight=byteswap(bh.biHeight);
+	{
-		bh.biPlanes=byteswap16(bh.biPlanes);
+		if((src=jinit_read_ppm(&cinfo))==NULL)
-		bh.biBitCount=byteswap16(bh.biBitCount);
+			_throw("loadbmp(): Could not initialize bitmap loader");
-		bh.biCompression=byteswap(bh.biCompression);
+	}
-		bh.biSizeImage=byteswap(bh.biSizeImage);
+	else _throw("loadbmp(): Unsupported file type");
-		bh.biXPelsPerMeter=byteswap(bh.biXPelsPerMeter);
+
-		bh.biYPelsPerMeter=byteswap(bh.biYPelsPerMeter);
+	src->input_file=file;
-		bh.biClrUsed=byteswap(bh.biClrUsed);
+	(*src->start_input)(&cinfo, src);
-		bh.biClrImportant=byteswap(bh.biClrImportant);
+	(*cinfo.mem->realize_virt_arrays)((j_common_ptr)&cinfo);
 	*w=cinfo.image_width;  *h=cinfo.image_height;
 	if(cinfo.input_components==1 && cinfo.in_color_space==JCS_RGB)
 		srcpf=TJPF_GRAY;
 	else srcpf=TJPF_RGB;
 	dstps=tjPixelSize[dstpf];
 	if((*buf=(unsigned char *)malloc((*w)*(*h)*dstps))==NULL)
 		_throw("loadbmp(): Memory allocation failure");
 	while(cinfo.next_scanline<cinfo.image_height)
 	{
 		int i, nlines=(*src->get_pixel_rows)(&cinfo, src);
 		for(i=0; i<nlines; i++)
 		{
 			unsigned char *outbuf;  int row;
 			row=cinfo.next_scanline+i;
 			if(bottomup) outbuf=&(*buf)[((*h)-row-1)*(*w)*dstps];
 			else outbuf=&(*buf)[row*(*w)*dstps];
 			pixelconvert(src->buffer[i], srcpf, 0, outbuf, dstpf, bottomup, *w,
 				nlines);
 		}
 		cinfo.next_scanline+=nlines;
 	}
-	if(bh.bfType!=0x4d42 || bh.bfOffBits<BMPHDRSIZE
+	(*src->finish_input)(&cinfo, src);
 	|| bh.biWidth<1 || bh.biHeight==0)
 		_throw("Corrupt bitmap header");
 	if((bh.biBitCount!=24 && bh.biBitCount!=32) || bh.biCompression!=BI_RGB)
 		_throw("Only uncompessed RGB bitmaps are supported");
-	*w=bh.biWidth;  *h=bh.biHeight;  srcps=bh.biBitCount/8;
+	bailout:
-	if(*h<0) {*h=-(*h);  srcbottomup=0;}
+	jpeg_destroy_compress(&cinfo);
-	srcpitch=(((*w)*srcps)+3)&(~3);
+	if(file) fclose(file);
-	dstpitch=(((*w)*ps[f])+(align-1))&(~(align-1));
+	if(retval<0 && buf && *buf) {free(*buf);  *buf=NULL;}
-
+	return retval;
 	if(srcpitch*(*h)+bh.bfOffBits!=bh.bfSize) _throw("Corrupt bitmap header");
 	if((tempbuf=(unsigned char *)malloc(srcpitch*(*h)))==NULL
 	|| (*buf=(unsigned char *)malloc(dstpitch*(*h)))==NULL)
 		_throw("Memory allocation error");
 	if(lseek(fd, (long)bh.bfOffBits, SEEK_SET)!=(long)bh.bfOffBits)
 		_throw(strerror(errno));
 	_unix(bytesread=read(fd, tempbuf, srcpitch*(*h)));
 	if(bytesread!=srcpitch*(*h)) _throw("Read error");
 	pixelconvert(tempbuf, BMP_BGR, srcpitch, *buf, f, dstpitch, *w, *h, 
 		srcbottomup!=dstbottomup);
 	finally:
 	if(tempbuf) free(tempbuf);
 	if(fd!=-1) close(fd);
 	return retcode;
 }
 #define writeme(fd, addr, size) \
 	if((byteswritten=write(fd, addr, (size)))==-1) _throw(strerror(errno)); \
 	if(byteswritten!=(size)) _throw("Write error");
-int saveppm(char *filename, unsigned char *buf, int w, int h,
+int savebmp(char *filename, unsigned char *buf, int w, int h, int srcpf,
-	enum BMPPIXELFORMAT f, int srcpitch, int srcbottomup)
+	int bottomup)
 {
-	FILE *fs=NULL;  int retcode=0;
+	int retval=0, srcps, dstpf;
-	unsigned char *tempbuf=NULL;
+	struct jpeg_decompress_struct dinfo;
 	struct my_error_mgr jerr;
 	djpeg_dest_ptr dst;
 	FILE *file=NULL;
 	char *ptr=NULL;
-	if((fs=fopen(filename, "wb"))==NULL) _throw(strerror(errno));
+	memset(&dinfo, 0, sizeof(struct jpeg_decompress_struct));
 	if(fprintf(fs, "P6\n")<1) _throw("Write error");
 	if(fprintf(fs, "%d %d\n", w, h)<1) _throw("Write error");
 	if(fprintf(fs, "255\n")<1) _throw("Write error");
-	if((tempbuf=(unsigned char *)malloc(w*h*3))==NULL)
+	if(!filename || !buf || w<1 || h<1 || srcpf<0 || srcpf>=TJ_NUMPF)
-		_throw("Memory allocation error");
+		_throw("savebmp(): Invalid argument");
-	pixelconvert(buf, f, srcpitch, tempbuf, BMP_RGB, w*3, w, h, 
+	if((file=fopen(filename, "wb"))==NULL)
-		srcbottomup);
+		_throwunix("savebmp(): Cannot open output file");
-	if((fwrite(tempbuf, w*h*3, 1, fs))!=1) _throw("Write error");
+	dinfo.err=jpeg_std_error(&jerr.pub);
 	jerr.pub.error_exit=my_error_exit;
 	jerr.pub.output_message=my_output_message;
-	finally:
+	if(setjmp(jerr.setjmp_buffer))
 	if(tempbuf) free(tempbuf);
 	if(fs) fclose(fs);
 	return retcode;
 }
 int savebmp(char *filename, unsigned char *buf, int w, int h,
 	enum BMPPIXELFORMAT f, int srcpitch, int srcbottomup)
 {
 	int fd=-1, byteswritten, dstpitch, retcode=0;
 	int flags=O_RDWR|O_CREAT|O_TRUNC;
 	unsigned char *tempbuf=NULL;  char *temp;
 	bmphdr bh;  int mode;
 	#ifdef _WIN32
 	flags|=O_BINARY;  mode=_S_IREAD|_S_IWRITE;
 	#else
 	mode=S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH;
 	#endif
 	if(!filename || !buf || w<1 || h<1 || f<0 || f>BMPPIXELFORMATS-1 || srcpitch<0)
 		_throw("bad argument to savebmp()");
 	if(srcpitch==0) srcpitch=w*ps[f];
 	if((temp=strrchr(filename, '.'))!=NULL)
 	{
-		if(!stricmp(temp, ".ppm"))
+		/* If we get here, the JPEG code has signaled an error. */
-			return saveppm(filename, buf, w, h, f, srcpitch, srcbottomup);
+		retval=-1;  goto bailout;
 	}
-	_unix(fd=open(filename, flags, mode));
+	jpeg_create_decompress(&dinfo);
-	dstpitch=((w*3)+3)&(~3);
+	if(srcpf==TJPF_GRAY)
 	bh.bfType=0x4d42;
 	bh.bfSize=BMPHDRSIZE+dstpitch*h;
 	bh.bfReserved1=0;  bh.bfReserved2=0;
 	bh.bfOffBits=BMPHDRSIZE;
 	bh.biSize=40;
 	bh.biWidth=w;  bh.biHeight=h;
 	bh.biPlanes=0;  bh.biBitCount=24;
 	bh.biCompression=BI_RGB;  bh.biSizeImage=0;
 	bh.biXPelsPerMeter=0;  bh.biYPelsPerMeter=0;
 	bh.biClrUsed=0;  bh.biClrImportant=0;
 	if(!littleendian())
 	{
-		bh.bfType=byteswap16(bh.bfType);
+		dinfo.out_color_components=dinfo.output_components=1;
-		bh.bfSize=byteswap(bh.bfSize);
+		dinfo.out_color_space=JCS_GRAYSCALE;
-		bh.bfOffBits=byteswap(bh.bfOffBits);
+	}
-		bh.biSize=byteswap(bh.biSize);
+	else
-		bh.biWidth=byteswap(bh.biWidth);
+	{
-		bh.biHeight=byteswap(bh.biHeight);
+		dinfo.out_color_components=dinfo.output_components=3;
-		bh.biPlanes=byteswap16(bh.biPlanes);
+		dinfo.out_color_space=JCS_RGB;
-		bh.biBitCount=byteswap16(bh.biBitCount);
+	}
-		bh.biCompression=byteswap(bh.biCompression);
+	dinfo.image_width=w;  dinfo.image_height=h;
-		bh.biSizeImage=byteswap(bh.biSizeImage);
+	dinfo.global_state=DSTATE_READY;
-		bh.biXPelsPerMeter=byteswap(bh.biXPelsPerMeter);
+	dinfo.scale_num=dinfo.scale_denom=1;
-		bh.biYPelsPerMeter=byteswap(bh.biYPelsPerMeter);
+
-		bh.biClrUsed=byteswap(bh.biClrUsed);
+	ptr=strrchr(filename, '.');
-		bh.biClrImportant=byteswap(bh.biClrImportant);
+	if(ptr && !strcasecmp(ptr, ".bmp"))
 	{
 		if((dst=jinit_write_bmp(&dinfo, 0))==NULL)
 			_throw("savebmp(): Could not initialize bitmap writer");
 	}
 	else
 	{
 		if((dst=jinit_write_ppm(&dinfo))==NULL)
 			_throw("savebmp(): Could not initialize PPM writer");
 	}
-	writeme(fd, &bh.bfType, sizeof(unsigned short));
+	dst->output_file=file;
-	writeme(fd, &bh.bfSize, sizeof(unsigned int));
+	(*dst->start_output)(&dinfo, dst);
-	writeme(fd, &bh.bfReserved1, sizeof(unsigned short));
+	(*dinfo.mem->realize_virt_arrays)((j_common_ptr)&dinfo);
 	writeme(fd, &bh.bfReserved2, sizeof(unsigned short));
 	writeme(fd, &bh.bfOffBits, sizeof(unsigned int));
 	writeme(fd, &bh.biSize, sizeof(unsigned int));
 	writeme(fd, &bh.biWidth, sizeof(int));
 	writeme(fd, &bh.biHeight, sizeof(int));
 	writeme(fd, &bh.biPlanes, sizeof(unsigned short));
 	writeme(fd, &bh.biBitCount, sizeof(unsigned short));
 	writeme(fd, &bh.biCompression, sizeof(unsigned int));
 	writeme(fd, &bh.biSizeImage, sizeof(unsigned int));
 	writeme(fd, &bh.biXPelsPerMeter, sizeof(int));
 	writeme(fd, &bh.biYPelsPerMeter, sizeof(int));
 	writeme(fd, &bh.biClrUsed, sizeof(unsigned int));
 	writeme(fd, &bh.biClrImportant, sizeof(unsigned int));
-	if((tempbuf=(unsigned char *)malloc(dstpitch*h))==NULL)
+	if(srcpf==TJPF_GRAY) dstpf=srcpf;
-		_throw("Memory allocation error");
+	else dstpf=TJPF_RGB;
 	srcps=tjPixelSize[srcpf];
-	pixelconvert(buf, f, srcpitch, tempbuf, BMP_BGR, dstpitch, w, h, 
+	while(dinfo.output_scanline<dinfo.output_height)
-		!srcbottomup);
+	{
 		int i, nlines=dst->buffer_height;
 		for(i=0; i<nlines; i++)
 		{
 			unsigned char *inbuf;  int row;
 			row=dinfo.output_scanline+i;
 			if(bottomup) inbuf=&buf[(h-row-1)*w*srcps];
 			else inbuf=&buf[row*w*srcps];
 			pixelconvert(inbuf, srcpf, bottomup, dst->buffer[i], dstpf, 0, w,
 				nlines);
 		}
 		(*dst->put_pixel_rows)(&dinfo, dst, nlines);
 		dinfo.output_scanline+=nlines;
 	}
-	if((byteswritten=write(fd, tempbuf, dstpitch*h))!=dstpitch*h)
+	(*dst->finish_output)(&dinfo, dst);
 		_throw(strerror(errno));
-	finally:
+	bailout:
-	if(tempbuf) free(tempbuf);
+	jpeg_destroy_decompress(&dinfo);
-	if(fd!=-1) close(fd);
+	if(file) fclose(file);
-	return retcode;
+	return retval;
 }
 const char *bmpgeterr(void)
 {
-	return __bmperr;
+	return errStr;
 }
--- a/bmp.h
+++ b/bmp.h
@@ -1,48 +1,42 @@
-/* Copyright (C)2004 Landmark Graphics Corporation
+/*
- * Copyright (C)2005 Sun Microsystems, Inc.
+ * Copyright (C)2011 D. R. Commander.  All Rights Reserved.
 *
- * This library is free software and may be redistributed and/or modified under
+ * Redistribution and use in source and binary forms, with or without
- * the terms of the wxWindows Library License, Version 3.1 or (at your option)
+ * modification, are permitted provided that the following conditions are met:
 * any later version.  The full license is in the LICENSE.txt file included
 * with this distribution.
 *
- * This library is distributed in the hope that it will be useful,
+ * - Redistributions of source code must retain the above copyright notice,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   this list of conditions and the following disclaimer.
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * - Redistributions in binary form must reproduce the above copyright notice,
- * wxWindows Library License for more details.
+ *   this list of conditions and the following disclaimer in the documentation
-*/
+ *   and/or other materials provided with the distribution.
-
+ * - Neither the name of the libjpeg-turbo Project nor the names of its
-// This provides rudimentary facilities for loading and saving true color
+ *   contributors may be used to endorse or promote products derived from this
-// BMP and PPM files
+ *   software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS",
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 */
 #ifndef __BMP_H__
 #define __BMP_H__
-#define BMPPIXELFORMATS 6
+#include "./turbojpeg.h"
 enum BMPPIXELFORMAT {BMP_RGB=0, BMP_RGBA, BMP_BGR, BMP_BGRA, BMP_ABGR, BMP_ARGB};
-#ifdef __cplusplus
+int loadbmp(char *filename, unsigned char **buf, int *w, int *h, int pf,
-extern "C" {
+	int bottomup);
 #endif
-// This will load a Windows bitmap from a file and return a buffer with the
+int savebmp(char *filename, unsigned char *buf, int w, int h, int pf,
-// specified pixel format, scanline alignment, and orientation.  The width and
+	int bottomup);
 // height are returned in w and h.
 int loadbmp(char *filename, unsigned char **buf, int *w, int *h,
 	enum BMPPIXELFORMAT f, int align, int dstbottomup);
 // This will save a buffer with the specified pixel format, pitch, orientation,
 // width, and height as a 24-bit Windows bitmap or PPM (the filename determines
 // which format to use)
 int savebmp(char *filename, unsigned char *buf, int w, int h,
 	enum BMPPIXELFORMAT f, int srcpitch, int srcbottomup);
 const char *bmpgeterr(void);
 #ifdef __cplusplus
 }
 #endif
 #endif
--- a/cderror.h
+++ b/cderror.h
@@ -2,6 +2,7 @@
 * cderror.h
 *
 * Copyright (C) 1994-1997, Thomas G. Lane.
 * Modified 2009 by Guido Vollbeding.
 * This file is part of the Independent JPEG Group's software.
 * For conditions of distribution and use, see the accompanying README file.
 *
@@ -32,7 +33,7 @@
 typedef enum {
-#define JMESSAGE(code,string)	code ,
+#define JMESSAGE(code,string)   code ,
 #endif /* JMAKE_ENUM_LIST */
@@ -45,6 +46,7 @@ JMESSAGE(JERR_BMP_BADHEADER, "Invalid BMP file: bad header length")
 JMESSAGE(JERR_BMP_BADPLANES, "Invalid BMP file: biPlanes not equal to 1")
 JMESSAGE(JERR_BMP_COLORSPACE, "BMP output must be grayscale or RGB")
 JMESSAGE(JERR_BMP_COMPRESSED, "Sorry, compressed BMPs not yet supported")
 JMESSAGE(JERR_BMP_EMPTY, "Empty BMP image")
 JMESSAGE(JERR_BMP_NOT, "Not a BMP file - does not start with BM")
 JMESSAGE(JTRC_BMP, "%ux%u 24-bit BMP image")
 JMESSAGE(JTRC_BMP_MAPPED, "%ux%u 8-bit colormapped BMP image")
@@ -60,7 +62,7 @@ JMESSAGE(JERR_GIF_IMAGENOTFOUND, "Too few images in GIF file")
 JMESSAGE(JERR_GIF_NOT, "Not a GIF file")
 JMESSAGE(JTRC_GIF, "%ux%ux%d GIF image")
 JMESSAGE(JTRC_GIF_BADVERSION,
-	 "Warning: unexpected GIF version number '%c%c%c'")
+         "Warning: unexpected GIF version number '%c%c%c'")
 JMESSAGE(JTRC_GIF_EXTENSION, "Ignoring GIF extension block of type 0x%02x")
 JMESSAGE(JTRC_GIF_NONSQUARE, "Caution: nonsquare pixels in input")
 JMESSAGE(JWRN_GIF_BADDATA, "Corrupt data in GIF file")
@@ -108,13 +110,13 @@ JMESSAGE(JERR_TGA_NOTCOMP, "Targa support was not compiled")
 #endif /* TARGA_SUPPORTED */
 JMESSAGE(JERR_BAD_CMAP_FILE,
-	 "Color map file is invalid or of unsupported format")
+         "Color map file is invalid or of unsupported format")
 JMESSAGE(JERR_TOO_MANY_COLORS,
-	 "Output file format cannot handle %d colormap entries")
+         "Output file format cannot handle %d colormap entries")
 JMESSAGE(JERR_UNGETC_FAILED, "ungetc failed")
 #ifdef TARGA_SUPPORTED
 JMESSAGE(JERR_UNKNOWN_FORMAT,
-	 "Unrecognized input file format --- perhaps you need -targa")
+         "Unrecognized input file format --- perhaps you need -targa")
 #else
 JMESSAGE(JERR_UNKNOWN_FORMAT, "Unrecognized input file format")
 #endif
--- a/cdjpeg.c
+++ b/cdjpeg.c
@@ -1,60 +1,22 @@
 /*
 * cdjpeg.c
 *
 * This file was part of the Independent JPEG Group's software:
 * Copyright (C) 1991-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
+ * It was modified by The libjpeg-turbo Project to include only code relevant
 * to libjpeg-turbo.
 * For conditions of distribution and use, see the accompanying README file.
 *
 * This file contains common support routines used by the IJG application
 * programs (cjpeg, djpeg, jpegtran).
 */
-#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */
+#include "cdjpeg.h"             /* Common decls for cjpeg/djpeg applications */
-#include <ctype.h>		/* to declare isupper(), tolower() */
+#include <ctype.h>              /* to declare isupper(), tolower() */
 #ifdef NEED_SIGNAL_CATCHER
 #include <signal.h>		/* to declare signal() */
 #endif
 #ifdef USE_SETMODE
-#include <fcntl.h>		/* to declare setmode()'s parameter macros */
+#include <fcntl.h>              /* to declare setmode()'s parameter macros */
 /* If you have setmode() but not <io.h>, just delete this line: */
-#include <io.h>			/* to declare setmode() */
+#include <io.h>                 /* to declare setmode() */
 #endif
 /*
 * Signal catcher to ensure that temporary files are removed before aborting.
 * NB: for Amiga Manx C this is actually a global routine named _abort();
 * we put "#define signal_catcher _abort" in jconfig.h.  Talk about bogus...
 */
 #ifdef NEED_SIGNAL_CATCHER
 static j_common_ptr sig_cinfo;
 void				/* must be global for Manx C */
 signal_catcher (int signum)
 {
  if (sig_cinfo != NULL) {
    if (sig_cinfo->err != NULL) /* turn off trace output */
      sig_cinfo->err->trace_level = 0;
    jpeg_destroy(sig_cinfo);	/* clean up memory allocation & temp files */
  }
  exit(EXIT_FAILURE);
 }
 GLOBAL(void)
 enable_signal_catcher (j_common_ptr cinfo)
 {
  sig_cinfo = cinfo;
 #ifdef SIGINT			/* not all systems have SIGINT */
  signal(SIGINT, signal_catcher);
 #endif
 #ifdef SIGTERM			/* not all systems have SIGTERM */
  signal(SIGTERM, signal_catcher);
 #endif
 }
 #endif
@@ -75,8 +37,8 @@ progress_monitor (j_common_ptr cinfo)
    prog->percent_done = percent_done;
    if (total_passes > 1) {
      fprintf(stderr, "\rPass %d/%d: %3d%% ",
-	      prog->pub.completed_passes + prog->completed_extra_passes + 1,
+              prog->pub.completed_passes + prog->completed_extra_passes + 1,
-	      total_passes, percent_done);
+              total_passes, percent_done);
    } else {
      fprintf(stderr, "\r %3d%% ", percent_done);
    }
@@ -126,17 +88,17 @@ keymatch (char * arg, const char * keyword, int minchars)
  while ((ca = *arg++) != '\0') {
    if ((ck = *keyword++) == '\0')
-      return FALSE;		/* arg longer than keyword, no good */
+      return FALSE;             /* arg longer than keyword, no good */
-    if (isupper(ca))		/* force arg to lcase (assume ck is already) */
+    if (isupper(ca))            /* force arg to lcase (assume ck is already) */
      ca = tolower(ca);
    if (ca != ck)
-      return FALSE;		/* no good */
+      return FALSE;             /* no good */
-    nmatched++;			/* count matched characters */
+    nmatched++;                 /* count matched characters */
  }
  /* reached end of argument; fail if it's too short for unique abbrev */
  if (nmatched < minchars)
    return FALSE;
-  return TRUE;			/* A-OK */
+  return TRUE;                  /* A-OK */
 }
@@ -150,10 +112,10 @@ read_stdin (void)
 {
  FILE * input_file = stdin;
-#ifdef USE_SETMODE		/* need to hack file mode? */
+#ifdef USE_SETMODE              /* need to hack file mode? */
  setmode(fileno(stdin), O_BINARY);
 #endif
-#ifdef USE_FDOPEN		/* need to re-open in binary mode? */
+#ifdef USE_FDOPEN               /* need to re-open in binary mode? */
  if ((input_file = fdopen(fileno(stdin), READ_BINARY)) == NULL) {
    fprintf(stderr, "Cannot reopen stdin\n");
    exit(EXIT_FAILURE);
@@ -168,10 +130,10 @@ write_stdout (void)
 {
  FILE * output_file = stdout;
-#ifdef USE_SETMODE		/* need to hack file mode? */
+#ifdef USE_SETMODE              /* need to hack file mode? */
  setmode(fileno(stdout), O_BINARY);
 #endif
-#ifdef USE_FDOPEN		/* need to re-open in binary mode? */
+#ifdef USE_FDOPEN               /* need to re-open in binary mode? */
  if ((output_file = fdopen(fileno(stdout), WRITE_BINARY)) == NULL) {
    fprintf(stderr, "Cannot reopen stdout\n");
    exit(EXIT_FAILURE);
--- a/cdjpeg.h
+++ b/cdjpeg.h
@@ -1,20 +1,22 @@
 /*
 * cdjpeg.h
 *
 * This file was part of the Independent JPEG Group's software:
 * Copyright (C) 1994-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
+ * It was modified by The libjpeg-turbo Project to include only code relevant
 * to libjpeg-turbo.
 * For conditions of distribution and use, see the accompanying README file.
 *
 * This file contains common declarations for the sample applications
 * cjpeg and djpeg.  It is NOT used by the core JPEG library.
 */
-#define JPEG_CJPEG_DJPEG	/* define proper options in jconfig.h */
+#define JPEG_CJPEG_DJPEG        /* define proper options in jconfig.h */
-#define JPEG_INTERNAL_OPTIONS	/* cjpeg.c,djpeg.c need to see xxx_SUPPORTED */
+#define JPEG_INTERNAL_OPTIONS   /* cjpeg.c,djpeg.c need to see xxx_SUPPORTED */
 #include "jinclude.h"
 #include "jpeglib.h"
-#include "jerror.h"		/* get library error codes too */
+#include "jerror.h"             /* get library error codes too */
-#include "cderror.h"		/* get application-specific error codes */
+#include "cderror.h"            /* get application-specific error codes */
 /*
@@ -24,12 +26,9 @@
 typedef struct cjpeg_source_struct * cjpeg_source_ptr;
 struct cjpeg_source_struct {
-  JMETHOD(void, start_input, (j_compress_ptr cinfo,
+  void (*start_input) (j_compress_ptr cinfo, cjpeg_source_ptr sinfo);
-			      cjpeg_source_ptr sinfo));
+  JDIMENSION (*get_pixel_rows) (j_compress_ptr cinfo, cjpeg_source_ptr sinfo);
-  JMETHOD(JDIMENSION, get_pixel_rows, (j_compress_ptr cinfo,
+  void (*finish_input) (j_compress_ptr cinfo, cjpeg_source_ptr sinfo);
 				       cjpeg_source_ptr sinfo));
  JMETHOD(void, finish_input, (j_compress_ptr cinfo,
 			       cjpeg_source_ptr sinfo));
  FILE *input_file;
@@ -48,15 +47,12 @@ struct djpeg_dest_struct {
  /* start_output is called after jpeg_start_decompress finishes.
   * The color map will be ready at this time, if one is needed.
   */
-  JMETHOD(void, start_output, (j_decompress_ptr cinfo,
+  void (*start_output) (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo);
 			       djpeg_dest_ptr dinfo));
  /* Emit the specified number of pixel rows from the buffer. */
-  JMETHOD(void, put_pixel_rows, (j_decompress_ptr cinfo,
+  void (*put_pixel_rows) (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo,
-				 djpeg_dest_ptr dinfo,
+                          JDIMENSION rows_supplied);
 				 JDIMENSION rows_supplied));
  /* Finish up at the end of the image. */
-  JMETHOD(void, finish_output, (j_decompress_ptr cinfo,
+  void (*finish_output) (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo);
 				djpeg_dest_ptr dinfo));
  /* Target file spec; filled in by djpeg.c after object is created. */
  FILE * output_file;
@@ -79,9 +75,9 @@ struct djpeg_dest_struct {
 */
 struct cdjpeg_progress_mgr {
-  struct jpeg_progress_mgr pub;	/* fields known to JPEG library */
+  struct jpeg_progress_mgr pub; /* fields known to JPEG library */
-  int completed_extra_passes;	/* extra passes completed */
+  int completed_extra_passes;   /* extra passes completed */
-  int total_extra_passes;	/* total extra */
+  int total_extra_passes;       /* total extra */
  /* last printed percentage stored here to avoid multiple printouts */
  int percent_done;
 };
@@ -89,96 +85,60 @@ struct cdjpeg_progress_mgr {
 typedef struct cdjpeg_progress_mgr * cd_progress_ptr;
 /* Short forms of external names for systems with brain-damaged linkers. */
 #ifdef NEED_SHORT_EXTERNAL_NAMES
 #define jinit_read_bmp		jIRdBMP
 #define jinit_write_bmp		jIWrBMP
 #define jinit_read_gif		jIRdGIF
 #define jinit_write_gif		jIWrGIF
 #define jinit_read_ppm		jIRdPPM
 #define jinit_write_ppm		jIWrPPM
 #define jinit_read_rle		jIRdRLE
 #define jinit_write_rle		jIWrRLE
 #define jinit_read_targa	jIRdTarga
 #define jinit_write_targa	jIWrTarga
 #define read_quant_tables	RdQTables
 #define read_scan_script	RdScnScript
 #define set_quant_slots		SetQSlots
 #define set_sample_factors	SetSFacts
 #define read_color_map		RdCMap
 #define enable_signal_catcher	EnSigCatcher
 #define start_progress_monitor	StProgMon
 #define end_progress_monitor	EnProgMon
 #define read_stdin		RdStdin
 #define write_stdout		WrStdout
 #endif /* NEED_SHORT_EXTERNAL_NAMES */
 /* Module selection routines for I/O modules. */
-EXTERN(cjpeg_source_ptr) jinit_read_bmp JPP((j_compress_ptr cinfo));
+EXTERN(cjpeg_source_ptr) jinit_read_bmp (j_compress_ptr cinfo);
-EXTERN(djpeg_dest_ptr) jinit_write_bmp JPP((j_decompress_ptr cinfo,
+EXTERN(djpeg_dest_ptr) jinit_write_bmp (j_decompress_ptr cinfo,
-					    boolean is_os2));
+                                        boolean is_os2);
-EXTERN(cjpeg_source_ptr) jinit_read_gif JPP((j_compress_ptr cinfo));
+EXTERN(cjpeg_source_ptr) jinit_read_gif (j_compress_ptr cinfo);
-EXTERN(djpeg_dest_ptr) jinit_write_gif JPP((j_decompress_ptr cinfo));
+EXTERN(djpeg_dest_ptr) jinit_write_gif (j_decompress_ptr cinfo);
-EXTERN(cjpeg_source_ptr) jinit_read_ppm JPP((j_compress_ptr cinfo));
+EXTERN(cjpeg_source_ptr) jinit_read_ppm (j_compress_ptr cinfo);
-EXTERN(djpeg_dest_ptr) jinit_write_ppm JPP((j_decompress_ptr cinfo));
+EXTERN(djpeg_dest_ptr) jinit_write_ppm (j_decompress_ptr cinfo);
-EXTERN(cjpeg_source_ptr) jinit_read_rle JPP((j_compress_ptr cinfo));
+EXTERN(cjpeg_source_ptr) jinit_read_rle (j_compress_ptr cinfo);
-EXTERN(djpeg_dest_ptr) jinit_write_rle JPP((j_decompress_ptr cinfo));
+EXTERN(djpeg_dest_ptr) jinit_write_rle (j_decompress_ptr cinfo);
-EXTERN(cjpeg_source_ptr) jinit_read_targa JPP((j_compress_ptr cinfo));
+EXTERN(cjpeg_source_ptr) jinit_read_targa (j_compress_ptr cinfo);
-EXTERN(djpeg_dest_ptr) jinit_write_targa JPP((j_decompress_ptr cinfo));
+EXTERN(djpeg_dest_ptr) jinit_write_targa (j_decompress_ptr cinfo);
 /* cjpeg support routines (in rdswitch.c) */
-EXTERN(boolean) read_quant_tables JPP((j_compress_ptr cinfo, char * filename,
+EXTERN(boolean) read_quant_tables (j_compress_ptr cinfo, char * filename,
-				    int scale_factor, boolean force_baseline));
+                                   boolean force_baseline);
-EXTERN(boolean) read_scan_script JPP((j_compress_ptr cinfo, char * filename));
+EXTERN(boolean) read_scan_script (j_compress_ptr cinfo, char * filename);
-EXTERN(boolean) set_quant_slots JPP((j_compress_ptr cinfo, char *arg));
+EXTERN(boolean) set_quality_ratings (j_compress_ptr cinfo, char *arg,
-EXTERN(boolean) set_sample_factors JPP((j_compress_ptr cinfo, char *arg));
+                                     boolean force_baseline);
 EXTERN(boolean) set_quant_slots (j_compress_ptr cinfo, char *arg);
 EXTERN(boolean) set_sample_factors (j_compress_ptr cinfo, char *arg);
 /* djpeg support routines (in rdcolmap.c) */
-EXTERN(void) read_color_map JPP((j_decompress_ptr cinfo, FILE * infile));
+EXTERN(void) read_color_map (j_decompress_ptr cinfo, FILE * infile);
 /* common support routines (in cdjpeg.c) */
-EXTERN(void) enable_signal_catcher JPP((j_common_ptr cinfo));
+EXTERN(void) enable_signal_catcher (j_common_ptr cinfo);
-EXTERN(void) start_progress_monitor JPP((j_common_ptr cinfo,
+EXTERN(void) start_progress_monitor (j_common_ptr cinfo,
-					 cd_progress_ptr progress));
+                                     cd_progress_ptr progress);
-EXTERN(void) end_progress_monitor JPP((j_common_ptr cinfo));
+EXTERN(void) end_progress_monitor (j_common_ptr cinfo);
-EXTERN(boolean) keymatch JPP((char * arg, const char * keyword, int minchars));
+EXTERN(boolean) keymatch (char * arg, const char * keyword, int minchars);
-EXTERN(FILE *) read_stdin JPP((void));
+EXTERN(FILE *) read_stdin (void);
-EXTERN(FILE *) write_stdout JPP((void));
+EXTERN(FILE *) write_stdout (void);
 /* miscellaneous useful macros */
-#ifdef DONT_USE_B_MODE		/* define mode parameters for fopen() */
+#ifdef DONT_USE_B_MODE          /* define mode parameters for fopen() */
-#define READ_BINARY	"r"
+#define READ_BINARY     "r"
-#define WRITE_BINARY	"w"
+#define WRITE_BINARY    "w"
 #else
-#ifdef VMS			/* VMS is very nonstandard */
+#define READ_BINARY     "rb"
-#define READ_BINARY	"rb", "ctx=stm"
+#define WRITE_BINARY    "wb"
 #define WRITE_BINARY	"wb", "ctx=stm"
 #else				/* standard ANSI-compliant case */
 #define READ_BINARY	"rb"
 #define WRITE_BINARY	"wb"
 #endif
 #endif
-#ifndef EXIT_FAILURE		/* define exit() codes if not provided */
+#ifndef EXIT_FAILURE            /* define exit() codes if not provided */
 #define EXIT_FAILURE  1
 #endif
 #ifndef EXIT_SUCCESS
 #ifdef VMS
 #define EXIT_SUCCESS  1		/* VMS is very nonstandard */
 #else
 #define EXIT_SUCCESS  0
 #endif
 #endif
 #ifndef EXIT_WARNING
 #ifdef VMS
 #define EXIT_WARNING  1		/* VMS is very nonstandard */
 #else
 #define EXIT_WARNING  2
 #endif
 #endif
--- a/change.log
+++ b/change.log
@@ -1,6 +1,85 @@
 NOTE:  This file was modified by The libjpeg-turbo Project to include only
 information relevant to libjpeg-turbo.
 CHANGE LOG for Independent JPEG Group's JPEG software
 Version 8d  15-Jan-2012
 -----------------------
 Add cjpeg -rgb option to create RGB JPEG files.
 Using this switch suppresses the conversion from RGB
 colorspace input to the default YCbCr JPEG colorspace.
 Thank to Michael Koch for the initial suggestion.
 Add option to disable the region adjustment in the transupp crop code.
 Thank to Jeffrey Friedl for the suggestion.
 Version 8b  16-May-2010
 -----------------------
 Repair problem in new memory source manager with corrupt JPEG data.
 Thank to Ted Campbell and Samuel Chun for the report.
 Version 8a  28-Feb-2010
 -----------------------
 Writing tables-only datastreams via jpeg_write_tables works again.
 Support 32-bit BMPs (RGB image with Alpha channel) for read in cjpeg.
 Thank to Brett Blackham for the suggestion.
 Version 8  10-Jan-2010
 ----------------------
 Add sanity check in BMP reader module to avoid cjpeg crash for empty input
 image (thank to Isaev Ildar of ISP RAS, Moscow, RU for reporting this error).
 Add data source and destination managers for read from and write to
 memory buffers.  New API functions jpeg_mem_src and jpeg_mem_dest.
 Thank to Roberto Boni from Italy for the suggestion.
 Version 7  27-Jun-2009
 ----------------------
 New scaled DCTs implemented.
 djpeg now supports scalings N/8 with all N from 1 to 16.
 cjpeg -quality option has been extended for support of separate quality
 settings for luminance and chrominance (or in general, for every provided
 quantization table slot).
 New API function jpeg_default_qtables() and q_scale_factor array in library.
 Support arithmetic entropy encoding and decoding.
 Added files jaricom.c, jcarith.c, jdarith.c.
 jpegtran has a new "lossless" cropping feature.
 Implement -perfect option in jpegtran, new API function
 jtransform_perfect_transform() in transupp. (DP 204_perfect.dpatch)
 Better error messages for jpegtran fopen failure.
 (DP 203_jpegtran_errmsg.dpatch)
 Fix byte order issue with 16bit PPM/PGM files in rdppm.c/wrppm.c:
 according to Netpbm, the de facto standard implementation of the PNM formats,
 the most significant byte is first. (DP 203_rdppm.dpatch)
 Add -raw option to rdjpgcom not to mangle the output.
 (DP 205_rdjpgcom_raw.dpatch)
 Make rdjpgcom locale aware. (DP 201_rdjpgcom_locale.dpatch)
 Add extern "C" to jpeglib.h.
 This avoids the need to put extern "C" { ... } around #include "jpeglib.h"
 in your C++ application.  Defining the symbol DONT_USE_EXTERN_C in the
 configuration prevents this. (DP 202_jpeglib.h_c++.dpatch)
 Version 6b  27-Mar-1998
 -----------------------
--- a/cjpeg.1
+++ b/cjpeg.1
@@ -1,4 +1,4 @@
-.TH CJPEG 1 "20 March 1998"
+.TH CJPEG 1 "21 November 2014"
 .SH NAME
 cjpeg \- compress an image file to a JPEG file
 .SH SYNOPSIS
@@ -16,7 +16,7 @@ cjpeg \- compress an image file to a JPEG file
 compresses the named image file, or the standard input if no file is
 named, and produces a JPEG/JFIF file on the standard output.
 The currently supported input file formats are: PPM (PBMPLUS color
-format), PGM (PBMPLUS gray-scale format), BMP, Targa, and RLE (Utah Raster
+format), PGM (PBMPLUS grayscale format), BMP, Targa, and RLE (Utah Raster
 Toolkit format).  (RLE is supported only if the URT library is available.)
 .SH OPTIONS
 All switch names may be abbreviated; for example,
@@ -36,7 +36,7 @@ though for brevity these are not mentioned below.
 .PP
 The basic switches are:
 .TP
-.BI \-quality " N"
+.BI \-quality " N[,...]"
 Scale quantization tables to adjust image quality.  Quality is 0 (worst) to
 100 (best); default is 75.  (See below for more info.)
 .TP
@@ -49,6 +49,11 @@ By saying
 .BR \-grayscale ,
 you'll get a smaller JPEG file that takes less time to process.
 .TP
 .B \-rgb
 Create RGB JPEG file.
 Using this switch suppresses the conversion from RGB
 colorspace input to the default YCbCr JPEG colorspace.
 .TP
 .B \-optimize
 Perform optimization of entropy encoding parameters.  Without this, default
 encoding parameters are used.
@@ -108,6 +113,36 @@ other JPEG programs may be unable to decode the resulting file.  Use
 .B \-baseline
 if you need to ensure compatibility at low quality values.)
 .PP
 The \fB-quality\fR option has been extended in this version of \fBcjpeg\fR to
 support separate quality settings for luminance and chrominance (or, in
 general, separate settings for every quantization table slot.)  The principle
 is the same as chrominance subsampling:  since the human eye is more sensitive
 to spatial changes in brightness than spatial changes in color, the chrominance
 components can be quantized more than the luminance components without
 incurring any visible image quality loss.  However, unlike subsampling, this
 feature reduces data in the frequency domain instead of the spatial domain,
 which allows for more fine-grained control.  This option is useful in
 quality-sensitive applications, for which the artifacts generated by
 subsampling may be unacceptable.
 .PP
 The \fB-quality\fR option accepts a comma-separated list of parameters, which
 respectively refer to the quality levels that should be assigned to the
 quantization table slots.  If there are more q-table slots than parameters,
 then the last parameter is replicated.  Thus, if only one quality parameter is
 given, this is used for both luminance and chrominance (slots 0 and 1,
 respectively), preserving the legacy behavior of cjpeg v6b and prior.
 More (or customized) quantization tables can be set with the \fB-qtables\fR
 option and assigned to components with the \fB-qslots\fR option (see the
 "wizard" switches below.)
 .PP
 JPEG files generated with separate luminance and chrominance quality are fully
 compliant with standard JPEG decoders.
 .PP
 .BR CAUTION:
 For this setting to be useful, be sure to pass an argument of \fB-sample 1x1\fR
 to \fBcjpeg\fR to disable chrominance subsampling.  Otherwise, the default
 subsampling level (2x2, AKA "4:2:0") will be used.
 .PP
 The
 .B \-progressive
 switch creates a "progressive JPEG" file.  In this type of JPEG file, the data
@@ -117,25 +152,41 @@ scan to display a low-quality image very quickly, and can then improve the
 display with each subsequent scan.  The final image is exactly equivalent to a
 standard JPEG file of the same quality setting, and the total file size is
 about the same --- often a little smaller.
 .B Caution:
 progressive JPEG is not yet widely implemented, so many decoders will be
 unable to view a progressive JPEG file at all.
 .PP
 Switches for advanced users:
 .TP
 .B \-arithmetic
 Use arithmetic coding.
 .B Caution:
 arithmetic coded JPEG is not yet widely implemented, so many decoders will be
 unable to view an arithmetic coded JPEG file at all.
 .TP
 .B \-dct int
 Use integer DCT method (default).
 .TP
 .B \-dct fast
 Use fast integer DCT (less accurate).
 In libjpeg-turbo, the fast method is generally about 5-15% faster than the int
 method when using the x86/x86-64 SIMD extensions (results may vary with other
 SIMD implementations, or when using libjpeg-turbo without SIMD extensions.)
 For quality levels of 90 and below, there should be little or no perceptible
 difference between the two algorithms.  For quality levels above 90, however,
 the difference between the fast and the int methods becomes more pronounced.
 With quality=97, for instance, the fast method incurs generally about a 1-3 dB
 loss (in PSNR) relative to the int method, but this can be larger for some
 images.  Do not use the fast method with quality levels above 97.  The
 algorithm often degenerates at quality=98 and above and can actually produce a
 more lossy image than if lower quality levels had been used.  Also, in
 libjpeg-turbo, the fast method is not fully accelerated for quality levels
 above 97, so it will be slower than the int method.
 .TP
 .B \-dct float
 Use floating-point DCT method.
-The float method is very slightly more accurate than the int method, but is
+The float method is mainly a legacy feature.  It does not produce significantly
-much slower unless your machine has very fast floating-point hardware.  Also
+more accurate results than the int method, and it is much slower.  The float
-note that results of the floating-point method may vary slightly across
+method may also give different results on different machines due to varying
-machines, while the integer methods should give the same results everywhere.
+roundoff behavior, whereas the integer methods should give the same results on
-The fast integer method is much less accurate than the other two.
+all machines.
 .TP
 .BI \-restart " N"
 Emit a JPEG restart marker every N MCU rows, or every N MCU blocks if "B" is
@@ -157,6 +208,11 @@ selects 4000000 bytes.  If more space is needed, temporary files will be used.
 .BI \-outfile " name"
 Send output image to the named file, not to standard output.
 .TP
 .BI \-memdst
 Compress to memory instead of a file.  This feature was implemented mainly as a
 way of testing the in-memory destination manager (jpeg_mem_dest()), but it is
 also useful for benchmarking, since it reduces the I/O overhead.
 .TP
 .B \-verbose
 Enable debug printout.  More
 .BR \-v 's
@@ -165,6 +221,9 @@ give more output.  Also, version information is printed at startup.
 .B \-debug
 Same as
 .BR \-verbose .
 .TP
 .B \-version
 Print version information and exit.
 .PP
 The
 .B \-restart
@@ -211,7 +270,7 @@ Use the scan script given in the specified text file.
 .PP
 The "wizard" switches are intended for experimentation with JPEG.  If you
 don't know what you are doing, \fBdon't use them\fR.  These switches are
-documented further in the file wizard.doc.
+documented further in the file wizard.txt.
 .SH EXAMPLES
 .LP
 This example compresses the PPM file foo.ppm with a quality factor of
@@ -275,12 +334,15 @@ Wallace, Gregory K.  "The JPEG Still Picture Compression Standard",
 Communications of the ACM, April 1991 (vol. 34, no. 4), pp. 30-44.
 .SH AUTHOR
 Independent JPEG Group
 .SH BUGS
 Arithmetic coding is not supported for legal reasons.
 .PP
-GIF input files are no longer supported, to avoid the Unisys LZW patent.
+This file was modified by The libjpeg-turbo Project to include only information
-Use a Unisys-licensed program if you need to read a GIF file.  (Conversion
+relevant to libjpeg-turbo, to wordsmith certain sections, and to describe
-of GIF files to JPEG is usually a bad idea anyway.)
+features not present in libjpeg.
 .SH BUGS
 Support for GIF input files was removed in cjpeg v6b due to concerns over
 the Unisys LZW patent.  Although this patent expired in 2006, cjpeg still
 lacks GIF support, for these historical reasons.  (Conversion of GIF files to
 JPEG is usually a bad idea anyway.)
 .PP
 Not all variants of BMP and Targa file formats are supported.
 .PP
@@ -288,5 +350,3 @@ The
 .B \-targa
 switch is not a bug, it's a feature.  (It would be a bug if the Targa format
 designers had not been clueless.)
 .PP
 Still not as fast as we'd like.
--- a/cjpeg.c
+++ b/cjpeg.c
@@ -1,8 +1,11 @@
 /*
 * cjpeg.c
 *
 * This file was part of the Independent JPEG Group's software:
 * Copyright (C) 1991-1998, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
+ * Modified 2003-2011 by Guido Vollbeding.
 * libjpeg-turbo Modifications:
 * Copyright (C) 2010, 2013-2014, D. R. Commander.
 * For conditions of distribution and use, see the accompanying README file.
 *
 * This file contains a command-line user interface for the JPEG compressor.
@@ -10,8 +13,8 @@
 *
 * Two different command line styles are permitted, depending on the
 * compile-time switch TWO_FILE_COMMANDLINE:
- *	cjpeg [options]  inputfile outputfile
+ *      cjpeg [options]  inputfile outputfile
- *	cjpeg [options]  [inputfile]
+ *      cjpeg [options]  [inputfile]
 * In the second style, output is always to standard output, which you'd
 * normally redirect to a file or pipe to some other program.  Input is
 * either from a named file or from standard input (typically redirected).
@@ -19,27 +22,28 @@
 * don't support pipes.  Also, you MUST use the first style if your system
 * doesn't do binary I/O to stdin/stdout.
 * To simplify script writing, the "-outfile" switch is provided.  The syntax
- *	cjpeg [options]  -outfile outputfile  inputfile
+ *      cjpeg [options]  -outfile outputfile  inputfile
 * works regardless of which command line style is used.
 */
-#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */
+#include "cdjpeg.h"             /* Common decls for cjpeg/djpeg applications */
-#include "jversion.h"		/* for version message */
+#include "jversion.h"           /* for version message */
 #include "jconfigint.h"
-#ifdef USE_CCOMMAND		/* command-line reader for Macintosh */
+#ifdef USE_CCOMMAND             /* command-line reader for Macintosh */
 #ifdef __MWERKS__
 #include <SIOUX.h>              /* Metrowerks needs this */
-#include <console.h>		/* ... and this */
+#include <console.h>            /* ... and this */
 #endif
 #ifdef THINK_C
-#include <console.h>		/* Think declares it here */
+#include <console.h>            /* Think declares it here */
 #endif
 #endif
 /* Create the add-on message string table. */
-#define JMESSAGE(code,string)	string ,
+#define JMESSAGE(code,string)   string ,
 static const char * const cdjpeg_message_table[] = {
 #include "cderror.h"
@@ -73,7 +77,7 @@ static const char * const cdjpeg_message_table[] = {
 * seldom-used ID field), so we provide a switch to force Targa input mode.
 */
-static boolean is_targa;	/* records user -targa switch */
+static boolean is_targa;        /* records user -targa switch */
 LOCAL(cjpeg_source_ptr)
@@ -120,7 +124,7 @@ select_file_type (j_compress_ptr cinfo, FILE * infile)
    break;
  }
-  return NULL;			/* suppress compiler warnings */
+  return NULL;                  /* suppress compiler warnings */
 }
@@ -133,8 +137,9 @@ select_file_type (j_compress_ptr cinfo, FILE * infile)
 */
-static const char * progname;	/* program name for error messages */
+static const char * progname;   /* program name for error messages */
-static char * outfilename;	/* for -outfile switch */
+static char * outfilename;      /* for -outfile switch */
 boolean memdst;  /* for -memdst switch */
 LOCAL(void)
@@ -149,8 +154,9 @@ usage (void)
 #endif
  fprintf(stderr, "Switches (names may be abbreviated):\n");
-  fprintf(stderr, "  -quality N     Compression quality (0..100; 5-95 is useful range)\n");
+  fprintf(stderr, "  -quality N[,...]   Compression quality (0..100; 5-95 is useful range)\n");
  fprintf(stderr, "  -grayscale     Create monochrome JPEG file\n");
  fprintf(stderr, "  -rgb           Create RGB JPEG file\n");
 #ifdef ENTROPY_OPT_SUPPORTED
  fprintf(stderr, "  -optimize      Optimize Huffman table (smaller file, but slow compression)\n");
 #endif
@@ -161,17 +167,20 @@ usage (void)
  fprintf(stderr, "  -targa         Input file is Targa format (usually not needed)\n");
 #endif
  fprintf(stderr, "Switches for advanced users:\n");
 #ifdef C_ARITH_CODING_SUPPORTED
  fprintf(stderr, "  -arithmetic    Use arithmetic coding\n");
 #endif
 #ifdef DCT_ISLOW_SUPPORTED
  fprintf(stderr, "  -dct int       Use integer DCT method%s\n",
-	  (JDCT_DEFAULT == JDCT_ISLOW ? " (default)" : ""));
+          (JDCT_DEFAULT == JDCT_ISLOW ? " (default)" : ""));
 #endif
 #ifdef DCT_IFAST_SUPPORTED
  fprintf(stderr, "  -dct fast      Use fast integer DCT (less accurate)%s\n",
-	  (JDCT_DEFAULT == JDCT_IFAST ? " (default)" : ""));
+          (JDCT_DEFAULT == JDCT_IFAST ? " (default)" : ""));
 #endif
 #ifdef DCT_FLOAT_SUPPORTED
  fprintf(stderr, "  -dct float     Use floating-point DCT method%s\n",
-	  (JDCT_DEFAULT == JDCT_FLOAT ? " (default)" : ""));
+          (JDCT_DEFAULT == JDCT_FLOAT ? " (default)" : ""));
 #endif
  fprintf(stderr, "  -restart N     Set restart interval in rows, or in blocks with B\n");
 #ifdef INPUT_SMOOTHING_SUPPORTED
@@ -179,11 +188,12 @@ usage (void)
 #endif
  fprintf(stderr, "  -maxmemory N   Maximum memory to use (in kbytes)\n");
  fprintf(stderr, "  -outfile name  Specify name for output file\n");
-  fprintf(stderr, "  -verbose  or  -debug   Emit debug output\n");
+#if JPEG_LIB_VERSION >= 80 || defined(MEM_SRCDST_SUPPORTED)
-  fprintf(stderr, "Switches for wizards:\n");
+  fprintf(stderr, "  -memdst        Compress to memory instead of file (useful for benchmarking)\n");
 #ifdef C_ARITH_CODING_SUPPORTED
  fprintf(stderr, "  -arithmetic    Use arithmetic coding\n");
 #endif
  fprintf(stderr, "  -verbose  or  -debug   Emit debug output\n");
  fprintf(stderr, "  -version       Print version information and exit\n");
  fprintf(stderr, "Switches for wizards:\n");
  fprintf(stderr, "  -baseline      Force baseline quantization tables\n");
  fprintf(stderr, "  -qtables file  Use quantization tables given in file\n");
  fprintf(stderr, "  -qslots N[,...]    Set component quantization tables\n");
@@ -197,7 +207,7 @@ usage (void)
 LOCAL(int)
 parse_switches (j_compress_ptr cinfo, int argc, char **argv,
-		int last_file_arg_seen, boolean for_real)
+                int last_file_arg_seen, boolean for_real)
 /* Parse optional switches.
 * Returns argv[] index of first file-name argument (== argc if none).
 * Any file names with indexes <= last_file_arg_seen are ignored;
@@ -209,25 +219,21 @@ parse_switches (j_compress_ptr cinfo, int argc, char **argv,
 {
  int argn;
  char * arg;
  int quality;			/* -quality parameter */
  int q_scale_factor;		/* scaling percentage for -qtables */
  boolean force_baseline;
  boolean simple_progressive;
-  char * qtablefile = NULL;	/* saves -qtables filename if any */
+  char * qualityarg = NULL;     /* saves -quality parm if any */
-  char * qslotsarg = NULL;	/* saves -qslots parm if any */
+  char * qtablefile = NULL;     /* saves -qtables filename if any */
-  char * samplearg = NULL;	/* saves -sample parm if any */
+  char * qslotsarg = NULL;      /* saves -qslots parm if any */
-  char * scansarg = NULL;	/* saves -scans parm if any */
+  char * samplearg = NULL;      /* saves -sample parm if any */
  char * scansarg = NULL;       /* saves -scans parm if any */
  /* Set up default JPEG parameters. */
-  /* Note that default -quality level need not, and does not,
+
-   * match the default scaling for an explicit -qtables argument.
+  force_baseline = FALSE;       /* by default, allow 16-bit quantizers */
   */
  quality = 75;			/* default -quality value */
  q_scale_factor = 100;		/* default to no scaling for -qtables */
  force_baseline = FALSE;	/* by default, allow 16-bit quantizers */
  simple_progressive = FALSE;
  is_targa = FALSE;
  outfilename = NULL;
  memdst = FALSE;
  cinfo->err->trace_level = 0;
  /* Scan command line options, adjust parameters */
@@ -237,12 +243,12 @@ parse_switches (j_compress_ptr cinfo, int argc, char **argv,
    if (*arg != '-') {
      /* Not a switch, must be a file name argument */
      if (argn <= last_file_arg_seen) {
-	outfilename = NULL;	/* -outfile applies to just one input file */
+        outfilename = NULL;     /* -outfile applies to just one input file */
-	continue;		/* ignore this name if previously processed */
+        continue;               /* ignore this name if previously processed */
      }
-      break;			/* else done parsing switches */
+      break;                    /* else done parsing switches */
    }
-    arg++;			/* advance past switch marker character */
+    arg++;                      /* advance past switch marker character */
    if (keymatch(arg, "arithmetic", 1)) {
      /* Use arithmetic coding. */
@@ -250,7 +256,7 @@ parse_switches (j_compress_ptr cinfo, int argc, char **argv,
      cinfo->arith_code = TRUE;
 #else
      fprintf(stderr, "%s: sorry, arithmetic coding not supported\n",
-	      progname);
+              progname);
      exit(EXIT_FAILURE);
 #endif
@@ -260,16 +266,16 @@ parse_switches (j_compress_ptr cinfo, int argc, char **argv,
    } else if (keymatch(arg, "dct", 2)) {
      /* Select DCT algorithm. */
-      if (++argn >= argc)	/* advance to next argument */
+      if (++argn >= argc)       /* advance to next argument */
-	usage();
+        usage();
      if (keymatch(argv[argn], "int", 1)) {
-	cinfo->dct_method = JDCT_ISLOW;
+        cinfo->dct_method = JDCT_ISLOW;
      } else if (keymatch(argv[argn], "fast", 2)) {
-	cinfo->dct_method = JDCT_IFAST;
+        cinfo->dct_method = JDCT_IFAST;
      } else if (keymatch(argv[argn], "float", 2)) {
-	cinfo->dct_method = JDCT_FLOAT;
+        cinfo->dct_method = JDCT_FLOAT;
      } else
-	usage();
+        usage();
    } else if (keymatch(arg, "debug", 1) || keymatch(arg, "verbose", 1)) {
      /* Enable debug printouts. */
@@ -277,27 +283,39 @@ parse_switches (j_compress_ptr cinfo, int argc, char **argv,
      static boolean printed_version = FALSE;
      if (! printed_version) {
-	fprintf(stderr, "Independent JPEG Group's CJPEG, version %s\n%s\n",
+        fprintf(stderr, "%s version %s (build %s)\n",
-		JVERSION, JCOPYRIGHT);
+                PACKAGE_NAME, VERSION, BUILD);
-	printed_version = TRUE;
+        fprintf(stderr, "%s\n\n", JCOPYRIGHT);
        fprintf(stderr, "Emulating The Independent JPEG Group's software, version %s\n\n",
                JVERSION);
        printed_version = TRUE;
      }
      cinfo->err->trace_level++;
    } else if (keymatch(arg, "version", 4)) {
      fprintf(stderr, "%s version %s (build %s)\n",
              PACKAGE_NAME, VERSION, BUILD);
      exit(EXIT_SUCCESS);
    } else if (keymatch(arg, "grayscale", 2) || keymatch(arg, "greyscale",2)) {
      /* Force a monochrome JPEG file to be generated. */
      jpeg_set_colorspace(cinfo, JCS_GRAYSCALE);
    } else if (keymatch(arg, "rgb", 3)) {
      /* Force an RGB JPEG file to be generated. */
      jpeg_set_colorspace(cinfo, JCS_RGB);
    } else if (keymatch(arg, "maxmemory", 3)) {
      /* Maximum memory in Kb (or Mb with 'm'). */
      long lval;
      char ch = 'x';
-      if (++argn >= argc)	/* advance to next argument */
+      if (++argn >= argc)       /* advance to next argument */
-	usage();
+        usage();
      if (sscanf(argv[argn], "%ld%c", &lval, &ch) < 1)
-	usage();
+        usage();
      if (ch == 'm' || ch == 'M')
-	lval *= 1000L;
+        lval *= 1000L;
      cinfo->mem->max_memory_to_use = lval * 1000L;
    } else if (keymatch(arg, "optimize", 1) || keymatch(arg, "optimise", 1)) {
@@ -305,16 +323,16 @@ parse_switches (j_compress_ptr cinfo, int argc, char **argv,
 #ifdef ENTROPY_OPT_SUPPORTED
      cinfo->optimize_coding = TRUE;
 #else
-      fprintf(stderr, "%s: sorry, entropy optimization was not compiled\n",
+      fprintf(stderr, "%s: sorry, entropy optimization was not compiled in\n",
-	      progname);
+              progname);
      exit(EXIT_FAILURE);
 #endif
    } else if (keymatch(arg, "outfile", 4)) {
      /* Set output file name. */
-      if (++argn >= argc)	/* advance to next argument */
+      if (++argn >= argc)       /* advance to next argument */
-	usage();
+        usage();
-      outfilename = argv[argn];	/* save it away for later use */
+      outfilename = argv[argn]; /* save it away for later use */
    } else if (keymatch(arg, "progressive", 1)) {
      /* Select simple progressive mode. */
@@ -322,24 +340,31 @@ parse_switches (j_compress_ptr cinfo, int argc, char **argv,
      simple_progressive = TRUE;
      /* We must postpone execution until num_components is known. */
 #else
-      fprintf(stderr, "%s: sorry, progressive output was not compiled\n",
+      fprintf(stderr, "%s: sorry, progressive output was not compiled in\n",
-	      progname);
+              progname);
      exit(EXIT_FAILURE);
 #endif
    } else if (keymatch(arg, "memdst", 2)) {
      /* Use in-memory destination manager */
 #if JPEG_LIB_VERSION >= 80 || defined(MEM_SRCDST_SUPPORTED)
      memdst = TRUE;
 #else
      fprintf(stderr, "%s: sorry, in-memory destination manager was not compiled in\n",
              progname);
      exit(EXIT_FAILURE);
 #endif
    } else if (keymatch(arg, "quality", 1)) {
-      /* Quality factor (quantization table scaling factor). */
+      /* Quality ratings (quantization table scaling factors). */
-      if (++argn >= argc)	/* advance to next argument */
+      if (++argn >= argc)       /* advance to next argument */
-	usage();
+        usage();
-      if (sscanf(argv[argn], "%d", &quality) != 1)
+      qualityarg = argv[argn];
 	usage();
      /* Change scale factor in case -qtables is present. */
      q_scale_factor = jpeg_quality_scaling(quality);
    } else if (keymatch(arg, "qslots", 2)) {
      /* Quantization table slot numbers. */
-      if (++argn >= argc)	/* advance to next argument */
+      if (++argn >= argc)       /* advance to next argument */
-	usage();
+        usage();
      qslotsarg = argv[argn];
      /* Must delay setting qslots until after we have processed any
       * colorspace-determining switches, since jpeg_set_colorspace sets
@@ -348,8 +373,8 @@ parse_switches (j_compress_ptr cinfo, int argc, char **argv,
    } else if (keymatch(arg, "qtables", 2)) {
      /* Quantization tables fetched from file. */
-      if (++argn >= argc)	/* advance to next argument */
+      if (++argn >= argc)       /* advance to next argument */
-	usage();
+        usage();
      qtablefile = argv[argn];
      /* We postpone actually reading the file in case -quality comes later. */
@@ -358,40 +383,40 @@ parse_switches (j_compress_ptr cinfo, int argc, char **argv,
      long lval;
      char ch = 'x';
-      if (++argn >= argc)	/* advance to next argument */
+      if (++argn >= argc)       /* advance to next argument */
-	usage();
+        usage();
      if (sscanf(argv[argn], "%ld%c", &lval, &ch) < 1)
-	usage();
+        usage();
      if (lval < 0 || lval > 65535L)
-	usage();
+        usage();
      if (ch == 'b' || ch == 'B') {
-	cinfo->restart_interval = (unsigned int) lval;
+        cinfo->restart_interval = (unsigned int) lval;
-	cinfo->restart_in_rows = 0; /* else prior '-restart n' overrides me */
+        cinfo->restart_in_rows = 0; /* else prior '-restart n' overrides me */
      } else {
-	cinfo->restart_in_rows = (int) lval;
+        cinfo->restart_in_rows = (int) lval;
-	/* restart_interval will be computed during startup */
+        /* restart_interval will be computed during startup */
      }
    } else if (keymatch(arg, "sample", 2)) {
      /* Set sampling factors. */
-      if (++argn >= argc)	/* advance to next argument */
+      if (++argn >= argc)       /* advance to next argument */
-	usage();
+        usage();
      samplearg = argv[argn];
      /* Must delay setting sample factors until after we have processed any
       * colorspace-determining switches, since jpeg_set_colorspace sets
       * default sampling factors.
       */
-    } else if (keymatch(arg, "scans", 2)) {
+    } else if (keymatch(arg, "scans", 4)) {
      /* Set scan script. */
 #ifdef C_MULTISCAN_FILES_SUPPORTED
-      if (++argn >= argc)	/* advance to next argument */
+      if (++argn >= argc)       /* advance to next argument */
-	usage();
+        usage();
      scansarg = argv[argn];
      /* We must postpone reading the file in case -progressive appears. */
 #else
-      fprintf(stderr, "%s: sorry, multi-scan output was not compiled\n",
+      fprintf(stderr, "%s: sorry, multi-scan output was not compiled in\n",
-	      progname);
+              progname);
      exit(EXIT_FAILURE);
 #endif
@@ -399,12 +424,12 @@ parse_switches (j_compress_ptr cinfo, int argc, char **argv,
      /* Set input smoothing factor. */
      int val;
-      if (++argn >= argc)	/* advance to next argument */
+      if (++argn >= argc)       /* advance to next argument */
-	usage();
+        usage();
      if (sscanf(argv[argn], "%d", &val) != 1)
-	usage();
+        usage();
      if (val < 0 || val > 100)
-	usage();
+        usage();
      cinfo->smoothing_factor = val;
    } else if (keymatch(arg, "targa", 1)) {
@@ -412,7 +437,7 @@ parse_switches (j_compress_ptr cinfo, int argc, char **argv,
      is_targa = TRUE;
    } else {
-      usage();			/* bogus switch */
+      usage();                  /* bogus switch */
    }
  }
@@ -422,34 +447,35 @@ parse_switches (j_compress_ptr cinfo, int argc, char **argv,
    /* Set quantization tables for selected quality. */
    /* Some or all may be overridden if -qtables is present. */
-    jpeg_set_quality(cinfo, quality, force_baseline);
+    if (qualityarg != NULL)     /* process -quality if it was present */
      if (! set_quality_ratings(cinfo, qualityarg, force_baseline))
        usage();
-    if (qtablefile != NULL)	/* process -qtables if it was present */
+    if (qtablefile != NULL)     /* process -qtables if it was present */
-      if (! read_quant_tables(cinfo, qtablefile,
+      if (! read_quant_tables(cinfo, qtablefile, force_baseline))
-			      q_scale_factor, force_baseline))
+        usage();
 	usage();
-    if (qslotsarg != NULL)	/* process -qslots if it was present */
+    if (qslotsarg != NULL)      /* process -qslots if it was present */
      if (! set_quant_slots(cinfo, qslotsarg))
-	usage();
+        usage();
-    if (samplearg != NULL)	/* process -sample if it was present */
+    if (samplearg != NULL)      /* process -sample if it was present */
      if (! set_sample_factors(cinfo, samplearg))
-	usage();
+        usage();
 #ifdef C_PROGRESSIVE_SUPPORTED
-    if (simple_progressive)	/* process -progressive; -scans can override */
+    if (simple_progressive)     /* process -progressive; -scans can override */
      jpeg_simple_progression(cinfo);
 #endif
 #ifdef C_MULTISCAN_FILES_SUPPORTED
-    if (scansarg != NULL)	/* process -scans if it was present */
+    if (scansarg != NULL)       /* process -scans if it was present */
      if (! read_scan_script(cinfo, scansarg))
-	usage();
+        usage();
 #endif
  }
-  return argn;			/* return index of next arg (file name) */
+  return argn;                  /* return index of next arg (file name) */
 }
@@ -468,7 +494,9 @@ main (int argc, char **argv)
  int file_index;
  cjpeg_source_ptr src_mgr;
  FILE * input_file;
-  FILE * output_file;
+  FILE * output_file = NULL;
  unsigned char *outbuffer = NULL;
  unsigned long outsize = 0;
  JDIMENSION num_scanlines;
  /* On Mac, fetch a command line. */
@@ -478,7 +506,7 @@ main (int argc, char **argv)
  progname = argv[0];
  if (progname == NULL || progname[0] == 0)
-    progname = "cjpeg";		/* in case C library doesn't provide it */
+    progname = "cjpeg";         /* in case C library doesn't provide it */
  /* Initialize the JPEG compression object with default error handling. */
  cinfo.err = jpeg_std_error(&jerr);
@@ -488,11 +516,6 @@ main (int argc, char **argv)
  jerr.first_addon_message = JMSG_FIRSTADDONCODE;
  jerr.last_addon_message = JMSG_LASTADDONCODE;
  /* Now safe to enable signal catcher. */
 #ifdef NEED_SIGNAL_CATCHER
  enable_signal_catcher((j_common_ptr) &cinfo);
 #endif
  /* Initialize JPEG parameters.
   * Much of this may be overridden later.
   * In particular, we don't yet know the input file's color space,
@@ -511,19 +534,21 @@ main (int argc, char **argv)
  file_index = parse_switches(&cinfo, argc, argv, 0, FALSE);
 #ifdef TWO_FILE_COMMANDLINE
-  /* Must have either -outfile switch or explicit output file name */
+  if (!memdst) {
-  if (outfilename == NULL) {
+    /* Must have either -outfile switch or explicit output file name */
-    if (file_index != argc-2) {
+    if (outfilename == NULL) {
-      fprintf(stderr, "%s: must name one input and one output file\n",
+      if (file_index != argc-2) {
-	      progname);
+        fprintf(stderr, "%s: must name one input and one output file\n",
-      usage();
+                progname);
-    }
+        usage();
-    outfilename = argv[file_index+1];
+      }
-  } else {
+      outfilename = argv[file_index+1];
-    if (file_index != argc-1) {
+    } else {
-      fprintf(stderr, "%s: must name one input and one output file\n",
+      if (file_index != argc-1) {
-	      progname);
+        fprintf(stderr, "%s: must name one input and one output file\n",
-      usage();
+                progname);
        usage();
      }
    }
  }
 #else
@@ -551,7 +576,7 @@ main (int argc, char **argv)
      fprintf(stderr, "%s: can't open %s\n", progname, outfilename);
      exit(EXIT_FAILURE);
    }
-  } else {
+  } else if (!memdst) {
    /* default output file is stdout */
    output_file = write_stdout();
  }
@@ -574,7 +599,12 @@ main (int argc, char **argv)
  file_index = parse_switches(&cinfo, argc, argv, 0, TRUE);
  /* Specify data destination for compression */
-  jpeg_stdio_dest(&cinfo, output_file);
+#if JPEG_LIB_VERSION >= 80 || defined(MEM_SRCDST_SUPPORTED)
  if (memdst)
    jpeg_mem_dest(&cinfo, &outbuffer, &outsize);
  else
 #endif
    jpeg_stdio_dest(&cinfo, output_file);
  /* Start compressor */
  jpeg_start_compress(&cinfo, TRUE);
@@ -593,14 +623,20 @@ main (int argc, char **argv)
  /* Close files, if we opened them */
  if (input_file != stdin)
    fclose(input_file);
-  if (output_file != stdout)
+  if (output_file != stdout && output_file != NULL)
    fclose(output_file);
 #ifdef PROGRESS_REPORT
  end_progress_monitor((j_common_ptr) &cinfo);
 #endif
  if (memdst) {
    fprintf(stderr, "Compressed size:  %lu bytes\n", outsize);
    if (outbuffer != NULL)
      free(outbuffer);
  }
  /* All done. */
  exit(jerr.num_warnings ? EXIT_WARNING : EXIT_SUCCESS);
-  return 0;			/* suppress no-return-value warnings */
+  return 0;                     /* suppress no-return-value warnings */
 }
--- a/cmakescripts/md5cmp.cmake
+++ b/cmakescripts/md5cmp.cmake
@@ -0,0 +1,15 @@
 if(NOT MD5)
  message(FATAL_ERROR "MD5 not specified")
 endif()
 if(NOT FILE)
  message(FATAL_ERROR "FILE not specified")
 endif()
 file(MD5 ${FILE} MD5FILE)
 if(NOT MD5 STREQUAL MD5FILE)
 	message(FATAL_ERROR "MD5 of ${FILE} should be ${MD5}, not ${MD5FILE}.")
 else()
 	message(STATUS "${MD5}: OK")
 endif()
--- a/cmakescripts/testclean.cmake
+++ b/cmakescripts/testclean.cmake
@@ -0,0 +1,34 @@
 file(GLOB FILES
  testout*
  *_GRAY_*.bmp
  *_GRAY_*.png
  *_GRAY_*.ppm
  *_GRAY_*.jpg
  *_GRAY.yuv
  *_420_*.bmp
  *_420_*.png
  *_420_*.ppm
  *_420_*.jpg
  *_420.yuv
  *_422_*.bmp
  *_422_*.png
  *_422_*.ppm
  *_422_*.jpg
  *_422.yuv
  *_444_*.bmp
  *_444_*.png
  *_444_*.ppm
  *_444_*.jpg
  *_444.yuv
  *_440_*.bmp
  *_440_*.png
  *_440_*.ppm
  *_440_*.jpg
  *_440.yuv)
 if(NOT FILES STREQUAL "")
  message(STATUS "Removing test files")
  file(REMOVE ${FILES})
 else()
  message(STATUS "No files to remove")
 endif()
--- a/coderules.txt
+++ b/coderules.txt
@@ -1,7 +1,9 @@
 IJG JPEG LIBRARY:  CODING RULES
 This file was part of the Independent JPEG Group's software:
 Copyright (C) 1991-1996, Thomas G. Lane.
-This file is part of the Independent JPEG Group's software.
+It was modified by The libjpeg-turbo Project to include only information
 relevant to libjpeg-turbo.
 For conditions of distribution and use, see the accompanying README file.
@@ -21,33 +23,18 @@ Block comments should be laid out thusly:
 */
 We indent statements in K&R style, e.g.,
-	if (test) {
+        if (test) {
-	  then-part;
+          then-part;
-	} else {
+        } else {
-	  else-part;
+          else-part;
-	}
+        }
 with two spaces per indentation level.  (This indentation convention is
 handled automatically by GNU Emacs and many other text editors.)
 Multi-word names should be written in lower case with underscores, e.g.,
 multi_word_name (not multiWordName).  Preprocessor symbols and enum constants
 are similar but upper case (MULTI_WORD_NAME).  Names should be unique within
-the first fifteen characters.  (On some older systems, global names must be
+the first fifteen characters.
 unique within six characters.  We accommodate this without cluttering the
 source code by using macros to substitute shorter names.)
 We use function prototypes everywhere; we rely on automatic source code
 transformation to feed prototype-less C compilers.  Transformation is done
 by the simple and portable tool 'ansi2knr.c' (courtesy of Ghostscript).
 ansi2knr is not very bright, so it imposes a format requirement on function
 declarations: the function name MUST BEGIN IN COLUMN 1.  Thus all functions
 should be written in the following style:
 LOCAL(int *)
 function_name (int a, char *b)
 {
    code...
 }
 Note that each function definition must begin with GLOBAL(type), LOCAL(type),
 or METHODDEF(type).  These macros expand to "static type" or just "type" as
@@ -55,32 +42,8 @@ appropriate.  They provide a readable indication of the routine's usage and
 can readily be changed for special needs.  (For instance, special linkage
 keywords can be inserted for use in Windows DLLs.)
-ansi2knr does not transform method declarations (function pointers in
+A similar solution is used for external function declarations (see the EXTERN
-structs).  We handle these with a macro JMETHOD, defined as
+macro.)
 	#ifdef HAVE_PROTOTYPES
 	#define JMETHOD(type,methodname,arglist)  type (*methodname) arglist
 	#else
 	#define JMETHOD(type,methodname,arglist)  type (*methodname) ()
 	#endif
 which is used like this:
 	struct function_pointers {
 	  JMETHOD(void, init_entropy_encoder, (int somearg, jparms *jp));
 	  JMETHOD(void, term_entropy_encoder, (void));
 	};
 Note the set of parentheses surrounding the parameter list.
 A similar solution is used for forward and external function declarations
 (see the EXTERN and JPP macros).
 If the code is to work on non-ANSI compilers, we cannot rely on a prototype
 declaration to coerce actual parameters into the right types.  Therefore, use
 explicit casts on actual parameters whenever the actual parameter type is not
 identical to the formal parameter.  Beware of implicit conversions to "int".
 It seems there are some non-ANSI compilers in which the sizeof() operator
 is defined to return int, yet size_t is defined as long.  Needless to say,
 this is brain-damaged.  Always use the SIZEOF() macro in place of sizeof(),
 so that the result is guaranteed to be of type size_t.
 The JPEG library is intended to be used within larger programs.  Furthermore,
@@ -94,23 +57,20 @@ pass these through the common routines provided.
 wherever possible.  (Note that our method-based calling conventions help this
 a lot: in many modules only the initialization function will ever need to be
 called directly, so only that function need be externally visible.)  All
-global function names should begin with "jpeg_", and should have an
+global function names should begin with "jpeg_".
 abbreviated name (unique in the first six characters) substituted by macro
 when NEED_SHORT_EXTERNAL_NAMES is set.
 3. Don't use global variables; anything that must be used in another module
 should be in the common data structures.
 4. Don't use static variables except for read-only constant tables.  Variables
 that should be private to a module can be placed into private structures (see
-the system architecture document, structure.doc).
+the system architecture document, structure.txt).
 5. Source file names should begin with "j" for files that are part of the
 library proper; source files that are not part of the library, such as cjpeg.c
-and djpeg.c, do not begin with "j".  Keep source file names to eight
+and djpeg.c, do not begin with "j".  Keep compression and decompression code in
-characters (plus ".c" or ".h", etc) to make life easy for MS-DOSers.  Keep
+separate source files --- some applications may want only one half of the
-compression and decompression code in separate source files --- some
+library.
 applications may want only one half of the library.
 Note: these rules (particularly #4) are not followed religiously in the
 modules that are used in cjpeg/djpeg but are not part of the JPEG library
--- a/configure.ac
+++ b/configure.ac
@@ -2,54 +2,90 @@
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.56])
-AC_INIT([libjpeg-turbo], [0.0.90])
+AC_INIT([libjpeg-turbo], [1.4.1])
 BUILD=`date +%Y%m%d`
 AM_INIT_AUTOMAKE([-Wall foreign dist-bzip2])
 AC_PREFIX_DEFAULT(/opt/libjpeg-turbo)
-# Always build with prototypes
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_DEFINE([HAVE_PROTOTYPES], 1, [Define if your compiler supports prototypes])
 # Don't use undefined types
 AC_DEFINE([INCOMPLETE_TYPES_BROKEN], 1, [Define if you want use complete types])
 # Checks for programs.
 SAVED_CFLAGS=${CFLAGS}
-SAVED_CXXFLAGS=${CXXFLAGS}
+SAVED_CPPFLAGS=${CPPFLAGS}
 AC_PROG_CPP
 AC_PROG_CC
-AC_PROG_CXX
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 AM_PROG_AS
 AM_PROG_CC_C_O
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
 AC_PROG_LN_S
-AC_MSG_CHECKING([whether the linker supports version scripts])
+# When the prefix is /opt/libjpeg-turbo, we assume that an "official" binary is
-VERSION_SCRIPT=no
+# being created, and thus we install things into specific locations.
-LDVER=`$LD --help </dev/null 2>&1 | grep "\-\-version-script"`
+
-if test "$LDVER"; then
+old_prefix=${prefix}
-  VERSION_SCRIPT=yes
+if test "x$prefix" = "xNONE" -a "x$ac_default_prefix" != "x"; then
-  VERSION_SCRIPT_FLAG=-Wl,--version-script,
+  prefix=$ac_default_prefix
-  AC_MSG_RESULT(yes)
+fi
-else
+DATADIR=`eval echo ${datadir}`
-  LDVER=`$LD --help </dev/null 2>&1 | grep "\-M"`
+DATADIR=`eval echo $DATADIR`
-  if test "$LDVER"; then
+if test "$DATADIR" = "/opt/libjpeg-turbo/share"; then
-    VERSION_SCRIPT=yes
+  datadir='${prefix}'
-    VERSION_SCRIPT_FLAG=-Wl,-M,
+fi
-    AC_MSG_RESULT(yes)
+DATADIR=`eval echo ${datarootdir}`
-  else
+DATADIR=`eval echo $DATADIR`
-    AC_MSG_RESULT(no)
+if test "$DATADIR" = "/opt/libjpeg-turbo/share"; then
-  fi
+  datarootdir='${prefix}'
 fi
 DOCDIR=`eval echo ${docdir}`
 DOCDIR=`eval echo $DOCDIR`
 if test "$DOCDIR" = "/opt/libjpeg-turbo/doc/libjpeg-turbo"; then
  docdir='${datadir}/doc'
 fi
-AM_CONDITIONAL(VERSION_SCRIPT, test "x$VERSION_SCRIPT" = "xyes")
+old_exec_prefix=${exec_prefix}
-AC_SUBST(VERSION_SCRIPT_FLAG)
+if test "x$exec_prefix" = "xNONE"; then
  exec_prefix=${prefix}
 fi
 AC_CHECK_SIZEOF(size_t)
 if test "x${libdir}" = 'x${exec_prefix}/lib' -o "x${libdir}" = 'x${prefix}/lib'; then
  LIBDIR=`eval echo ${libdir}`
  LIBDIR=`eval echo $LIBDIR`
  if test "$LIBDIR" = "/opt/libjpeg-turbo/lib"; then
    case $host_os in
      darwin*)
        ;;
      *)
        if test "${ac_cv_sizeof_size_t}" = "8"; then
          libdir='${exec_prefix}/lib64'
        elif test "${ac_cv_sizeof_size_t}" = "4"; then
          libdir='${exec_prefix}/lib32'
        fi
        ;;
    esac
  fi
 fi
 exec_prefix=${old_exec_prefix}
 prefix=${old_prefix}
 # Check whether compiler supports pointers to undefined structures
 AC_MSG_CHECKING(whether compiler supports pointers to undefined structures)
 AC_TRY_COMPILE([ typedef struct undefined_structure * undef_struct_ptr; ], ,
  AC_MSG_RESULT(yes),
  [AC_MSG_RESULT(no)
   AC_DEFINE([INCOMPLETE_TYPES_BROKEN], [1],
     [Compiler does not support pointers to undefined structures.])])
 if test "x${GCC}" = "xyes"; then
  if test "x${SAVED_CFLAGS}" = "x"; then
    CFLAGS=-O3
  fi
-  if test "x${SAVED_CXXFLAGS}" = "x"; then
+  if test "x${SAVED_CPPFLAGS}" = "x"; then
-    CXXFLAGS=-O3
+    CPPFLAGS=-Wall
  fi
 fi
@@ -58,17 +94,15 @@ if test "x${SUNCC}" = "xyes"; then
  if test "x${SAVED_CFLAGS}" = "x"; then
    CFLAGS=-xO5
  fi
  if test "x${SAVED_CXXFLAGS}" = "x"; then
    CXXFLAGS=-xO5
  fi
 fi
 # Checks for libraries.
 # Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([stddef.h stdlib.h string.h])
+AC_CHECK_HEADERS([stddef.h stdlib.h locale.h string.h])
-AC_CHECK_HEADER([sys/types.h], AC_DEFINE([NEED_SYS_TYPES_H], 1, [Define if you have sys/types.h]))
+AC_CHECK_HEADER([sys/types.h],
  AC_DEFINE([NEED_SYS_TYPES_H], 1, [Define if you need to include <sys/types.h> to get size_t.]))
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -79,85 +113,421 @@ AC_CHECK_TYPES([unsigned char, unsigned short])
 AC_MSG_CHECKING([if right shift is signed])
 AC_TRY_RUN(
-	[#include <stdio.h>
+  [#include <stdio.h>
-	 int is_shifting_signed (long arg) {
+   int is_shifting_signed (long arg) {
-	 long res = arg >> 4;
+     long res = arg >> 4;
-	 if (res == -0x7F7E80CL)
+     if (res == -0x7F7E80CL)
-		return 1; /* right shift is signed */
+       return 1; /* right shift is signed */
-	 /* see if unsigned-shift hack will fix it. */
+     /* see if unsigned-shift hack will fix it. */
-	 /* we can't just test exact value since it depends on width of long... */
+     /* we can't just test exact value since it depends on width of long... */
-	 res |= (~0L) << (32-4);
+     res |= (~0L) << (32-4);
-	 if (res == -0x7F7E80CL)
+     if (res == -0x7F7E80CL)
-		return 0; /* right shift is unsigned */
+       return 0; /* right shift is unsigned */
-	 printf("Right shift isn't acting as I expect it to.\n");
+     printf("Right shift isn't acting as I expect it to.\n");
-	 printf("I fear the JPEG software will not work at all.\n\n");
+     printf("I fear the JPEG software will not work at all.\n\n");
-	 return 0; /* try it with unsigned anyway */
+     return 0; /* try it with unsigned anyway */
-	 }
+   }
-	 int main (void) {
+   int main (void) {
-		exit(is_shifting_signed(-0x7F7E80B1L));
+     exit(is_shifting_signed(-0x7F7E80B1L));
-	 }],
+   }],
-	[AC_MSG_RESULT(no)
+  [AC_MSG_RESULT(no)
-	 AC_DEFINE([RIGHT_SHIFT_IS_UNSIGNED], 1, [Define if shift is unsigned])],
+   AC_DEFINE([RIGHT_SHIFT_IS_UNSIGNED], 1,
-	[AC_MSG_RESULT(yes)],
+     [Define if your (broken) compiler shifts signed values as if they were unsigned.])],
-	[AC_MSG_RESULT(Assuming that right shift is signed on target machine.)])
+  [AC_MSG_RESULT(yes)],
-
+  [AC_MSG_RESULT(Assuming that right shift is signed on target machine.)])
 # test whether global names are unique to at least 15 chars
 AC_MSG_CHECKING([for short external names])
 AC_TRY_LINK(
 	[int possibly_duplicate_function () { return 0; }
 	 int possibly_dupli_function () { return 1; }], [ ],
 	[AC_MSG_RESULT(ok)],
 	[AC_MSG_RESULT(short)
 	 AC_DEFINE([NEED_SHORT_EXTERNAL_NAMES], 1, [Define if you need short function names])])
 # Checks for library functions.
 AC_CHECK_FUNCS([memset memcpy], [],
-	[AC_DEFINE([NEED_BSD_STRINGS], 1,
+  [AC_DEFINE([NEED_BSD_STRINGS], 1,
-		   [Define if you have BSD-like bzero and bcopy])])
+     [Define if you have BSD-like bzero and bcopy in <strings.h> rather than memset/memcpy in <string.h>.])])
-# Set flags to indicate platform
+AC_MSG_CHECKING([libjpeg API version])
-case "$host_os" in
+AC_ARG_VAR(JPEG_LIB_VERSION, [libjpeg API version (62, 70, or 80)])
-  cygwin* | mingw* | pw32* | interix*)
+if test "x$JPEG_LIB_VERSION" = "x"; then
-    is_win32=1
+  AC_ARG_WITH([jpeg7],
-  ;;
+    AC_HELP_STRING([--with-jpeg7],
-esac
+      [Emulate libjpeg v7 API/ABI (this makes libjpeg-turbo backward incompatible with libjpeg v6b.)]))
-AM_CONDITIONAL([IS_WIN32], [test "x$is_win32" = "x1"])
+  AC_ARG_WITH([jpeg8],
    AC_HELP_STRING([--with-jpeg8],
      [Emulate libjpeg v8 API/ABI (this makes libjpeg-turbo backward incompatible with libjpeg v6b.)]))
  if test "x${with_jpeg8}" = "xyes"; then
    JPEG_LIB_VERSION=80
  else
    if test "x${with_jpeg7}" = "xyes"; then
      JPEG_LIB_VERSION=70
    else
      JPEG_LIB_VERSION=62
    fi
  fi
 fi
 JPEG_LIB_VERSION_DECIMAL=`expr $JPEG_LIB_VERSION / 10`.`expr $JPEG_LIB_VERSION % 10`
 AC_SUBST(JPEG_LIB_VERSION_DECIMAL)
 AC_MSG_RESULT([$JPEG_LIB_VERSION_DECIMAL])
 AC_DEFINE_UNQUOTED(JPEG_LIB_VERSION, [$JPEG_LIB_VERSION],
  [libjpeg API version])
 AC_ARG_VAR(SO_MAJOR_VERSION,
  [Major version of the libjpeg-turbo shared library (default is determined by the API version)])
 AC_ARG_VAR(SO_MINOR_VERSION,
  [Minor version of the libjpeg-turbo shared library (default is determined by the API version)])
 if test "x$SO_MAJOR_VERSION" = "x"; then
  case "$JPEG_LIB_VERSION" in
    62)  SO_MAJOR_VERSION=$JPEG_LIB_VERSION ;;
    *)   SO_MAJOR_VERSION=`expr $JPEG_LIB_VERSION / 10` ;;
  esac
 fi
 if test "x$SO_MINOR_VERSION" = "x"; then
  case "$JPEG_LIB_VERSION" in
    80)  SO_MINOR_VERSION=2 ;;
    *)   SO_MINOR_VERSION=0 ;;
  esac
 fi
 RPM_CONFIG_ARGS=
 # Memory source/destination managers
 SO_AGE=0
 MEM_SRCDST_FUNCTIONS=
 if test "x${with_jpeg8}" != "xyes"; then
  AC_MSG_CHECKING([whether to include in-memory source/destination managers])
  AC_ARG_WITH([mem-srcdst],
    AC_HELP_STRING([--without-mem-srcdst],
      [Do not include in-memory source/destination manager functions when emulating the libjpeg v6b or v7 API/ABI]))
  if test "x$with_mem_srcdst" != "xno"; then
    AC_MSG_RESULT(yes)
    AC_DEFINE([MEM_SRCDST_SUPPORTED], [1],
      [Support in-memory source/destination managers])
    SO_AGE=1
    MEM_SRCDST_FUNCTIONS="global:  jpeg_mem_dest;  jpeg_mem_src;";
  else
    AC_MSG_RESULT(no)
    RPM_CONFIG_ARGS="$RPM_CONFIG_ARGS --without-mem-srcdst"
  fi
 fi
 AC_MSG_CHECKING([libjpeg shared library version])
 AC_MSG_RESULT([$SO_MAJOR_VERSION.$SO_AGE.$SO_MINOR_VERSION])
 LIBTOOL_CURRENT=`expr $SO_MAJOR_VERSION + $SO_AGE`
 AC_SUBST(LIBTOOL_CURRENT)
 AC_SUBST(SO_MAJOR_VERSION)
 AC_SUBST(SO_MINOR_VERSION)
 AC_SUBST(SO_AGE)
 AC_SUBST(MEM_SRCDST_FUNCTIONS)
 AC_DEFINE_UNQUOTED(LIBJPEG_TURBO_VERSION, [$VERSION], [libjpeg-turbo version])
 VERSION_SCRIPT=yes
 AC_ARG_ENABLE([ld-version-script],
  AS_HELP_STRING([--disable-ld-version-script],
    [Disable linker version script for libjpeg-turbo (default is to use linker version script if the linker supports it)]),
  [VERSION_SCRIPT=$enableval], [])
 AC_MSG_CHECKING([whether the linker supports version scripts])
 SAVED_LDFLAGS="$LDFLAGS"
 LDFLAGS="$LDFLAGS -Wl,--version-script,conftest.map"
 cat > conftest.map <<EOF
 VERS_1 {
  global: *;
 };
 EOF
 AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
  [VERSION_SCRIPT_FLAG=-Wl,--version-script,;
   AC_MSG_RESULT([yes (GNU style)])],
  [])
 if test "x$VERSION_SCRIPT_FLAG" = "x"; then
  LDFLAGS="$SAVED_LDFLAGS -Wl,-M,conftest.map"
  AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
    [VERSION_SCRIPT_FLAG=-Wl,-M,;
     AC_MSG_RESULT([yes (Sun style)])],
    [])
 fi
 if test "x$VERSION_SCRIPT_FLAG" = "x"; then
  VERSION_SCRIPT=no
  AC_MSG_RESULT(no)
 fi
 LDFLAGS="$SAVED_LDFLAGS"
 AC_MSG_CHECKING([whether to use version script when building libjpeg-turbo])
 AC_MSG_RESULT($VERSION_SCRIPT)
 AM_CONDITIONAL(VERSION_SCRIPT, test "x$VERSION_SCRIPT" = "xyes")
 AC_SUBST(VERSION_SCRIPT_FLAG)
 # Check for non-broken inline under various spellings
 AC_MSG_CHECKING(for inline)
 ljt_cv_inline=""
 AC_TRY_COMPILE(, [} inline __attribute__((always_inline)) int foo() { return 0; }
 int bar() { return foo();], ljt_cv_inline="inline __attribute__((always_inline))",
 AC_TRY_COMPILE(, [} __inline__ int foo() { return 0; }
 int bar() { return foo();], ljt_cv_inline="__inline__",
 AC_TRY_COMPILE(, [} __inline int foo() { return 0; }
 int bar() { return foo();], ljt_cv_inline="__inline",
 AC_TRY_COMPILE(, [} inline int foo() { return 0; }
 int bar() { return foo();], ljt_cv_inline="inline"))))
 AC_MSG_RESULT($ljt_cv_inline)
 AC_DEFINE_UNQUOTED([INLINE],[$ljt_cv_inline],[How to obtain function inlining.])
 # Arithmetic coding support
 AC_MSG_CHECKING([whether to include arithmetic encoding support])
 AC_ARG_WITH([arith-enc],
  AC_HELP_STRING([--without-arith-enc],
    [Do not include arithmetic encoding support]))
 if test "x$with_12bit" = "xyes"; then
  with_arith_enc=no
 fi
 if test "x$with_arith_enc" = "xno"; then
  AC_MSG_RESULT(no)
  RPM_CONFIG_ARGS="$RPM_CONFIG_ARGS --without-arith-enc"
 else
  AC_DEFINE([C_ARITH_CODING_SUPPORTED], [1], [Support arithmetic encoding])
  AC_MSG_RESULT(yes)
 fi
 AM_CONDITIONAL([WITH_ARITH_ENC], [test "x$with_arith_enc" != "xno"])
 AC_MSG_CHECKING([whether to include arithmetic decoding support])
 AC_ARG_WITH([arith-dec],
  AC_HELP_STRING([--without-arith-dec],
    [Do not include arithmetic decoding support]))
 if test "x$with_12bit" = "xyes"; then
  with_arith_dec=no
 fi
 if test "x$with_arith_dec" = "xno"; then
  AC_MSG_RESULT(no)
  RPM_CONFIG_ARGS="$RPM_CONFIG_ARGS --without-arith-dec"
 else
  AC_DEFINE([D_ARITH_CODING_SUPPORTED], [1], [Support arithmetic decoding])
  AC_MSG_RESULT(yes)
 fi
 AM_CONDITIONAL([WITH_ARITH_DEC], [test "x$with_arith_dec" != "xno"])
 AM_CONDITIONAL([WITH_ARITH],
  [test "x$with_arith_dec" != "xno" -o "x$with_arith_enc" != "xno"])
 # 12-bit component support
 AC_MSG_CHECKING([whether to use 12-bit samples])
 AC_ARG_WITH([12bit],
  AC_HELP_STRING([--with-12bit], [Encode/decode JPEG images with 12-bit samples (implies --without-simd --without-turbojpeg --without-arith-dec --without-arith-enc)]))
 if test "x$with_12bit" = "xyes"; then
  AC_DEFINE([BITS_IN_JSAMPLE], [12], [use 8 or 12])
  AC_MSG_RESULT(yes)
 else
  AC_MSG_RESULT(no)
 fi
 AM_CONDITIONAL([WITH_12BIT], [test "x$with_12bit" = "xyes"])
 # TurboJPEG support
 AC_MSG_CHECKING([whether to build TurboJPEG C wrapper])
 AC_ARG_WITH([turbojpeg],
  AC_HELP_STRING([--without-turbojpeg],
    [Do not include the TurboJPEG wrapper library and associated test programs]))
 if test "x$with_12bit" = "xyes"; then
  with_turbojpeg=no
 fi
 if test "x$with_turbojpeg" = "xno"; then
  AC_MSG_RESULT(no)
  RPM_CONFIG_ARGS="$RPM_CONFIG_ARGS --without-turbojpeg"
 else
  AC_MSG_RESULT(yes)
 fi
 # Java support
 AC_ARG_VAR(JAVAC, [Java compiler command (default: javac)])
 if test "x$JAVAC" = "x"; then
  JAVAC=javac
 fi
 AC_SUBST(JAVAC)
 AC_ARG_VAR(JAVACFLAGS, [Java compiler flags])
 AC_SUBST(JAVACFLAGS)
 AC_ARG_VAR(JAR, [Java archive command (default: jar)])
 if test "x$JAR" = "x"; then
  JAR=jar
 fi
 AC_SUBST(JAR)
 AC_ARG_VAR(JAVA, [Java runtime command (default: java)])
 if test "x$JAVA" = "x"; then
  JAVA=java
 fi
 AC_SUBST(JAVA)
 AC_ARG_VAR(JNI_CFLAGS,
  [C compiler flags needed to include jni.h (default: -I/System/Library/Frameworks/JavaVM.framework/Headers on OS X, '-I/usr/java/include -I/usr/java/include/solaris' on Solaris, and '-I/usr/java/default/include -I/usr/java/default/include/linux' on Linux)])
 AC_MSG_CHECKING([whether to build TurboJPEG Java wrapper])
 AC_ARG_WITH([java],
  AC_HELP_STRING([--with-java], [Build Java wrapper for the TurboJPEG library]))
 if test "x$with_12bit" = "xyes" -o "x$with_turbojpeg" = "xno"; then
  with_java=no
 fi
 WITH_JAVA=0
 if test "x$with_java" = "xyes"; then
  AC_MSG_RESULT(yes)
  case $host_os in
    darwin*)
      DEFAULT_JNI_CFLAGS=-I/System/Library/Frameworks/JavaVM.framework/Headers
      ;;
    solaris*)
      DEFAULT_JNI_CFLAGS='-I/usr/java/include -I/usr/java/include/solaris'
      ;;
    linux*)
      DEFAULT_JNI_CFLAGS='-I/usr/java/default/include -I/usr/java/default/include/linux'
      ;;
  esac
  if test "x$JNI_CFLAGS" = "x"; then
    JNI_CFLAGS=$DEFAULT_JNI_CFLAGS
  fi
  SAVE_CPPFLAGS=${CPPFLAGS}
  CPPFLAGS="${CPPFLAGS} ${JNI_CFLAGS}"
  AC_CHECK_HEADERS([jni.h], [DUMMY=1],
    [AC_MSG_ERROR([Could not find JNI header file])])
  CPPFLAGS=${SAVE_CPPFLAGS}
  AC_SUBST(JNI_CFLAGS)
  RPM_CONFIG_ARGS="$RPM_CONFIG_ARGS --with-java"
  JAVA_RPM_CONTENTS_1='%dir %{_datadir}/classes'
  JAVA_RPM_CONTENTS_2=%{_datadir}/classes/turbojpeg.jar
  WITH_JAVA=1
 else
  AC_MSG_RESULT(no)
 fi
 AM_CONDITIONAL([WITH_JAVA], [test "x$with_java" = "xyes"])
 AC_SUBST(WITH_JAVA)
 AC_SUBST(JAVA_RPM_CONTENTS_1)
 AC_SUBST(JAVA_RPM_CONTENTS_2)
 # optionally force using gas-preprocessor.pl for compatibility testing
 AC_ARG_WITH([gas-preprocessor],
  AC_HELP_STRING([--with-gas-preprocessor],
    [Force using gas-preprocessor.pl on ARM.]))
 if test "x${with_gas_preprocessor}" = "xyes"; then
  case $host_os in
    darwin*)
      CCAS="gas-preprocessor.pl -fix-unreq $CC"
      ;;
    *)
      CCAS="gas-preprocessor.pl -no-fix-unreq $CC"
      ;;
  esac
  AC_SUBST([CCAS])
 fi
 # SIMD is optional
 AC_ARG_WITH([simd],
-    AC_HELP_STRING([--without-simd],[Omit accelerated SIMD routines.]))
+  AC_HELP_STRING([--without-simd], [Do not include SIMD extensions]))
 if test "x$with_12bit" = "xyes"; then
  with_simd=no
 fi
 if test "x${with_simd}" != "xno"; then
  require_simd=no
  if test "x${with_simd}" = "xyes"; then
    require_simd=yes
  fi
  # Check if we're on a supported CPU
  AC_MSG_CHECKING([if we have SIMD optimisations for cpu type])
  case "$host_cpu" in
-    x86_64)
+    x86_64 | amd64)
      AC_MSG_RESULT([yes (x86_64)])
      AC_PROG_NASM
      simd_arch=x86_64
-    ;;
+      ;;
    i*86 | x86 | ia32)
      AC_MSG_RESULT([yes (i386)])
      AC_PROG_NASM
      simd_arch=i386
-    ;;
+      ;;
    arm*)
      AC_MSG_RESULT([yes (arm)])
      AC_MSG_CHECKING([if the assembler is GNU-compatible and can be used])
      AC_CHECK_COMPATIBLE_ARM_ASSEMBLER_IFELSE(
        [if test "x$ac_use_gas_preprocessor" = "xyes"; then
           AC_MSG_RESULT([yes (with gas-preprocessor)])
         else
           AC_MSG_RESULT([yes])
         fi
         simd_arch=arm],
        [AC_MSG_RESULT([no])
         with_simd=no])
      if test "x${with_simd}" = "xno"; then
        if test "x${require_simd}" = "xyes"; then
          AC_MSG_ERROR([SIMD support can't be enabled.])
        else
          AC_MSG_WARN([SIMD support can't be enabled.  Performance will suffer.])
        fi
      fi
      ;;
    aarch64*)
      AC_MSG_RESULT([yes (arm64)])
      AC_MSG_CHECKING([if the assembler is GNU-compatible and can be used])
      AC_CHECK_COMPATIBLE_ARM64_ASSEMBLER_IFELSE(
        [if test "x$ac_use_gas_preprocessor" = "xyes"; then
           AC_MSG_RESULT([yes (with gas-preprocessor)])
         else
           AC_MSG_RESULT([yes])
         fi
         simd_arch=aarch64],
        [AC_MSG_RESULT([no])
         with_simd=no])
      if test "x${with_simd}" = "xno"; then
        if test "x${require_simd}" = "xyes"; then
          AC_MSG_ERROR([SIMD support can't be enabled.])
        else
          AC_MSG_WARN([SIMD support can't be enabled.  Performance will suffer.])
        fi
      fi
      ;;
    mips*)
      AC_MSG_RESULT([yes (mips)])
      AC_MSG_CHECKING([if the assembler is GNU-compatible and can be used])
      AC_CHECK_COMPATIBLE_MIPS_ASSEMBLER_IFELSE(
        [AC_MSG_RESULT([yes])
         simd_arch=mips],
        [AC_MSG_RESULT([no])
         with_simd=no])
      if test "x${with_simd}" = "xno"; then
        if test "x${require_simd}" = "xyes"; then
          AC_MSG_ERROR([SIMD support can't be enabled.])
        else
          AC_MSG_WARN([SIMD support can't be enabled.  Performance will suffer.])
        fi
      fi
      ;;
    *)
      AC_MSG_RESULT([no ("$host_cpu")])
-      AC_MSG_ERROR([CPU is not supported])
+      with_simd=no;
-    ;;
+      if test "x${require_simd}" = "xyes"; then
        AC_MSG_ERROR([SIMD support not available for this CPU.])
      else
        AC_MSG_WARN([SIMD support not available for this CPU.  Performance will suffer.])
      fi
      ;;
  esac
  if test "x${with_simd}" != "xno"; then
    AC_DEFINE([WITH_SIMD], [1], [Use accelerated SIMD routines.])
  fi
 else
  RPM_CONFIG_ARGS="$RPM_CONFIG_ARGS --without-simd"
 fi
 AM_CONDITIONAL([WITH_SIMD], [test "x$with_simd" != "xno"])
 AM_CONDITIONAL([WITH_SSE_FLOAT_DCT], [test "x$simd_arch" = "xx86_64" -o "x$simd_arch" = "xi386"])
 AM_CONDITIONAL([SIMD_I386], [test "x$simd_arch" = "xi386"])
 AM_CONDITIONAL([SIMD_X86_64], [test "x$simd_arch" = "xx86_64"])
-AM_CONDITIONAL([X86_64], [test "x$host_cpu" = "xx86_64"])
+AM_CONDITIONAL([SIMD_ARM], [test "x$simd_arch" = "xarm"])
 AM_CONDITIONAL([SIMD_ARM_64], [test "x$simd_arch" = "xaarch64"])
 AM_CONDITIONAL([SIMD_MIPS], [test "x$simd_arch" = "xmips"])
 AM_CONDITIONAL([X86_64], [test "x$host_cpu" = "xx86_64" -o "x$host_cpu" = "xamd64"])
 AM_CONDITIONAL([WITH_TURBOJPEG], [test "x$with_turbojpeg" != "xno"])
 AC_ARG_VAR(PKGNAME, [distribution package name (default: libjpeg-turbo)])
 if test "x$PKGNAME" = "x"; then
  PKGNAME=$PACKAGE_NAME
 fi
 AC_SUBST(PKGNAME)
 case "$host_cpu" in
  x86_64)
@@ -168,17 +538,45 @@ case "$host_cpu" in
    RPMARCH=i386
    DEBARCH=i386
    ;;
  *)
    RPMARCH=`uname -m`
    DEBARCH=$RPMARCH
    ;;
 esac
 if test "${docdir}" = ""; then
  docdir=${datadir}/doc
  AC_SUBST(docdir)
 fi
 AC_SUBST(RPMARCH)
 AC_SUBST(RPM_CONFIG_ARGS)
 AC_SUBST(DEBARCH)
 AC_SUBST(BUILD)
 AC_DEFINE_UNQUOTED([BUILD], "$BUILD", [libjpeg-turbo build number])
-# jconfig.h is the file we use, but we have another before that to
+# NOTE: autoheader automatically modifies the input file of the first
-# fool autoheader. the reason is that we include this header in our
+# invocation of AC_CONFIG_HEADERS, so we put config.h first to prevent
-# API headers, which can screw things up for users of the lib.
+# jconfig.h.in from being clobbered.  config.h is used only internally, whereas
-# jconfig.h is a minimal version that allows this package to be built
+# jconfig.h contains macros that are relevant to external programs (macros that
 # specify which features were built into the library.)
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_HEADERS([jconfig.h])
 AC_CONFIG_HEADERS([jconfigint.h])
 AC_CONFIG_FILES([pkgscripts/libjpeg-turbo.spec.tmpl:release/libjpeg-turbo.spec.in])
 AC_CONFIG_FILES([pkgscripts/makecygwinpkg.tmpl:release/makecygwinpkg.in])
 AC_CONFIG_FILES([pkgscripts/makedpkg.tmpl:release/makedpkg.in])
 AC_CONFIG_FILES([pkgscripts/makemacpkg.tmpl:release/makemacpkg.in])
 AC_CONFIG_FILES([pkgscripts/uninstall.tmpl:release/uninstall.in])
 if test "x$with_turbojpeg" != "xno"; then
  AC_CONFIG_FILES([tjbenchtest])
 fi
 if test "x$with_java" = "xyes"; then
  AC_CONFIG_FILES([tjbenchtest.java])
  AC_CONFIG_FILES([tjexampletest])
 fi
 AC_CONFIG_FILES([libjpeg.map])
 AC_CONFIG_FILES([Makefile simd/Makefile])
 AC_CONFIG_FILES([java/Makefile])
 AC_CONFIG_FILES([md5/Makefile])
 AC_OUTPUT
--- a/djpeg.1
+++ b/djpeg.1
@@ -1,4 +1,4 @@
-.TH DJPEG 1 "22 August 1997"
+.TH DJPEG 1 "21 November 2014"
 .SH NAME
 djpeg \- decompress a JPEG file to an image file
 .SH SYNOPSIS
@@ -55,15 +55,19 @@ default options are chosen for highest quality output.)  Currently, this is
 equivalent to \fB\-dct fast \-nosmooth \-onepass \-dither ordered\fR.
 .TP
 .B \-grayscale
-Force gray-scale output even if JPEG file is color.  Useful for viewing on
+Force grayscale output even if JPEG file is color.  Useful for viewing on
 monochrome displays; also,
 .B djpeg
 runs noticeably faster in this mode.
 .TP
 .B \-rgb
 Force RGB output even if JPEG file is grayscale.
 .TP
 .BI \-scale " M/N"
 Scale the output image by a factor M/N.  Currently the scale factor must be
-1/1, 1/2, 1/4, or 1/8.  Scaling is handy if the image is larger than your
+M/8, where M is an integer between 1 and 16 inclusive, or any reduced fraction
-screen; also,
+thereof (such as 1/2, 3/4, etc.)  Scaling is handy if the image is larger than
 your screen; also,
 .B djpeg
 runs much faster when scaling down the output.
 .TP
@@ -73,7 +77,7 @@ emitted if
 .B \-colors
 or
 .B \-grayscale
-is specified, or if the JPEG file is gray-scale; otherwise, 24-bit full-color
+is specified, or if the JPEG file is grayscale; otherwise, 24-bit full-color
 format is emitted.
 .TP
 .B \-gif
@@ -87,12 +91,12 @@ emitted if
 .B \-colors
 or
 .B \-grayscale
-is specified, or if the JPEG file is gray-scale; otherwise, 24-bit full-color
+is specified, or if the JPEG file is grayscale; otherwise, 24-bit full-color
 format is emitted.
 .TP
 .B \-pnm
 Select PBMPLUS (PPM/PGM) output format (this is the default format).
-PGM is emitted if the JPEG file is gray-scale or if
+PGM is emitted if the JPEG file is grayscale or if
 .B \-grayscale
 is specified; otherwise PPM is emitted.
 .TP
@@ -100,8 +104,8 @@ is specified; otherwise PPM is emitted.
 Select RLE output format.  (Requires URT library.)
 .TP
 .B \-targa
-Select Targa output format.  Gray-scale format is emitted if the JPEG file is
+Select Targa output format.  Grayscale format is emitted if the JPEG file is
-gray-scale or if
+grayscale or if
 .B \-grayscale
 is specified; otherwise, colormapped format is emitted if
 .B \-colors
@@ -114,14 +118,28 @@ Use integer DCT method (default).
 .TP
 .B \-dct fast
 Use fast integer DCT (less accurate).
 In libjpeg-turbo, the fast method is generally about 5-15% faster than the int
 method when using the x86/x86-64 SIMD extensions (results may vary with other
 SIMD implementations, or when using libjpeg-turbo without SIMD extensions.)  If
 the JPEG image was compressed using a quality level of 85 or below, then there
 should be little or no perceptible difference between the two algorithms.  When
 decompressing images that were compressed using quality levels above 85,
 however, the difference between the fast and int methods becomes more
 pronounced.  With images compressed using quality=97, for instance, the fast
 method incurs generally about a 4-6 dB loss (in PSNR) relative to the int
 method, but this can be larger for some images.  If you can avoid it, do not
 use the fast method when decompressing images that were compressed using
 quality levels above 97.  The algorithm often degenerates for such images and
 can actually produce a more lossy output image than if the JPEG image had been
 compressed using lower quality levels.
 .TP
 .B \-dct float
 Use floating-point DCT method.
-The float method is very slightly more accurate than the int method, but is
+The float method is mainly a legacy feature.  It does not produce significantly
-much slower unless your machine has very fast floating-point hardware.  Also
+more accurate results than the int method, and it is much slower.  The float
-note that results of the floating-point method may vary slightly across
+method may also give different results on different machines due to varying
-machines, while the integer methods should give the same results everywhere.
+roundoff behavior, whereas the integer methods should give the same results on
-The fast integer method is much less accurate than the other two.
+all machines.
 .TP
 .B \-dither fs
 Use Floyd-Steinberg dithering in color quantization.
@@ -159,7 +177,7 @@ faster and needs less memory, but it produces a lower-quality image.
 is ignored unless you also say
 .B \-colors
 .IR N .
-Also, the one-pass method is always used for gray-scale output (the two-pass
+Also, the one-pass method is always used for grayscale output (the two-pass
 method is no improvement then).
 .TP
 .BI \-maxmemory " N"
@@ -172,6 +190,10 @@ selects 4000000 bytes.  If more space is needed, temporary files will be used.
 .BI \-outfile " name"
 Send output image to the named file, not to standard output.
 .TP
 .BI \-memsrc
 Load input file into memory before decompressing.  This feature was implemented
 mainly as a way of testing the in-memory source manager (jpeg_mem_src().)
 .TP
 .B \-verbose
 Enable debug printout.  More
 .BR \-v 's
@@ -180,6 +202,9 @@ give more output.  Also, version information is printed at startup.
 .B \-debug
 Same as
 .BR \-verbose .
 .TP
 .B \-version
 Print version information and exit.
 .SH EXAMPLES
 .LP
 This example decompresses the JPEG file foo.jpg, quantizes it to
@@ -242,12 +267,12 @@ Wallace, Gregory K.  "The JPEG Still Picture Compression Standard",
 Communications of the ACM, April 1991 (vol. 34, no. 4), pp. 30-44.
 .SH AUTHOR
 Independent JPEG Group
 .SH BUGS
 Arithmetic coding is not supported for legal reasons.
 .PP
 This file was modified by The libjpeg-turbo Project to include only information
 relevant to libjpeg-turbo, to wordsmith certain sections, and to describe
 features not present in libjpeg.
 .SH BUGS
 To avoid the Unisys LZW patent,
 .B djpeg
 produces uncompressed GIF files.  These are larger than they should be, but
 are readable by standard GIF decoders.
 .PP
 Still not as fast as we'd like.
--- a/djpeg.c
+++ b/djpeg.c
@@ -1,8 +1,10 @@
 /*
 * djpeg.c
 *
 * This file was part of the Independent JPEG Group's software:
 * Copyright (C) 1991-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
+ * libjpeg-turbo Modifications:
 * Copyright (C) 2010-2011, 2013-2014, D. R. Commander.
 * For conditions of distribution and use, see the accompanying README file.
 *
 * This file contains a command-line user interface for the JPEG decompressor.
@@ -10,8 +12,8 @@
 *
 * Two different command line styles are permitted, depending on the
 * compile-time switch TWO_FILE_COMMANDLINE:
- *	djpeg [options]  inputfile outputfile
+ *      djpeg [options]  inputfile outputfile
- *	djpeg [options]  [inputfile]
+ *      djpeg [options]  [inputfile]
 * In the second style, output is always to standard output, which you'd
 * normally redirect to a file or pipe to some other program.  Input is
 * either from a named file or from standard input (typically redirected).
@@ -19,29 +21,30 @@
 * don't support pipes.  Also, you MUST use the first style if your system
 * doesn't do binary I/O to stdin/stdout.
 * To simplify script writing, the "-outfile" switch is provided.  The syntax
- *	djpeg [options]  -outfile outputfile  inputfile
+ *      djpeg [options]  -outfile outputfile  inputfile
 * works regardless of which command line style is used.
 */
-#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */
+#include "cdjpeg.h"             /* Common decls for cjpeg/djpeg applications */
-#include "jversion.h"		/* for version message */
+#include "jversion.h"           /* for version message */
 #include "jconfigint.h"
-#include <ctype.h>		/* to declare isprint() */
+#include <ctype.h>              /* to declare isprint() */
-#ifdef USE_CCOMMAND		/* command-line reader for Macintosh */
+#ifdef USE_CCOMMAND             /* command-line reader for Macintosh */
 #ifdef __MWERKS__
 #include <SIOUX.h>              /* Metrowerks needs this */
-#include <console.h>		/* ... and this */
+#include <console.h>            /* ... and this */
 #endif
 #ifdef THINK_C
-#include <console.h>		/* Think declares it here */
+#include <console.h>            /* Think declares it here */
 #endif
 #endif
 /* Create the add-on message string table. */
-#define JMESSAGE(code,string)	string ,
+#define JMESSAGE(code,string)   string ,
 static const char * const cdjpeg_message_table[] = {
 #include "cderror.h"
@@ -57,17 +60,17 @@ static const char * const cdjpeg_message_table[] = {
 */
 typedef enum {
-	FMT_BMP,		/* BMP format (Windows flavor) */
+        FMT_BMP,                /* BMP format (Windows flavor) */
-	FMT_GIF,		/* GIF format */
+        FMT_GIF,                /* GIF format */
-	FMT_OS2,		/* BMP format (OS/2 flavor) */
+        FMT_OS2,                /* BMP format (OS/2 flavor) */
-	FMT_PPM,		/* PPM/PGM (PBMPLUS formats) */
+        FMT_PPM,                /* PPM/PGM (PBMPLUS formats) */
-	FMT_RLE,		/* RLE format */
+        FMT_RLE,                /* RLE format */
-	FMT_TARGA,		/* Targa format */
+        FMT_TARGA,              /* Targa format */
-	FMT_TIFF		/* TIFF format */
+        FMT_TIFF                /* TIFF format */
 } IMAGE_FORMATS;
-#ifndef DEFAULT_FMT		/* so can override from CFLAGS in Makefile */
+#ifndef DEFAULT_FMT             /* so can override from CFLAGS in Makefile */
-#define DEFAULT_FMT	FMT_PPM
+#define DEFAULT_FMT     FMT_PPM
 #endif
 static IMAGE_FORMATS requested_fmt;
@@ -82,8 +85,10 @@ static IMAGE_FORMATS requested_fmt;
 */
-static const char * progname;	/* program name for error messages */
+static const char * progname;   /* program name for error messages */
-static char * outfilename;	/* for -outfile switch */
+static char * outfilename;      /* for -outfile switch */
 boolean memsrc;  /* for -memsrc switch */
 #define INPUT_BUF_SIZE  4096
 LOCAL(void)
@@ -101,45 +106,47 @@ usage (void)
  fprintf(stderr, "  -colors N      Reduce image to no more than N colors\n");
  fprintf(stderr, "  -fast          Fast, low-quality processing\n");
  fprintf(stderr, "  -grayscale     Force grayscale output\n");
  fprintf(stderr, "  -rgb           Force RGB output\n");
  fprintf(stderr, "  -rgb565        Force RGB565 output\n");
 #ifdef IDCT_SCALING_SUPPORTED
  fprintf(stderr, "  -scale M/N     Scale output image by fraction M/N, eg, 1/8\n");
 #endif
 #ifdef BMP_SUPPORTED
  fprintf(stderr, "  -bmp           Select BMP output format (Windows style)%s\n",
-	  (DEFAULT_FMT == FMT_BMP ? " (default)" : ""));
+          (DEFAULT_FMT == FMT_BMP ? " (default)" : ""));
 #endif
 #ifdef GIF_SUPPORTED
  fprintf(stderr, "  -gif           Select GIF output format%s\n",
-	  (DEFAULT_FMT == FMT_GIF ? " (default)" : ""));
+          (DEFAULT_FMT == FMT_GIF ? " (default)" : ""));
 #endif
 #ifdef BMP_SUPPORTED
  fprintf(stderr, "  -os2           Select BMP output format (OS/2 style)%s\n",
-	  (DEFAULT_FMT == FMT_OS2 ? " (default)" : ""));
+          (DEFAULT_FMT == FMT_OS2 ? " (default)" : ""));
 #endif
 #ifdef PPM_SUPPORTED
  fprintf(stderr, "  -pnm           Select PBMPLUS (PPM/PGM) output format%s\n",
-	  (DEFAULT_FMT == FMT_PPM ? " (default)" : ""));
+          (DEFAULT_FMT == FMT_PPM ? " (default)" : ""));
 #endif
 #ifdef RLE_SUPPORTED
  fprintf(stderr, "  -rle           Select Utah RLE output format%s\n",
-	  (DEFAULT_FMT == FMT_RLE ? " (default)" : ""));
+          (DEFAULT_FMT == FMT_RLE ? " (default)" : ""));
 #endif
 #ifdef TARGA_SUPPORTED
  fprintf(stderr, "  -targa         Select Targa output format%s\n",
-	  (DEFAULT_FMT == FMT_TARGA ? " (default)" : ""));
+          (DEFAULT_FMT == FMT_TARGA ? " (default)" : ""));
 #endif
  fprintf(stderr, "Switches for advanced users:\n");
 #ifdef DCT_ISLOW_SUPPORTED
  fprintf(stderr, "  -dct int       Use integer DCT method%s\n",
-	  (JDCT_DEFAULT == JDCT_ISLOW ? " (default)" : ""));
+          (JDCT_DEFAULT == JDCT_ISLOW ? " (default)" : ""));
 #endif
 #ifdef DCT_IFAST_SUPPORTED
  fprintf(stderr, "  -dct fast      Use fast integer DCT (less accurate)%s\n",
-	  (JDCT_DEFAULT == JDCT_IFAST ? " (default)" : ""));
+          (JDCT_DEFAULT == JDCT_IFAST ? " (default)" : ""));
 #endif
 #ifdef DCT_FLOAT_SUPPORTED
  fprintf(stderr, "  -dct float     Use floating-point DCT method%s\n",
-	  (JDCT_DEFAULT == JDCT_FLOAT ? " (default)" : ""));
+          (JDCT_DEFAULT == JDCT_FLOAT ? " (default)" : ""));
 #endif
  fprintf(stderr, "  -dither fs     Use F-S dithering (default)\n");
  fprintf(stderr, "  -dither none   Don't use dithering in quantization\n");
@@ -153,14 +160,19 @@ usage (void)
 #endif
  fprintf(stderr, "  -maxmemory N   Maximum memory to use (in kbytes)\n");
  fprintf(stderr, "  -outfile name  Specify name for output file\n");
 #if JPEG_LIB_VERSION >= 80 || defined(MEM_SRCDST_SUPPORTED)
  fprintf(stderr, "  -memsrc        Load input file into memory before decompressing\n");
 #endif
  fprintf(stderr, "  -verbose  or  -debug   Emit debug output\n");
  fprintf(stderr, "  -version       Print version information and exit\n");
  exit(EXIT_FAILURE);
 }
 LOCAL(int)
 parse_switches (j_decompress_ptr cinfo, int argc, char **argv,
-		int last_file_arg_seen, boolean for_real)
+                int last_file_arg_seen, boolean for_real)
 /* Parse optional switches.
 * Returns argv[] index of first file-name argument (== argc if none).
 * Any file names with indexes <= last_file_arg_seen are ignored;
@@ -174,8 +186,9 @@ parse_switches (j_decompress_ptr cinfo, int argc, char **argv,
  char * arg;
  /* Set up default JPEG parameters. */
-  requested_fmt = DEFAULT_FMT;	/* set default output file format */
+  requested_fmt = DEFAULT_FMT;  /* set default output file format */
  outfilename = NULL;
  memsrc = FALSE;
  cinfo->err->trace_level = 0;
  /* Scan command line options, adjust parameters */
@@ -185,54 +198,54 @@ parse_switches (j_decompress_ptr cinfo, int argc, char **argv,
    if (*arg != '-') {
      /* Not a switch, must be a file name argument */
      if (argn <= last_file_arg_seen) {
-	outfilename = NULL;	/* -outfile applies to just one input file */
+        outfilename = NULL;     /* -outfile applies to just one input file */
-	continue;		/* ignore this name if previously processed */
+        continue;               /* ignore this name if previously processed */
      }
-      break;			/* else done parsing switches */
+      break;                    /* else done parsing switches */
    }
-    arg++;			/* advance past switch marker character */
+    arg++;                      /* advance past switch marker character */
    if (keymatch(arg, "bmp", 1)) {
      /* BMP output format. */
      requested_fmt = FMT_BMP;
    } else if (keymatch(arg, "colors", 1) || keymatch(arg, "colours", 1) ||
-	       keymatch(arg, "quantize", 1) || keymatch(arg, "quantise", 1)) {
+               keymatch(arg, "quantize", 1) || keymatch(arg, "quantise", 1)) {
      /* Do color quantization. */
      int val;
-      if (++argn >= argc)	/* advance to next argument */
+      if (++argn >= argc)       /* advance to next argument */
-	usage();
+        usage();
      if (sscanf(argv[argn], "%d", &val) != 1)
-	usage();
+        usage();
      cinfo->desired_number_of_colors = val;
      cinfo->quantize_colors = TRUE;
    } else if (keymatch(arg, "dct", 2)) {
      /* Select IDCT algorithm. */
-      if (++argn >= argc)	/* advance to next argument */
+      if (++argn >= argc)       /* advance to next argument */
-	usage();
+        usage();
      if (keymatch(argv[argn], "int", 1)) {
-	cinfo->dct_method = JDCT_ISLOW;
+        cinfo->dct_method = JDCT_ISLOW;
      } else if (keymatch(argv[argn], "fast", 2)) {
-	cinfo->dct_method = JDCT_IFAST;
+        cinfo->dct_method = JDCT_IFAST;
      } else if (keymatch(argv[argn], "float", 2)) {
-	cinfo->dct_method = JDCT_FLOAT;
+        cinfo->dct_method = JDCT_FLOAT;
      } else
-	usage();
+        usage();
    } else if (keymatch(arg, "dither", 2)) {
      /* Select dithering algorithm. */
-      if (++argn >= argc)	/* advance to next argument */
+      if (++argn >= argc)       /* advance to next argument */
-	usage();
+        usage();
      if (keymatch(argv[argn], "fs", 2)) {
-	cinfo->dither_mode = JDITHER_FS;
+        cinfo->dither_mode = JDITHER_FS;
      } else if (keymatch(argv[argn], "none", 2)) {
-	cinfo->dither_mode = JDITHER_NONE;
+        cinfo->dither_mode = JDITHER_NONE;
      } else if (keymatch(argv[argn], "ordered", 2)) {
-	cinfo->dither_mode = JDITHER_ORDERED;
+        cinfo->dither_mode = JDITHER_ORDERED;
      } else
-	usage();
+        usage();
    } else if (keymatch(arg, "debug", 1) || keymatch(arg, "verbose", 1)) {
      /* Enable debug printouts. */
@@ -240,18 +253,26 @@ parse_switches (j_decompress_ptr cinfo, int argc, char **argv,
      static boolean printed_version = FALSE;
      if (! printed_version) {
-	fprintf(stderr, "Independent JPEG Group's DJPEG, version %s\n%s\n",
+        fprintf(stderr, "%s version %s (build %s)\n",
-		JVERSION, JCOPYRIGHT);
+                PACKAGE_NAME, VERSION, BUILD);
-	printed_version = TRUE;
+        fprintf(stderr, "%s\n\n", JCOPYRIGHT);
        fprintf(stderr, "Emulating The Independent JPEG Group's software, version %s\n\n",
                JVERSION);
        printed_version = TRUE;
      }
      cinfo->err->trace_level++;
    } else if (keymatch(arg, "version", 4)) {
      fprintf(stderr, "%s version %s (build %s)\n",
              PACKAGE_NAME, VERSION, BUILD);
      exit(EXIT_SUCCESS);
    } else if (keymatch(arg, "fast", 1)) {
      /* Select recommended processing options for quick-and-dirty output. */
      cinfo->two_pass_quantize = FALSE;
      cinfo->dither_mode = JDITHER_ORDERED;
      if (! cinfo->quantize_colors) /* don't override an earlier -colors */
-	cinfo->desired_number_of_colors = 216;
+        cinfo->desired_number_of_colors = 216;
      cinfo->dct_method = JDCT_FASTEST;
      cinfo->do_fancy_upsampling = FALSE;
@@ -263,23 +284,31 @@ parse_switches (j_decompress_ptr cinfo, int argc, char **argv,
      /* Force monochrome output. */
      cinfo->out_color_space = JCS_GRAYSCALE;
    } else if (keymatch(arg, "rgb", 2)) {
      /* Force RGB output. */
      cinfo->out_color_space = JCS_RGB;
    } else if (keymatch(arg, "rgb565", 2)) {
      /* Force RGB565 output. */
      cinfo->out_color_space = JCS_RGB565;
    } else if (keymatch(arg, "map", 3)) {
      /* Quantize to a color map taken from an input file. */
-      if (++argn >= argc)	/* advance to next argument */
+      if (++argn >= argc)       /* advance to next argument */
-	usage();
+        usage();
-      if (for_real) {		/* too expensive to do twice! */
+      if (for_real) {           /* too expensive to do twice! */
-#ifdef QUANT_2PASS_SUPPORTED	/* otherwise can't quantize to supplied map */
+#ifdef QUANT_2PASS_SUPPORTED    /* otherwise can't quantize to supplied map */
-	FILE * mapfile;
+        FILE * mapfile;
-	if ((mapfile = fopen(argv[argn], READ_BINARY)) == NULL) {
+        if ((mapfile = fopen(argv[argn], READ_BINARY)) == NULL) {
-	  fprintf(stderr, "%s: can't open %s\n", progname, argv[argn]);
+          fprintf(stderr, "%s: can't open %s\n", progname, argv[argn]);
-	  exit(EXIT_FAILURE);
+          exit(EXIT_FAILURE);
-	}
+        }
-	read_color_map(cinfo, mapfile);
+        read_color_map(cinfo, mapfile);
-	fclose(mapfile);
+        fclose(mapfile);
-	cinfo->quantize_colors = TRUE;
+        cinfo->quantize_colors = TRUE;
 #else
-	ERREXIT(cinfo, JERR_NOT_COMPILED);
+        ERREXIT(cinfo, JERR_NOT_COMPILED);
 #endif
      }
@@ -288,12 +317,12 @@ parse_switches (j_decompress_ptr cinfo, int argc, char **argv,
      long lval;
      char ch = 'x';
-      if (++argn >= argc)	/* advance to next argument */
+      if (++argn >= argc)       /* advance to next argument */
-	usage();
+        usage();
      if (sscanf(argv[argn], "%ld%c", &lval, &ch) < 1)
-	usage();
+        usage();
      if (ch == 'm' || ch == 'M')
-	lval *= 1000L;
+        lval *= 1000L;
      cinfo->mem->max_memory_to_use = lval * 1000L;
    } else if (keymatch(arg, "nosmooth", 3)) {
@@ -310,9 +339,19 @@ parse_switches (j_decompress_ptr cinfo, int argc, char **argv,
    } else if (keymatch(arg, "outfile", 4)) {
      /* Set output file name. */
-      if (++argn >= argc)	/* advance to next argument */
+      if (++argn >= argc)       /* advance to next argument */
-	usage();
+        usage();
-      outfilename = argv[argn];	/* save it away for later use */
+      outfilename = argv[argn]; /* save it away for later use */
    } else if (keymatch(arg, "memsrc", 2)) {
      /* Use in-memory source manager */
 #if JPEG_LIB_VERSION >= 80 || defined(MEM_SRCDST_SUPPORTED)
      memsrc = TRUE;
 #else
      fprintf(stderr, "%s: sorry, in-memory source manager was not compiled in\n",
              progname);
      exit(EXIT_FAILURE);
 #endif
    } else if (keymatch(arg, "pnm", 1) || keymatch(arg, "ppm", 1)) {
      /* PPM/PGM output format. */
@@ -324,22 +363,22 @@ parse_switches (j_decompress_ptr cinfo, int argc, char **argv,
    } else if (keymatch(arg, "scale", 1)) {
      /* Scale the output image by a fraction M/N. */
-      if (++argn >= argc)	/* advance to next argument */
+      if (++argn >= argc)       /* advance to next argument */
-	usage();
+        usage();
      if (sscanf(argv[argn], "%d/%d",
-		 &cinfo->scale_num, &cinfo->scale_denom) != 2)
+                 &cinfo->scale_num, &cinfo->scale_denom) != 2)
-	usage();
+        usage();
    } else if (keymatch(arg, "targa", 1)) {
      /* Targa output format. */
      requested_fmt = FMT_TARGA;
    } else {
-      usage();			/* bogus switch */
+      usage();                  /* bogus switch */
    }
  }
-  return argn;			/* return index of next arg (file name) */
+  return argn;                  /* return index of next arg (file name) */
 }
@@ -375,14 +414,14 @@ print_text_marker (j_decompress_ptr cinfo)
  length = jpeg_getc(cinfo) << 8;
  length += jpeg_getc(cinfo);
-  length -= 2;			/* discount the length word itself */
+  length -= 2;                  /* discount the length word itself */
  if (traceit) {
    if (cinfo->unread_marker == JPEG_COM)
      fprintf(stderr, "Comment, length %ld:\n", (long) length);
-    else			/* assume it is an APPn otherwise */
+    else                        /* assume it is an APPn otherwise */
      fprintf(stderr, "APP%d, length %ld:\n",
-	      cinfo->unread_marker - JPEG_APP0, (long) length);
+              cinfo->unread_marker - JPEG_APP0, (long) length);
  }
  while (--length >= 0) {
@@ -394,16 +433,16 @@ print_text_marker (j_decompress_ptr cinfo)
       * Newlines in CR, CR/LF, or LF form will be printed as one newline.
       */
      if (ch == '\r') {
-	fprintf(stderr, "\n");
+        fprintf(stderr, "\n");
      } else if (ch == '\n') {
-	if (lastch != '\r')
+        if (lastch != '\r')
-	  fprintf(stderr, "\n");
+          fprintf(stderr, "\n");
      } else if (ch == '\\') {
-	fprintf(stderr, "\\\\");
+        fprintf(stderr, "\\\\");
      } else if (isprint(ch)) {
-	putc(ch, stderr);
+        putc(ch, stderr);
      } else {
-	fprintf(stderr, "\\%03o", ch);
+        fprintf(stderr, "\\%03o", ch);
      }
      lastch = ch;
    }
@@ -432,6 +471,8 @@ main (int argc, char **argv)
  djpeg_dest_ptr dest_mgr = NULL;
  FILE * input_file;
  FILE * output_file;
  unsigned char *inbuffer = NULL;
  unsigned long insize = 0;
  JDIMENSION num_scanlines;
  /* On Mac, fetch a command line. */
@@ -441,7 +482,7 @@ main (int argc, char **argv)
  progname = argv[0];
  if (progname == NULL || progname[0] == 0)
-    progname = "djpeg";		/* in case C library doesn't provide it */
+    progname = "djpeg";         /* in case C library doesn't provide it */
  /* Initialize the JPEG decompression object with default error handling. */
  cinfo.err = jpeg_std_error(&jerr);
@@ -455,16 +496,11 @@ main (int argc, char **argv)
   * APP12 is used by some digital camera makers for textual info,
   * so we provide the ability to display it as text.
   * If you like, additional APPn marker types can be selected for display,
-   * but don't try to override APP0 or APP14 this way (see libjpeg.doc).
+   * but don't try to override APP0 or APP14 this way (see libjpeg.txt).
   */
  jpeg_set_marker_processor(&cinfo, JPEG_COM, print_text_marker);
  jpeg_set_marker_processor(&cinfo, JPEG_APP0+12, print_text_marker);
  /* Now safe to enable signal catcher. */
 #ifdef NEED_SIGNAL_CATCHER
  enable_signal_catcher((j_common_ptr) &cinfo);
 #endif
  /* Scan command line to find file names. */
  /* It is convenient to use just one switch-parsing routine, but the switch
   * values read here are ignored; we will rescan the switches after opening
@@ -480,14 +516,14 @@ main (int argc, char **argv)
  if (outfilename == NULL) {
    if (file_index != argc-2) {
      fprintf(stderr, "%s: must name one input and one output file\n",
-	      progname);
+              progname);
      usage();
    }
    outfilename = argv[file_index+1];
  } else {
    if (file_index != argc-1) {
      fprintf(stderr, "%s: must name one input and one output file\n",
-	      progname);
+              progname);
      usage();
    }
  }
@@ -526,7 +562,30 @@ main (int argc, char **argv)
 #endif
  /* Specify data source for decompression */
-  jpeg_stdio_src(&cinfo, input_file);
+#if JPEG_LIB_VERSION >= 80 || defined(MEM_SRCDST_SUPPORTED)
  if (memsrc) {
    size_t nbytes;
    do {
      inbuffer = (unsigned char *)realloc(inbuffer, insize + INPUT_BUF_SIZE);
      if (inbuffer == NULL) {
        fprintf(stderr, "%s: memory allocation failure\n", progname);
        exit(EXIT_FAILURE);
      }
      nbytes = JFREAD(input_file, &inbuffer[insize], INPUT_BUF_SIZE);
      if (nbytes < INPUT_BUF_SIZE && ferror(input_file)) {
        if (file_index < argc)
          fprintf(stderr, "%s: can't read from %s\n", progname,
                  argv[file_index]);
        else
          fprintf(stderr, "%s: can't read from stdin\n", progname);
      }
      insize += (unsigned long)nbytes;
    } while (nbytes == INPUT_BUF_SIZE);
    fprintf(stderr, "Compressed size:  %lu bytes\n", insize);
    jpeg_mem_src(&cinfo, inbuffer, insize);
  } else
 #endif
    jpeg_stdio_src(&cinfo, input_file);
  /* Read file header, set default decompression parameters */
  (void) jpeg_read_header(&cinfo, TRUE);
@@ -581,7 +640,7 @@ main (int argc, char **argv)
  /* Process data */
  while (cinfo.output_scanline < cinfo.output_height) {
    num_scanlines = jpeg_read_scanlines(&cinfo, dest_mgr->buffer,
-					dest_mgr->buffer_height);
+                                        dest_mgr->buffer_height);
    (*dest_mgr->put_pixel_rows) (&cinfo, dest_mgr, num_scanlines);
  }
@@ -610,7 +669,10 @@ main (int argc, char **argv)
  end_progress_monitor((j_common_ptr) &cinfo);
 #endif
  if (memsrc && inbuffer != NULL)
    free(inbuffer);
  /* All done. */
  exit(jerr.num_warnings ? EXIT_WARNING : EXIT_SUCCESS);
-  return 0;			/* suppress no-return-value warnings */
+  return 0;                     /* suppress no-return-value warnings */
 }
--- a/doc/html/annotated.html
+++ b/doc/html/annotated.html
@@ -0,0 +1,104 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <meta name="generator" content="Doxygen 1.8.3.1"/>
 <title>TurboJPEG: Data Structures</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/search.js"></script>
 <script type="text/javascript">
  $(document).ready(function() { searchBox.OnSelectItem(0); });
 </script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="doxygen-extra.css" rel="stylesheet" type="text/css"/>
 </head>
 <body>
 <div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
 <tbody>
 <tr style="height: 56px;">
  <td style="padding-left: 0.5em;">
   <div id="projectname">TurboJPEG
   &#160;<span id="projectnumber">1.4</span>
   </div>
  </td>
 </tr>
 </tbody>
 </table>
 </div>
 <!-- end header part -->
 <!-- Generated by Doxygen 1.8.3.1 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
  <div id="navrow1" class="tabs">
    <ul class="tablist">
      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
      <li><a href="modules.html"><span>Modules</span></a></li>
      <li class="current"><a href="annotated.html"><span>Data&#160;Structures</span></a></li>
      <li>
        <div id="MSearchBox" class="MSearchBoxInactive">
        <span class="left">
          <img id="MSearchSelect" src="search/mag_sel.png"
               onmouseover="return searchBox.OnSearchSelectShow()"
               onmouseout="return searchBox.OnSearchSelectHide()"
               alt=""/>
          <input type="text" id="MSearchField" value="Search" accesskey="S"
               onfocus="searchBox.OnSearchFieldFocus(true)" 
               onblur="searchBox.OnSearchFieldFocus(false)" 
               onkeyup="searchBox.OnSearchFieldChange(event)"/>
          </span><span class="right">
            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
          </span>
        </div>
      </li>
    </ul>
  </div>
  <div id="navrow2" class="tabs2">
    <ul class="tablist">
      <li class="current"><a href="annotated.html"><span>Data&#160;Structures</span></a></li>
      <li><a href="classes.html"><span>Data&#160;Structure&#160;Index</span></a></li>
      <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
    </ul>
  </div>
 </div><!-- top -->
 <!-- window showing the filter options -->
 <div id="MSearchSelectWindow"
     onmouseover="return searchBox.OnSearchSelectShow()"
     onmouseout="return searchBox.OnSearchSelectHide()"
     onkeydown="return searchBox.OnSearchSelectKey(event)">
 <a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(0)"><span class="SelectionMark">&#160;</span>All</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(1)"><span class="SelectionMark">&#160;</span>Data Structures</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(2)"><span class="SelectionMark">&#160;</span>Functions</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(3)"><span class="SelectionMark">&#160;</span>Variables</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(4)"><span class="SelectionMark">&#160;</span>Typedefs</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(5)"><span class="SelectionMark">&#160;</span>Enumerations</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(6)"><span class="SelectionMark">&#160;</span>Enumerator</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(7)"><span class="SelectionMark">&#160;</span>Groups</a></div>
 <!-- iframe showing the search results (closed by default) -->
 <div id="MSearchResultsWindow">
 <iframe src="javascript:void(0)" frameborder="0" 
        name="MSearchResults" id="MSearchResults">
 </iframe>
 </div>
 <div class="header">
  <div class="headertitle">
 <div class="title">Data Structures</div>  </div>
 </div><!--header-->
 <div class="contents">
 <div class="textblock">Here are the data structures with brief descriptions:</div><div class="directory">
 <table class="directory">
 <tr id="row_0_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structtjregion.html" target="_self">tjregion</a></td><td class="desc">Cropping region</td></tr>
 <tr id="row_1_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structtjscalingfactor.html" target="_self">tjscalingfactor</a></td><td class="desc">Scaling factor</td></tr>
 <tr id="row_2_" class="even"><td class="entry"><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structtjtransform.html" target="_self">tjtransform</a></td><td class="desc">Lossless transform</td></tr>
 </table>
 </div><!-- directory -->
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
 Generated by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.3.1
 </small></address>
 </body>
 </html>
--- a/doc/html/bc_s.png
+++ b/doc/html/bc_s.png
--- a/doc/html/bdwn.png
+++ b/doc/html/bdwn.png
--- a/doc/html/classes.html
+++ b/doc/html/classes.html
@@ -0,0 +1,106 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <meta name="generator" content="Doxygen 1.8.3.1"/>
 <title>TurboJPEG: Data Structure Index</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/search.js"></script>
 <script type="text/javascript">
  $(document).ready(function() { searchBox.OnSelectItem(0); });
 </script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="doxygen-extra.css" rel="stylesheet" type="text/css"/>
 </head>
 <body>
 <div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
 <tbody>
 <tr style="height: 56px;">
  <td style="padding-left: 0.5em;">
   <div id="projectname">TurboJPEG
   &#160;<span id="projectnumber">1.4</span>
   </div>
  </td>
 </tr>
 </tbody>
 </table>
 </div>
 <!-- end header part -->
 <!-- Generated by Doxygen 1.8.3.1 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
  <div id="navrow1" class="tabs">
    <ul class="tablist">
      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
      <li><a href="modules.html"><span>Modules</span></a></li>
      <li class="current"><a href="annotated.html"><span>Data&#160;Structures</span></a></li>
      <li>
        <div id="MSearchBox" class="MSearchBoxInactive">
        <span class="left">
          <img id="MSearchSelect" src="search/mag_sel.png"
               onmouseover="return searchBox.OnSearchSelectShow()"
               onmouseout="return searchBox.OnSearchSelectHide()"
               alt=""/>
          <input type="text" id="MSearchField" value="Search" accesskey="S"
               onfocus="searchBox.OnSearchFieldFocus(true)" 
               onblur="searchBox.OnSearchFieldFocus(false)" 
               onkeyup="searchBox.OnSearchFieldChange(event)"/>
          </span><span class="right">
            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
          </span>
        </div>
      </li>
    </ul>
  </div>
  <div id="navrow2" class="tabs2">
    <ul class="tablist">
      <li><a href="annotated.html"><span>Data&#160;Structures</span></a></li>
      <li class="current"><a href="classes.html"><span>Data&#160;Structure&#160;Index</span></a></li>
      <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
    </ul>
  </div>
 </div><!-- top -->
 <!-- window showing the filter options -->
 <div id="MSearchSelectWindow"
     onmouseover="return searchBox.OnSearchSelectShow()"
     onmouseout="return searchBox.OnSearchSelectHide()"
     onkeydown="return searchBox.OnSearchSelectKey(event)">
 <a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(0)"><span class="SelectionMark">&#160;</span>All</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(1)"><span class="SelectionMark">&#160;</span>Data Structures</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(2)"><span class="SelectionMark">&#160;</span>Functions</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(3)"><span class="SelectionMark">&#160;</span>Variables</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(4)"><span class="SelectionMark">&#160;</span>Typedefs</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(5)"><span class="SelectionMark">&#160;</span>Enumerations</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(6)"><span class="SelectionMark">&#160;</span>Enumerator</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(7)"><span class="SelectionMark">&#160;</span>Groups</a></div>
 <!-- iframe showing the search results (closed by default) -->
 <div id="MSearchResultsWindow">
 <iframe src="javascript:void(0)" frameborder="0" 
        name="MSearchResults" id="MSearchResults">
 </iframe>
 </div>
 <div class="header">
  <div class="headertitle">
 <div class="title">Data Structure Index</div>  </div>
 </div><!--header-->
 <div class="contents">
 <div class="qindex"><a class="qindex" href="#letter_T">T</a></div>
 <table style="margin: 10px; white-space: nowrap;" align="center" width="95%" border="0" cellspacing="0" cellpadding="0">
 <tr><td rowspan="2" valign="bottom"><a name="letter_T"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;T&#160;&#160;</div></td></tr></table>
 </td><td valign="top"><a class="el" href="structtjscalingfactor.html">tjscalingfactor</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="structtjtransform.html">tjtransform</a>&#160;&#160;&#160;</td><td></td></tr>
 <tr><td></td><td></td><td></td></tr>
 <tr><td valign="top"><a class="el" href="structtjregion.html">tjregion</a>&#160;&#160;&#160;</td><td></td><td></td><td></td></tr>
 <tr><td></td><td></td><td></td><td></td></tr>
 </table>
 <div class="qindex"><a class="qindex" href="#letter_T">T</a></div>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
 Generated by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.3.1
 </small></address>
 </body>
 </html>
--- a/doc/html/closed.png
+++ b/doc/html/closed.png
--- a/doc/html/doxygen-extra.css
+++ b/doc/html/doxygen-extra.css
@@ -0,0 +1,3 @@
 code {
 	color: #4665A2; 
 }
--- a/doc/html/doxygen.css
+++ b/doc/html/doxygen.css
--- a/doc/html/doxygen.png
+++ b/doc/html/doxygen.png
--- a/doc/html/dynsections.js
+++ b/doc/html/dynsections.js
@@ -0,0 +1,97 @@
 function toggleVisibility(linkObj)
 {
 var base = $(linkObj).attr('id');
 var summary = $('#'+base+'-summary');
 var content = $('#'+base+'-content');
 var trigger = $('#'+base+'-trigger');
 var src=$(trigger).attr('src');
 if (content.is(':visible')===true) {
   content.hide();
   summary.show();
   $(linkObj).addClass('closed').removeClass('opened');
   $(trigger).attr('src',src.substring(0,src.length-8)+'closed.png');
 } else {
   content.show();
   summary.hide();
   $(linkObj).removeClass('closed').addClass('opened');
   $(trigger).attr('src',src.substring(0,src.length-10)+'open.png');
 } 
 return false;
 }
 function updateStripes()
 {
  $('table.directory tr').
       removeClass('even').filter(':visible:even').addClass('even');
 }
 function toggleLevel(level)
 {
  $('table.directory tr').each(function(){ 
    var l = this.id.split('_').length-1;
    var i = $('#img'+this.id.substring(3));
    var a = $('#arr'+this.id.substring(3));
    if (l<level+1) {
      i.attr('src','ftv2folderopen.png');
      a.attr('src','ftv2mnode.png');
      $(this).show();
    } else if (l==level+1) {
      i.attr('src','ftv2folderclosed.png');
      a.attr('src','ftv2pnode.png');
      $(this).show();
    } else {
      $(this).hide();
    }
  });
  updateStripes();
 }
 function toggleFolder(id)
 {
  //The clicked row
  var currentRow = $('#row_'+id);
  var currentRowImages = currentRow.find("img");
  //All rows after the clicked row
  var rows = currentRow.nextAll("tr");
  //Only match elements AFTER this one (can't hide elements before)
  var childRows = rows.filter(function() {
    var re = new RegExp('^row_'+id+'\\d+_$', "i"); //only one sub
    return this.id.match(re);
  });
  //First row is visible we are HIDING
  if (childRows.filter(':first').is(':visible')===true) {
    currentRowImages.filter("[id^=arr]").attr('src', 'ftv2pnode.png');
    currentRowImages.filter("[id^=img]").attr('src', 'ftv2folderclosed.png');
    rows.filter("[id^=row_"+id+"]").hide();
  } else { //We are SHOWING
    //All sub images
    var childImages = childRows.find("img");
    var childImg = childImages.filter("[id^=img]");
    var childArr = childImages.filter("[id^=arr]");
    currentRow.find("[id^=arr]").attr('src', 'ftv2mnode.png'); //open row
    currentRow.find("[id^=img]").attr('src', 'ftv2folderopen.png'); //open row
    childImg.attr('src','ftv2folderclosed.png'); //children closed
    childArr.attr('src','ftv2pnode.png'); //children closed
    childRows.show(); //show all children
  }
  updateStripes();
 }
 function toggleInherit(id)
 {
  var rows = $('tr.inherit.'+id);
  var img = $('tr.inherit_header.'+id+' img');
  var src = $(img).attr('src');
  if (rows.filter(':first').is(':visible')===true) {
    rows.css('display','none');
    $(img).attr('src',src.substring(0,src.length-8)+'closed.png');
  } else {
    rows.css('display','table-row'); // using show() causes jump in firefox
    $(img).attr('src',src.substring(0,src.length-10)+'open.png');
  }
 }
--- a/doc/html/ftv2blank.png
+++ b/doc/html/ftv2blank.png
--- a/doc/html/ftv2cl.png
+++ b/doc/html/ftv2cl.png
--- a/doc/html/ftv2doc.png
+++ b/doc/html/ftv2doc.png
--- a/doc/html/ftv2folderclosed.png
+++ b/doc/html/ftv2folderclosed.png
--- a/doc/html/ftv2folderopen.png
+++ b/doc/html/ftv2folderopen.png
--- a/doc/html/ftv2lastnode.png
+++ b/doc/html/ftv2lastnode.png
--- a/doc/html/ftv2link.png
+++ b/doc/html/ftv2link.png
--- a/doc/html/ftv2mlastnode.png
+++ b/doc/html/ftv2mlastnode.png
--- a/doc/html/ftv2mnode.png
+++ b/doc/html/ftv2mnode.png
--- a/doc/html/ftv2mo.png
+++ b/doc/html/ftv2mo.png
--- a/doc/html/ftv2node.png
+++ b/doc/html/ftv2node.png
--- a/doc/html/ftv2ns.png
+++ b/doc/html/ftv2ns.png
--- a/doc/html/ftv2plastnode.png
+++ b/doc/html/ftv2plastnode.png
--- a/doc/html/ftv2pnode.png
+++ b/doc/html/ftv2pnode.png
--- a/doc/html/ftv2splitbar.png
+++ b/doc/html/ftv2splitbar.png
--- a/doc/html/ftv2vertline.png
+++ b/doc/html/ftv2vertline.png
--- a/doc/html/functions.html
+++ b/doc/html/functions.html
@@ -0,0 +1,134 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <meta name="generator" content="Doxygen 1.8.3.1"/>
 <title>TurboJPEG: Data Fields</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/search.js"></script>
 <script type="text/javascript">
  $(document).ready(function() { searchBox.OnSelectItem(0); });
 </script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="doxygen-extra.css" rel="stylesheet" type="text/css"/>
 </head>
 <body>
 <div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
 <tbody>
 <tr style="height: 56px;">
  <td style="padding-left: 0.5em;">
   <div id="projectname">TurboJPEG
   &#160;<span id="projectnumber">1.4</span>
   </div>
  </td>
 </tr>
 </tbody>
 </table>
 </div>
 <!-- end header part -->
 <!-- Generated by Doxygen 1.8.3.1 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
  <div id="navrow1" class="tabs">
    <ul class="tablist">
      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
      <li><a href="modules.html"><span>Modules</span></a></li>
      <li class="current"><a href="annotated.html"><span>Data&#160;Structures</span></a></li>
      <li>
        <div id="MSearchBox" class="MSearchBoxInactive">
        <span class="left">
          <img id="MSearchSelect" src="search/mag_sel.png"
               onmouseover="return searchBox.OnSearchSelectShow()"
               onmouseout="return searchBox.OnSearchSelectHide()"
               alt=""/>
          <input type="text" id="MSearchField" value="Search" accesskey="S"
               onfocus="searchBox.OnSearchFieldFocus(true)" 
               onblur="searchBox.OnSearchFieldFocus(false)" 
               onkeyup="searchBox.OnSearchFieldChange(event)"/>
          </span><span class="right">
            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
          </span>
        </div>
      </li>
    </ul>
  </div>
  <div id="navrow2" class="tabs2">
    <ul class="tablist">
      <li><a href="annotated.html"><span>Data&#160;Structures</span></a></li>
      <li><a href="classes.html"><span>Data&#160;Structure&#160;Index</span></a></li>
      <li class="current"><a href="functions.html"><span>Data&#160;Fields</span></a></li>
    </ul>
  </div>
  <div id="navrow3" class="tabs2">
    <ul class="tablist">
      <li class="current"><a href="functions.html"><span>All</span></a></li>
      <li><a href="functions_vars.html"><span>Variables</span></a></li>
    </ul>
  </div>
 </div><!-- top -->
 <!-- window showing the filter options -->
 <div id="MSearchSelectWindow"
     onmouseover="return searchBox.OnSearchSelectShow()"
     onmouseout="return searchBox.OnSearchSelectHide()"
     onkeydown="return searchBox.OnSearchSelectKey(event)">
 <a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(0)"><span class="SelectionMark">&#160;</span>All</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(1)"><span class="SelectionMark">&#160;</span>Data Structures</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(2)"><span class="SelectionMark">&#160;</span>Functions</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(3)"><span class="SelectionMark">&#160;</span>Variables</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(4)"><span class="SelectionMark">&#160;</span>Typedefs</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(5)"><span class="SelectionMark">&#160;</span>Enumerations</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(6)"><span class="SelectionMark">&#160;</span>Enumerator</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(7)"><span class="SelectionMark">&#160;</span>Groups</a></div>
 <!-- iframe showing the search results (closed by default) -->
 <div id="MSearchResultsWindow">
 <iframe src="javascript:void(0)" frameborder="0" 
        name="MSearchResults" id="MSearchResults">
 </iframe>
 </div>
 <div class="contents">
 <div class="textblock">Here is a list of all documented struct and union fields with links to the struct/union documentation for each field:</div><ul>
 <li>customFilter
 : <a class="el" href="structtjtransform.html#a43ee1bcdd2a8d7249a756774f78793c1">tjtransform</a>
 </li>
 <li>data
 : <a class="el" href="structtjtransform.html#a688fe8f1a8ecc12a538d9e561cf338e3">tjtransform</a>
 </li>
 <li>denom
 : <a class="el" href="structtjscalingfactor.html#aefbcdf3e9e62274b2d312c695f133ce3">tjscalingfactor</a>
 </li>
 <li>h
 : <a class="el" href="structtjregion.html#aecefc45a26f4d8b60dd4d825c1710115">tjregion</a>
 </li>
 <li>num
 : <a class="el" href="structtjscalingfactor.html#a9b011e57f981ee23083e2c1aa5e640ec">tjscalingfactor</a>
 </li>
 <li>op
 : <a class="el" href="structtjtransform.html#a2525aab4ba6978a1c273f74fef50e498">tjtransform</a>
 </li>
 <li>options
 : <a class="el" href="structtjtransform.html#ac0e74655baa4402209a21e1ae481c8f6">tjtransform</a>
 </li>
 <li>r
 : <a class="el" href="structtjtransform.html#ac324e5e442abec8a961e5bf219db12cf">tjtransform</a>
 </li>
 <li>w
 : <a class="el" href="structtjregion.html#ab6eb73ceef584fc23c8c8097926dce42">tjregion</a>
 </li>
 <li>x
 : <a class="el" href="structtjregion.html#a4b6a37a93997091b26a75831fa291ad9">tjregion</a>
 </li>
 <li>y
 : <a class="el" href="structtjregion.html#a7b3e0c24cfe87acc80e334cafdcf22c2">tjregion</a>
 </li>
 </ul>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
 Generated by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.3.1
 </small></address>
 </body>
 </html>
--- a/doc/html/functions_vars.html
+++ b/doc/html/functions_vars.html
@@ -0,0 +1,134 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <meta name="generator" content="Doxygen 1.8.3.1"/>
 <title>TurboJPEG: Data Fields - Variables</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/search.js"></script>
 <script type="text/javascript">
  $(document).ready(function() { searchBox.OnSelectItem(0); });
 </script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="doxygen-extra.css" rel="stylesheet" type="text/css"/>
 </head>
 <body>
 <div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
 <tbody>
 <tr style="height: 56px;">
  <td style="padding-left: 0.5em;">
   <div id="projectname">TurboJPEG
   &#160;<span id="projectnumber">1.4</span>
   </div>
  </td>
 </tr>
 </tbody>
 </table>
 </div>
 <!-- end header part -->
 <!-- Generated by Doxygen 1.8.3.1 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
  <div id="navrow1" class="tabs">
    <ul class="tablist">
      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
      <li><a href="modules.html"><span>Modules</span></a></li>
      <li class="current"><a href="annotated.html"><span>Data&#160;Structures</span></a></li>
      <li>
        <div id="MSearchBox" class="MSearchBoxInactive">
        <span class="left">
          <img id="MSearchSelect" src="search/mag_sel.png"
               onmouseover="return searchBox.OnSearchSelectShow()"
               onmouseout="return searchBox.OnSearchSelectHide()"
               alt=""/>
          <input type="text" id="MSearchField" value="Search" accesskey="S"
               onfocus="searchBox.OnSearchFieldFocus(true)" 
               onblur="searchBox.OnSearchFieldFocus(false)" 
               onkeyup="searchBox.OnSearchFieldChange(event)"/>
          </span><span class="right">
            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
          </span>
        </div>
      </li>
    </ul>
  </div>
  <div id="navrow2" class="tabs2">
    <ul class="tablist">
      <li><a href="annotated.html"><span>Data&#160;Structures</span></a></li>
      <li><a href="classes.html"><span>Data&#160;Structure&#160;Index</span></a></li>
      <li class="current"><a href="functions.html"><span>Data&#160;Fields</span></a></li>
    </ul>
  </div>
  <div id="navrow3" class="tabs2">
    <ul class="tablist">
      <li><a href="functions.html"><span>All</span></a></li>
      <li class="current"><a href="functions_vars.html"><span>Variables</span></a></li>
    </ul>
  </div>
 </div><!-- top -->
 <!-- window showing the filter options -->
 <div id="MSearchSelectWindow"
     onmouseover="return searchBox.OnSearchSelectShow()"
     onmouseout="return searchBox.OnSearchSelectHide()"
     onkeydown="return searchBox.OnSearchSelectKey(event)">
 <a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(0)"><span class="SelectionMark">&#160;</span>All</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(1)"><span class="SelectionMark">&#160;</span>Data Structures</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(2)"><span class="SelectionMark">&#160;</span>Functions</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(3)"><span class="SelectionMark">&#160;</span>Variables</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(4)"><span class="SelectionMark">&#160;</span>Typedefs</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(5)"><span class="SelectionMark">&#160;</span>Enumerations</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(6)"><span class="SelectionMark">&#160;</span>Enumerator</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(7)"><span class="SelectionMark">&#160;</span>Groups</a></div>
 <!-- iframe showing the search results (closed by default) -->
 <div id="MSearchResultsWindow">
 <iframe src="javascript:void(0)" frameborder="0" 
        name="MSearchResults" id="MSearchResults">
 </iframe>
 </div>
 <div class="contents">
 &#160;<ul>
 <li>customFilter
 : <a class="el" href="structtjtransform.html#a43ee1bcdd2a8d7249a756774f78793c1">tjtransform</a>
 </li>
 <li>data
 : <a class="el" href="structtjtransform.html#a688fe8f1a8ecc12a538d9e561cf338e3">tjtransform</a>
 </li>
 <li>denom
 : <a class="el" href="structtjscalingfactor.html#aefbcdf3e9e62274b2d312c695f133ce3">tjscalingfactor</a>
 </li>
 <li>h
 : <a class="el" href="structtjregion.html#aecefc45a26f4d8b60dd4d825c1710115">tjregion</a>
 </li>
 <li>num
 : <a class="el" href="structtjscalingfactor.html#a9b011e57f981ee23083e2c1aa5e640ec">tjscalingfactor</a>
 </li>
 <li>op
 : <a class="el" href="structtjtransform.html#a2525aab4ba6978a1c273f74fef50e498">tjtransform</a>
 </li>
 <li>options
 : <a class="el" href="structtjtransform.html#ac0e74655baa4402209a21e1ae481c8f6">tjtransform</a>
 </li>
 <li>r
 : <a class="el" href="structtjtransform.html#ac324e5e442abec8a961e5bf219db12cf">tjtransform</a>
 </li>
 <li>w
 : <a class="el" href="structtjregion.html#ab6eb73ceef584fc23c8c8097926dce42">tjregion</a>
 </li>
 <li>x
 : <a class="el" href="structtjregion.html#a4b6a37a93997091b26a75831fa291ad9">tjregion</a>
 </li>
 <li>y
 : <a class="el" href="structtjregion.html#a7b3e0c24cfe87acc80e334cafdcf22c2">tjregion</a>
 </li>
 </ul>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
 Generated by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.3.1
 </small></address>
 </body>
 </html>
--- a/doc/html/group___turbo_j_p_e_g.html
+++ b/doc/html/group___turbo_j_p_e_g.html
--- a/doc/html/index.html
+++ b/doc/html/index.html
@@ -0,0 +1,90 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <meta name="generator" content="Doxygen 1.8.3.1"/>
 <title>TurboJPEG: Main Page</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/search.js"></script>
 <script type="text/javascript">
  $(document).ready(function() { searchBox.OnSelectItem(0); });
 </script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="doxygen-extra.css" rel="stylesheet" type="text/css"/>
 </head>
 <body>
 <div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
 <tbody>
 <tr style="height: 56px;">
  <td style="padding-left: 0.5em;">
   <div id="projectname">TurboJPEG
   &#160;<span id="projectnumber">1.4</span>
   </div>
  </td>
 </tr>
 </tbody>
 </table>
 </div>
 <!-- end header part -->
 <!-- Generated by Doxygen 1.8.3.1 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
  <div id="navrow1" class="tabs">
    <ul class="tablist">
      <li class="current"><a href="index.html"><span>Main&#160;Page</span></a></li>
      <li><a href="modules.html"><span>Modules</span></a></li>
      <li><a href="annotated.html"><span>Data&#160;Structures</span></a></li>
      <li>
        <div id="MSearchBox" class="MSearchBoxInactive">
        <span class="left">
          <img id="MSearchSelect" src="search/mag_sel.png"
               onmouseover="return searchBox.OnSearchSelectShow()"
               onmouseout="return searchBox.OnSearchSelectHide()"
               alt=""/>
          <input type="text" id="MSearchField" value="Search" accesskey="S"
               onfocus="searchBox.OnSearchFieldFocus(true)" 
               onblur="searchBox.OnSearchFieldFocus(false)" 
               onkeyup="searchBox.OnSearchFieldChange(event)"/>
          </span><span class="right">
            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
          </span>
        </div>
      </li>
    </ul>
  </div>
 </div><!-- top -->
 <!-- window showing the filter options -->
 <div id="MSearchSelectWindow"
     onmouseover="return searchBox.OnSearchSelectShow()"
     onmouseout="return searchBox.OnSearchSelectHide()"
     onkeydown="return searchBox.OnSearchSelectKey(event)">
 <a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(0)"><span class="SelectionMark">&#160;</span>All</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(1)"><span class="SelectionMark">&#160;</span>Data Structures</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(2)"><span class="SelectionMark">&#160;</span>Functions</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(3)"><span class="SelectionMark">&#160;</span>Variables</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(4)"><span class="SelectionMark">&#160;</span>Typedefs</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(5)"><span class="SelectionMark">&#160;</span>Enumerations</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(6)"><span class="SelectionMark">&#160;</span>Enumerator</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(7)"><span class="SelectionMark">&#160;</span>Groups</a></div>
 <!-- iframe showing the search results (closed by default) -->
 <div id="MSearchResultsWindow">
 <iframe src="javascript:void(0)" frameborder="0" 
        name="MSearchResults" id="MSearchResults">
 </iframe>
 </div>
 <div class="header">
  <div class="headertitle">
 <div class="title">TurboJPEG Documentation</div>  </div>
 </div><!--header-->
 <div class="contents">
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
 Generated by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.3.1
 </small></address>
 </body>
 </html>
--- a/doc/html/jquery.js
+++ b/doc/html/jquery.js
--- a/doc/html/modules.html
+++ b/doc/html/modules.html
@@ -0,0 +1,95 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <meta name="generator" content="Doxygen 1.8.3.1"/>
 <title>TurboJPEG: Modules</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/search.js"></script>
 <script type="text/javascript">
  $(document).ready(function() { searchBox.OnSelectItem(0); });
 </script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <link href="doxygen-extra.css" rel="stylesheet" type="text/css"/>
 </head>
 <body>
 <div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
 <tbody>
 <tr style="height: 56px;">
  <td style="padding-left: 0.5em;">
   <div id="projectname">TurboJPEG
   &#160;<span id="projectnumber">1.4</span>
   </div>
  </td>
 </tr>
 </tbody>
 </table>
 </div>
 <!-- end header part -->
 <!-- Generated by Doxygen 1.8.3.1 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
  <div id="navrow1" class="tabs">
    <ul class="tablist">
      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
      <li class="current"><a href="modules.html"><span>Modules</span></a></li>
      <li><a href="annotated.html"><span>Data&#160;Structures</span></a></li>
      <li>
        <div id="MSearchBox" class="MSearchBoxInactive">
        <span class="left">
          <img id="MSearchSelect" src="search/mag_sel.png"
               onmouseover="return searchBox.OnSearchSelectShow()"
               onmouseout="return searchBox.OnSearchSelectHide()"
               alt=""/>
          <input type="text" id="MSearchField" value="Search" accesskey="S"
               onfocus="searchBox.OnSearchFieldFocus(true)" 
               onblur="searchBox.OnSearchFieldFocus(false)" 
               onkeyup="searchBox.OnSearchFieldChange(event)"/>
          </span><span class="right">
            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
          </span>
        </div>
      </li>
    </ul>
  </div>
 </div><!-- top -->
 <!-- window showing the filter options -->
 <div id="MSearchSelectWindow"
     onmouseover="return searchBox.OnSearchSelectShow()"
     onmouseout="return searchBox.OnSearchSelectHide()"
     onkeydown="return searchBox.OnSearchSelectKey(event)">
 <a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(0)"><span class="SelectionMark">&#160;</span>All</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(1)"><span class="SelectionMark">&#160;</span>Data Structures</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(2)"><span class="SelectionMark">&#160;</span>Functions</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(3)"><span class="SelectionMark">&#160;</span>Variables</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(4)"><span class="SelectionMark">&#160;</span>Typedefs</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(5)"><span class="SelectionMark">&#160;</span>Enumerations</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(6)"><span class="SelectionMark">&#160;</span>Enumerator</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(7)"><span class="SelectionMark">&#160;</span>Groups</a></div>
 <!-- iframe showing the search results (closed by default) -->
 <div id="MSearchResultsWindow">
 <iframe src="javascript:void(0)" frameborder="0" 
        name="MSearchResults" id="MSearchResults">
 </iframe>
 </div>
 <div class="header">
  <div class="headertitle">
 <div class="title">Modules</div>  </div>
 </div><!--header-->
 <div class="contents">
 <div class="textblock">Here is a list of all modules:</div><div class="directory">
 <table class="directory">
 <tr id="row_0_" class="even"><td class="entry"><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><a class="el" href="group___turbo_j_p_e_g.html" target="_self">TurboJPEG</a></td><td class="desc">TurboJPEG API</td></tr>
 </table>
 </div><!-- directory -->
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
 Generated by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.3.1
 </small></address>
 </body>
 </html>
--- a/doc/html/nav_f.png
+++ b/doc/html/nav_f.png
--- a/doc/html/nav_g.png
+++ b/doc/html/nav_g.png
--- a/doc/html/nav_h.png
+++ b/doc/html/nav_h.png
--- a/doc/html/open.png
+++ b/doc/html/open.png
--- a/doc/html/search/all_63.html
+++ b/doc/html/search/all_63.html
@@ -0,0 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta name="generator" content="Doxygen 1.8.3.1">
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="all_63.js"></script>
 <script type="text/javascript" src="search.js"></script>
 </head>
 <body class="SRPage">
 <div id="SRIndex">
 <div class="SRStatus" id="Loading">Loading...</div>
 <div id="SRResults"></div>
 <script type="text/javascript"><!--
 createResults();
 --></script>
 <div class="SRStatus" id="Searching">Searching...</div>
 <div class="SRStatus" id="NoMatches">No Matches</div>
 <script type="text/javascript"><!--
 document.getElementById("Loading").style.display="none";
 document.getElementById("NoMatches").style.display="none";
 var searchResults = new SearchResults("searchResults");
 searchResults.Search();
 --></script>
 </div>
 </body>
 </html>
--- a/doc/html/search/all_63.js
+++ b/doc/html/search/all_63.js
@@ -0,0 +1,4 @@
 var searchData=
 [
  ['customfilter',['customFilter',['../structtjtransform.html#a43ee1bcdd2a8d7249a756774f78793c1',1,'tjtransform']]]
 ];
--- a/doc/html/search/all_64.html
+++ b/doc/html/search/all_64.html
@@ -0,0 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta name="generator" content="Doxygen 1.8.3.1">
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="all_64.js"></script>
 <script type="text/javascript" src="search.js"></script>
 </head>
 <body class="SRPage">
 <div id="SRIndex">
 <div class="SRStatus" id="Loading">Loading...</div>
 <div id="SRResults"></div>
 <script type="text/javascript"><!--
 createResults();
 --></script>
 <div class="SRStatus" id="Searching">Searching...</div>
 <div class="SRStatus" id="NoMatches">No Matches</div>
 <script type="text/javascript"><!--
 document.getElementById("Loading").style.display="none";
 document.getElementById("NoMatches").style.display="none";
 var searchResults = new SearchResults("searchResults");
 searchResults.Search();
 --></script>
 </div>
 </body>
 </html>
--- a/doc/html/search/all_64.js
+++ b/doc/html/search/all_64.js
@@ -0,0 +1,5 @@
 var searchData=
 [
  ['data',['data',['../structtjtransform.html#a688fe8f1a8ecc12a538d9e561cf338e3',1,'tjtransform']]],
  ['denom',['denom',['../structtjscalingfactor.html#aefbcdf3e9e62274b2d312c695f133ce3',1,'tjscalingfactor']]]
 ];
--- a/doc/html/search/all_68.html
+++ b/doc/html/search/all_68.html
@@ -0,0 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta name="generator" content="Doxygen 1.8.3.1">
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="all_68.js"></script>
 <script type="text/javascript" src="search.js"></script>
 </head>
 <body class="SRPage">
 <div id="SRIndex">
 <div class="SRStatus" id="Loading">Loading...</div>
 <div id="SRResults"></div>
 <script type="text/javascript"><!--
 createResults();
 --></script>
 <div class="SRStatus" id="Searching">Searching...</div>
 <div class="SRStatus" id="NoMatches">No Matches</div>
 <script type="text/javascript"><!--
 document.getElementById("Loading").style.display="none";
 document.getElementById("NoMatches").style.display="none";
 var searchResults = new SearchResults("searchResults");
 searchResults.Search();
 --></script>
 </div>
 </body>
 </html>
--- a/doc/html/search/all_68.js
+++ b/doc/html/search/all_68.js
@@ -0,0 +1,4 @@
 var searchData=
 [
  ['h',['h',['../structtjregion.html#aecefc45a26f4d8b60dd4d825c1710115',1,'tjregion']]]
 ];
--- a/doc/html/search/all_6e.html
+++ b/doc/html/search/all_6e.html
@@ -0,0 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta name="generator" content="Doxygen 1.8.3.1">
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="all_6e.js"></script>
 <script type="text/javascript" src="search.js"></script>
 </head>
 <body class="SRPage">
 <div id="SRIndex">
 <div class="SRStatus" id="Loading">Loading...</div>
 <div id="SRResults"></div>
 <script type="text/javascript"><!--
 createResults();
 --></script>
 <div class="SRStatus" id="Searching">Searching...</div>
 <div class="SRStatus" id="NoMatches">No Matches</div>
 <script type="text/javascript"><!--
 document.getElementById("Loading").style.display="none";
 document.getElementById("NoMatches").style.display="none";
 var searchResults = new SearchResults("searchResults");
 searchResults.Search();
 --></script>
 </div>
 </body>
 </html>
--- a/doc/html/search/all_6e.js
+++ b/doc/html/search/all_6e.js
@@ -0,0 +1,4 @@
 var searchData=
 [
  ['num',['num',['../structtjscalingfactor.html#a9b011e57f981ee23083e2c1aa5e640ec',1,'tjscalingfactor']]]
 ];
--- a/doc/html/search/all_6f.html
+++ b/doc/html/search/all_6f.html
@@ -0,0 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta name="generator" content="Doxygen 1.8.3.1">
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="all_6f.js"></script>
 <script type="text/javascript" src="search.js"></script>
 </head>
 <body class="SRPage">
 <div id="SRIndex">
 <div class="SRStatus" id="Loading">Loading...</div>
 <div id="SRResults"></div>
 <script type="text/javascript"><!--
 createResults();
 --></script>
 <div class="SRStatus" id="Searching">Searching...</div>
 <div class="SRStatus" id="NoMatches">No Matches</div>
 <script type="text/javascript"><!--
 document.getElementById("Loading").style.display="none";
 document.getElementById("NoMatches").style.display="none";
 var searchResults = new SearchResults("searchResults");
 searchResults.Search();
 --></script>
 </div>
 </body>
 </html>
--- a/doc/html/search/all_6f.js
+++ b/doc/html/search/all_6f.js
@@ -0,0 +1,5 @@
 var searchData=
 [
  ['op',['op',['../structtjtransform.html#a2525aab4ba6978a1c273f74fef50e498',1,'tjtransform']]],
  ['options',['options',['../structtjtransform.html#ac0e74655baa4402209a21e1ae481c8f6',1,'tjtransform']]]
 ];
--- a/doc/html/search/all_72.html
+++ b/doc/html/search/all_72.html
@@ -0,0 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta name="generator" content="Doxygen 1.8.3.1">
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="all_72.js"></script>
 <script type="text/javascript" src="search.js"></script>
 </head>
 <body class="SRPage">
 <div id="SRIndex">
 <div class="SRStatus" id="Loading">Loading...</div>
 <div id="SRResults"></div>
 <script type="text/javascript"><!--
 createResults();
 --></script>
 <div class="SRStatus" id="Searching">Searching...</div>
 <div class="SRStatus" id="NoMatches">No Matches</div>
 <script type="text/javascript"><!--
 document.getElementById("Loading").style.display="none";
 document.getElementById("NoMatches").style.display="none";
 var searchResults = new SearchResults("searchResults");
 searchResults.Search();
 --></script>
 </div>
 </body>
 </html>
--- a/doc/html/search/all_72.js
+++ b/doc/html/search/all_72.js
@@ -0,0 +1,4 @@
 var searchData=
 [
  ['r',['r',['../structtjtransform.html#ac324e5e442abec8a961e5bf219db12cf',1,'tjtransform']]]
 ];
--- a/doc/html/search/all_74.html
+++ b/doc/html/search/all_74.html
@@ -0,0 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta name="generator" content="Doxygen 1.8.3.1">
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="all_74.js"></script>
 <script type="text/javascript" src="search.js"></script>
 </head>
 <body class="SRPage">
 <div id="SRIndex">
 <div class="SRStatus" id="Loading">Loading...</div>
 <div id="SRResults"></div>
 <script type="text/javascript"><!--
 createResults();
 --></script>
 <div class="SRStatus" id="Searching">Searching...</div>
 <div class="SRStatus" id="NoMatches">No Matches</div>
 <script type="text/javascript"><!--
 document.getElementById("Loading").style.display="none";
 document.getElementById("NoMatches").style.display="none";
 var searchResults = new SearchResults("searchResults");
 searchResults.Search();
 --></script>
 </div>
 </body>
 </html>
--- a/doc/html/search/all_74.js
+++ b/doc/html/search/all_74.js
@@ -0,0 +1,89 @@
 var searchData=
 [
  ['tj_5fnumcs',['TJ_NUMCS',['../group___turbo_j_p_e_g.html#ga39f57a6fb02d9cf32e7b6890099b5a71',1,'turbojpeg.h']]],
  ['tj_5fnumpf',['TJ_NUMPF',['../group___turbo_j_p_e_g.html#ga7010a4402f54a45ba822ad8675a4655e',1,'turbojpeg.h']]],
  ['tj_5fnumsamp',['TJ_NUMSAMP',['../group___turbo_j_p_e_g.html#ga5ef3d169162ce77ce348e292a0b7477c',1,'turbojpeg.h']]],
  ['tj_5fnumxop',['TJ_NUMXOP',['../group___turbo_j_p_e_g.html#ga0f6dbd18adf38b7d46ac547f0f4d562c',1,'turbojpeg.h']]],
  ['tjalloc',['tjAlloc',['../group___turbo_j_p_e_g.html#ga5c9234bda6d993cdaffdd89bf81a00ff',1,'turbojpeg.h']]],
  ['tjblueoffset',['tjBlueOffset',['../group___turbo_j_p_e_g.html#ga84e2e35d3f08025f976ec1ec53693dea',1,'turbojpeg.h']]],
  ['tjbufsize',['tjBufSize',['../group___turbo_j_p_e_g.html#gaccc5bca7f12fcdcc302e6e1c6d4b311b',1,'turbojpeg.h']]],
  ['tjbufsizeyuv2',['tjBufSizeYUV2',['../group___turbo_j_p_e_g.html#gaf451664a62c1f6c7cc5a6401f32908c9',1,'turbojpeg.h']]],
  ['tjcompress2',['tjCompress2',['../group___turbo_j_p_e_g.html#gaba62b7a98f960839b588579898495cf2',1,'turbojpeg.h']]],
  ['tjcompressfromyuv',['tjCompressFromYUV',['../group___turbo_j_p_e_g.html#ga0b931126c7a615ddc3bbd0cca6698d67',1,'turbojpeg.h']]],
  ['tjcompressfromyuvplanes',['tjCompressFromYUVPlanes',['../group___turbo_j_p_e_g.html#gaa89a1982cb4556b12ae7af4439991af6',1,'turbojpeg.h']]],
  ['tjcs',['TJCS',['../group___turbo_j_p_e_g.html#ga4f83ad3368e0e29d1957be0efa7c3720',1,'turbojpeg.h']]],
  ['tjcs_5fcmyk',['TJCS_CMYK',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720a6c8b636152ac8195b869587db315ee53',1,'turbojpeg.h']]],
  ['tjcs_5fgray',['TJCS_GRAY',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720ab3e7d6a87f695e45b81c1b5262b5a50a',1,'turbojpeg.h']]],
  ['tjcs_5frgb',['TJCS_RGB',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720a677cb7ccb85c4038ac41964a2e09e555',1,'turbojpeg.h']]],
  ['tjcs_5fycbcr',['TJCS_YCbCr',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720a7389b8f65bb387ffedce3efd0d78ec75',1,'turbojpeg.h']]],
  ['tjcs_5fycck',['TJCS_YCCK',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720a53839e0fe867b76b58d16b0a1a7c598e',1,'turbojpeg.h']]],
  ['tjdecodeyuv',['tjDecodeYUV',['../group___turbo_j_p_e_g.html#ga132ae2c2cadcf64c8bb0f3bdf69da3ed',1,'turbojpeg.h']]],
  ['tjdecodeyuvplanes',['tjDecodeYUVPlanes',['../group___turbo_j_p_e_g.html#ga6cb5b0e1101a2b20edea576e11faf93d',1,'turbojpeg.h']]],
  ['tjdecompress2',['tjDecompress2',['../group___turbo_j_p_e_g.html#gada69cc6443d1bb493b40f1626259e5e9',1,'turbojpeg.h']]],
  ['tjdecompressheader3',['tjDecompressHeader3',['../group___turbo_j_p_e_g.html#gacd0fac3af74b3511d39b4781b7103086',1,'turbojpeg.h']]],
  ['tjdecompresstoyuv2',['tjDecompressToYUV2',['../group___turbo_j_p_e_g.html#ga7c08b340ad7f8e85d407bd9e81d44d07',1,'turbojpeg.h']]],
  ['tjdecompresstoyuvplanes',['tjDecompressToYUVPlanes',['../group___turbo_j_p_e_g.html#ga0828a38ae29631ac28b6857cefb0eebf',1,'turbojpeg.h']]],
  ['tjdestroy',['tjDestroy',['../group___turbo_j_p_e_g.html#ga674adee917b95ad4a896f1ba39e12540',1,'turbojpeg.h']]],
  ['tjencodeyuv3',['tjEncodeYUV3',['../group___turbo_j_p_e_g.html#ga0a5ffbf7cb58a5b6a8201114fe889360',1,'turbojpeg.h']]],
  ['tjencodeyuvplanes',['tjEncodeYUVPlanes',['../group___turbo_j_p_e_g.html#gaa791db8598853ddcad24e42897ef1269',1,'turbojpeg.h']]],
  ['tjflag_5faccuratedct',['TJFLAG_ACCURATEDCT',['../group___turbo_j_p_e_g.html#gacb233cfd722d66d1ccbf48a7de81f0e0',1,'turbojpeg.h']]],
  ['tjflag_5fbottomup',['TJFLAG_BOTTOMUP',['../group___turbo_j_p_e_g.html#ga72ecf4ebe6eb702d3c6f5ca27455e1ec',1,'turbojpeg.h']]],
  ['tjflag_5ffastdct',['TJFLAG_FASTDCT',['../group___turbo_j_p_e_g.html#gaabce235db80d3f698b27f36cbd453da2',1,'turbojpeg.h']]],
  ['tjflag_5ffastupsample',['TJFLAG_FASTUPSAMPLE',['../group___turbo_j_p_e_g.html#ga4ee4506c81177a06f77e2504a22efd2d',1,'turbojpeg.h']]],
  ['tjflag_5fnorealloc',['TJFLAG_NOREALLOC',['../group___turbo_j_p_e_g.html#ga8808d403c68b62aaa58a4c1e58e98963',1,'turbojpeg.h']]],
  ['tjfree',['tjFree',['../group___turbo_j_p_e_g.html#ga8c4a1231dc06a450514c835f6471f137',1,'turbojpeg.h']]],
  ['tjgeterrorstr',['tjGetErrorStr',['../group___turbo_j_p_e_g.html#ga9af79c908ec131b1ae8d52fe40375abf',1,'turbojpeg.h']]],
  ['tjgetscalingfactors',['tjGetScalingFactors',['../group___turbo_j_p_e_g.html#ga6449044b9af402999ccf52f401333be8',1,'turbojpeg.h']]],
  ['tjgreenoffset',['tjGreenOffset',['../group___turbo_j_p_e_g.html#ga82d6e35da441112a411da41923c0ba2f',1,'turbojpeg.h']]],
  ['tjhandle',['tjhandle',['../group___turbo_j_p_e_g.html#ga758d2634ecb4949de7815cba621f5763',1,'turbojpeg.h']]],
  ['tjinitcompress',['tjInitCompress',['../group___turbo_j_p_e_g.html#ga3d10c47fbe4a2489a2b30c931551d01a',1,'turbojpeg.h']]],
  ['tjinitdecompress',['tjInitDecompress',['../group___turbo_j_p_e_g.html#gae5408179d041e2a2f7199c8283cf649e',1,'turbojpeg.h']]],
  ['tjinittransform',['tjInitTransform',['../group___turbo_j_p_e_g.html#ga3155b775bfbac9dbba869b95a0367902',1,'turbojpeg.h']]],
  ['tjmcuheight',['tjMCUHeight',['../group___turbo_j_p_e_g.html#gabd247bb9fecb393eca57366feb8327bf',1,'turbojpeg.h']]],
  ['tjmcuwidth',['tjMCUWidth',['../group___turbo_j_p_e_g.html#ga9e61e7cd47a15a173283ba94e781308c',1,'turbojpeg.h']]],
  ['tjpad',['TJPAD',['../group___turbo_j_p_e_g.html#ga0aba955473315e405295d978f0c16511',1,'turbojpeg.h']]],
  ['tjpf',['TJPF',['../group___turbo_j_p_e_g.html#gac916144e26c3817ac514e64ae5d12e2a',1,'turbojpeg.h']]],
  ['tjpf_5fabgr',['TJPF_ABGR',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa1ba1a7f1631dbeaa49a0a85fc4a40081',1,'turbojpeg.h']]],
  ['tjpf_5fargb',['TJPF_ARGB',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aae8f846ed9d9de99b6e1dfe448848765c',1,'turbojpeg.h']]],
  ['tjpf_5fbgr',['TJPF_BGR',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aab10624437fb8ef495a0b153e65749839',1,'turbojpeg.h']]],
  ['tjpf_5fbgra',['TJPF_BGRA',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aac037ff1845cf9b74bb81a3659c2b9fb4',1,'turbojpeg.h']]],
  ['tjpf_5fbgrx',['TJPF_BGRX',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa2a1fbf569ca79897eae886e3376ca4c8',1,'turbojpeg.h']]],
  ['tjpf_5fcmyk',['TJPF_CMYK',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa7f5100ec44c91994e243f1cf55553f8b',1,'turbojpeg.h']]],
  ['tjpf_5fgray',['TJPF_GRAY',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa5431b54b015337705f13118073711a1a',1,'turbojpeg.h']]],
  ['tjpf_5frgb',['TJPF_RGB',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa7ce93230bff449518ce387c17e6ed37c',1,'turbojpeg.h']]],
  ['tjpf_5frgba',['TJPF_RGBA',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa88d2e88fab67f6503cf972e14851cc12',1,'turbojpeg.h']]],
  ['tjpf_5frgbx',['TJPF_RGBX',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa83973bebb7e2dc6fa8bae89ff3f42e01',1,'turbojpeg.h']]],
  ['tjpf_5fxbgr',['TJPF_XBGR',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aaf6603b27147de47e212e75dac027b2af',1,'turbojpeg.h']]],
  ['tjpf_5fxrgb',['TJPF_XRGB',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aadae996905efcfa3b42a0bb3bea7f9d84',1,'turbojpeg.h']]],
  ['tjpixelsize',['tjPixelSize',['../group___turbo_j_p_e_g.html#gad77cf8fe5b2bfd3cb3f53098146abb4c',1,'turbojpeg.h']]],
  ['tjplaneheight',['tjPlaneHeight',['../group___turbo_j_p_e_g.html#ga1a209696c6a80748f20e134b3c64789f',1,'turbojpeg.h']]],
  ['tjplanesizeyuv',['tjPlaneSizeYUV',['../group___turbo_j_p_e_g.html#ga6f98d977bfa9d167c97172e876ba61e2',1,'turbojpeg.h']]],
  ['tjplanewidth',['tjPlaneWidth',['../group___turbo_j_p_e_g.html#ga63fb66bb1e36c74008c4634360becbb1',1,'turbojpeg.h']]],
  ['tjredoffset',['tjRedOffset',['../group___turbo_j_p_e_g.html#gadd9b446742ac8a3923f7992c7988fea8',1,'turbojpeg.h']]],
  ['tjregion',['tjregion',['../structtjregion.html',1,'']]],
  ['tjsamp',['TJSAMP',['../group___turbo_j_p_e_g.html#ga1d047060ea80bb9820d540bb928e9074',1,'turbojpeg.h']]],
  ['tjsamp_5f411',['TJSAMP_411',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a28ec62575e5ea295c3fde3001dc628e2',1,'turbojpeg.h']]],
  ['tjsamp_5f420',['TJSAMP_420',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a63085dbf683cfe39e513cdb6343e3737',1,'turbojpeg.h']]],
  ['tjsamp_5f422',['TJSAMP_422',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a136130902cc578f11f32429b59368404',1,'turbojpeg.h']]],
  ['tjsamp_5f440',['TJSAMP_440',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074accf740e6f3aa6ba20ba922cad13cb974',1,'turbojpeg.h']]],
  ['tjsamp_5f444',['TJSAMP_444',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074afb8da4f44197837bdec0a4f593dacae3',1,'turbojpeg.h']]],
  ['tjsamp_5fgray',['TJSAMP_GRAY',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a3f1c9504842ddc7a48d0f690754b6248',1,'turbojpeg.h']]],
  ['tjscaled',['TJSCALED',['../group___turbo_j_p_e_g.html#ga84878bb65404204743aa18cac02781df',1,'turbojpeg.h']]],
  ['tjscalingfactor',['tjscalingfactor',['../structtjscalingfactor.html',1,'']]],
  ['tjtransform',['tjtransform',['../structtjtransform.html',1,'tjtransform'],['../group___turbo_j_p_e_g.html#gae403193ceb4aafb7e0f56ab587b48616',1,'tjTransform(tjhandle handle, unsigned char *jpegBuf, unsigned long jpegSize, int n, unsigned char **dstBufs, unsigned long *dstSizes, tjtransform *transforms, int flags):&#160;turbojpeg.h'],['../group___turbo_j_p_e_g.html#gaa29f3189c41be12ec5dee7caec318a31',1,'tjtransform():&#160;turbojpeg.h']]],
  ['tjxop',['TJXOP',['../group___turbo_j_p_e_g.html#ga2de531af4e7e6c4f124908376b354866',1,'turbojpeg.h']]],
  ['tjxop_5fhflip',['TJXOP_HFLIP',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866aa0df69776caa30f0fa28e26332d311ce',1,'turbojpeg.h']]],
  ['tjxop_5fnone',['TJXOP_NONE',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866aad88c0366cd3f7d0eac9d7a3fa1c2c27',1,'turbojpeg.h']]],
  ['tjxop_5frot180',['TJXOP_ROT180',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a140952eb8dd0300accfcc22726d69692',1,'turbojpeg.h']]],
  ['tjxop_5frot270',['TJXOP_ROT270',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a3064ee5dfb7f032df332818587567a08',1,'turbojpeg.h']]],
  ['tjxop_5frot90',['TJXOP_ROT90',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a43b2bbb23bc4bd548422d43fbe9af128',1,'turbojpeg.h']]],
  ['tjxop_5ftranspose',['TJXOP_TRANSPOSE',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a31060aed199f886afdd417f80499c32d',1,'turbojpeg.h']]],
  ['tjxop_5ftransverse',['TJXOP_TRANSVERSE',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866af3b14d488aea6ece9e5b3df73a74d6a4',1,'turbojpeg.h']]],
  ['tjxop_5fvflip',['TJXOP_VFLIP',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a324eddfbec53b7e691f61e56929d0d5d',1,'turbojpeg.h']]],
  ['tjxopt_5fcrop',['TJXOPT_CROP',['../group___turbo_j_p_e_g.html#ga9c771a757fc1294add611906b89ab2d2',1,'turbojpeg.h']]],
  ['tjxopt_5fgray',['TJXOPT_GRAY',['../group___turbo_j_p_e_g.html#ga3acee7b48ade1b99e5588736007c2589',1,'turbojpeg.h']]],
  ['tjxopt_5fnooutput',['TJXOPT_NOOUTPUT',['../group___turbo_j_p_e_g.html#gafbf992bbf6e006705886333703ffab31',1,'turbojpeg.h']]],
  ['tjxopt_5fperfect',['TJXOPT_PERFECT',['../group___turbo_j_p_e_g.html#ga50e03cb5ed115330e212417429600b00',1,'turbojpeg.h']]],
  ['tjxopt_5ftrim',['TJXOPT_TRIM',['../group___turbo_j_p_e_g.html#ga319826b7eb1583c0595bbe7b95428709',1,'turbojpeg.h']]],
  ['turbojpeg',['TurboJPEG',['../group___turbo_j_p_e_g.html',1,'']]]
 ];
--- a/doc/html/search/all_77.html
+++ b/doc/html/search/all_77.html
@@ -0,0 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta name="generator" content="Doxygen 1.8.3.1">
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="all_77.js"></script>
 <script type="text/javascript" src="search.js"></script>
 </head>
 <body class="SRPage">
 <div id="SRIndex">
 <div class="SRStatus" id="Loading">Loading...</div>
 <div id="SRResults"></div>
 <script type="text/javascript"><!--
 createResults();
 --></script>
 <div class="SRStatus" id="Searching">Searching...</div>
 <div class="SRStatus" id="NoMatches">No Matches</div>
 <script type="text/javascript"><!--
 document.getElementById("Loading").style.display="none";
 document.getElementById("NoMatches").style.display="none";
 var searchResults = new SearchResults("searchResults");
 searchResults.Search();
 --></script>
 </div>
 </body>
 </html>
--- a/doc/html/search/all_77.js
+++ b/doc/html/search/all_77.js
@@ -0,0 +1,4 @@
 var searchData=
 [
  ['w',['w',['../structtjregion.html#ab6eb73ceef584fc23c8c8097926dce42',1,'tjregion']]]
 ];
--- a/doc/html/search/all_78.html
+++ b/doc/html/search/all_78.html
@@ -0,0 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta name="generator" content="Doxygen 1.8.3.1">
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="all_78.js"></script>
 <script type="text/javascript" src="search.js"></script>
 </head>
 <body class="SRPage">
 <div id="SRIndex">
 <div class="SRStatus" id="Loading">Loading...</div>
 <div id="SRResults"></div>
 <script type="text/javascript"><!--
 createResults();
 --></script>
 <div class="SRStatus" id="Searching">Searching...</div>
 <div class="SRStatus" id="NoMatches">No Matches</div>
 <script type="text/javascript"><!--
 document.getElementById("Loading").style.display="none";
 document.getElementById("NoMatches").style.display="none";
 var searchResults = new SearchResults("searchResults");
 searchResults.Search();
 --></script>
 </div>
 </body>
 </html>
--- a/doc/html/search/all_78.js
+++ b/doc/html/search/all_78.js
@@ -0,0 +1,4 @@
 var searchData=
 [
  ['x',['x',['../structtjregion.html#a4b6a37a93997091b26a75831fa291ad9',1,'tjregion']]]
 ];
--- a/doc/html/search/all_79.html
+++ b/doc/html/search/all_79.html
@@ -0,0 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta name="generator" content="Doxygen 1.8.3.1">
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="all_79.js"></script>
 <script type="text/javascript" src="search.js"></script>
 </head>
 <body class="SRPage">
 <div id="SRIndex">
 <div class="SRStatus" id="Loading">Loading...</div>
 <div id="SRResults"></div>
 <script type="text/javascript"><!--
 createResults();
 --></script>
 <div class="SRStatus" id="Searching">Searching...</div>
 <div class="SRStatus" id="NoMatches">No Matches</div>
 <script type="text/javascript"><!--
 document.getElementById("Loading").style.display="none";
 document.getElementById("NoMatches").style.display="none";
 var searchResults = new SearchResults("searchResults");
 searchResults.Search();
 --></script>
 </div>
 </body>
 </html>
--- a/doc/html/search/all_79.js
+++ b/doc/html/search/all_79.js
@@ -0,0 +1,4 @@
 var searchData=
 [
  ['y',['y',['../structtjregion.html#a7b3e0c24cfe87acc80e334cafdcf22c2',1,'tjregion']]]
 ];
--- a/doc/html/search/classes_74.html
+++ b/doc/html/search/classes_74.html
@@ -0,0 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta name="generator" content="Doxygen 1.8.3.1">
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="classes_74.js"></script>
 <script type="text/javascript" src="search.js"></script>
 </head>
 <body class="SRPage">
 <div id="SRIndex">
 <div class="SRStatus" id="Loading">Loading...</div>
 <div id="SRResults"></div>
 <script type="text/javascript"><!--
 createResults();
 --></script>
 <div class="SRStatus" id="Searching">Searching...</div>
 <div class="SRStatus" id="NoMatches">No Matches</div>
 <script type="text/javascript"><!--
 document.getElementById("Loading").style.display="none";
 document.getElementById("NoMatches").style.display="none";
 var searchResults = new SearchResults("searchResults");
 searchResults.Search();
 --></script>
 </div>
 </body>
 </html>
--- a/doc/html/search/classes_74.js
+++ b/doc/html/search/classes_74.js
@@ -0,0 +1,6 @@
 var searchData=
 [
  ['tjregion',['tjregion',['../structtjregion.html',1,'']]],
  ['tjscalingfactor',['tjscalingfactor',['../structtjscalingfactor.html',1,'']]],
  ['tjtransform',['tjtransform',['../structtjtransform.html',1,'']]]
 ];
--- a/doc/html/search/close.png
+++ b/doc/html/search/close.png
--- a/doc/html/search/enums_74.html
+++ b/doc/html/search/enums_74.html
@@ -0,0 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta name="generator" content="Doxygen 1.8.3.1">
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="enums_74.js"></script>
 <script type="text/javascript" src="search.js"></script>
 </head>
 <body class="SRPage">
 <div id="SRIndex">
 <div class="SRStatus" id="Loading">Loading...</div>
 <div id="SRResults"></div>
 <script type="text/javascript"><!--
 createResults();
 --></script>
 <div class="SRStatus" id="Searching">Searching...</div>
 <div class="SRStatus" id="NoMatches">No Matches</div>
 <script type="text/javascript"><!--
 document.getElementById("Loading").style.display="none";
 document.getElementById("NoMatches").style.display="none";
 var searchResults = new SearchResults("searchResults");
 searchResults.Search();
 --></script>
 </div>
 </body>
 </html>
--- a/doc/html/search/enums_74.js
+++ b/doc/html/search/enums_74.js
@@ -0,0 +1,7 @@
 var searchData=
 [
  ['tjcs',['TJCS',['../group___turbo_j_p_e_g.html#ga4f83ad3368e0e29d1957be0efa7c3720',1,'turbojpeg.h']]],
  ['tjpf',['TJPF',['../group___turbo_j_p_e_g.html#gac916144e26c3817ac514e64ae5d12e2a',1,'turbojpeg.h']]],
  ['tjsamp',['TJSAMP',['../group___turbo_j_p_e_g.html#ga1d047060ea80bb9820d540bb928e9074',1,'turbojpeg.h']]],
  ['tjxop',['TJXOP',['../group___turbo_j_p_e_g.html#ga2de531af4e7e6c4f124908376b354866',1,'turbojpeg.h']]]
 ];
--- a/doc/html/search/enumvalues_74.html
+++ b/doc/html/search/enumvalues_74.html
@@ -0,0 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta name="generator" content="Doxygen 1.8.3.1">
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="enumvalues_74.js"></script>
 <script type="text/javascript" src="search.js"></script>
 </head>
 <body class="SRPage">
 <div id="SRIndex">
 <div class="SRStatus" id="Loading">Loading...</div>
 <div id="SRResults"></div>
 <script type="text/javascript"><!--
 createResults();
 --></script>
 <div class="SRStatus" id="Searching">Searching...</div>
 <div class="SRStatus" id="NoMatches">No Matches</div>
 <script type="text/javascript"><!--
 document.getElementById("Loading").style.display="none";
 document.getElementById("NoMatches").style.display="none";
 var searchResults = new SearchResults("searchResults");
 searchResults.Search();
 --></script>
 </div>
 </body>
 </html>
--- a/doc/html/search/enumvalues_74.js
+++ b/doc/html/search/enumvalues_74.js
@@ -0,0 +1,34 @@
 var searchData=
 [
  ['tjcs_5fcmyk',['TJCS_CMYK',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720a6c8b636152ac8195b869587db315ee53',1,'turbojpeg.h']]],
  ['tjcs_5fgray',['TJCS_GRAY',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720ab3e7d6a87f695e45b81c1b5262b5a50a',1,'turbojpeg.h']]],
  ['tjcs_5frgb',['TJCS_RGB',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720a677cb7ccb85c4038ac41964a2e09e555',1,'turbojpeg.h']]],
  ['tjcs_5fycbcr',['TJCS_YCbCr',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720a7389b8f65bb387ffedce3efd0d78ec75',1,'turbojpeg.h']]],
  ['tjcs_5fycck',['TJCS_YCCK',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720a53839e0fe867b76b58d16b0a1a7c598e',1,'turbojpeg.h']]],
  ['tjpf_5fabgr',['TJPF_ABGR',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa1ba1a7f1631dbeaa49a0a85fc4a40081',1,'turbojpeg.h']]],
  ['tjpf_5fargb',['TJPF_ARGB',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aae8f846ed9d9de99b6e1dfe448848765c',1,'turbojpeg.h']]],
  ['tjpf_5fbgr',['TJPF_BGR',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aab10624437fb8ef495a0b153e65749839',1,'turbojpeg.h']]],
  ['tjpf_5fbgra',['TJPF_BGRA',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aac037ff1845cf9b74bb81a3659c2b9fb4',1,'turbojpeg.h']]],
  ['tjpf_5fbgrx',['TJPF_BGRX',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa2a1fbf569ca79897eae886e3376ca4c8',1,'turbojpeg.h']]],
  ['tjpf_5fcmyk',['TJPF_CMYK',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa7f5100ec44c91994e243f1cf55553f8b',1,'turbojpeg.h']]],
  ['tjpf_5fgray',['TJPF_GRAY',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa5431b54b015337705f13118073711a1a',1,'turbojpeg.h']]],
  ['tjpf_5frgb',['TJPF_RGB',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa7ce93230bff449518ce387c17e6ed37c',1,'turbojpeg.h']]],
  ['tjpf_5frgba',['TJPF_RGBA',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa88d2e88fab67f6503cf972e14851cc12',1,'turbojpeg.h']]],
  ['tjpf_5frgbx',['TJPF_RGBX',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa83973bebb7e2dc6fa8bae89ff3f42e01',1,'turbojpeg.h']]],
  ['tjpf_5fxbgr',['TJPF_XBGR',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aaf6603b27147de47e212e75dac027b2af',1,'turbojpeg.h']]],
  ['tjpf_5fxrgb',['TJPF_XRGB',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aadae996905efcfa3b42a0bb3bea7f9d84',1,'turbojpeg.h']]],
  ['tjsamp_5f411',['TJSAMP_411',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a28ec62575e5ea295c3fde3001dc628e2',1,'turbojpeg.h']]],
  ['tjsamp_5f420',['TJSAMP_420',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a63085dbf683cfe39e513cdb6343e3737',1,'turbojpeg.h']]],
  ['tjsamp_5f422',['TJSAMP_422',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a136130902cc578f11f32429b59368404',1,'turbojpeg.h']]],
  ['tjsamp_5f440',['TJSAMP_440',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074accf740e6f3aa6ba20ba922cad13cb974',1,'turbojpeg.h']]],
  ['tjsamp_5f444',['TJSAMP_444',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074afb8da4f44197837bdec0a4f593dacae3',1,'turbojpeg.h']]],
  ['tjsamp_5fgray',['TJSAMP_GRAY',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a3f1c9504842ddc7a48d0f690754b6248',1,'turbojpeg.h']]],
  ['tjxop_5fhflip',['TJXOP_HFLIP',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866aa0df69776caa30f0fa28e26332d311ce',1,'turbojpeg.h']]],
  ['tjxop_5fnone',['TJXOP_NONE',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866aad88c0366cd3f7d0eac9d7a3fa1c2c27',1,'turbojpeg.h']]],
  ['tjxop_5frot180',['TJXOP_ROT180',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a140952eb8dd0300accfcc22726d69692',1,'turbojpeg.h']]],
  ['tjxop_5frot270',['TJXOP_ROT270',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a3064ee5dfb7f032df332818587567a08',1,'turbojpeg.h']]],
  ['tjxop_5frot90',['TJXOP_ROT90',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a43b2bbb23bc4bd548422d43fbe9af128',1,'turbojpeg.h']]],
  ['tjxop_5ftranspose',['TJXOP_TRANSPOSE',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a31060aed199f886afdd417f80499c32d',1,'turbojpeg.h']]],
  ['tjxop_5ftransverse',['TJXOP_TRANSVERSE',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866af3b14d488aea6ece9e5b3df73a74d6a4',1,'turbojpeg.h']]],
  ['tjxop_5fvflip',['TJXOP_VFLIP',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a324eddfbec53b7e691f61e56929d0d5d',1,'turbojpeg.h']]]
 ];
--- a/doc/html/search/functions_74.html
+++ b/doc/html/search/functions_74.html
@@ -0,0 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta name="generator" content="Doxygen 1.8.3.1">
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="functions_74.js"></script>
 <script type="text/javascript" src="search.js"></script>
 </head>
 <body class="SRPage">
 <div id="SRIndex">
 <div class="SRStatus" id="Loading">Loading...</div>
 <div id="SRResults"></div>
 <script type="text/javascript"><!--
 createResults();
 --></script>
 <div class="SRStatus" id="Searching">Searching...</div>
 <div class="SRStatus" id="NoMatches">No Matches</div>
 <script type="text/javascript"><!--
 document.getElementById("Loading").style.display="none";
 document.getElementById("NoMatches").style.display="none";
 var searchResults = new SearchResults("searchResults");
 searchResults.Search();
 --></script>
 </div>
 </body>
 </html>
--- a/doc/html/search/functions_74.js
+++ b/doc/html/search/functions_74.js
@@ -0,0 +1,28 @@
 var searchData=
 [
  ['tjalloc',['tjAlloc',['../group___turbo_j_p_e_g.html#ga5c9234bda6d993cdaffdd89bf81a00ff',1,'turbojpeg.h']]],
  ['tjbufsize',['tjBufSize',['../group___turbo_j_p_e_g.html#gaccc5bca7f12fcdcc302e6e1c6d4b311b',1,'turbojpeg.h']]],
  ['tjbufsizeyuv2',['tjBufSizeYUV2',['../group___turbo_j_p_e_g.html#gaf451664a62c1f6c7cc5a6401f32908c9',1,'turbojpeg.h']]],
  ['tjcompress2',['tjCompress2',['../group___turbo_j_p_e_g.html#gaba62b7a98f960839b588579898495cf2',1,'turbojpeg.h']]],
  ['tjcompressfromyuv',['tjCompressFromYUV',['../group___turbo_j_p_e_g.html#ga0b931126c7a615ddc3bbd0cca6698d67',1,'turbojpeg.h']]],
  ['tjcompressfromyuvplanes',['tjCompressFromYUVPlanes',['../group___turbo_j_p_e_g.html#gaa89a1982cb4556b12ae7af4439991af6',1,'turbojpeg.h']]],
  ['tjdecodeyuv',['tjDecodeYUV',['../group___turbo_j_p_e_g.html#ga132ae2c2cadcf64c8bb0f3bdf69da3ed',1,'turbojpeg.h']]],
  ['tjdecodeyuvplanes',['tjDecodeYUVPlanes',['../group___turbo_j_p_e_g.html#ga6cb5b0e1101a2b20edea576e11faf93d',1,'turbojpeg.h']]],
  ['tjdecompress2',['tjDecompress2',['../group___turbo_j_p_e_g.html#gada69cc6443d1bb493b40f1626259e5e9',1,'turbojpeg.h']]],
  ['tjdecompressheader3',['tjDecompressHeader3',['../group___turbo_j_p_e_g.html#gacd0fac3af74b3511d39b4781b7103086',1,'turbojpeg.h']]],
  ['tjdecompresstoyuv2',['tjDecompressToYUV2',['../group___turbo_j_p_e_g.html#ga7c08b340ad7f8e85d407bd9e81d44d07',1,'turbojpeg.h']]],
  ['tjdecompresstoyuvplanes',['tjDecompressToYUVPlanes',['../group___turbo_j_p_e_g.html#ga0828a38ae29631ac28b6857cefb0eebf',1,'turbojpeg.h']]],
  ['tjdestroy',['tjDestroy',['../group___turbo_j_p_e_g.html#ga674adee917b95ad4a896f1ba39e12540',1,'turbojpeg.h']]],
  ['tjencodeyuv3',['tjEncodeYUV3',['../group___turbo_j_p_e_g.html#ga0a5ffbf7cb58a5b6a8201114fe889360',1,'turbojpeg.h']]],
  ['tjencodeyuvplanes',['tjEncodeYUVPlanes',['../group___turbo_j_p_e_g.html#gaa791db8598853ddcad24e42897ef1269',1,'turbojpeg.h']]],
  ['tjfree',['tjFree',['../group___turbo_j_p_e_g.html#ga8c4a1231dc06a450514c835f6471f137',1,'turbojpeg.h']]],
  ['tjgeterrorstr',['tjGetErrorStr',['../group___turbo_j_p_e_g.html#ga9af79c908ec131b1ae8d52fe40375abf',1,'turbojpeg.h']]],
  ['tjgetscalingfactors',['tjGetScalingFactors',['../group___turbo_j_p_e_g.html#ga6449044b9af402999ccf52f401333be8',1,'turbojpeg.h']]],
  ['tjinitcompress',['tjInitCompress',['../group___turbo_j_p_e_g.html#ga3d10c47fbe4a2489a2b30c931551d01a',1,'turbojpeg.h']]],
  ['tjinitdecompress',['tjInitDecompress',['../group___turbo_j_p_e_g.html#gae5408179d041e2a2f7199c8283cf649e',1,'turbojpeg.h']]],
  ['tjinittransform',['tjInitTransform',['../group___turbo_j_p_e_g.html#ga3155b775bfbac9dbba869b95a0367902',1,'turbojpeg.h']]],
  ['tjplaneheight',['tjPlaneHeight',['../group___turbo_j_p_e_g.html#ga1a209696c6a80748f20e134b3c64789f',1,'turbojpeg.h']]],
  ['tjplanesizeyuv',['tjPlaneSizeYUV',['../group___turbo_j_p_e_g.html#ga6f98d977bfa9d167c97172e876ba61e2',1,'turbojpeg.h']]],
  ['tjplanewidth',['tjPlaneWidth',['../group___turbo_j_p_e_g.html#ga63fb66bb1e36c74008c4634360becbb1',1,'turbojpeg.h']]],
  ['tjtransform',['tjTransform',['../group___turbo_j_p_e_g.html#gae403193ceb4aafb7e0f56ab587b48616',1,'turbojpeg.h']]]
 ];
--- a/doc/html/search/groups_74.html
+++ b/doc/html/search/groups_74.html
@@ -0,0 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta name="generator" content="Doxygen 1.8.3.1">
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="groups_74.js"></script>
 <script type="text/javascript" src="search.js"></script>
 </head>
 <body class="SRPage">
 <div id="SRIndex">
 <div class="SRStatus" id="Loading">Loading...</div>
 <div id="SRResults"></div>
 <script type="text/javascript"><!--
 createResults();
 --></script>
 <div class="SRStatus" id="Searching">Searching...</div>
 <div class="SRStatus" id="NoMatches">No Matches</div>
 <script type="text/javascript"><!--
 document.getElementById("Loading").style.display="none";
 document.getElementById("NoMatches").style.display="none";
 var searchResults = new SearchResults("searchResults");
 searchResults.Search();
 --></script>
 </div>
 </body>
 </html>
--- a/doc/html/search/groups_74.js
+++ b/doc/html/search/groups_74.js
@@ -0,0 +1,4 @@
 var searchData=
 [
  ['turbojpeg',['TurboJPEG',['../group___turbo_j_p_e_g.html',1,'']]]
 ];
--- a/doc/html/search/mag_sel.png
+++ b/doc/html/search/mag_sel.png
--- a/doc/html/search/nomatches.html
+++ b/doc/html/search/nomatches.html
@@ -0,0 +1,12 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="search.js"></script>
 </head>
 <body class="SRPage">
 <div id="SRIndex">
 <div class="SRStatus" id="NoMatches">No Matches</div>
 </div>
 </body>
 </html>
--- a/doc/html/search/search.css
+++ b/doc/html/search/search.css
@@ -0,0 +1,271 @@
 /*---------------- Search Box */
 #FSearchBox {
    float: left;
 }
 #MSearchBox {
    white-space : nowrap;
    position: absolute;
    float: none;
    display: inline;
    margin-top: 8px;
    right: 0px;
    width: 170px;
    z-index: 102;
    background-color: white;
 }
 #MSearchBox .left
 {
    display:block;
    position:absolute;
    left:10px;
    width:20px;
    height:19px;
    background:url('search_l.png') no-repeat;
    background-position:right;
 }
 #MSearchSelect {
    display:block;
    position:absolute;
    width:20px;
    height:19px;
 }
 .left #MSearchSelect {
    left:4px;
 }
 .right #MSearchSelect {
    right:5px;
 }
 #MSearchField {
    display:block;
    position:absolute;
    height:19px;
    background:url('search_m.png') repeat-x;
    border:none;
    width:116px;
    margin-left:20px;
    padding-left:4px;
    color: #909090;
    outline: none;
    font: 9pt Arial, Verdana, sans-serif;
 }
 #FSearchBox #MSearchField {
    margin-left:15px;
 }
 #MSearchBox .right {
    display:block;
    position:absolute;
    right:10px;
    top:0px;
    width:20px;
    height:19px;
    background:url('search_r.png') no-repeat;
    background-position:left;
 }
 #MSearchClose {
    display: none;
    position: absolute;
    top: 4px;
    background : none;
    border: none;
    margin: 0px 4px 0px 0px;
    padding: 0px 0px;
    outline: none;
 }
 .left #MSearchClose {
    left: 6px;
 }
 .right #MSearchClose {
    right: 2px;
 }
 .MSearchBoxActive #MSearchField {
    color: #000000;
 }
 /*---------------- Search filter selection */
 #MSearchSelectWindow {
    display: none;
    position: absolute;
    left: 0; top: 0;
    border: 1px solid #90A5CE;
    background-color: #F9FAFC;
    z-index: 1;
    padding-top: 4px;
    padding-bottom: 4px;
    -moz-border-radius: 4px;
    -webkit-border-top-left-radius: 4px;
    -webkit-border-top-right-radius: 4px;
    -webkit-border-bottom-left-radius: 4px;
    -webkit-border-bottom-right-radius: 4px;
    -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
 }
 .SelectItem {
    font: 8pt Arial, Verdana, sans-serif;
    padding-left:  2px;
    padding-right: 12px;
    border: 0px;
 }
 span.SelectionMark {
    margin-right: 4px;
    font-family: monospace;
    outline-style: none;
    text-decoration: none;
 }
 a.SelectItem {
    display: block;
    outline-style: none;
    color: #000000; 
    text-decoration: none;
    padding-left:   6px;
    padding-right: 12px;
 }
 a.SelectItem:focus,
 a.SelectItem:active {
    color: #000000; 
    outline-style: none;
    text-decoration: none;
 }
 a.SelectItem:hover {
    color: #FFFFFF;
    background-color: #3D578C;
    outline-style: none;
    text-decoration: none;
    cursor: pointer;
    display: block;
 }
 /*---------------- Search results window */
 iframe#MSearchResults {
    width: 60ex;
    height: 15em;
 }
 #MSearchResultsWindow {
    display: none;
    position: absolute;
    left: 0; top: 0;
    border: 1px solid #000;
    background-color: #EEF1F7;
 }
 /* ----------------------------------- */
 #SRIndex {
    clear:both; 
    padding-bottom: 15px;
 }
 .SREntry {
    font-size: 10pt;
    padding-left: 1ex;
 }
 .SRPage .SREntry {
    font-size: 8pt;
    padding: 1px 5px;
 }
 body.SRPage {
    margin: 5px 2px;
 }
 .SRChildren {
    padding-left: 3ex; padding-bottom: .5em 
 }
 .SRPage .SRChildren {
    display: none;
 }
 .SRSymbol {
    font-weight: bold; 
    color: #425E97;
    font-family: Arial, Verdana, sans-serif;
    text-decoration: none;
    outline: none;
 }
 a.SRScope {
    display: block;
    color: #425E97; 
    font-family: Arial, Verdana, sans-serif;
    text-decoration: none;
    outline: none;
 }
 a.SRSymbol:focus, a.SRSymbol:active,
 a.SRScope:focus, a.SRScope:active {
    text-decoration: underline;
 }
 span.SRScope {
    padding-left: 4px;
 }
 .SRPage .SRStatus {
    padding: 2px 5px;
    font-size: 8pt;
    font-style: italic;
 }
 .SRResult {
    display: none;
 }
 DIV.searchresults {
    margin-left: 10px;
    margin-right: 10px;
 }
 /*---------------- External search page results */
 .searchresult {
    background-color: #F0F3F8;
 }
 .pages b {
   color: white;
   padding: 5px 5px 3px 5px;
   background-image: url("../tab_a.png");
   background-repeat: repeat-x;
   text-shadow: 0 1px 1px #000000;
 }
 .pages {
    line-height: 17px;
    margin-left: 4px;
    text-decoration: none;
 }
 .hl {
    font-weight: bold;
 }
 #searchresults {
    margin-bottom: 20px;
 }
 .searchpages {
    margin-top: 10px;
 }
--- a/doc/html/search/search.js
+++ b/doc/html/search/search.js
@@ -0,0 +1,809 @@
 // Search script generated by doxygen
 // Copyright (C) 2009 by Dimitri van Heesch.
 // The code in this file is loosly based on main.js, part of Natural Docs,
 // which is Copyright (C) 2003-2008 Greg Valure
 // Natural Docs is licensed under the GPL.
 var indexSectionsWithContent =
 {
  0: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001100010000011001010011100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
  1: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
  2: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
  3: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001100010000011001010011100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
  4: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
  5: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
  6: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
  7: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
 };
 var indexSectionNames =
 {
  0: "all",
  1: "classes",
  2: "functions",
  3: "variables",
  4: "typedefs",
  5: "enums",
  6: "enumvalues",
  7: "groups"
 };
 function convertToId(search)
 {
  var result = '';
  for (i=0;i<search.length;i++)
  {
    var c = search.charAt(i);
    var cn = c.charCodeAt(0);
    if (c.match(/[a-z0-9]/))
    {
      result+=c;
    }
    else if (cn<16) 
    {
      result+="_0"+cn.toString(16);
    }
    else 
    {
      result+="_"+cn.toString(16);
    }
  }
  return result;
 }
 function getXPos(item)
 {
  var x = 0;
  if (item.offsetWidth)
  {
    while (item && item!=document.body)
    {
      x   += item.offsetLeft;
      item = item.offsetParent;
    }
  }
  return x;
 }
 function getYPos(item)
 {
  var y = 0;
  if (item.offsetWidth)
  {
     while (item && item!=document.body)
     {
       y   += item.offsetTop;
       item = item.offsetParent;
     }
  }
  return y;
 }
 /* A class handling everything associated with the search panel.
   Parameters:
   name - The name of the global variable that will be 
          storing this instance.  Is needed to be able to set timeouts.
   resultPath - path to use for external files
 */
 function SearchBox(name, resultsPath, inFrame, label)
 {
  if (!name || !resultsPath) {  alert("Missing parameters to SearchBox."); }
  // ---------- Instance variables
  this.name                  = name;
  this.resultsPath           = resultsPath;
  this.keyTimeout            = 0;
  this.keyTimeoutLength      = 500;
  this.closeSelectionTimeout = 300;
  this.lastSearchValue       = "";
  this.lastResultsPage       = "";
  this.hideTimeout           = 0;
  this.searchIndex           = 0;
  this.searchActive          = false;
  this.insideFrame           = inFrame;
  this.searchLabel           = label;
  // ----------- DOM Elements
  this.DOMSearchField = function()
  {  return document.getElementById("MSearchField");  }
  this.DOMSearchSelect = function()
  {  return document.getElementById("MSearchSelect");  }
  this.DOMSearchSelectWindow = function()
  {  return document.getElementById("MSearchSelectWindow");  }
  this.DOMPopupSearchResults = function()
  {  return document.getElementById("MSearchResults");  }
  this.DOMPopupSearchResultsWindow = function()
  {  return document.getElementById("MSearchResultsWindow");  }
  this.DOMSearchClose = function()
  {  return document.getElementById("MSearchClose"); }
  this.DOMSearchBox = function()
  {  return document.getElementById("MSearchBox");  }
  // ------------ Event Handlers
  // Called when focus is added or removed from the search field.
  this.OnSearchFieldFocus = function(isActive)
  {
    this.Activate(isActive);
  }
  this.OnSearchSelectShow = function()
  {
    var searchSelectWindow = this.DOMSearchSelectWindow();
    var searchField        = this.DOMSearchSelect();
    if (this.insideFrame)
    {
      var left = getXPos(searchField);
      var top  = getYPos(searchField);
      left += searchField.offsetWidth + 6;
      top += searchField.offsetHeight;
      // show search selection popup
      searchSelectWindow.style.display='block';
      left -= searchSelectWindow.offsetWidth;
      searchSelectWindow.style.left =  left + 'px';
      searchSelectWindow.style.top  =  top  + 'px';
    }
    else
    {
      var left = getXPos(searchField);
      var top  = getYPos(searchField);
      top += searchField.offsetHeight;
      // show search selection popup
      searchSelectWindow.style.display='block';
      searchSelectWindow.style.left =  left + 'px';
      searchSelectWindow.style.top  =  top  + 'px';
    }
    // stop selection hide timer
    if (this.hideTimeout) 
    {
      clearTimeout(this.hideTimeout);
      this.hideTimeout=0;
    }
    return false; // to avoid "image drag" default event
  }
  this.OnSearchSelectHide = function()
  {
    this.hideTimeout = setTimeout(this.name +".CloseSelectionWindow()",
                                  this.closeSelectionTimeout);
  }
  // Called when the content of the search field is changed.
  this.OnSearchFieldChange = function(evt)
  {
    if (this.keyTimeout) // kill running timer
    {
      clearTimeout(this.keyTimeout);
      this.keyTimeout = 0;
    }
    var e  = (evt) ? evt : window.event; // for IE
    if (e.keyCode==40 || e.keyCode==13)
    {
      if (e.shiftKey==1)
      {
        this.OnSearchSelectShow();
        var win=this.DOMSearchSelectWindow(); 
        for (i=0;i<win.childNodes.length;i++)
        {
          var child = win.childNodes[i]; // get span within a
          if (child.className=='SelectItem')
          {
            child.focus();
            return;
          }
        }
        return;
      }
      else if (window.frames.MSearchResults.searchResults)
      {
        var elem = window.frames.MSearchResults.searchResults.NavNext(0);
        if (elem) elem.focus();
      }
    }
    else if (e.keyCode==27) // Escape out of the search field
    {
      this.DOMSearchField().blur();
      this.DOMPopupSearchResultsWindow().style.display = 'none';
      this.DOMSearchClose().style.display = 'none';
      this.lastSearchValue = '';
      this.Activate(false);
      return;
    }
    // strip whitespaces
    var searchValue = this.DOMSearchField().value.replace(/ +/g, "");
    if (searchValue != this.lastSearchValue) // search value has changed
    {
      if (searchValue != "") // non-empty search
      {
        // set timer for search update
        this.keyTimeout = setTimeout(this.name + '.Search()',
                                     this.keyTimeoutLength);
      }
      else // empty search field
      {
        this.DOMPopupSearchResultsWindow().style.display = 'none';
        this.DOMSearchClose().style.display = 'none';
        this.lastSearchValue = '';
      }
    }
  }
  this.SelectItemCount = function(id)
  {
    var count=0;
    var win=this.DOMSearchSelectWindow(); 
    for (i=0;i<win.childNodes.length;i++)
    {
      var child = win.childNodes[i]; // get span within a
      if (child.className=='SelectItem')
      {
        count++;
      }
    }
    return count;
  }
  this.SelectItemSet = function(id)
  {
    var i,j=0;
    var win=this.DOMSearchSelectWindow(); 
    for (i=0;i<win.childNodes.length;i++)
    {
      var child = win.childNodes[i]; // get span within a
      if (child.className=='SelectItem')
      {
        var node = child.firstChild;
        if (j==id)
        {
          node.innerHTML='&#8226;';
        }
        else
        {
          node.innerHTML='&#160;';
        }
        j++;
      }
    }
  }
  // Called when an search filter selection is made.
  // set item with index id as the active item
  this.OnSelectItem = function(id)
  {
    this.searchIndex = id;
    this.SelectItemSet(id);
    var searchValue = this.DOMSearchField().value.replace(/ +/g, "");
    if (searchValue!="" && this.searchActive) // something was found -> do a search
    {
      this.Search();
    }
  }
  this.OnSearchSelectKey = function(evt)
  {
    var e = (evt) ? evt : window.event; // for IE
    if (e.keyCode==40 && this.searchIndex<this.SelectItemCount()) // Down
    {
      this.searchIndex++;
      this.OnSelectItem(this.searchIndex);
    }
    else if (e.keyCode==38 && this.searchIndex>0) // Up
    {
      this.searchIndex--;
      this.OnSelectItem(this.searchIndex);
    }
    else if (e.keyCode==13 || e.keyCode==27)
    {
      this.OnSelectItem(this.searchIndex);
      this.CloseSelectionWindow();
      this.DOMSearchField().focus();
    }
    return false;
  }
  // --------- Actions
  // Closes the results window.
  this.CloseResultsWindow = function()
  {
    this.DOMPopupSearchResultsWindow().style.display = 'none';
    this.DOMSearchClose().style.display = 'none';
    this.Activate(false);
  }
  this.CloseSelectionWindow = function()
  {
    this.DOMSearchSelectWindow().style.display = 'none';
  }
  // Performs a search.
  this.Search = function()
  {
    this.keyTimeout = 0;
    // strip leading whitespace
    var searchValue = this.DOMSearchField().value.replace(/^ +/, "");
    var code = searchValue.toLowerCase().charCodeAt(0);
    var hexCode;
    if (code<16) 
    {
      hexCode="0"+code.toString(16);
    }
    else 
    {
      hexCode=code.toString(16);
    }
    var resultsPage;
    var resultsPageWithSearch;
    var hasResultsPage;
    if (indexSectionsWithContent[this.searchIndex].charAt(code) == '1')
    {
       resultsPage = this.resultsPath + '/' + indexSectionNames[this.searchIndex] + '_' + hexCode + '.html';
       resultsPageWithSearch = resultsPage+'?'+escape(searchValue);
       hasResultsPage = true;
    }
    else // nothing available for this search term
    {
       resultsPage = this.resultsPath + '/nomatches.html';
       resultsPageWithSearch = resultsPage;
       hasResultsPage = false;
    }
    window.frames.MSearchResults.location = resultsPageWithSearch;  
    var domPopupSearchResultsWindow = this.DOMPopupSearchResultsWindow();
    if (domPopupSearchResultsWindow.style.display!='block')
    {
       var domSearchBox = this.DOMSearchBox();
       this.DOMSearchClose().style.display = 'inline';
       if (this.insideFrame)
       {
         var domPopupSearchResults = this.DOMPopupSearchResults();
         domPopupSearchResultsWindow.style.position = 'relative';
         domPopupSearchResultsWindow.style.display  = 'block';
         var width = document.body.clientWidth - 8; // the -8 is for IE :-(
         domPopupSearchResultsWindow.style.width    = width + 'px';
         domPopupSearchResults.style.width          = width + 'px';
       }
       else
       {
         var domPopupSearchResults = this.DOMPopupSearchResults();
         var left = getXPos(domSearchBox) + 150; // domSearchBox.offsetWidth;
         var top  = getYPos(domSearchBox) + 20;  // domSearchBox.offsetHeight + 1;
         domPopupSearchResultsWindow.style.display = 'block';
         left -= domPopupSearchResults.offsetWidth;
         domPopupSearchResultsWindow.style.top     = top  + 'px';
         domPopupSearchResultsWindow.style.left    = left + 'px';
       }
    }
    this.lastSearchValue = searchValue;
    this.lastResultsPage = resultsPage;
  }
  // -------- Activation Functions
  // Activates or deactivates the search panel, resetting things to 
  // their default values if necessary. 
  this.Activate = function(isActive)
  {
    if (isActive || // open it
        this.DOMPopupSearchResultsWindow().style.display == 'block' 
       )
    {
      this.DOMSearchBox().className = 'MSearchBoxActive';
      var searchField = this.DOMSearchField();
      if (searchField.value == this.searchLabel) // clear "Search" term upon entry
      {  
        searchField.value = '';  
        this.searchActive = true;
      }
    }
    else if (!isActive) // directly remove the panel
    {
      this.DOMSearchBox().className = 'MSearchBoxInactive';
      this.DOMSearchField().value   = this.searchLabel;
      this.searchActive             = false;
      this.lastSearchValue          = ''
      this.lastResultsPage          = '';
    }
  }
 }
 // -----------------------------------------------------------------------
 // The class that handles everything on the search results page.
 function SearchResults(name)
 {
    // The number of matches from the last run of <Search()>.
    this.lastMatchCount = 0;
    this.lastKey = 0;
    this.repeatOn = false;
    // Toggles the visibility of the passed element ID.
    this.FindChildElement = function(id)
    {
      var parentElement = document.getElementById(id);
      var element = parentElement.firstChild;
      while (element && element!=parentElement)
      {
        if (element.nodeName == 'DIV' && element.className == 'SRChildren')
        {
          return element;
        }
        if (element.nodeName == 'DIV' && element.hasChildNodes())
        {  
           element = element.firstChild;  
        }
        else if (element.nextSibling)
        {  
           element = element.nextSibling;  
        }
        else
        {
          do
          {
            element = element.parentNode;
          }
          while (element && element!=parentElement && !element.nextSibling);
          if (element && element!=parentElement)
          {  
            element = element.nextSibling;  
          }
        }
      }
    }
    this.Toggle = function(id)
    {
      var element = this.FindChildElement(id);
      if (element)
      {
        if (element.style.display == 'block')
        {
          element.style.display = 'none';
        }
        else
        {
          element.style.display = 'block';
        }
      }
    }
    // Searches for the passed string.  If there is no parameter,
    // it takes it from the URL query.
    //
    // Always returns true, since other documents may try to call it
    // and that may or may not be possible.
    this.Search = function(search)
    {
      if (!search) // get search word from URL
      {
        search = window.location.search;
        search = search.substring(1);  // Remove the leading '?'
        search = unescape(search);
      }
      search = search.replace(/^ +/, ""); // strip leading spaces
      search = search.replace(/ +$/, ""); // strip trailing spaces
      search = search.toLowerCase();
      search = convertToId(search);
      var resultRows = document.getElementsByTagName("div");
      var matches = 0;
      var i = 0;
      while (i < resultRows.length)
      {
        var row = resultRows.item(i);
        if (row.className == "SRResult")
        {
          var rowMatchName = row.id.toLowerCase();
          rowMatchName = rowMatchName.replace(/^sr\d*_/, ''); // strip 'sr123_'
          if (search.length<=rowMatchName.length && 
             rowMatchName.substr(0, search.length)==search)
          {
            row.style.display = 'block';
            matches++;
          }
          else
          {
            row.style.display = 'none';
          }
        }
        i++;
      }
      document.getElementById("Searching").style.display='none';
      if (matches == 0) // no results
      {
        document.getElementById("NoMatches").style.display='block';
      }
      else // at least one result
      {
        document.getElementById("NoMatches").style.display='none';
      }
      this.lastMatchCount = matches;
      return true;
    }
    // return the first item with index index or higher that is visible
    this.NavNext = function(index)
    {
      var focusItem;
      while (1)
      {
        var focusName = 'Item'+index;
        focusItem = document.getElementById(focusName);
        if (focusItem && focusItem.parentNode.parentNode.style.display=='block')
        {
          break;
        }
        else if (!focusItem) // last element
        {
          break;
        }
        focusItem=null;
        index++;
      }
      return focusItem;
    }
    this.NavPrev = function(index)
    {
      var focusItem;
      while (1)
      {
        var focusName = 'Item'+index;
        focusItem = document.getElementById(focusName);
        if (focusItem && focusItem.parentNode.parentNode.style.display=='block')
        {
          break;
        }
        else if (!focusItem) // last element
        {
          break;
        }
        focusItem=null;
        index--;
      }
      return focusItem;
    }
    this.ProcessKeys = function(e)
    {
      if (e.type == "keydown") 
      {
        this.repeatOn = false;
        this.lastKey = e.keyCode;
      }
      else if (e.type == "keypress")
      {
        if (!this.repeatOn)
        {
          if (this.lastKey) this.repeatOn = true;
          return false; // ignore first keypress after keydown
        }
      }
      else if (e.type == "keyup")
      {
        this.lastKey = 0;
        this.repeatOn = false;
      }
      return this.lastKey!=0;
    }
    this.Nav = function(evt,itemIndex) 
    {
      var e  = (evt) ? evt : window.event; // for IE
      if (e.keyCode==13) return true;
      if (!this.ProcessKeys(e)) return false;
      if (this.lastKey==38) // Up
      {
        var newIndex = itemIndex-1;
        var focusItem = this.NavPrev(newIndex);
        if (focusItem)
        {
          var child = this.FindChildElement(focusItem.parentNode.parentNode.id);
          if (child && child.style.display == 'block') // children visible
          { 
            var n=0;
            var tmpElem;
            while (1) // search for last child
            {
              tmpElem = document.getElementById('Item'+newIndex+'_c'+n);
              if (tmpElem)
              {
                focusItem = tmpElem;
              }
              else // found it!
              {
                break;
              }
              n++;
            }
          }
        }
        if (focusItem)
        {
          focusItem.focus();
        }
        else // return focus to search field
        {
           parent.document.getElementById("MSearchField").focus();
        }
      }
      else if (this.lastKey==40) // Down
      {
        var newIndex = itemIndex+1;
        var focusItem;
        var item = document.getElementById('Item'+itemIndex);
        var elem = this.FindChildElement(item.parentNode.parentNode.id);
        if (elem && elem.style.display == 'block') // children visible
        {
          focusItem = document.getElementById('Item'+itemIndex+'_c0');
        }
        if (!focusItem) focusItem = this.NavNext(newIndex);
        if (focusItem)  focusItem.focus();
      }
      else if (this.lastKey==39) // Right
      {
        var item = document.getElementById('Item'+itemIndex);
        var elem = this.FindChildElement(item.parentNode.parentNode.id);
        if (elem) elem.style.display = 'block';
      }
      else if (this.lastKey==37) // Left
      {
        var item = document.getElementById('Item'+itemIndex);
        var elem = this.FindChildElement(item.parentNode.parentNode.id);
        if (elem) elem.style.display = 'none';
      }
      else if (this.lastKey==27) // Escape
      {
        parent.searchBox.CloseResultsWindow();
        parent.document.getElementById("MSearchField").focus();
      }
      else if (this.lastKey==13) // Enter
      {
        return true;
      }
      return false;
    }
    this.NavChild = function(evt,itemIndex,childIndex)
    {
      var e  = (evt) ? evt : window.event; // for IE
      if (e.keyCode==13) return true;
      if (!this.ProcessKeys(e)) return false;
      if (this.lastKey==38) // Up
      {
        if (childIndex>0)
        {
          var newIndex = childIndex-1;
          document.getElementById('Item'+itemIndex+'_c'+newIndex).focus();
        }
        else // already at first child, jump to parent
        {
          document.getElementById('Item'+itemIndex).focus();
        }
      }
      else if (this.lastKey==40) // Down
      {
        var newIndex = childIndex+1;
        var elem = document.getElementById('Item'+itemIndex+'_c'+newIndex);
        if (!elem) // last child, jump to parent next parent
        {
          elem = this.NavNext(itemIndex+1);
        }
        if (elem)
        {
          elem.focus();
        } 
      }
      else if (this.lastKey==27) // Escape
      {
        parent.searchBox.CloseResultsWindow();
        parent.document.getElementById("MSearchField").focus();
      }
      else if (this.lastKey==13) // Enter
      {
        return true;
      }
      return false;
    }
 }
 function setKeyActions(elem,action)
 {
  elem.setAttribute('onkeydown',action);
  elem.setAttribute('onkeypress',action);
  elem.setAttribute('onkeyup',action);
 }
 function setClassAttr(elem,attr)
 {
  elem.setAttribute('class',attr);
  elem.setAttribute('className',attr);
 }
 function createResults()
 {
  var results = document.getElementById("SRResults");
  for (var e=0; e<searchData.length; e++)
  {
    var id = searchData[e][0];
    var srResult = document.createElement('div');
    srResult.setAttribute('id','SR_'+id);
    setClassAttr(srResult,'SRResult');
    var srEntry = document.createElement('div');
    setClassAttr(srEntry,'SREntry');
    var srLink = document.createElement('a');
    srLink.setAttribute('id','Item'+e);
    setKeyActions(srLink,'return searchResults.Nav(event,'+e+')');
    setClassAttr(srLink,'SRSymbol');
    srLink.innerHTML = searchData[e][1][0];
    srEntry.appendChild(srLink);
    if (searchData[e][1].length==2) // single result
    {
      srLink.setAttribute('href',searchData[e][1][1][0]);
      if (searchData[e][1][1][1])
      {
       srLink.setAttribute('target','_parent');
      }
      var srScope = document.createElement('span');
      setClassAttr(srScope,'SRScope');
      srScope.innerHTML = searchData[e][1][1][2];
      srEntry.appendChild(srScope);
    }
    else // multiple results
    {
      srLink.setAttribute('href','javascript:searchResults.Toggle("SR_'+id+'")');
      var srChildren = document.createElement('div');
      setClassAttr(srChildren,'SRChildren');
      for (var c=0; c<searchData[e][1].length-1; c++)
      {
        var srChild = document.createElement('a');
        srChild.setAttribute('id','Item'+e+'_c'+c);
        setKeyActions(srChild,'return searchResults.NavChild(event,'+e+','+c+')');
        setClassAttr(srChild,'SRScope');
        srChild.setAttribute('href',searchData[e][1][c+1][0]);
        if (searchData[e][1][c+1][1])
        {
         srChild.setAttribute('target','_parent');
        }
        srChild.innerHTML = searchData[e][1][c+1][2];
        srChildren.appendChild(srChild);
      }
      srEntry.appendChild(srChildren);
    }
    srResult.appendChild(srEntry);
    results.appendChild(srResult);
  }
 }
--- a/doc/html/search/search_l.png
+++ b/doc/html/search/search_l.png
--- a/doc/html/search/search_m.png
+++ b/doc/html/search/search_m.png
--- a/doc/html/search/search_r.png
+++ b/doc/html/search/search_r.png
--- a/doc/html/search/typedefs_74.html
+++ b/doc/html/search/typedefs_74.html
@@ -0,0 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta name="generator" content="Doxygen 1.8.3.1">
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="typedefs_74.js"></script>
 <script type="text/javascript" src="search.js"></script>
 </head>
 <body class="SRPage">
 <div id="SRIndex">
 <div class="SRStatus" id="Loading">Loading...</div>
 <div id="SRResults"></div>
 <script type="text/javascript"><!--
 createResults();
 --></script>
 <div class="SRStatus" id="Searching">Searching...</div>
 <div class="SRStatus" id="NoMatches">No Matches</div>
 <script type="text/javascript"><!--
 document.getElementById("Loading").style.display="none";
 document.getElementById("NoMatches").style.display="none";
 var searchResults = new SearchResults("searchResults");
 searchResults.Search();
 --></script>
 </div>
 </body>
 </html>
--- a/doc/html/search/typedefs_74.js
+++ b/doc/html/search/typedefs_74.js
@@ -0,0 +1,5 @@
 var searchData=
 [
  ['tjhandle',['tjhandle',['../group___turbo_j_p_e_g.html#ga758d2634ecb4949de7815cba621f5763',1,'turbojpeg.h']]],
  ['tjtransform',['tjtransform',['../group___turbo_j_p_e_g.html#gaa29f3189c41be12ec5dee7caec318a31',1,'turbojpeg.h']]]
 ];
--- a/doc/html/search/variables_63.html
+++ b/doc/html/search/variables_63.html
@@ -0,0 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta name="generator" content="Doxygen 1.8.3.1">
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="variables_63.js"></script>
 <script type="text/javascript" src="search.js"></script>
 </head>
 <body class="SRPage">
 <div id="SRIndex">
 <div class="SRStatus" id="Loading">Loading...</div>
 <div id="SRResults"></div>
 <script type="text/javascript"><!--
 createResults();
 --></script>
 <div class="SRStatus" id="Searching">Searching...</div>
 <div class="SRStatus" id="NoMatches">No Matches</div>
 <script type="text/javascript"><!--
 document.getElementById("Loading").style.display="none";
 document.getElementById("NoMatches").style.display="none";
 var searchResults = new SearchResults("searchResults");
 searchResults.Search();
 --></script>
 </div>
 </body>
 </html>
--- a/doc/html/search/variables_63.js
+++ b/doc/html/search/variables_63.js
@@ -0,0 +1,4 @@
 var searchData=
 [
  ['customfilter',['customFilter',['../structtjtransform.html#a43ee1bcdd2a8d7249a756774f78793c1',1,'tjtransform']]]
 ];
--- a/Show More
+++ b/Show More