commit 38cb1ec2a77b7209a260f3cced1e6c6365616c8e
author DRC <dcommander@users.sourceforge.net> Fri Aug 23 04:45:43 2013 +0000
committer DRC <dcommander@users.sourceforge.net> Fri Aug 23 04:45:43 2013 +0000
tree 2a38785e79262f1981e64455bdc8f171819c232d
parent cd7c3e6672cce3779450c6dd10d0d70b0c2278b2

Add CMYK support to the TurboJPEG Java API & clean up a few things in the C API


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

Makefile.am

diff --git a/Makefile.am b/Makefile.am
index bd77c33..6096049 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -196,14 +196,14 @@
 
 test: testclean all
 if WITH_TURBOJPEG
-#if WITH_JAVA
-#	$(JAVA) -cp java/turbojpeg.jar -Djava.library.path=.libs TJUnitTest
-#	$(JAVA) -cp java/turbojpeg.jar -Djava.library.path=.libs TJUnitTest -bi
-#	$(JAVA) -cp java/turbojpeg.jar -Djava.library.path=.libs TJUnitTest -yuv
-#	$(JAVA) -cp java/turbojpeg.jar -Djava.library.path=.libs TJUnitTest -yuv -noyuvpad
-#	$(JAVA) -cp java/turbojpeg.jar -Djava.library.path=.libs TJUnitTest -yuv -bi
-#	$(JAVA) -cp java/turbojpeg.jar -Djava.library.path=.libs TJUnitTest -yuv -bi -noyuvpad
-#endif
+if WITH_JAVA
+	$(JAVA) -cp java/turbojpeg.jar -Djava.library.path=.libs TJUnitTest
+	$(JAVA) -cp java/turbojpeg.jar -Djava.library.path=.libs TJUnitTest -bi
+	$(JAVA) -cp java/turbojpeg.jar -Djava.library.path=.libs TJUnitTest -yuv
+	$(JAVA) -cp java/turbojpeg.jar -Djava.library.path=.libs TJUnitTest -yuv -noyuvpad
+	$(JAVA) -cp java/turbojpeg.jar -Djava.library.path=.libs TJUnitTest -yuv -bi
+	$(JAVA) -cp java/turbojpeg.jar -Djava.library.path=.libs TJUnitTest -yuv -bi -noyuvpad
+endif
 	./tjunittest
 	./tjunittest -alloc
 	./tjunittest -yuv