From 49df783743c65d84b795fc4a9a6f3c7bd425784e Mon Sep 17 00:00:00 2001 From: DRC Date: Sat, 4 May 2013 23:31:32 +0000 Subject: [PATCH 1/3] Clean up the output of tjunittest and TJUnitTest git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.3.x@980 632fc199-4ca6-4c93-a231-07263d6284db --- java/TJUnitTest.java | 28 +++++++++++++--------------- tjunittest.c | 8 ++++---- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/java/TJUnitTest.java b/java/TJUnitTest.java index d0a609a9..ed67100a 100644 --- a/java/TJUnitTest.java +++ b/java/TJUnitTest.java @@ -260,8 +260,8 @@ public class TJUnitTest { throws Exception { v = (v < 0) ? v + 256 : v; if (v < cv - 1 || v > cv + 1) { - throw new Exception("\nComp. " + vname + " at " + row + "," + col + - " should be " + cv + ", not " + v + "\n"); + throw new Exception("Comp. " + vname + " at " + row + "," + col + + " should be " + cv + ", not " + v); } } @@ -269,8 +269,8 @@ public class TJUnitTest { throws Exception { v = (v < 0) ? v + 256 : v; if (v > 1) { - throw new Exception("\nComp. " + vname + " at " + row + "," + col + - " should be 0, not " + v + "\n"); + throw new Exception("Comp. " + vname + " at " + row + "," + col + + " should be 0, not " + v); } } @@ -278,8 +278,8 @@ public class TJUnitTest { throws Exception { v = (v < 0) ? v + 256 : v; if (v < 254) { - throw new Exception("\nComp. " + vname + " at " + row + "," + col + - " should be 255, not " + v + "\n"); + throw new Exception("Comp. " + vname + " at " + row + "," + col + + " should be 255, not " + v); } } @@ -341,12 +341,11 @@ public class TJUnitTest { } } } catch(Exception e) { - System.out.println(e); + System.out.println("\n" + e.getMessage()); retval = 0; } if (retval == 0) { - System.out.print("\n"); for (row = 0; row < h; row++) { for (col = 0; col < w; col++) { int r = buf[pitch * row + col * ps + roffset]; @@ -420,12 +419,11 @@ public class TJUnitTest { } } } catch(Exception e) { - System.out.println(e); + System.out.println("\n" + e.getMessage()); retval = 0; } if (retval == 0) { - System.out.print("\n"); for (row = 0; row < h; row++) { for (col = 0; col < w; col++) { int r = (buf[pitch * row + col] >> rshift) & 0xFF; @@ -485,7 +483,7 @@ public class TJUnitTest { try { if (size != correctsize) - throw new Exception("\nIncorrect size " + size + ". Should be " + + throw new Exception("Incorrect size " + size + ". Should be " + correctsize); for (row = 0; row < ph; row++) { @@ -526,7 +524,7 @@ public class TJUnitTest { } } } catch(Exception e) { - System.out.println(e); + System.out.println("\n" + e.getMessage()); retval = 0; } @@ -557,7 +555,6 @@ public class TJUnitTest { } System.out.print("\n"); } - System.out.print("\n"); } return retval; @@ -680,7 +677,7 @@ public class TJUnitTest { System.out.print("JPEG -> "); if (yuv == YUVDECODE) - System.out.print("YUV " + subName[subsamp] + " ... "); + System.out.print("YUV " + subNameLong[subsamp] + " ... "); else { System.out.print(pfStr + " "); if (bi) @@ -760,7 +757,6 @@ public class TJUnitTest { } else decompTest(tjd, jpegBuf, jpegSize, w, h, pf, baseName, subsamp, flags, new TJScalingFactor(1, 1)); - System.out.print("\n"); } private static void doTest(int w, int h, int[] formats, int subsamp, @@ -799,8 +795,10 @@ public class TJUnitTest { if (pf >= TJ.PF_RGBX && pf <= TJ.PF_XRGB && !bi) decompTest(tjd, dstBuf, size, w, h, pf + (TJ.PF_RGBA - TJ.PF_RGBX), baseName, subsamp, flags); + System.out.print("\n"); } } + System.out.print("--------------------\n\n"); } catch(Exception e) { if (tjc != null) tjc.close(); if (tjd != null) tjd.close(); diff --git a/tjunittest.c b/tjunittest.c index 89a6d1db..6f23b234 100644 --- a/tjunittest.c +++ b/tjunittest.c @@ -219,7 +219,6 @@ int checkBuf(unsigned char *buf, int w, int h, int pf, int subsamp, bailout: if(retval==0) { - printf("\n"); for(row=0; row YUV %s ... ", subName[subsamp]); + printf("JPEG -> YUV %s ... ", subNameLong[subsamp]); else { printf("JPEG -> %s %s ", pixFormatStr[pf], @@ -475,7 +473,7 @@ void decompTest(tjhandle handle, unsigned char *jpegBuf, sf1); bailout: - printf("\n"); + return; } @@ -517,8 +515,10 @@ void doTest(int w, int h, const int *formats, int nformats, int subsamp, if(pf>=TJPF_RGBX && pf<=TJPF_XRGB) decompTest(dhandle, dstBuf, size, w, h, pf+(TJPF_RGBA-TJPF_RGBX), basename, subsamp, flags); + printf("\n"); } } + printf("--------------------\n\n"); bailout: if(chandle) tjDestroy(chandle); From 6e0bbbf7e6287a10606d5c118bcf5c56b2a1a758 Mon Sep 17 00:00:00 2001 From: DRC Date: Fri, 10 May 2013 22:08:53 +0000 Subject: [PATCH 2/3] 1.3.0 git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.3.x@983 632fc199-4ca6-4c93-a231-07263d6284db --- CMakeLists.txt | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 98fee90a..d086a35d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 2.6) project(libjpeg-turbo C) -set(VERSION 1.2.91) +set(VERSION 1.3.0) if(MINGW OR CYGWIN) execute_process(COMMAND "date" "+%Y%m%d" OUTPUT_VARIABLE BUILD) diff --git a/configure.ac b/configure.ac index 9ba28666..eb580fd7 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.56]) -AC_INIT([libjpeg-turbo], [1.2.91]) +AC_INIT([libjpeg-turbo], [1.3.0]) BUILD=`date +%Y%m%d` AM_INIT_AUTOMAKE([-Wall foreign dist-bzip2]) From d3eb40b97ae1ff7a82cc0c09da6cfc8ccf47c9f2 Mon Sep 17 00:00:00 2001 From: DRC Date: Wed, 3 Jul 2013 14:22:09 +0000 Subject: [PATCH 3/3] Use ELF64 object format on 64-bit kFreeBSD systems. git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.3.x@990 632fc199-4ca6-4c93-a231-07263d6284db --- acinclude.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acinclude.m4 b/acinclude.m4 index 70e2555f..ea8ec528 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -40,7 +40,7 @@ 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