generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

REVERT OF: Update libjpeg to release 8d (reverse-merged from commit d28af08ef3)

Browse Source
This commit is contained in:
Andrey Pavlenko
2012-09-26 14:02:23 +04:00
parent 4e193a3380
commit 56200dbd37
58 changed files with 5629 additions and 15833 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
3rdparty/libjpeg/jquant2.c vendored
View File

@@ -2,7 +2,6 @@
* jquant2.c
*
* Copyright (C) 1991-1996, Thomas G. Lane.
* Modified 2011 by Guido Vollbeding.
* This file is part of the Independent JPEG Group's software.
* For conditions of distribution and use, see the accompanying README file.
*
@@ -1204,7 +1203,7 @@ start_pass_2_quant (j_decompress_ptr cinfo, boolean is_pre_scan)
cquantize->fserrors = (FSERRPTR) (*cinfo->mem->alloc_large)
((j_common_ptr) cinfo, JPOOL_IMAGE, arraysize);
/* Initialize the propagated errors to zero. */
FMEMZERO((void FAR *) cquantize->fserrors, arraysize);
jzero_far((void FAR *) cquantize->fserrors, arraysize);
/* Make the error-limit table if we didn't already. */
if (cquantize->error_limiter == NULL)
init_error_limit(cinfo);
@@ -1215,8 +1214,8 @@ start_pass_2_quant (j_decompress_ptr cinfo, boolean is_pre_scan)
/* Zero the histogram or inverse color map, if necessary */
if (cquantize->needs_zeroed) {
for (i = 0; i < HIST_C0_ELEMS; i++) {
FMEMZERO((void FAR *) histogram[i],
HIST_C1_ELEMS*HIST_C2_ELEMS * SIZEOF(histcell));
jzero_far((void FAR *) histogram[i],
HIST_C1_ELEMS*HIST_C2_ELEMS * SIZEOF(histcell));
}
cquantize->needs_zeroed = FALSE;
}