ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@1373 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
DRC
2014-08-22 03:00:37 +00:00
parent 88b90bdc07
commit d92949b0ac
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/TJBench.java
View File

@@ -236,7 +236,7 @@ class TJBench {
"_" + sizeStr + ".bmp"); "_" + sizeStr + ".bmp");
saveImage(tempStr, dstBuf, scaledw, scaledh, pf); saveImage(tempStr, dstBuf, scaledw, scaledh, pf);
int ndx = tempStr.indexOf('.'); int ndx = tempStr.lastIndexOf('.');
tempStr = new String(tempStr.substring(0, ndx) + "-err.bmp"); tempStr = new String(tempStr.substring(0, ndx) + "-err.bmp");
if (srcBuf != null && sf.getNum() == 1 && sf.getDenom() == 1) { if (srcBuf != null && sf.getNum() == 1 && sf.getDenom() == 1) {
if (quiet == 0) if (quiet == 0)
@@ -432,7 +432,7 @@ class TJBench {
fis.read(srcBuf, 0, srcSize); fis.read(srcBuf, 0, srcSize);
fis.close(); fis.close();
int index = fileName.indexOf('.'); int index = fileName.lastIndexOf('.');
if (index >= 0) if (index >= 0)
fileName = new String(fileName.substring(0, index)); fileName = new String(fileName.substring(0, index));
@@ -846,7 +846,7 @@ class TJBench {
srcBuf = loadImage(argv[0], width, height, pf); srcBuf = loadImage(argv[0], width, height, pf);
w = width[0]; h = height[0]; w = width[0]; h = height[0];
int index = -1; int index = -1;
if ((index = argv[0].indexOf('.')) >= 0) if ((index = argv[0].lastIndexOf('.')) >= 0)
argv[0] = argv[0].substring(0, index); argv[0] = argv[0].substring(0, index);
} }

2
tjbenchtest.in
View File

@@ -22,7 +22,7 @@ runme()
EXT=bmp EXT=bmp
IMAGES="vgl_5674_0098.${EXT} vgl_6434_0018a.${EXT} vgl_6548_0026a.${EXT} nightshot_iso_100.${EXT}" IMAGES="vgl_5674_0098.${EXT} vgl_6434_0018a.${EXT} vgl_6548_0026a.${EXT} nightshot_iso_100.${EXT}"
IMGDIR=@srcdir@/testimages IMGDIR=@srcdir@/testimages
OUTDIR=__tjbenchtest_output OUTDIR=`mktemp -d /tmp/__tjbenchtest_output.XXXXXX`
EXEDIR=. EXEDIR=.
BMPARG= BMPARG=
NSARG= NSARG=

2
tjbenchtest.java.in
View File

@@ -21,7 +21,7 @@ runme()
IMAGES="vgl_5674_0098.bmp vgl_6434_0018a.bmp vgl_6548_0026a.bmp nightshot_iso_100.bmp" IMAGES="vgl_5674_0098.bmp vgl_6434_0018a.bmp vgl_6548_0026a.bmp nightshot_iso_100.bmp"
IMGDIR=@srcdir@/testimages IMGDIR=@srcdir@/testimages
OUTDIR=__tjbenchtest_java_output OUTDIR=`mktemp -d /tmp/__tjbenchtest_java_output.XXXXXX`
EXEDIR=. EXEDIR=.
JAVA="@JAVA@ -cp java/turbojpeg.jar -Djava.library.path=.libs" JAVA="@JAVA@ -cp java/turbojpeg.jar -Djava.library.path=.libs"
BMPARG= BMPARG=