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

Merge pull request #108 from pornel/c89

Browse Source 
C89 compat
This commit is contained in:
Josh Aas
2014-09-25 13:51:43 -05:00
parent 6948e6c2bf 873b390172
commit 9de0e03f2f
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
jcdctmgr.c
View File

@@ -876,8 +876,8 @@ quantize_trellis(j_compress_ptr cinfo, c_derived_tbl *dctbl, c_derived_tbl *actb
accumulated_zero_dist[Ss-1] = 0.0; accumulated_zero_dist[Ss-1] = 0.0;
accumulated_cost[Ss-1] = 0.0; accumulated_cost[Ss-1] = 0.0;
// Do DC coefficient /* Do DC coefficient */
if (cinfo->trellis_quant_dc) { if (cinfo->trellis_quant_dc) {
int sign = src[bi][0] >> 31; int sign = src[bi][0] >> 31;
int x = abs(src[bi][0]); int x = abs(src[bi][0]);
@@ -898,8 +898,8 @@ quantize_trellis(j_compress_ptr cinfo, c_derived_tbl *dctbl, c_derived_tbl *actb
if (bi == 0) { if (bi == 0) {
dc_delta = dc_candidate[k][bi] - *last_dc_val; dc_delta = dc_candidate[k][bi] - *last_dc_val;
// Derive number of suffix bits /* Derive number of suffix bits */
bits = 0; bits = 0;
dc_delta = abs(dc_delta); dc_delta = abs(dc_delta);
while (dc_delta) { while (dc_delta) {
@@ -912,8 +912,8 @@ quantize_trellis(j_compress_ptr cinfo, c_derived_tbl *dctbl, c_derived_tbl *actb
} else { } else {
for (l = 0; l < 3; l++) { for (l = 0; l < 3; l++) {
dc_delta = dc_candidate[k][bi] - dc_candidate[l][bi-1]; dc_delta = dc_candidate[k][bi] - dc_candidate[l][bi-1];
// Derive number of suffix bits /* Derive number of suffix bits */
bits = 0; bits = 0;
dc_delta = abs(dc_delta); dc_delta = abs(dc_delta);
while (dc_delta) { while (dc_delta) {
@@ -929,8 +929,8 @@ quantize_trellis(j_compress_ptr cinfo, c_derived_tbl *dctbl, c_derived_tbl *actb
} }
} }
} }
// Do AC coefficients /* Do AC coefficients */
for (i = Ss; i <= Se; i++) { for (i = Ss; i <= Se; i++) {
int z = jpeg_natural_order[i]; int z = jpeg_natural_order[i];
@@ -1125,8 +1125,8 @@ quantize_trellis(j_compress_ptr cinfo, c_derived_tbl *dctbl, c_derived_tbl *actb
coef_blocks[bi][0] = dc_candidate[j][bi]; coef_blocks[bi][0] = dc_candidate[j][bi];
j = dc_cost_backtrack[j][bi]; j = dc_cost_backtrack[j][bi];
} }
// Save DC predictor /* Save DC predictor */
*last_dc_val = coef_blocks[num_blocks-1][0]; *last_dc_val = coef_blocks[num_blocks-1][0];
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {