From 67810edcf79aa5ae1f1c49e1da7786f2e76f3261 Mon Sep 17 00:00:00 2001 From: DRC Date: Wed, 25 May 2011 06:02:50 +0000 Subject: [PATCH] jpegtran on Windows needs the same fix as cjpeg and djpeg to eliminate errors when I/O redirection is used. --- CMakeLists.txt | 1 + ChangeLog.txt | 4 ++++ sharedlib/CMakeLists.txt | 1 + 3 files changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 388c582a..10960eb7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -225,6 +225,7 @@ 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") add_executable(rdjpgcom rdjpgcom.c) diff --git a/ChangeLog.txt b/ChangeLog.txt index 00a4ede3..17bf5383 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -38,6 +38,10 @@ size and component order of the uncompressed source/destination images as well as uses the libjpeg memory source and destination managers. The latter 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 output.jpg). + 1.1.1 ===== diff --git a/sharedlib/CMakeLists.txt b/sharedlib/CMakeLists.txt index 7db7e2fd..97e06e39 100755 --- a/sharedlib/CMakeLists.txt +++ b/sharedlib/CMakeLists.txt @@ -51,6 +51,7 @@ target_link_libraries(djpeg jpeg) add_executable(jpegtran ../jpegtran.c ../cdjpeg.c ../rdswitch.c ../transupp.c) target_link_libraries(jpegtran jpeg) +set_property(TARGET jpegtran PROPERTY COMPILE_FLAGS "-DUSE_SETMODE") install(TARGETS jpeg cjpeg djpeg jpegtran ARCHIVE DESTINATION lib