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

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

1 files changed, 2 insertions, 2 deletions

diff --git a/tjbench.c b/tjbench.c
index 615f2f7..b2ef8d6 100644
--- a/tjbench.c
+++ b/tjbench.c
@@ -69,13 +69,13 @@ double benchtime=5.0;
 
 char *formatName(int subsamp, int cs, char *buf)
 {
-	if(cs==TJCS_YCbCr) return subNameLong[subsamp];
+	if(cs==TJCS_YCbCr) return (char *)subNameLong[subsamp];
 	else if(cs==TJCS_YCCK)
 	{
 		snprintf(buf, 80, "%s %s", csName[cs], subNameLong[subsamp]);
 		return buf;
 	}
-	else return csName[cs];
+	else return (char *)csName[cs];
 }