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

Merge pull request #75 from pmed/master

Browse Source 
Fixed mozjpeg build with Visual C++ 2010
This commit is contained in:
Josh Aas
2014-07-21 11:18:33 -05:00
parent 514307e9e6 d9605b0560
commit b95528727f
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
jcdctmgr.c
View File

@@ -543,6 +543,8 @@ forward_DCT_float (j_compress_ptr cinfo, jpeg_component_info * compptr,
FAST_FLOAT * divisors = fdct->float_divisors[compptr->quant_tbl_no]; FAST_FLOAT * divisors = fdct->float_divisors[compptr->quant_tbl_no];
FAST_FLOAT * workspace; FAST_FLOAT * workspace;
JDIMENSION bi; JDIMENSION bi;
float v;
int x;
/* Make sure the compiler doesn't look up these every pass */ /* Make sure the compiler doesn't look up these every pass */
@@ -572,10 +574,10 @@ forward_DCT_float (j_compress_ptr cinfo, jpeg_component_info * compptr,
}; };
for (i = 0; i < DCTSIZE2; i++) { for (i = 0; i < DCTSIZE2; i++) {
float v = workspace[i]; v = workspace[i];
v /= aanscalefactor[i%8]; v /= aanscalefactor[i%8];
v /= aanscalefactor[i/8]; v /= aanscalefactor[i/8];
int x = (v >= 0.0) ? (int)(v + 0.5) : (int)(v - 0.5); x = (v >= 0.0) ? (int)(v + 0.5) : (int)(v - 0.5);
dst[bi][i] = x; dst[bi][i] = x;
} }
} }
@@ -637,6 +639,10 @@ quantize_trellis(j_compress_ptr cinfo, c_derived_tbl *actbl, JBLOCKROW coef_bloc
int has_eob; int has_eob;
float cost_all_zeros; float cost_all_zeros;
float best_cost_skip; float best_cost_skip;
float cost;
int zero_run;
int run_bits;
int rate;
Ss = cinfo->Ss; Ss = cinfo->Ss;
Se = cinfo->Se; Se = cinfo->Se;
@@ -725,11 +731,11 @@ quantize_trellis(j_compress_ptr cinfo, c_derived_tbl *actbl, JBLOCKROW coef_bloc
if (j != Ss-1 && coef_blocks[bi][zz] == 0) if (j != Ss-1 && coef_blocks[bi][zz] == 0)
continue; continue;
int zero_run = i - 1 - j; zero_run = i - 1 - j;
if ((zero_run >> 4) && actbl->ehufsi[0xf0] == 0) if ((zero_run >> 4) && actbl->ehufsi[0xf0] == 0)
continue; continue;
int run_bits = (zero_run >> 4) * actbl->ehufsi[0xf0]; run_bits = (zero_run >> 4) * actbl->ehufsi[0xf0];
zero_run &= 15; zero_run &= 15;
for (k = 0; k < num_candidates; k++) { for (k = 0; k < num_candidates; k++) {
@@ -737,8 +743,8 @@ quantize_trellis(j_compress_ptr cinfo, c_derived_tbl *actbl, JBLOCKROW coef_bloc
if (coef_bits == 0) if (coef_bits == 0)
continue; continue;
int rate = coef_bits + candidate_bits[k] + run_bits; rate = coef_bits + candidate_bits[k] + run_bits;
float cost = rate + candidate_dist[k]; cost = rate + candidate_dist[k];
cost += accumulated_zero_dist[i-1] - accumulated_zero_dist[j] + accumulated_cost[j]; cost += accumulated_zero_dist[i-1] - accumulated_zero_dist[j] + accumulated_cost[j];
if (cost < accumulated_cost[i]) { if (cost < accumulated_cost[i]) {