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

Expose new scaling factors in TurboJPEG API

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@757 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
DRC
2012-01-28 06:49:56 +00:00
parent 84d37a09b6
commit 688a25c4cc
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tjbench.c
View File

@@ -696,6 +696,7 @@ void usage(char *progname)
if(i!=nsf-1) printf(", "); if(i!=nsf-1) printf(", ");
if(i==nsf-2) printf("or "); if(i==nsf-2) printf("or ");
} }
if(i%8==0 && i!=0) printf("\n ");
} }
printf(")\n"); printf(")\n");
printf("-hflip, -vflip, -transpose, -transverse, -rot90, -rot180, -rot270 =\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++) 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]; sf=scalingfactors[j];
match=1; break; match=1; break;

14
turbojpeg.c
View File

@@ -92,10 +92,22 @@ static const JXFORM_CODE xformtypes[TJ_NUMXOP]=
JXFORM_TRANSVERSE, JXFORM_ROT_90, JXFORM_ROT_180, JXFORM_ROT_270 JXFORM_TRANSVERSE, JXFORM_ROT_90, JXFORM_ROT_180, JXFORM_ROT_270
}; };
#define NUMSF 4 #define NUMSF 16
static const tjscalingfactor sf[NUMSF]={ static const tjscalingfactor sf[NUMSF]={
{2, 1},
{15, 8},
{7, 4},
{13, 8},
{3, 2},
{11, 8},
{5, 4},
{9, 8},
{1, 1}, {1, 1},
{7, 8},
{3, 4},
{5, 8},
{1, 2}, {1, 2},
{3, 8},
{1, 4}, {1, 4},
{1, 8} {1, 8}
}; };