From ab2df6ea1bfd89df619742b3a8f26e2dd7deefdb Mon Sep 17 00:00:00 2001
From: DRC <dcommander@users.sourceforge.net>
Date: Sat, 28 Jan 2012 06:49:56 +0000
Subject: [PATCH] Expose new scaling factors in TurboJPEG API

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@757 632fc199-4ca6-4c93-a231-07263d6284db
---
 tjbench.c   |  4 +++-
 turbojpeg.c | 14 +++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/tjbench.c b/tjbench.c
index f298732c..8125e56a 100644
--- a/tjbench.c
+++ b/tjbench.c
@@ -696,6 +696,7 @@ void usage(char *progname)
 			if(i!=nsf-1) printf(", ");
 			if(i==nsf-2) printf("or ");
 		}
+		if(i%8==0 && i!=0) printf("\n     ");
 	}
 	printf(")\n");
 	printf("-hflip, -vflip, -transpose, -transverse, -rot90, -rot180, -rot270 =\n");
@@ -811,7 +812,8 @@ int main(int argc, char *argv[])
 				{
 					for(j=0; j<nsf; j++)
 					{
-						if(temp1==scalingfactors[j].num && temp2==scalingfactors[j].denom)
+						if((double)temp1/(double)temp2
+							== (double)scalingfactors[j].num/(double)scalingfactors[j].denom)
 						{
 							sf=scalingfactors[j];
 							match=1;  break;
diff --git a/turbojpeg.c b/turbojpeg.c
index 2d5959a3..2f7cbf9a 100644
--- a/turbojpeg.c
+++ b/turbojpeg.c
@@ -92,10 +92,22 @@ static const JXFORM_CODE xformtypes[TJ_NUMXOP]=
 	JXFORM_TRANSVERSE, JXFORM_ROT_90, JXFORM_ROT_180, JXFORM_ROT_270
 };
 
-#define NUMSF 4
+#define NUMSF 16
 static const tjscalingfactor sf[NUMSF]={
+	{2, 1},
+	{15, 8},
+	{7, 4},
+	{13, 8},
+	{3, 2},
+	{11, 8},
+	{5, 4},
+	{9, 8},
 	{1, 1},
+	{7, 8},
+	{3, 4},
+	{5, 8},
 	{1, 2},
+	{3, 8},
 	{1, 4},
 	{1, 8}
 };