From a1a920cc5184d771c81858fc81a40128ac1e6953 Mon Sep 17 00:00:00 2001
From: DRC <dcommander@users.sourceforge.net>
Date: Fri, 22 Aug 2014 02:51:16 +0000
Subject: [PATCH] Run the TurboJPEG conformance tests out of a directory in
 /tmp (for improved performance, if the source directory is on a remote file
 share.)  Fix an issue in TJBench.java that prevented it from working properly
 if the source image resided in a directory with a dot in the name.

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.3.x@1371 632fc199-4ca6-4c93-a231-07263d6284db
---
 java/TJBench.java   | 6 +++---
 tjbenchtest.in      | 2 +-
 tjbenchtest.java.in | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/java/TJBench.java b/java/TJBench.java
index e9ed226..36df1ab 100644
--- a/java/TJBench.java
+++ b/java/TJBench.java
@@ -204,7 +204,7 @@ class TJBench {
         tempStr = new String(fileName + "_" + subName[subsamp] + qualStr +
                              "_" + sizeStr + ".bmp");
       saveImage(tempStr, dstBuf, scaledw, scaledh, pf);
-      int ndx = tempStr.indexOf('.');
+      int ndx = tempStr.lastIndexOf('.');
       tempStr = new String(tempStr.substring(0, ndx) + "-err.bmp");
       if (srcBuf != null && sf.getNum() == 1 && sf.getDenom() == 1) {
         if (quiet == 0)
@@ -427,7 +427,7 @@ class TJBench {
     fis.read(srcBuf, 0, srcSize);
     fis.close();
 
-    int index = fileName.indexOf('.');
+    int index = fileName.lastIndexOf('.');
     if (index >= 0)
       fileName = new String(fileName.substring(0, index));
 
@@ -822,7 +822,7 @@ class TJBench {
         srcBuf = loadImage(argv[0], width, height, pf);
         w = width[0];  h = height[0];
         int index = -1;
-        if ((index = argv[0].indexOf('.')) >= 0)
+        if ((index = argv[0].lastIndexOf('.')) >= 0)
           argv[0] = argv[0].substring(0, index);
       }
 
diff --git a/tjbenchtest.in b/tjbenchtest.in
index 72b93f8..b75fe8b 100755
--- a/tjbenchtest.in
+++ b/tjbenchtest.in
@@ -22,7 +22,7 @@ runme()
 EXT=bmp
 IMAGES="vgl_5674_0098.${EXT} vgl_6434_0018a.${EXT} vgl_6548_0026a.${EXT} nightshot_iso_100.${EXT}"
 IMGDIR=@srcdir@/testimages
-OUTDIR=__tjbenchtest_output
+OUTDIR=`mktemp -d /tmp/__tjbenchtest_output.XXXXXX`
 EXEDIR=.
 BMPARG=
 if [ "$EXT" = "bmp" ]; then BMPARG=-bmp; fi
diff --git a/tjbenchtest.java.in b/tjbenchtest.java.in
index ebff9c8..44cdf4a 100755
--- a/tjbenchtest.java.in
+++ b/tjbenchtest.java.in
@@ -21,7 +21,7 @@ runme()
 
 IMAGES="vgl_5674_0098.bmp vgl_6434_0018a.bmp vgl_6548_0026a.bmp nightshot_iso_100.bmp"
 IMGDIR=@srcdir@/testimages
-OUTDIR=__tjbenchtest_java_output
+OUTDIR=`mktemp -d /tmp/__tjbenchtest_java_output.XXXXXX`
 EXEDIR=.
 JAVA="@JAVA@ -cp java/turbojpeg.jar -Djava.library.path=.libs"
 
-- 
2.40.0