"jpegut"="tjunittest" & "jpgtest"="tjbench"

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2634c420bd9026a74f0fcfb2e433bfaa25e76b5b..388c582a7d6e882f852ca68a845967ef0c75a802 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -193,22 +193,22 @@ if(WITH_SIMD)
   add_dependencies(turbojpeg-static simd)
 endif()
 
-add_executable(jpegut jpegut.c tjutil.c)
-target_link_libraries(jpegut turbojpeg)
+add_executable(tjunittest tjunittest.c tjutil.c)
+target_link_libraries(tjunittest turbojpeg)
 
-add_executable(jpegut-static jpegut.c tjutil.c)
-target_link_libraries(jpegut-static turbojpeg-static)
+add_executable(tjunittest-static tjunittest.c tjutil.c)
+target_link_libraries(tjunittest-static turbojpeg-static)
 
-add_executable(jpgtest jpgtest.c bmp.c tjutil.c rdbmp.c rdppm.c wrbmp.c
+add_executable(tjbench tjbench.c bmp.c tjutil.c rdbmp.c rdppm.c wrbmp.c
   wrppm.c)
-target_link_libraries(jpgtest turbojpeg jpeg)
-set_property(TARGET jpgtest PROPERTY COMPILE_FLAGS
+target_link_libraries(tjbench turbojpeg jpeg)
+set_property(TARGET tjbench PROPERTY COMPILE_FLAGS
   "-DBMP_SUPPORTED -DPPM_SUPPORTED")
 
-add_executable(jpgtest-static jpgtest.c bmp.c tjutil.c rdbmp.c rdppm.c wrbmp.c
+add_executable(tjbench-static tjbench.c bmp.c tjutil.c rdbmp.c rdppm.c wrbmp.c
   wrppm.c)
-target_link_libraries(jpgtest-static turbojpeg-static jpeg-static)
-set_property(TARGET jpgtest-static PROPERTY COMPILE_FLAGS
+target_link_libraries(tjbench-static turbojpeg-static jpeg-static)
+set_property(TARGET tjbench-static PROPERTY COMPILE_FLAGS
   "-DBMP_SUPPORTED -DPPM_SUPPORTED")
 
 add_executable(cjpeg-static cjpeg.c cdjpeg.c rdbmp.c rdgif.c rdppm.c rdswitch.c
@@ -248,9 +248,9 @@ add_test(TJUnitTest-yuv ${JAVA_RUNTIME} -cp java/${OBJDIR}turbojpeg.jar -Djava.l
 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)
 endif()
-add_test(jpegut jpegut)
-add_test(jpegut-alloc jpegut -alloc)
-add_test(jpegut-yuv jpegut -yuv)
+add_test(tjunittest tjunittest)
+add_test(tjunittest-alloc tjunittest -alloc)
+add_test(tjunittest-yuv tjunittest -yuv)
 add_test(cjpeg-int sharedlib/cjpeg -dct int -outfile testoutint.jpg ${CMAKE_SOURCE_DIR}/testorig.ppm)
 add_test(cjpeg-int-cmp ${CMAKE_COMMAND} -E compare_files ${CMAKE_SOURCE_DIR}/testimgint.jpg testoutint.jpg)
 add_test(cjpeg-fast sharedlib/cjpeg -dct fast -opt -outfile testoutfst.jpg ${CMAKE_SOURCE_DIR}/testorig.ppm)
@@ -308,9 +308,9 @@ endif()
 add_test(jpegtran-crop sharedlib/jpegtran -crop 120x90+20+50 -transpose -perfect -outfile testoutcrop.jpg ${CMAKE_SOURCE_DIR}/testorig.jpg)
 add_test(jpegtran-crop-cmp ${CMAKE_COMMAND} -E compare_files ${CMAKE_SOURCE_DIR}/testimgcrop.jpg testoutcrop.jpg)
 
-add_test(jpegut-static jpegut-static)
-add_test(jpegut-static-alloc jpegut-static -alloc)
-add_test(jpegut-static-yuv jpegut-static -yuv)
+add_test(tjunittest-static tjunittest-static)
+add_test(tjunittest-static-alloc tjunittest-static -alloc)
+add_test(tjunittest-static-yuv tjunittest-static -yuv)
 add_test(cjpeg-static-int cjpeg-static -dct int -outfile testoutint.jpg ${CMAKE_SOURCE_DIR}/testorig.ppm)
 add_test(cjpeg-static-int-cmp ${CMAKE_COMMAND} -E compare_files ${CMAKE_SOURCE_DIR}/testimgint.jpg testoutint.jpg)
 add_test(cjpeg-static-fast cjpeg-static -dct fast -opt -outfile testoutfst.jpg ${CMAKE_SOURCE_DIR}/testorig.ppm)
@@ -409,10 +409,10 @@ configure_file(release/libjpeg-turbo.nsi.in libjpeg-turbo.nsi @ONLY)
 add_custom_target(installer
   makensis -nocd ${INST_DEFS} libjpeg-turbo.nsi
   DEPENDS jpeg jpeg-static turbojpeg turbojpeg-static rdjpgcom wrjpgcom
-    cjpeg djpeg jpegtran jpgtest
+    cjpeg djpeg jpegtran tjbench
   SOURCES libjpeg-turbo.nsi)
 
-install(TARGETS jpeg-static turbojpeg turbojpeg-static rdjpgcom wrjpgcom jpgtest
+install(TARGETS jpeg-static turbojpeg turbojpeg-static rdjpgcom wrjpgcom tjbench
   ARCHIVE DESTINATION lib
   LIBRARY DESTINATION lib
   RUNTIME DESTINATION bin

diff --git a/Makefile.am b/Makefile.am
index 3d67d2219aa54cf53640c7d6da5b2393e2cc6cca..bfac20b979e8bed4feb60ec722fe259adf0411b5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -72,19 +72,19 @@ libjpeg_la_SOURCES += jsimd_none.c
 
 endif
 
-bin_PROGRAMS = cjpeg djpeg jpegtran rdjpgcom wrjpgcom jpgtest
-noinst_PROGRAMS = jpegut
+bin_PROGRAMS = cjpeg djpeg jpegtran rdjpgcom wrjpgcom tjbench
+noinst_PROGRAMS = tjunittest
 
-jpgtest_SOURCES = jpgtest.c bmp.h bmp.c tjutil.h tjutil.c rdbmp.c rdppm.c \
+tjbench_SOURCES = tjbench.c bmp.h bmp.c tjutil.h tjutil.c rdbmp.c rdppm.c \
        wrbmp.c wrppm.c
 
-jpgtest_LDADD = libturbojpeg.la libjpeg.la -lm
+tjbench_LDADD = libturbojpeg.la libjpeg.la -lm
 
-jpgtest_CFLAGS = -DBMP_SUPPORTED -DPPM_SUPPORTED
+tjbench_CFLAGS = -DBMP_SUPPORTED -DPPM_SUPPORTED
 
-jpegut_SOURCES = jpegut.c tjutil.h tjutil.c
+tjunittest_SOURCES = tjunittest.c tjutil.h tjutil.c
 
-jpegut_LDADD = libturbojpeg.la
+tjunittest_LDADD = libturbojpeg.la
 
 cjpeg_SOURCES = cdjpeg.h cderror.h cdjpeg.c cjpeg.c rdbmp.c rdgif.c \
        rdppm.c rdswitch.c rdtarga.c 
@@ -143,9 +143,9 @@ if WITH_JAVA
        $(JAVA) -cp java/turbojpeg.jar -Djava.library.path=.libs TJUnitTest -yuv
        $(JAVA) -cp java/turbojpeg.jar -Djava.library.path=.libs TJUnitTest -yuv -bi
 endif
-       ./jpegut
-       ./jpegut -alloc
-       ./jpegut -yuv
+       ./tjunittest
+       ./tjunittest -alloc
+       ./tjunittest -yuv
        ./cjpeg -dct int -outfile testoutint.jpg $(srcdir)/testorig.ppm
        cmp $(srcdir)/testimgint.jpg testoutint.jpg
        ./cjpeg -dct fast -opt -outfile testoutfst.jpg $(srcdir)/testorig.ppm

diff --git a/release/libjpeg-turbo.nsi.in b/release/libjpeg-turbo.nsi.in
index 3e191d7cc8838e3bad83ba6917649b5a0f7d3b4d..39773f6ae788487b160406e38ae3d041683206a7 100755 (executable)
--- a/release/libjpeg-turbo.nsi.in
+++ b/release/libjpeg-turbo.nsi.in
@@ -48,7 +48,7 @@ Section "@CMAKE_PROJECT_NAME@ SDK for @INST_PLATFORM@ (required)"
        File "@CMAKE_BINARY_DIR@\sharedlib\${BUILDDIR}cjpeg.exe"
        File "@CMAKE_BINARY_DIR@\sharedlib\${BUILDDIR}djpeg.exe"
        File "@CMAKE_BINARY_DIR@\sharedlib\${BUILDDIR}jpegtran.exe"
-       File "@CMAKE_BINARY_DIR@\${BUILDDIR}jpgtest.exe"
+       File "@CMAKE_BINARY_DIR@\${BUILDDIR}tjbench.exe"
        File "@CMAKE_BINARY_DIR@\${BUILDDIR}rdjpgcom.exe"
        File "@CMAKE_BINARY_DIR@\${BUILDDIR}wrjpgcom.exe"
        SetOutPath $INSTDIR\lib
@@ -121,7 +121,7 @@ Section "Uninstall"
        Delete $INSTDIR\bin\cjpeg.exe
        Delete $INSTDIR\bin\djpeg.exe
        Delete $INSTDIR\bin\jpegtran.exe
-       Delete $INSTDIR\bin\jpgtest.exe
+       Delete $INSTDIR\bin\tjbench.exe
        Delete $INSTDIR\bin\rdjpgcom.exe
        Delete $INSTDIR\bin\wrjpgcom.exe
        Delete $INSTDIR\include\jconfig.h"

diff --git a/release/libjpeg-turbo.spec.in b/release/libjpeg-turbo.spec.in
index 03d63a0e50f068fe3601eedec97fb4c234583f2b..68a67b5f16d6e1c29ffa515b7810a74ddcb7097e 100644 (file)
--- a/release/libjpeg-turbo.spec.in
+++ b/release/libjpeg-turbo.spec.in
@@ -75,7 +75,7 @@ rm -rf $RPM_BUILD_ROOT
 /opt/%{name}/bin/cjpeg
 /opt/%{name}/bin/djpeg
 /opt/%{name}/bin/jpegtran
-/opt/%{name}/bin/jpgtest
+/opt/%{name}/bin/tjbench
 /opt/%{name}/bin/rdjpgcom
 /opt/%{name}/bin/wrjpgcom
 %dir /opt/%{name}/%{__lib}

diff --git a/release/makemacpkg.in b/release/makemacpkg.in
index b80ed6ce90518bbb1c2d3c5a1bf62de0df1a2fef..2ee080531717eea15f3f8c48ec6d612f8e2d9bc4 100644 (file)
--- a/release/makemacpkg.in
+++ b/release/makemacpkg.in
@@ -104,9 +104,9 @@ if [ $UNIVERSAL = 1 ]; then
                -arch x86_64 $PKGROOT/opt/$PACKAGE_NAME/bin/jpegtran \
                -output $PKGROOT/opt/$PACKAGE_NAME/bin/jpegtran
        lipo -create \
-               -arch i386 $TMPDIR/dist.x86/opt/$PACKAGE_NAME/bin/jpgtest \
-               -arch x86_64 $PKGROOT/opt/$PACKAGE_NAME/bin/jpgtest \
-               -output $PKGROOT/opt/$PACKAGE_NAME/bin/jpgtest
+               -arch i386 $TMPDIR/dist.x86/opt/$PACKAGE_NAME/bin/tjbench \
+               -arch x86_64 $PKGROOT/opt/$PACKAGE_NAME/bin/tjbench \
+               -output $PKGROOT/opt/$PACKAGE_NAME/bin/tjbench
        lipo -create \
                -arch i386 $TMPDIR/dist.x86/opt/$PACKAGE_NAME/bin/rdjpgcom \
                -arch x86_64 $PKGROOT/opt/$PACKAGE_NAME/bin/rdjpgcom \

diff --git a/release/makesunpkg.in b/release/makesunpkg.in
index 77177cf61ae56ba999a4127fba472fb6cb054088..3331dab02fda20b3306ae9a311fad562657f91ed 100644 (file)
--- a/release/makesunpkg.in
+++ b/release/makesunpkg.in
@@ -80,7 +80,7 @@ d none $PACKAGE_NAME/bin 0755 root bin
 f none $PACKAGE_NAME/bin/cjpeg 0755 root bin
 f none $PACKAGE_NAME/bin/djpeg 0755 root bin
 f none $PACKAGE_NAME/bin/jpegtran 0755 root bin
-f none $PACKAGE_NAME/bin/jpgtest 0755 root bin
+f none $PACKAGE_NAME/bin/tjbench 0755 root bin
 f none $PACKAGE_NAME/bin/rdjpgcom 0755 root bin
 f none $PACKAGE_NAME/bin/wrjpgcom 0755 root bin
 d none $PACKAGE_NAME/lib 0755 root bin