rpms/mingw32-libjpeg/devel jpeg-fix-typo.patch, NONE, 1.1 jpeg-workaround-typedef-conflict.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 mingw32-libjpeg.spec, 1.4, 1.5 sources, 1.2, 1.3 jpeg-c++.patch, 1.1, NONE
epienbro
epienbro at fedoraproject.org
Thu Aug 27 20:42:37 UTC 2009
Author: epienbro
Update of /cvs/pkgs/rpms/mingw32-libjpeg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31222
Modified Files:
.cvsignore mingw32-libjpeg.spec sources
Added Files:
jpeg-fix-typo.patch jpeg-workaround-typedef-conflict.patch
Removed Files:
jpeg-c++.patch
Log Message:
* Thu Aug 27 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 7-1
- Update to version 7
- Resolves typedef conflict (BZ #497492)
- Use %%global instead of %%define
- Automatically generate debuginfo subpackage
- Fixed %%defattr line
- Added -static subpackage
- Dropped upstreamed patches
- Dropped autoconf stuff
- Fixed a comment typo
jpeg-fix-typo.patch:
jmorecfg.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE jpeg-fix-typo.patch ---
--- jmorecfg.h.orig 2009-08-20 12:17:45.157121881 +0200
+++ jmorecfg.h 2009-08-20 12:17:50.738866350 +0200
@@ -159,7 +159,7 @@
/* INT32 must hold at least signed 32-bit values. */
#ifndef XMD_H /* X11/xmd.h correctly defines INT32 */
-#ifndef _BASETSD_H_ /* Microsoft defines it in basetsd.h */
+#ifndef _BASETSD_H /* Microsoft defines it in basetsd.h */
#ifndef QGLOBAL_H /* Qt defines it in qglobal.h */
typedef long INT32;
#endif
jpeg-workaround-typedef-conflict.patch:
cdjpeg.c | 2 -
cdjpeg.h | 18 +++++------
cjpeg.c | 10 +++---
djpeg.c | 8 ++---
jcapimin.c | 2 -
jcapistd.c | 2 -
jcarith.c | 12 +++----
jccoefct.c | 14 ++++----
jchuff.c | 34 ++++++++++-----------
jcinit.c | 2 -
jcmainct.c | 6 +--
jcmarker.c | 4 +-
jcmaster.c | 4 +-
jcparam.c | 8 ++---
jcprepct.c | 2 -
jcsample.c | 2 -
jctrans.c | 2 -
jdapimin.c | 8 ++---
jdapistd.c | 10 +++---
jdarith.c | 10 +++---
jdatadst.c | 2 -
jdatasrc.c | 4 +-
jdcoefct.c | 10 +++---
jdhuff.c | 16 +++++-----
jdinput.c | 2 -
jdmainct.c | 4 +-
jdmarker.c | 30 +++++++++----------
jdmaster.c | 6 +--
jdmerge.c | 2 -
jdpostct.c | 2 -
jdsample.c | 2 -
jerror.c | 2 -
jmemmgr.c | 24 +++++++--------
jmorecfg.h | 5 ---
jpegint.h | 44 +++++++++++++--------------
jpeglib.h | 96 ++++++++++++++++++++++++++++++-------------------------------
jpegtran.c | 6 +--
jquant1.c | 8 ++---
jquant2.c | 6 +--
rdppm.c | 2 -
rdswitch.c | 18 +++++------
rdtarga.c | 2 -
transupp.c | 12 +++----
transupp.h | 12 +++----
wrbmp.c | 4 +-
45 files changed, 239 insertions(+), 242 deletions(-)
--- NEW FILE jpeg-workaround-typedef-conflict.patch ---
--- cdjpeg.c.orig 2009-08-20 11:49:32.400866798 +0200
+++ cdjpeg.c 2009-08-20 11:49:38.214138721 +0200
@@ -118,7 +118,7 @@
* minchars is length of minimum legal abbreviation.
*/
-GLOBAL(boolean)
+GLOBAL(jpeg_boolean)
keymatch (char * arg, const char * keyword, int minchars)
{
register int ca, ck;
--- cjpeg.c.orig 2009-08-20 11:48:18.679873935 +0200
+++ cjpeg.c 2009-08-20 11:48:29.886865993 +0200
@@ -74,7 +74,7 @@
* seldom-used ID field), so we provide a switch to force Targa input mode.
*/
-static boolean is_targa; /* records user -targa switch */
+static jpeg_boolean is_targa; /* records user -targa switch */
LOCAL(cjpeg_source_ptr)
@@ -202,7 +202,7 @@
LOCAL(int)
parse_switches (j_compress_ptr cinfo, int argc, char **argv,
- int last_file_arg_seen, boolean for_real)
+ int last_file_arg_seen, jpeg_boolean for_real)
/* Parse optional switches.
* Returns argv[] index of first file-name argument (== argc if none).
* Any file names with indexes <= last_file_arg_seen are ignored;
@@ -214,8 +214,8 @@
{
int argn;
char * arg;
- boolean force_baseline;
- boolean simple_progressive;
+ jpeg_boolean force_baseline;
+ jpeg_boolean simple_progressive;
char * qualityarg = NULL; /* saves -quality parm if any */
char * qtablefile = NULL; /* saves -qtables filename if any */
char * qslotsarg = NULL; /* saves -qslots parm if any */
@@ -274,7 +274,7 @@
} else if (keymatch(arg, "debug", 1) || keymatch(arg, "verbose", 1)) {
/* Enable debug printouts. */
/* On first -d, print version identification */
- static boolean printed_version = FALSE;
+ static jpeg_boolean printed_version = FALSE;
if (! printed_version) {
fprintf(stderr, "Independent JPEG Group's CJPEG, version %s\n%s\n",
--- djpeg.c.orig 2009-08-20 11:49:46.529889918 +0200
+++ djpeg.c 2009-08-20 11:49:55.963116109 +0200
@@ -161,7 +161,7 @@
LOCAL(int)
parse_switches (j_decompress_ptr cinfo, int argc, char **argv,
- int last_file_arg_seen, boolean for_real)
+ int last_file_arg_seen, jpeg_boolean for_real)
/* Parse optional switches.
* Returns argv[] index of first file-name argument (== argc if none).
* Any file names with indexes <= last_file_arg_seen are ignored;
@@ -238,7 +238,7 @@
} else if (keymatch(arg, "debug", 1) || keymatch(arg, "verbose", 1)) {
/* Enable debug printouts. */
/* On first -d, print version identification */
- static boolean printed_version = FALSE;
+ static jpeg_boolean printed_version = FALSE;
if (! printed_version) {
fprintf(stderr, "Independent JPEG Group's DJPEG, version %s\n%s\n",
@@ -366,10 +366,10 @@
}
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
print_text_marker (j_decompress_ptr cinfo)
{
- boolean traceit = (cinfo->err->trace_level >= 1);
+ jpeg_boolean traceit = (cinfo->err->trace_level >= 1);
INT32 length;
unsigned int ch;
unsigned int lastch = 0;
--- jcapimin.c.orig 2009-08-20 11:32:18.918886764 +0200
+++ jcapimin.c 2009-08-20 11:32:25.869115909 +0200
@@ -118,7 +118,7 @@
*/
GLOBAL(void)
-jpeg_suppress_tables (j_compress_ptr cinfo, boolean suppress)
+jpeg_suppress_tables (j_compress_ptr cinfo, jpeg_boolean suppress)
{
int i;
JQUANT_TBL * qtbl;
--- jcarith.c.orig 2009-08-20 11:35:14.553873155 +0200
+++ jcarith.c 2009-08-20 11:34:40.704868643 +0200
@@ -356,7 +356,7 @@
* or first pass of successive approximation).
*/
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
encode_mcu_DC_first (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
{
arith_entropy_ptr entropy = (arith_entropy_ptr) cinfo->entropy;
@@ -447,7 +447,7 @@
* or first pass of successive approximation).
*/
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
encode_mcu_AC_first (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
{
arith_entropy_ptr entropy = (arith_entropy_ptr) cinfo->entropy;
@@ -547,7 +547,7 @@
* MCU encoding for DC successive approximation refinement scan.
*/
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
encode_mcu_DC_refine (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
{
arith_entropy_ptr entropy = (arith_entropy_ptr) cinfo->entropy;
@@ -582,7 +582,7 @@
* MCU encoding for AC successive approximation refinement scan.
*/
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
encode_mcu_AC_refine (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
{
arith_entropy_ptr entropy = (arith_entropy_ptr) cinfo->entropy;
@@ -676,7 +676,7 @@
* Encode and output one MCU's worth of arithmetic-compressed coefficients.
*/
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
encode_mcu (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
{
arith_entropy_ptr entropy = (arith_entropy_ptr) cinfo->entropy;
@@ -820,7 +820,7 @@
*/
METHODDEF(void)
-start_pass (j_compress_ptr cinfo, boolean gather_statistics)
+start_pass (j_compress_ptr cinfo, jpeg_boolean gather_statistics)
{
arith_entropy_ptr entropy = (arith_entropy_ptr) cinfo->entropy;
int ci, tbl;
--- jccoefct.c.orig 2009-08-20 11:35:33.811137499 +0200
+++ jccoefct.c 2009-08-20 11:35:56.295116220 +0200
@@ -58,12 +58,12 @@
/* Forward declarations */
-METHODDEF(boolean) compress_data
+METHODDEF(jpeg_boolean) compress_data
JPP((j_compress_ptr cinfo, JSAMPIMAGE input_buf));
#ifdef FULL_COEF_BUFFER_SUPPORTED
-METHODDEF(boolean) compress_first_pass
+METHODDEF(jpeg_boolean) compress_first_pass
JPP((j_compress_ptr cinfo, JSAMPIMAGE input_buf));
-METHODDEF(boolean) compress_output
+METHODDEF(jpeg_boolean) compress_output
JPP((j_compress_ptr cinfo, JSAMPIMAGE input_buf));
#endif
@@ -139,7 +139,7 @@
* which we index according to the component's SOF position.
*/
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
compress_data (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
{
my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
@@ -244,7 +244,7 @@
* at the scan-dependent variables (MCU dimensions, etc).
*/
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
compress_first_pass (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
{
my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
@@ -341,7 +341,7 @@
* NB: input_buf is ignored; it is likely to be a NULL pointer.
*/
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
compress_output (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
{
my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
@@ -406,7 +406,7 @@
*/
GLOBAL(void)
-jinit_c_coef_controller (j_compress_ptr cinfo, boolean need_full_buffer)
+jinit_c_coef_controller (j_compress_ptr cinfo, jpeg_boolean need_full_buffer)
{
my_coef_ptr coef;
--- jchuff.c.orig 2009-08-20 11:36:07.392116357 +0200
+++ jchuff.c 2009-08-20 11:37:12.788115828 +0200
@@ -100,7 +100,7 @@
/* Following fields used only in progressive mode */
/* Mode flag: TRUE for optimization, FALSE for actual data output */
- boolean gather_statistics;
+ jpeg_boolean gather_statistics;
/* next_output_byte/free_in_buffer are local copies of cinfo->dest fields.
*/
@@ -169,7 +169,7 @@
*/
LOCAL(void)
-jpeg_make_c_derived_tbl (j_compress_ptr cinfo, boolean isDC, int tblno,
+jpeg_make_c_derived_tbl (j_compress_ptr cinfo, jpeg_boolean isDC, int tblno,
c_derived_tbl ** pdtbl)
{
JHUFF_TBL *htbl;
@@ -276,7 +276,7 @@
dump_buffer_e(entropy); }
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
dump_buffer_s (working_state * state)
/* Empty the output buffer; return TRUE if successful, FALSE if must suspend */
{
@@ -314,7 +314,7 @@
*/
INLINE
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
emit_bits_s (working_state * state, unsigned int code, int size)
/* Emit some bits; return TRUE if successful, FALSE if must suspend */
{
@@ -393,7 +393,7 @@
}
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
flush_bits_s (working_state * state)
{
if (! emit_bits_s(state, 0x7F, 7)) /* fill any partial byte with ones */
@@ -484,7 +484,7 @@
* Emit a restart marker & resynchronize predictions.
*/
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
emit_restart_s (working_state * state, int restart_num)
{
int ci;
@@ -535,7 +535,7 @@
* or first pass of successive approximation).
*/
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
encode_mcu_DC_first (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
{
huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
@@ -622,7 +622,7 @@
* or first pass of successive approximation).
*/
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
encode_mcu_AC_first (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
{
huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
@@ -729,7 +729,7 @@
* is not very clear on the point.
*/
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
encode_mcu_DC_refine (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
{
huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
@@ -776,7 +776,7 @@
* MCU encoding for AC successive approximation refinement scan.
*/
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
encode_mcu_AC_refine (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
{
huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
@@ -902,7 +902,7 @@
/* Encode a single block's worth of coefficients */
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
encode_one_block (working_state * state, JCOEFPTR block, int last_dc_val,
c_derived_tbl *dctbl, c_derived_tbl *actbl)
{
@@ -1000,7 +1000,7 @@
* Encode and output one MCU's worth of Huffman-compressed coefficients.
*/
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
encode_mcu_huff (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
{
huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
@@ -1179,7 +1179,7 @@
* No data is actually output, so no suspension return is possible.
*/
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
encode_mcu_gather (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
{
huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
@@ -1386,9 +1386,9 @@
int ci, dctbl, actbl, tbl;
jpeg_component_info * compptr;
JHUFF_TBL **htblptr;
- boolean did_dc[NUM_HUFF_TBLS];
- boolean did_ac[NUM_HUFF_TBLS];
- boolean did[NUM_HUFF_TBLS];
+ jpeg_boolean did_dc[NUM_HUFF_TBLS];
+ jpeg_boolean did_ac[NUM_HUFF_TBLS];
+ jpeg_boolean did[NUM_HUFF_TBLS];
/* It's important not to apply jpeg_gen_optimal_table more than once
* per table, because it clobbers the input frequency counts!
@@ -1453,7 +1453,7 @@
*/
METHODDEF(void)
-start_pass_huff (j_compress_ptr cinfo, boolean gather_statistics)
+start_pass_huff (j_compress_ptr cinfo, jpeg_boolean gather_statistics)
{
huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
int ci, dctbl, actbl, tbl;
--- jcinit.c.orig 2009-08-20 11:37:36.967116497 +0200
+++ jcinit.c 2009-08-20 11:37:41.404866807 +0200
@@ -49,7 +49,7 @@
/* Need a full-image coefficient buffer in any multi-pass mode. */
jinit_c_coef_controller(cinfo,
- (boolean) (cinfo->num_scans > 1 || cinfo->optimize_coding));
+ (jpeg_boolean) (cinfo->num_scans > 1 || cinfo->optimize_coding));
jinit_c_main_controller(cinfo, FALSE /* never need full buffer here */);
jinit_marker_writer(cinfo);
--- jcmainct.c.orig 2009-08-20 11:37:50.361119428 +0200
+++ jcmainct.c 2009-08-20 11:38:14.445115752 +0200
@@ -30,7 +30,7 @@
JDIMENSION cur_iMCU_row; /* number of current iMCU row */
JDIMENSION rowgroup_ctr; /* counts row groups received in iMCU row */
- boolean suspended; /* remember if we suspended output */
+ jpeg_boolean suspended; /* remember if we suspended output */
J_BUF_MODE pass_mode; /* current operating mode */
/* If using just a strip buffer, this points to the entire set of buffers
@@ -173,7 +173,7 @@
my_main_ptr main = (my_main_ptr) cinfo->main;
int ci;
jpeg_component_info *compptr;
- boolean writing = (main->pass_mode != JBUF_CRANK_DEST);
+ jpeg_boolean writing = (main->pass_mode != JBUF_CRANK_DEST);
while (main->cur_iMCU_row < cinfo->total_iMCU_rows) {
/* Realign the virtual buffers if at the start of an iMCU row. */
@@ -242,7 +242,7 @@
*/
GLOBAL(void)
-jinit_c_main_controller (j_compress_ptr cinfo, boolean need_full_buffer)
+jinit_c_main_controller (j_compress_ptr cinfo, jpeg_boolean need_full_buffer)
{
my_main_ptr main;
int ci;
--- jcmarker.c.orig 2009-08-20 11:38:29.633866300 +0200
+++ jcmarker.c 2009-08-20 11:38:39.734866207 +0200
@@ -181,7 +181,7 @@
LOCAL(void)
-emit_dht (j_compress_ptr cinfo, int index, boolean is_ac)
+emit_dht (j_compress_ptr cinfo, int index, jpeg_boolean is_ac)
/* Emit a DHT marker */
{
JHUFF_TBL * htbl;
@@ -494,7 +494,7 @@
write_frame_header (j_compress_ptr cinfo)
{
int ci, prec;
- boolean is_baseline;
+ jpeg_boolean is_baseline;
jpeg_component_info *compptr;
/* Emit DQT for each quantization table.
--- jcmaster.c.orig 2009-08-20 11:38:46.833116724 +0200
+++ jcmaster.c 2009-08-20 11:38:58.318116526 +0200
@@ -315,7 +315,7 @@
const jpeg_scan_info * scanptr;
int scanno, ncomps, ci, coefi, thisi;
int Ss, Se, Ah, Al;
- boolean component_sent[MAX_COMPONENTS];
+ jpeg_boolean component_sent[MAX_COMPONENTS];
#ifdef C_PROGRESSIVE_SUPPORTED
int * last_bitpos_ptr;
int last_bitpos[MAX_COMPONENTS][DCTSIZE2];
@@ -720,7 +720,7 @@
*/
GLOBAL(void)
-jinit_c_master_control (j_compress_ptr cinfo, boolean transcode_only)
+jinit_c_master_control (j_compress_ptr cinfo, jpeg_boolean transcode_only)
{
my_master_ptr master;
--- jcparam.c.orig 2009-08-20 11:39:06.346890823 +0200
+++ jcparam.c 2009-08-20 11:39:20.036116324 +0200
@@ -23,7 +23,7 @@
GLOBAL(void)
jpeg_add_quant_table (j_compress_ptr cinfo, int which_tbl,
const unsigned int *basic_table,
- int scale_factor, boolean force_baseline)
+ int scale_factor, jpeg_boolean force_baseline)
/* Define a quantization table equal to the basic_table times
* a scale factor (given as a percentage).
* If force_baseline is TRUE, the computed quantization table entries
@@ -88,7 +88,7 @@
GLOBAL(void)
-jpeg_default_qtables (j_compress_ptr cinfo, boolean force_baseline)
+jpeg_default_qtables (j_compress_ptr cinfo, jpeg_boolean force_baseline)
/* Set or change the 'quality' (quantization) setting, using default tables
* and straight percentage-scaling quality scales.
* This entry point allows different scalings for luminance and chrominance.
@@ -104,7 +104,7 @@
GLOBAL(void)
jpeg_set_linear_quality (j_compress_ptr cinfo, int scale_factor,
- boolean force_baseline)
+ jpeg_boolean force_baseline)
/* Set or change the 'quality' (quantization) setting, using default tables
* and a straight percentage-scaling quality scale. In most cases it's better
* to use jpeg_set_quality (below); this entry point is provided for
@@ -146,7 +146,7 @@
GLOBAL(void)
-jpeg_set_quality (j_compress_ptr cinfo, int quality, boolean force_baseline)
+jpeg_set_quality (j_compress_ptr cinfo, int quality, jpeg_boolean force_baseline)
/* Set or change the 'quality' (quantization) setting, using default tables.
* This is the standard quality-adjusting entry point for typical user
* interfaces; only those who want detailed control over quantization tables
--- jcprepct.c.orig 2009-08-20 11:39:26.614865820 +0200
+++ jcprepct.c 2009-08-20 11:39:41.838870566 +0200
@@ -315,7 +315,7 @@
*/
GLOBAL(void)
-jinit_c_prep_controller (j_compress_ptr cinfo, boolean need_full_buffer)
+jinit_c_prep_controller (j_compress_ptr cinfo, jpeg_boolean need_full_buffer)
{
my_prep_ptr prep;
int ci;
--- jcsample.c.orig 2009-08-20 11:39:48.648868104 +0200
+++ jcsample.c 2009-08-20 11:39:54.663867262 +0200
@@ -480,7 +480,7 @@
my_downsample_ptr downsample;
int ci;
jpeg_component_info * compptr;
- boolean smoothok = TRUE;
+ jpeg_boolean smoothok = TRUE;
int h_in_group, v_in_group, h_out_group, v_out_group;
downsample = (my_downsample_ptr)
--- jctrans.c.orig 2009-08-20 11:40:02.960129048 +0200
+++ jctrans.c 2009-08-20 11:40:09.904868915 +0200
@@ -267,7 +267,7 @@
* NB: input_buf is ignored; it is likely to be a NULL pointer.
*/
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
compress_output (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
{
my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
--- jdapimin.c.orig 2009-08-20 11:40:56.430866566 +0200
+++ jdapimin.c 2009-08-20 11:41:15.705116071 +0200
@@ -239,7 +239,7 @@
*/
GLOBAL(int)
-jpeg_read_header (j_decompress_ptr cinfo, boolean require_image)
+jpeg_read_header (j_decompress_ptr cinfo, jpeg_boolean require_image)
{
int retcode;
@@ -331,7 +331,7 @@
* Have we finished reading the input file?
*/
-GLOBAL(boolean)
+GLOBAL(jpeg_boolean)
jpeg_input_complete (j_decompress_ptr cinfo)
{
/* Check for valid jpeg object */
@@ -346,7 +346,7 @@
* Is there more than one scan?
*/
-GLOBAL(boolean)
+GLOBAL(jpeg_boolean)
jpeg_has_multiple_scans (j_decompress_ptr cinfo)
{
/* Only valid after jpeg_read_header completes */
@@ -366,7 +366,7 @@
* a suspending data source is used.
*/
-GLOBAL(boolean)
+GLOBAL(jpeg_boolean)
jpeg_finish_decompress (j_decompress_ptr cinfo)
{
if ((cinfo->global_state == DSTATE_SCANNING ||
--- jdapistd.c.orig 2009-08-20 11:41:22.526890349 +0200
+++ jdapistd.c 2009-08-20 11:41:36.330126243 +0200
@@ -20,7 +20,7 @@
/* Forward declarations */
-LOCAL(boolean) output_pass_setup JPP((j_decompress_ptr cinfo));
+LOCAL(jpeg_boolean) output_pass_setup JPP((j_decompress_ptr cinfo));
/*
@@ -34,7 +34,7 @@
* a suspending data source is used.
*/
-GLOBAL(boolean)
+GLOBAL(jpeg_boolean)
jpeg_start_decompress (j_decompress_ptr cinfo)
{
if (cinfo->global_state == DSTATE_READY) {
@@ -91,7 +91,7 @@
* If suspended, returns FALSE and sets global_state = DSTATE_PRESCAN.
*/
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
output_pass_setup (j_decompress_ptr cinfo)
{
if (cinfo->global_state != DSTATE_PRESCAN) {
@@ -224,7 +224,7 @@
* Initialize for an output pass in buffered-image mode.
*/
-GLOBAL(boolean)
+GLOBAL(jpeg_boolean)
jpeg_start_output (j_decompress_ptr cinfo, int scan_number)
{
if (cinfo->global_state != DSTATE_BUFIMAGE &&
@@ -249,7 +249,7 @@
* a suspending data source is used.
*/
-GLOBAL(boolean)
+GLOBAL(jpeg_boolean)
jpeg_finish_output (j_decompress_ptr cinfo)
{
if ((cinfo->global_state == DSTATE_SCANNING ||
--- jdarith.c.orig 2009-08-20 11:41:44.971116507 +0200
+++ jdarith.c 2009-08-20 11:42:12.791118218 +0200
@@ -237,7 +237,7 @@
* or first pass of successive approximation).
*/
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
decode_mcu_DC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
{
arith_entropy_ptr entropy = (arith_entropy_ptr) cinfo->entropy;
@@ -316,7 +316,7 @@
* or first pass of successive approximation).
*/
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
decode_mcu_AC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
{
arith_entropy_ptr entropy = (arith_entropy_ptr) cinfo->entropy;
@@ -391,7 +391,7 @@
* MCU decoding for DC successive approximation refinement scan.
*/
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
decode_mcu_DC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
{
arith_entropy_ptr entropy = (arith_entropy_ptr) cinfo->entropy;
@@ -424,7 +424,7 @@
* MCU decoding for AC successive approximation refinement scan.
*/
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
decode_mcu_AC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
{
arith_entropy_ptr entropy = (arith_entropy_ptr) cinfo->entropy;
@@ -494,7 +494,7 @@
* Decode one MCU's worth of arithmetic-compressed coefficients.
*/
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
decode_mcu (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
{
arith_entropy_ptr entropy = (arith_entropy_ptr) cinfo->entropy;
--- jdatadst.c.orig 2009-08-20 11:42:36.799116272 +0200
+++ jdatadst.c 2009-08-20 11:42:43.198116026 +0200
@@ -77,7 +77,7 @@
* write it out when emptying the buffer externally.
*/
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
empty_output_buffer (j_compress_ptr cinfo)
{
my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
--- jdatasrc.c.orig 2009-08-20 11:42:52.345883058 +0200
+++ jdatasrc.c 2009-08-20 11:42:58.981116194 +0200
@@ -27,7 +27,7 @@
FILE * infile; /* source stream */
JOCTET * buffer; /* start of buffer */
- boolean start_of_file; /* have we gotten any data yet? */
+ jpeg_boolean start_of_file; /* have we gotten any data yet? */
} my_source_mgr;
typedef my_source_mgr * my_src_ptr;
@@ -86,7 +86,7 @@
* the front of the buffer rather than discarding it.
*/
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
fill_input_buffer (j_decompress_ptr cinfo)
{
my_src_ptr src = (my_src_ptr) cinfo->src;
--- jdcoefct.c.orig 2009-08-20 11:43:05.725894412 +0200
+++ jdcoefct.c 2009-08-20 11:43:19.139866248 +0200
@@ -69,7 +69,7 @@
JPP((j_decompress_ptr cinfo, JSAMPIMAGE output_buf));
#endif
#ifdef BLOCK_SMOOTHING_SUPPORTED
-LOCAL(boolean) smoothing_ok JPP((j_decompress_ptr cinfo));
+LOCAL(jpeg_boolean) smoothing_ok JPP((j_decompress_ptr cinfo));
METHODDEF(int) decompress_smooth_data
JPP((j_decompress_ptr cinfo, JSAMPIMAGE output_buf));
#endif
@@ -401,11 +401,11 @@
* more accurately than they really are.
*/
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
smoothing_ok (j_decompress_ptr cinfo)
{
my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
- boolean smoothing_useful = FALSE;
+ jpeg_boolean smoothing_useful = FALSE;
int ci, coefi;
jpeg_component_info *compptr;
JQUANT_TBL * qtable;
@@ -470,7 +470,7 @@
JDIMENSION output_col;
jpeg_component_info *compptr;
inverse_DCT_method_ptr inverse_DCT;
- boolean first_row, last_row;
+ jpeg_boolean first_row, last_row;
JBLOCK workspace;
int *coef_bits;
JQUANT_TBL *quanttbl;
@@ -673,7 +673,7 @@
*/
GLOBAL(void)
-jinit_d_coef_controller (j_decompress_ptr cinfo, boolean need_full_buffer)
+jinit_d_coef_controller (j_decompress_ptr cinfo, jpeg_boolean need_full_buffer)
{
my_coef_ptr coef;
--- jdhuff.c.orig 2009-08-20 11:43:27.669123391 +0200
+++ jdhuff.c 2009-08-20 11:43:54.296866948 +0200
@@ -274,7 +274,7 @@
*/
LOCAL(void)
-jpeg_make_d_derived_tbl (j_decompress_ptr cinfo, boolean isDC, int tblno,
+jpeg_make_d_derived_tbl (j_decompress_ptr cinfo, jpeg_boolean isDC, int tblno,
d_derived_tbl ** pdtbl)
{
JHUFF_TBL *htbl;
@@ -415,7 +415,7 @@
#endif
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
jpeg_fill_bit_buffer (bitread_working_state * state,
register bit_buf_type get_buffer, register int bits_left,
int nbits)
@@ -586,7 +586,7 @@
* Returns FALSE if must suspend.
*/
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
process_restart (j_decompress_ptr cinfo)
{
huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
@@ -645,7 +645,7 @@
* or first pass of successive approximation).
*/
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
decode_mcu_DC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
{
huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
@@ -716,7 +716,7 @@
* or first pass of successive approximation).
*/
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
decode_mcu_AC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
{
huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
@@ -801,7 +801,7 @@
* is not very clear on the point.
*/
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
decode_mcu_DC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
{
huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
@@ -850,7 +850,7 @@
* MCU decoding for AC successive approximation refinement scan.
*/
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
decode_mcu_AC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
{
huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
@@ -1000,7 +1000,7 @@
* Decode one MCU's worth of Huffman-compressed coefficients.
*/
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
decode_mcu (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
{
huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
--- jdinput.c.orig 2009-08-20 11:44:01.240887972 +0200
+++ jdinput.c 2009-08-20 11:44:08.081866527 +0200
@@ -22,7 +22,7 @@
typedef struct {
struct jpeg_input_controller pub; /* public fields */
- boolean inheaders; /* TRUE until first SOS is reached */
+ jpeg_boolean inheaders; /* TRUE until first SOS is reached */
} my_input_controller;
typedef my_input_controller * my_inputctl_ptr;
--- jdmainct.c.orig 2009-08-20 11:44:23.934140509 +0200
+++ jdmainct.c 2009-08-20 11:44:30.961876604 +0200
@@ -117,7 +117,7 @@
/* Pointer to allocated workspace (M or M+2 row groups). */
JSAMPARRAY buffer[MAX_COMPONENTS];
- boolean buffer_full; /* Have we gotten an iMCU row from decoder? */
+ jpeg_boolean buffer_full; /* Have we gotten an iMCU row from decoder? */
JDIMENSION rowgroup_ctr; /* counts row groups output to postprocessor */
/* Remaining fields are only used in the context case. */
@@ -473,7 +473,7 @@
*/
GLOBAL(void)
-jinit_d_main_controller (j_decompress_ptr cinfo, boolean need_full_buffer)
+jinit_d_main_controller (j_decompress_ptr cinfo, jpeg_boolean need_full_buffer)
{
my_main_ptr main;
int ci, rgroup, ngroups;
--- jdmarker.c.orig 2009-08-20 11:44:39.278866368 +0200
+++ jdmarker.c 2009-08-20 11:45:17.804115896 +0200
@@ -193,7 +193,7 @@
*/
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
get_soi (j_decompress_ptr cinfo)
/* Process an SOI marker */
{
@@ -233,8 +233,8 @@
}
-LOCAL(boolean)
-get_sof (j_decompress_ptr cinfo, boolean is_prog, boolean is_arith)
+LOCAL(jpeg_boolean)
+get_sof (j_decompress_ptr cinfo, jpeg_boolean is_prog, jpeg_boolean is_arith)
/* Process a SOFn marker */
{
INT32 length;
@@ -297,7 +297,7 @@
}
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
get_sos (j_decompress_ptr cinfo)
/* Process a SOS marker */
{
@@ -369,7 +369,7 @@
#ifdef D_ARITH_CODING_SUPPORTED
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
get_dac (j_decompress_ptr cinfo)
/* Process a DAC marker */
{
@@ -415,7 +415,7 @@
#endif /* D_ARITH_CODING_SUPPORTED */
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
get_dht (j_decompress_ptr cinfo)
/* Process a DHT marker */
{
@@ -486,7 +486,7 @@
}
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
get_dqt (j_decompress_ptr cinfo)
/* Process a DQT marker */
{
@@ -544,7 +544,7 @@
}
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
get_dri (j_decompress_ptr cinfo)
/* Process a DRI marker */
{
@@ -687,7 +687,7 @@
}
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
get_interesting_appn (j_decompress_ptr cinfo)
/* Process an APP0 or APP14 marker without saving it */
{
@@ -735,7 +735,7 @@
#ifdef SAVE_MARKERS_SUPPORTED
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
save_marker (j_decompress_ptr cinfo)
/* Save an APPn or COM marker into the marker list */
{
@@ -841,7 +841,7 @@
#endif /* SAVE_MARKERS_SUPPORTED */
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
skip_variable (j_decompress_ptr cinfo)
/* Skip over an unknown or uninteresting variable-length marker */
{
@@ -870,7 +870,7 @@
* but it will never be 0 or FF.
*/
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
next_marker (j_decompress_ptr cinfo)
{
int c;
@@ -917,7 +917,7 @@
}
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
first_marker (j_decompress_ptr cinfo)
/* Like next_marker, but used to obtain the initial SOI marker. */
/* For this marker, we do not allow preceding garbage or fill; otherwise,
@@ -1109,7 +1109,7 @@
* it holds a marker which the decoder will be unable to read past.
*/
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
read_restart_marker (j_decompress_ptr cinfo)
{
/* Obtain a marker unless we already did. */
@@ -1188,7 +1188,7 @@
* any other marker would have to be bogus data in that case.
*/
-GLOBAL(boolean)
+GLOBAL(jpeg_boolean)
jpeg_resync_to_restart (j_decompress_ptr cinfo, int desired)
{
int marker = cinfo->unread_marker;
--- jdmaster.c.orig 2009-08-20 11:45:36.984115940 +0200
+++ jdmaster.c 2009-08-20 11:45:48.922119814 +0200
@@ -24,7 +24,7 @@
int pass_number; /* # of passes completed */
- boolean using_merged_upsample; /* TRUE if using merged upsample/cconvert */
+ jpeg_boolean using_merged_upsample; /* TRUE if using merged upsample/cconvert */
/* Saved references to initialized quantizer modules,
* in case we need to switch modes.
@@ -41,7 +41,7 @@
* CRUCIAL: this must match the actual capabilities of jdmerge.c!
*/
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
use_merged_upsample (j_decompress_ptr cinfo)
{
#ifdef UPSAMPLE_MERGING_SUPPORTED
@@ -401,7 +401,7 @@
master_selection (j_decompress_ptr cinfo)
{
my_master_ptr master = (my_master_ptr) cinfo->master;
- boolean use_c_buffer;
+ jpeg_boolean use_c_buffer;
long samplesperrow;
JDIMENSION jd_samplesperrow;
--- jdmerge.c.orig 2009-08-20 11:45:55.827140697 +0200
+++ jdmerge.c 2009-08-20 11:46:02.113873456 +0200
@@ -61,7 +61,7 @@
* to discard the dummy last row if the image height is odd.
*/
JSAMPROW spare_row;
- boolean spare_full; /* T if spare buffer is occupied */
+ jpeg_boolean spare_full; /* T if spare buffer is occupied */
JDIMENSION out_row_width; /* samples per output row */
JDIMENSION rows_to_go; /* counts rows remaining in image */
--- jdpostct.c.orig 2009-08-20 11:46:08.022116658 +0200
+++ jdpostct.c 2009-08-20 11:46:12.271138065 +0200
@@ -247,7 +247,7 @@
*/
GLOBAL(void)
-jinit_d_post_controller (j_decompress_ptr cinfo, boolean need_full_buffer)
+jinit_d_post_controller (j_decompress_ptr cinfo, jpeg_boolean need_full_buffer)
{
my_post_ptr post;
--- jdsample.c.orig 2009-08-20 11:46:20.616866424 +0200
+++ jdsample.c 2009-08-20 11:46:27.457115806 +0200
@@ -296,7 +296,7 @@
my_upsample_ptr upsample;
int ci;
jpeg_component_info * compptr;
- boolean need_buffer;
+ jpeg_boolean need_buffer;
int h_in_group, v_in_group, h_out_group, v_out_group;
upsample = (my_upsample_ptr)
--- jerror.c.orig 2009-08-20 11:46:34.576116112 +0200
+++ jerror.c 2009-08-20 11:46:39.701116174 +0200
@@ -161,7 +161,7 @@
const char * msgtext = NULL;
const char * msgptr;
char ch;
- boolean isstring;
+ jpeg_boolean isstring;
/* Look up message string in proper table */
if (msg_code > 0 && msg_code <= err->last_jpeg_message) {
--- jmemmgr.c.orig 2009-08-20 11:47:37.676116529 +0200
+++ jmemmgr.c 2009-08-20 11:48:09.789865834 +0200
@@ -156,9 +156,9 @@
JDIMENSION rowsperchunk; /* allocation chunk size in mem_buffer */
JDIMENSION cur_start_row; /* first logical row # in the buffer */
JDIMENSION first_undef_row; /* row # of first uninitialized row */
- boolean pre_zero; /* pre-zero mode requested? */
- boolean dirty; /* do current buffer contents need written? */
- boolean b_s_open; /* is backing-store data valid? */
+ jpeg_boolean pre_zero; /* pre-zero mode requested? */
+ jpeg_boolean dirty; /* do current buffer contents need written? */
+ jpeg_boolean b_s_open; /* is backing-store data valid? */
jvirt_sarray_ptr next; /* link to next virtual sarray control block */
backing_store_info b_s_info; /* System-dependent control info */
};
@@ -172,9 +172,9 @@
JDIMENSION rowsperchunk; /* allocation chunk size in mem_buffer */
JDIMENSION cur_start_row; /* first logical row # in the buffer */
JDIMENSION first_undef_row; /* row # of first uninitialized row */
- boolean pre_zero; /* pre-zero mode requested? */
- boolean dirty; /* do current buffer contents need written? */
- boolean b_s_open; /* is backing-store data valid? */
+ jpeg_boolean pre_zero; /* pre-zero mode requested? */
+ jpeg_boolean dirty; /* do current buffer contents need written? */
+ jpeg_boolean b_s_open; /* is backing-store data valid? */
jvirt_barray_ptr next; /* link to next virtual barray control block */
backing_store_info b_s_info; /* System-dependent control info */
};
@@ -520,7 +520,7 @@
METHODDEF(jvirt_sarray_ptr)
-request_virt_sarray (j_common_ptr cinfo, int pool_id, boolean pre_zero,
+request_virt_sarray (j_common_ptr cinfo, int pool_id, jpeg_boolean pre_zero,
JDIMENSION samplesperrow, JDIMENSION numrows,
JDIMENSION maxaccess)
/* Request a virtual 2-D sample array */
@@ -550,7 +550,7 @@
METHODDEF(jvirt_barray_ptr)
-request_virt_barray (j_common_ptr cinfo, int pool_id, boolean pre_zero,
+request_virt_barray (j_common_ptr cinfo, int pool_id, jpeg_boolean pre_zero,
JDIMENSION blocksperrow, JDIMENSION numrows,
JDIMENSION maxaccess)
/* Request a virtual 2-D coefficient-block array */
@@ -687,7 +687,7 @@
LOCAL(void)
-do_sarray_io (j_common_ptr cinfo, jvirt_sarray_ptr ptr, boolean writing)
+do_sarray_io (j_common_ptr cinfo, jvirt_sarray_ptr ptr, jpeg_boolean writing)
/* Do backing store read or write of a virtual sample array */
{
long bytesperrow, file_offset, byte_count, rows, thisrow, i;
@@ -720,7 +720,7 @@
LOCAL(void)
-do_barray_io (j_common_ptr cinfo, jvirt_barray_ptr ptr, boolean writing)
+do_barray_io (j_common_ptr cinfo, jvirt_barray_ptr ptr, jpeg_boolean writing)
/* Do backing store read or write of a virtual coefficient-block array */
{
long bytesperrow, file_offset, byte_count, rows, thisrow, i;
@@ -755,7 +755,7 @@
METHODDEF(JSAMPARRAY)
access_virt_sarray (j_common_ptr cinfo, jvirt_sarray_ptr ptr,
JDIMENSION start_row, JDIMENSION num_rows,
- boolean writable)
+ jpeg_boolean writable)
/* Access the part of a virtual sample array starting at start_row */
/* and extending for num_rows rows. writable is true if */
/* caller intends to modify the accessed area. */
@@ -840,7 +840,7 @@
METHODDEF(JBLOCKARRAY)
access_virt_barray (j_common_ptr cinfo, jvirt_barray_ptr ptr,
JDIMENSION start_row, JDIMENSION num_rows,
- boolean writable)
+ jpeg_boolean writable)
/* Access the part of a virtual block array starting at start_row */
/* and extending for num_rows rows. writable is true if */
/* caller intends to modify the accessed area. */
--- jmorecfg.h.orig 2009-08-20 11:17:11.941144303 +0200
+++ jmorecfg.h 2009-08-20 11:30:55.922866404 +0200
@@ -229,10 +229,7 @@
* specific header files that you want to include together with these files.
* Defining HAVE_BOOLEAN before including jpeglib.h should make it work.
*/
-
-#ifndef HAVE_BOOLEAN
-typedef int boolean;
-#endif
+typedef int jpeg_boolean;
#ifndef FALSE /* in case these macros already exist */
#define FALSE 0 /* values of boolean */
#endif
--- jpegint.h.orig 2009-08-20 11:31:06.535867201 +0200
+++ jpegint.h 2009-08-20 11:32:05.734866377 +0200
@@ -49,8 +49,8 @@
JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
/* State variables made visible to other modules */
- boolean call_pass_startup; /* True if pass_startup must be called */
- boolean is_last_pass; /* True during last pass */
+ jpeg_boolean call_pass_startup; /* True if pass_startup must be called */
+ jpeg_boolean is_last_pass; /* True during last pass */
};
/* Main buffer control (downsampled-data buffer) */
@@ -76,7 +76,7 @@
/* Coefficient buffer control */
struct jpeg_c_coef_controller {
JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
- JMETHOD(boolean, compress_data, (j_compress_ptr cinfo,
+ JMETHOD(jpeg_boolean, compress_data, (j_compress_ptr cinfo,
JSAMPIMAGE input_buf));
};
@@ -96,7 +96,7 @@
JSAMPIMAGE output_buf,
JDIMENSION out_row_group_index));
- boolean need_context_rows; /* TRUE if need rows above & below */
+ jpeg_boolean need_context_rows; /* TRUE if need rows above & below */
};
/* Forward DCT (also controls coefficient quantization) */
@@ -114,8 +114,8 @@
/* Entropy encoding */
struct jpeg_entropy_encoder {
- JMETHOD(void, start_pass, (j_compress_ptr cinfo, boolean gather_statistics));
- JMETHOD(boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data));
+ JMETHOD(void, start_pass, (j_compress_ptr cinfo, jpeg_boolean gather_statistics));
+ JMETHOD(jpeg_boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data));
JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
};
@@ -142,7 +142,7 @@
JMETHOD(void, finish_output_pass, (j_decompress_ptr cinfo));
/* State variables made visible to other modules */
- boolean is_dummy_pass; /* True during 1st pass for 2-pass quant */
+ jpeg_boolean is_dummy_pass; /* True during 1st pass for 2-pass quant */
};
/* Input control module */
@@ -153,8 +153,8 @@
JMETHOD(void, finish_input_pass, (j_decompress_ptr cinfo));
/* State variables made visible to other modules */
- boolean has_multiple_scans; /* True if file has multiple scans */
- boolean eoi_reached; /* True when EOI has been consumed */
+ jpeg_boolean has_multiple_scans; /* True if file has multiple scans */
+ jpeg_boolean eoi_reached; /* True when EOI has been consumed */
};
/* Main buffer control (downsampled-data buffer) */
@@ -202,8 +202,8 @@
/* State of marker reader --- nominally internal, but applications
* supplying COM or APPn handlers might like to know the state.
*/
- boolean saw_SOI; /* found SOI? */
- boolean saw_SOF; /* found SOF? */
+ jpeg_boolean saw_SOI; /* found SOI? */
+ jpeg_boolean saw_SOF; /* found SOF? */
int next_restart_num; /* next restart number expected (0-7) */
unsigned int discarded_bytes; /* # of bytes skipped looking for a marker */
};
@@ -211,12 +211,12 @@
/* Entropy decoding */
struct jpeg_entropy_decoder {
JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
- JMETHOD(boolean, decode_mcu, (j_decompress_ptr cinfo,
+ JMETHOD(jpeg_boolean, decode_mcu, (j_decompress_ptr cinfo,
JBLOCKROW *MCU_data));
/* This is here to share code between baseline and progressive decoders; */
/* other modules probably should not use it */
- boolean insufficient_data; /* set TRUE after emitting warning */
+ jpeg_boolean insufficient_data; /* set TRUE after emitting warning */
};
/* Inverse DCT (also performs dequantization) */
@@ -242,7 +242,7 @@
JDIMENSION *out_row_ctr,
JDIMENSION out_rows_avail));
- boolean need_context_rows; /* TRUE if need rows above & below */
+ jpeg_boolean need_context_rows; /* TRUE if need rows above & below */
};
/* Colorspace conversion */
@@ -255,7 +255,7 @@
/* Color quantization or color precision reduction */
struct jpeg_color_quantizer {
- JMETHOD(void, start_pass, (j_decompress_ptr cinfo, boolean is_pre_scan));
+ JMETHOD(void, start_pass, (j_decompress_ptr cinfo, jpeg_boolean is_pre_scan));
JMETHOD(void, color_quantize, (j_decompress_ptr cinfo,
JSAMPARRAY input_buf, JSAMPARRAY output_buf,
int num_rows));
@@ -336,13 +336,13 @@
/* Compression module initialization routines */
EXTERN(void) jinit_compress_master JPP((j_compress_ptr cinfo));
EXTERN(void) jinit_c_master_control JPP((j_compress_ptr cinfo,
- boolean transcode_only));
+ jpeg_boolean transcode_only));
EXTERN(void) jinit_c_main_controller JPP((j_compress_ptr cinfo,
- boolean need_full_buffer));
+ jpeg_boolean need_full_buffer));
EXTERN(void) jinit_c_prep_controller JPP((j_compress_ptr cinfo,
- boolean need_full_buffer));
+ jpeg_boolean need_full_buffer));
EXTERN(void) jinit_c_coef_controller JPP((j_compress_ptr cinfo,
- boolean need_full_buffer));
+ jpeg_boolean need_full_buffer));
EXTERN(void) jinit_color_converter JPP((j_compress_ptr cinfo));
EXTERN(void) jinit_downsampler JPP((j_compress_ptr cinfo));
EXTERN(void) jinit_forward_dct JPP((j_compress_ptr cinfo));
@@ -352,11 +352,11 @@
/* Decompression module initialization routines */
EXTERN(void) jinit_master_decompress JPP((j_decompress_ptr cinfo));
EXTERN(void) jinit_d_main_controller JPP((j_decompress_ptr cinfo,
- boolean need_full_buffer));
+ jpeg_boolean need_full_buffer));
EXTERN(void) jinit_d_coef_controller JPP((j_decompress_ptr cinfo,
- boolean need_full_buffer));
+ jpeg_boolean need_full_buffer));
EXTERN(void) jinit_d_post_controller JPP((j_decompress_ptr cinfo,
- boolean need_full_buffer));
+ jpeg_boolean need_full_buffer));
EXTERN(void) jinit_input_controller JPP((j_decompress_ptr cinfo));
EXTERN(void) jinit_marker_reader JPP((j_decompress_ptr cinfo));
EXTERN(void) jinit_huff_decoder JPP((j_decompress_ptr cinfo));
--- jpeglib.h.orig 2009-08-20 11:28:13.725117628 +0200
+++ jpeglib.h 2009-08-20 11:30:27.042115824 +0200
@@ -98,7 +98,7 @@
* You could suppress output of a table by setting this to TRUE.
* (See jpeg_suppress_tables for an example.)
*/
- boolean sent_table; /* TRUE when table has been output */
+ jpeg_boolean sent_table; /* TRUE when table has been output */
} JQUANT_TBL;
@@ -114,7 +114,7 @@
* You could suppress output of a table by setting this to TRUE.
* (See jpeg_suppress_tables for an example.)
*/
- boolean sent_table; /* TRUE when table has been output */
+ jpeg_boolean sent_table; /* TRUE when table has been output */
} JHUFF_TBL;
@@ -164,7 +164,7 @@
* components will be ignored (eg grayscale output from YCbCr image),
* we can skip most computations for the unused components.
*/
- boolean component_needed; /* do we need the value of this component? */
+ jpeg_boolean component_needed; /* do we need the value of this component? */
/* These values are computed before starting a scan of the component. */
/* The decompressor output side may not use these variables. */
@@ -250,7 +250,7 @@
struct jpeg_memory_mgr * mem; /* Memory manager module */\
struct jpeg_progress_mgr * progress; /* Progress monitor, or NULL if none */\
void * client_data; /* Available for use by application */\
- boolean is_decompressor; /* So common code can tell which is which */\
+ jpeg_boolean is_decompressor; /* So common code can tell which is which */\
int global_state /* For checking call sequence validity */
/* Routines that are to be used by both halves of the library are declared
@@ -338,11 +338,11 @@
* set num_scans and scan_info to point to an array of scan definitions.
*/
- boolean raw_data_in; /* TRUE=caller supplies downsampled data */
- boolean arith_code; /* TRUE=arithmetic coding, FALSE=Huffman */
- boolean optimize_coding; /* TRUE=optimize entropy encoding parms */
- boolean CCIR601_sampling; /* TRUE=first samples are cosited */
- boolean do_fancy_downsampling; /* TRUE=apply fancy downsampling */
+ jpeg_boolean raw_data_in; /* TRUE=caller supplies downsampled data */
+ jpeg_boolean arith_code; /* TRUE=arithmetic coding, FALSE=Huffman */
+ jpeg_boolean optimize_coding; /* TRUE=optimize entropy encoding parms */
+ jpeg_boolean CCIR601_sampling; /* TRUE=first samples are cosited */
+ jpeg_boolean do_fancy_downsampling; /* TRUE=apply fancy downsampling */
int smoothing_factor; /* 1..100, or 0 for no input smoothing */
J_DCT_METHOD dct_method; /* DCT algorithm selector */
@@ -356,7 +356,7 @@
/* Parameters controlling emission of special markers. */
- boolean write_JFIF_header; /* should a JFIF marker be written? */
+ jpeg_boolean write_JFIF_header; /* should a JFIF marker be written? */
UINT8 JFIF_major_version; /* What to write for the JFIF version number */
UINT8 JFIF_minor_version;
/* These three values are not used by the JPEG code, merely copied */
@@ -366,7 +366,7 @@
UINT8 density_unit; /* JFIF code for pixel size units */
UINT16 X_density; /* Horizontal pixel density */
UINT16 Y_density; /* Vertical pixel density */
- boolean write_Adobe_marker; /* should an Adobe marker be written? */
+ jpeg_boolean write_Adobe_marker; /* should an Adobe marker be written? */
/* State variable: index of next scanline to be written to
* jpeg_write_scanlines(). Application may use this to control its
@@ -382,7 +382,7 @@
/*
* These fields are computed during compression startup
*/
- boolean progressive_mode; /* TRUE if scan script uses progressive mode */
+ jpeg_boolean progressive_mode; /* TRUE if scan script uses progressive mode */
int max_h_samp_factor; /* largest h_samp_factor */
int max_v_samp_factor; /* largest v_samp_factor */
@@ -458,22 +458,22 @@
double output_gamma; /* image gamma wanted in output */
- boolean buffered_image; /* TRUE=multiple output passes */
- boolean raw_data_out; /* TRUE=downsampled data wanted */
+ jpeg_boolean buffered_image; /* TRUE=multiple output passes */
+ jpeg_boolean raw_data_out; /* TRUE=downsampled data wanted */
J_DCT_METHOD dct_method; /* IDCT algorithm selector */
- boolean do_fancy_upsampling; /* TRUE=apply fancy upsampling */
- boolean do_block_smoothing; /* TRUE=apply interblock smoothing */
+ jpeg_boolean do_fancy_upsampling; /* TRUE=apply fancy upsampling */
+ jpeg_boolean do_block_smoothing; /* TRUE=apply interblock smoothing */
- boolean quantize_colors; /* TRUE=colormapped output wanted */
+ jpeg_boolean quantize_colors; /* TRUE=colormapped output wanted */
/* the following are ignored if not quantize_colors: */
J_DITHER_MODE dither_mode; /* type of color dithering to use */
- boolean two_pass_quantize; /* TRUE=use two-pass color quantization */
+ jpeg_boolean two_pass_quantize; /* TRUE=use two-pass color quantization */
int desired_number_of_colors; /* max # colors to use in created colormap */
/* these are significant only in buffered-image mode: */
- boolean enable_1pass_quant; /* enable future use of 1-pass quantizer */
- boolean enable_external_quant;/* enable future use of external colormap */
- boolean enable_2pass_quant; /* enable future use of 2-pass quantizer */
+ jpeg_boolean enable_1pass_quant; /* enable future use of 1-pass quantizer */
+ jpeg_boolean enable_external_quant;/* enable future use of external colormap */
+ jpeg_boolean enable_2pass_quant; /* enable future use of 2-pass quantizer */
/* Description of actual output image that will be returned to application.
* These fields are computed by jpeg_start_decompress().
@@ -560,8 +560,8 @@
jpeg_component_info * comp_info;
/* comp_info[i] describes component that appears i'th in SOF */
- boolean progressive_mode; /* TRUE if SOFn specifies progressive mode */
- boolean arith_code; /* TRUE=arithmetic coding, FALSE=Huffman */
+ jpeg_boolean progressive_mode; /* TRUE if SOFn specifies progressive mode */
+ jpeg_boolean arith_code; /* TRUE=arithmetic coding, FALSE=Huffman */
UINT8 arith_dc_L[NUM_ARITH_TBLS]; /* L values for DC arith-coding tables */
UINT8 arith_dc_U[NUM_ARITH_TBLS]; /* U values for DC arith-coding tables */
@@ -572,17 +572,17 @@
/* These fields record data obtained from optional markers recognized by
* the JPEG library.
*/
- boolean saw_JFIF_marker; /* TRUE iff a JFIF APP0 marker was found */
+ jpeg_boolean saw_JFIF_marker; /* TRUE iff a JFIF APP0 marker was found */
/* Data copied from JFIF marker; only valid if saw_JFIF_marker is TRUE: */
UINT8 JFIF_major_version; /* JFIF version number */
UINT8 JFIF_minor_version;
UINT8 density_unit; /* JFIF code for pixel size units */
UINT16 X_density; /* Horizontal pixel density */
UINT16 Y_density; /* Vertical pixel density */
- boolean saw_Adobe_marker; /* TRUE iff an Adobe APP14 marker was found */
+ jpeg_boolean saw_Adobe_marker; /* TRUE iff an Adobe APP14 marker was found */
UINT8 Adobe_transform; /* Color transform code from Adobe marker */
- boolean CCIR601_sampling; /* TRUE=first samples are cosited */
+ jpeg_boolean CCIR601_sampling; /* TRUE=first samples are cosited */
/* Aside from the specific data retained from APPn markers known to the
* library, the uninterpreted contents of any or all APPn and COM markers
@@ -741,7 +741,7 @@
size_t free_in_buffer; /* # of byte spaces remaining in buffer */
JMETHOD(void, init_destination, (j_compress_ptr cinfo));
- JMETHOD(boolean, empty_output_buffer, (j_compress_ptr cinfo));
+ JMETHOD(jpeg_boolean, empty_output_buffer, (j_compress_ptr cinfo));
JMETHOD(void, term_destination, (j_compress_ptr cinfo));
};
@@ -753,9 +753,9 @@
size_t bytes_in_buffer; /* # of bytes remaining in buffer */
JMETHOD(void, init_source, (j_decompress_ptr cinfo));
- JMETHOD(boolean, fill_input_buffer, (j_decompress_ptr cinfo));
+ JMETHOD(jpeg_boolean, fill_input_buffer, (j_decompress_ptr cinfo));
JMETHOD(void, skip_input_data, (j_decompress_ptr cinfo, long num_bytes));
- JMETHOD(boolean, resync_to_restart, (j_decompress_ptr cinfo, int desired));
+ JMETHOD(jpeg_boolean, resync_to_restart, (j_decompress_ptr cinfo, int desired));
JMETHOD(void, term_source, (j_decompress_ptr cinfo));
};
@@ -793,13 +793,13 @@
JDIMENSION numrows));
JMETHOD(jvirt_sarray_ptr, request_virt_sarray, (j_common_ptr cinfo,
int pool_id,
- boolean pre_zero,
+ jpeg_boolean pre_zero,
JDIMENSION samplesperrow,
JDIMENSION numrows,
JDIMENSION maxaccess));
JMETHOD(jvirt_barray_ptr, request_virt_barray, (j_common_ptr cinfo,
int pool_id,
- boolean pre_zero,
+ jpeg_boolean pre_zero,
JDIMENSION blocksperrow,
JDIMENSION numrows,
JDIMENSION maxaccess));
@@ -808,12 +808,12 @@
jvirt_sarray_ptr ptr,
JDIMENSION start_row,
JDIMENSION num_rows,
- boolean writable));
+ jpeg_boolean writable));
JMETHOD(JBLOCKARRAY, access_virt_barray, (j_common_ptr cinfo,
jvirt_barray_ptr ptr,
JDIMENSION start_row,
JDIMENSION num_rows,
- boolean writable));
+ jpeg_boolean writable));
JMETHOD(void, free_pool, (j_common_ptr cinfo, int pool_id));
JMETHOD(void, self_destruct, (j_common_ptr cinfo));
@@ -832,7 +832,7 @@
/* Routine signature for application-supplied marker processing methods.
* Need not pass marker code since it is stored in cinfo->unread_marker.
*/
-typedef JMETHOD(boolean, jpeg_marker_parser_method, (j_decompress_ptr cinfo));
+typedef JMETHOD(jpeg_boolean, jpeg_marker_parser_method, (j_decompress_ptr cinfo));
/* Declarations for routines called by application.
@@ -945,26 +945,26 @@
J_COLOR_SPACE colorspace));
EXTERN(void) jpeg_default_colorspace JPP((j_compress_ptr cinfo));
EXTERN(void) jpeg_set_quality JPP((j_compress_ptr cinfo, int quality,
- boolean force_baseline));
+ jpeg_boolean force_baseline));
EXTERN(void) jpeg_set_linear_quality JPP((j_compress_ptr cinfo,
int scale_factor,
- boolean force_baseline));
+ jpeg_boolean force_baseline));
EXTERN(void) jpeg_default_qtables JPP((j_compress_ptr cinfo,
- boolean force_baseline));
+ jpeg_boolean force_baseline));
EXTERN(void) jpeg_add_quant_table JPP((j_compress_ptr cinfo, int which_tbl,
const unsigned int *basic_table,
int scale_factor,
- boolean force_baseline));
+ jpeg_boolean force_baseline));
EXTERN(int) jpeg_quality_scaling JPP((int quality));
EXTERN(void) jpeg_simple_progression JPP((j_compress_ptr cinfo));
EXTERN(void) jpeg_suppress_tables JPP((j_compress_ptr cinfo,
- boolean suppress));
+ jpeg_boolean suppress));
EXTERN(JQUANT_TBL *) jpeg_alloc_quant_table JPP((j_common_ptr cinfo));
EXTERN(JHUFF_TBL *) jpeg_alloc_huff_table JPP((j_common_ptr cinfo));
/* Main entry points for compression */
EXTERN(void) jpeg_start_compress JPP((j_compress_ptr cinfo,
- boolean write_all_tables));
+ jpeg_boolean write_all_tables));
EXTERN(JDIMENSION) jpeg_write_scanlines JPP((j_compress_ptr cinfo,
JSAMPARRAY scanlines,
JDIMENSION num_lines));
@@ -993,7 +993,7 @@
/* Decompression startup: read start of JPEG datastream to see what's there */
EXTERN(int) jpeg_read_header JPP((j_decompress_ptr cinfo,
- boolean require_image));
+ jpeg_boolean require_image));
/* Return value is one of: */
#define JPEG_SUSPENDED 0 /* Suspended due to lack of input data */
#define JPEG_HEADER_OK 1 /* Found valid image datastream */
@@ -1005,11 +1005,11 @@
*/
/* Main entry points for decompression */
-EXTERN(boolean) jpeg_start_decompress JPP((j_decompress_ptr cinfo));
+EXTERN(jpeg_boolean) jpeg_start_decompress JPP((j_decompress_ptr cinfo));
EXTERN(JDIMENSION) jpeg_read_scanlines JPP((j_decompress_ptr cinfo,
JSAMPARRAY scanlines,
JDIMENSION max_lines));
-EXTERN(boolean) jpeg_finish_decompress JPP((j_decompress_ptr cinfo));
+EXTERN(jpeg_boolean) jpeg_finish_decompress JPP((j_decompress_ptr cinfo));
/* Replaces jpeg_read_scanlines when reading raw downsampled data. */
EXTERN(JDIMENSION) jpeg_read_raw_data JPP((j_decompress_ptr cinfo,
@@ -1017,11 +1017,11 @@
JDIMENSION max_lines));
/* Additional entry points for buffered-image mode. */
-EXTERN(boolean) jpeg_has_multiple_scans JPP((j_decompress_ptr cinfo));
-EXTERN(boolean) jpeg_start_output JPP((j_decompress_ptr cinfo,
+EXTERN(jpeg_boolean) jpeg_has_multiple_scans JPP((j_decompress_ptr cinfo));
+EXTERN(jpeg_boolean) jpeg_start_output JPP((j_decompress_ptr cinfo,
int scan_number));
-EXTERN(boolean) jpeg_finish_output JPP((j_decompress_ptr cinfo));
-EXTERN(boolean) jpeg_input_complete JPP((j_decompress_ptr cinfo));
+EXTERN(jpeg_boolean) jpeg_finish_output JPP((j_decompress_ptr cinfo));
+EXTERN(jpeg_boolean) jpeg_input_complete JPP((j_decompress_ptr cinfo));
EXTERN(void) jpeg_new_colormap JPP((j_decompress_ptr cinfo));
EXTERN(int) jpeg_consume_input JPP((j_decompress_ptr cinfo));
/* Return value is one of: */
@@ -1067,7 +1067,7 @@
EXTERN(void) jpeg_destroy JPP((j_common_ptr cinfo));
/* Default restart-marker-resync procedure for use by data source modules */
-EXTERN(boolean) jpeg_resync_to_restart JPP((j_decompress_ptr cinfo,
+EXTERN(jpeg_boolean) jpeg_resync_to_restart JPP((j_decompress_ptr cinfo,
int desired));
--- jpegtran.c.orig 2009-08-20 11:50:17.652872947 +0200
+++ jpegtran.c 2009-08-20 11:50:27.852866642 +0200
@@ -114,7 +114,7 @@
LOCAL(int)
parse_switches (j_compress_ptr cinfo, int argc, char **argv,
- int last_file_arg_seen, boolean for_real)
+ int last_file_arg_seen, jpeg_boolean for_real)
/* Parse optional switches.
* Returns argv[] index of first file-name argument (== argc if none).
* Any file names with indexes <= last_file_arg_seen are ignored;
@@ -126,7 +126,7 @@
{
int argn;
char * arg;
- boolean simple_progressive;
+ jpeg_boolean simple_progressive;
char * scansarg = NULL; /* saves -scans parm if any */
/* Set up default JPEG parameters. */
@@ -194,7 +194,7 @@
} else if (keymatch(arg, "debug", 1) || keymatch(arg, "verbose", 1)) {
/* Enable debug printouts. */
/* On first -d, print version identification */
- static boolean printed_version = FALSE;
+ static jpeg_boolean printed_version = FALSE;
if (! printed_version) {
fprintf(stderr, "Independent JPEG Group's JPEGTRAN, version %s\n%s\n",
--- jquant1.c.orig 2009-08-20 11:46:56.877115750 +0200
+++ jquant1.c 2009-08-20 11:47:07.640866353 +0200
@@ -151,7 +151,7 @@
* premultiplied as described above. Since colormap indexes must fit into
* JSAMPLEs, the entries of this array will too.
*/
- boolean is_padded; /* is the colorindex padded for odither? */
+ jpeg_boolean is_padded; /* is the colorindex padded for odither? */
int Ncolors[MAX_Q_COMPS]; /* # of values alloced to each component */
@@ -161,7 +161,7 @@
/* Variables for Floyd-Steinberg dithering */
FSERRPTR fserrors[MAX_Q_COMPS]; /* accumulated errors */
- boolean on_odd_row; /* flag to remember which row we are on */
+ jpeg_boolean on_odd_row; /* flag to remember which row we are on */
} my_cquantizer;
typedef my_cquantizer * my_cquantize_ptr;
@@ -191,7 +191,7 @@
int nc = cinfo->out_color_components; /* number of color components */
int max_colors = cinfo->desired_number_of_colors;
int total_colors, iroot, i, j;
- boolean changed;
+ jpeg_boolean changed;
long temp;
static const int RGB_order[3] = { RGB_GREEN, RGB_RED, RGB_BLUE };
@@ -738,7 +738,7 @@
*/
METHODDEF(void)
-start_pass_1_quant (j_decompress_ptr cinfo, boolean is_pre_scan)
+start_pass_1_quant (j_decompress_ptr cinfo, jpeg_boolean is_pre_scan)
{
my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
size_t arraysize;
--- jquant2.c.orig 2009-08-20 11:47:15.798869830 +0200
+++ jquant2.c 2009-08-20 11:47:24.253866267 +0200
@@ -200,11 +200,11 @@
/* Variables for accumulating image statistics */
hist3d histogram; /* pointer to the histogram */
- boolean needs_zeroed; /* TRUE if next pass must zero histogram */
+ jpeg_boolean needs_zeroed; /* TRUE if next pass must zero histogram */
/* Variables for Floyd-Steinberg dithering */
FSERRPTR fserrors; /* accumulated errors */
- boolean on_odd_row; /* flag to remember which row we are on */
+ jpeg_boolean on_odd_row; /* flag to remember which row we are on */
int * error_limiter; /* table for clamping the applied error */
} my_cquantizer;
@@ -1164,7 +1164,7 @@
*/
METHODDEF(void)
-start_pass_2_quant (j_decompress_ptr cinfo, boolean is_pre_scan)
+start_pass_2_quant (j_decompress_ptr cinfo, jpeg_boolean is_pre_scan)
{
my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
hist3d histogram = cquantize->histogram;
--- rdppm.c.orig 2009-08-20 11:48:37.810129297 +0200
+++ rdppm.c 2009-08-20 11:48:43.341116052 +0200
@@ -299,7 +299,7 @@
ppm_source_ptr source = (ppm_source_ptr) sinfo;
int c;
unsigned int w, h, maxval;
- boolean need_iobuffer, use_raw_buffer, need_rescale;
+ jpeg_boolean need_iobuffer, use_raw_buffer, need_rescale;
if (getc(source->pub.input_file) != 'P')
ERREXIT(cinfo, JERR_PPM_NOT);
--- rdswitch.c.orig 2009-08-20 11:49:02.748128456 +0200
+++ rdswitch.c 2009-08-20 11:49:24.135865988 +0200
@@ -35,7 +35,7 @@
}
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
read_text_integer (FILE * file, long * result, int * termchar)
/* Read an unsigned decimal integer from a file, store it in result */
/* Reads one trailing character after the integer; returns it in termchar */
@@ -70,8 +70,8 @@
}
-GLOBAL(boolean)
-read_quant_tables (j_compress_ptr cinfo, char * filename, boolean force_baseline)
+GLOBAL(jpeg_boolean)
+read_quant_tables (j_compress_ptr cinfo, char * filename, jpeg_boolean force_baseline)
/* Read a set of quantization tables from the specified file.
* The file is plain ASCII text: decimal numbers with whitespace between.
* Comments preceded by '#' may be included in the file.
@@ -126,7 +126,7 @@
#ifdef C_MULTISCAN_FILES_SUPPORTED
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
read_scan_integer (FILE * file, long * result, int * termchar)
/* Variant of read_text_integer that always looks for a non-space termchar;
* this simplifies parsing of punctuation in scan scripts.
@@ -155,7 +155,7 @@
}
-GLOBAL(boolean)
+GLOBAL(jpeg_boolean)
read_scan_script (j_compress_ptr cinfo, char * filename)
/* Read a scan script from the specified text file.
* Each entry in the file defines one scan to be emitted.
@@ -263,8 +263,8 @@
#endif /* C_MULTISCAN_FILES_SUPPORTED */
-GLOBAL(boolean)
-set_quality_ratings (j_compress_ptr cinfo, char *arg, boolean force_baseline)
+GLOBAL(jpeg_boolean)
+set_quality_ratings (j_compress_ptr cinfo, char *arg, jpeg_boolean force_baseline)
/* Process a quality-ratings parameter string, of the form
* N[,N,...]
* If there are more q-table slots than parameters, the last value is replicated.
@@ -295,7 +295,7 @@
}
-GLOBAL(boolean)
+GLOBAL(jpeg_boolean)
set_quant_slots (j_compress_ptr cinfo, char *arg)
/* Process a quantization-table-selectors parameter string, of the form
* N[,N,...]
@@ -330,7 +330,7 @@
}
-GLOBAL(boolean)
+GLOBAL(jpeg_boolean)
set_sample_factors (j_compress_ptr cinfo, char *arg)
/* Process a sample-factors parameter string, of the form
* HxV[,HxV,...]
--- rdtarga.c.orig 2009-08-20 11:48:50.730140596 +0200
+++ rdtarga.c 2009-08-20 11:48:55.082866165 +0200
@@ -336,7 +336,7 @@
U_CHAR targaheader[18];
int idlen, cmaptype, subtype, flags, interlace_type, components;
unsigned int width, height, maplen;
- boolean is_bottom_up;
+ jpeg_boolean is_bottom_up;
#define GET_2B(offset) ((unsigned int) UCH(targaheader[offset]) + \
(((unsigned int) UCH(targaheader[offset+1])) << 8))
--- transupp.c.orig 2009-08-20 11:50:33.940866572 +0200
+++ transupp.c 2009-08-20 11:50:47.543865927 +0200
@@ -741,7 +741,7 @@
* *strptr is advanced over the digit string, and *result is set to its value.
*/
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
jt_read_integer (const char ** strptr, JDIMENSION * result)
{
const char * ptr = *strptr;
@@ -771,7 +771,7 @@
* This code is loosely based on XParseGeometry from the X11 distribution.
*/
-GLOBAL(boolean)
+GLOBAL(jpeg_boolean)
jtransform_parse_crop_spec (jpeg_transform_info *info, const char *spec)
{
info->crop = FALSE;
@@ -859,7 +859,7 @@
jpeg_transform_info *info)
{
jvirt_barray_ptr *coef_arrays = NULL;
- boolean need_workspace, transpose_it;
+ jpeg_boolean need_workspace, transpose_it;
jpeg_component_info *compptr;
JDIMENSION xoffset, yoffset, width_in_iMCUs, height_in_iMCUs;
JDIMENSION width_in_blocks, height_in_blocks;
@@ -1097,7 +1097,7 @@
adjust_exif_parameters (JOCTET FAR * data, unsigned int length,
JDIMENSION new_width, JDIMENSION new_height)
{
- boolean is_motorola; /* Flag for byte order */
+ jpeg_boolean is_motorola; /* Flag for byte order */
unsigned int number_of_tags, tagnum;
unsigned int firstoffset, offset;
JDIMENSION new_value;
@@ -1423,12 +1423,12 @@
* (may use custom action then)
*/
-GLOBAL(boolean)
+GLOBAL(jpeg_boolean)
jtransform_perfect_transform(JDIMENSION image_width, JDIMENSION image_height,
int MCU_width, int MCU_height,
JXFORM_CODE transform)
{
- boolean result = TRUE; /* initialize TRUE */
+ jpeg_boolean result = TRUE; /* initialize TRUE */
switch (transform) {
case JXFORM_FLIP_H:
--- wrbmp.c.orig 2009-08-20 11:50:03.848890455 +0200
+++ wrbmp.c 2009-08-20 11:50:10.497868472 +0200
@@ -44,7 +44,7 @@
typedef struct {
struct djpeg_dest_struct pub; /* public fields */
- boolean is_os2; /* saves the OS2 format request flag */
+ jpeg_boolean is_os2; /* saves the OS2 format request flag */
jvirt_sarray_ptr whole_image; /* needed to reverse row order */
JDIMENSION data_width; /* JSAMPLEs per row */
@@ -387,7 +387,7 @@
*/
GLOBAL(djpeg_dest_ptr)
-jinit_write_bmp (j_decompress_ptr cinfo, boolean is_os2)
+jinit_write_bmp (j_decompress_ptr cinfo, jpeg_boolean is_os2)
{
bmp_dest_ptr dest;
JDIMENSION row_width;
--- jcapistd.c.orig 2009-08-20 12:02:14.120886794 +0200
+++ jcapistd.c 2009-08-20 12:02:21.946120307 +0200
@@ -35,7 +35,7 @@
*/
GLOBAL(void)
-jpeg_start_compress (j_compress_ptr cinfo, boolean write_all_tables)
+jpeg_start_compress (j_compress_ptr cinfo, jpeg_boolean write_all_tables)
{
if (cinfo->global_state != CSTATE_START)
ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
--- cdjpeg.h.orig 2009-08-20 12:03:31.719864529 +0200
+++ cdjpeg.h 2009-08-20 12:03:59.094878304 +0200
@@ -119,7 +119,7 @@
EXTERN(cjpeg_source_ptr) jinit_read_bmp JPP((j_compress_ptr cinfo));
EXTERN(djpeg_dest_ptr) jinit_write_bmp JPP((j_decompress_ptr cinfo,
- boolean is_os2));
+ jpeg_boolean is_os2));
EXTERN(cjpeg_source_ptr) jinit_read_gif JPP((j_compress_ptr cinfo));
EXTERN(djpeg_dest_ptr) jinit_write_gif JPP((j_decompress_ptr cinfo));
EXTERN(cjpeg_source_ptr) jinit_read_ppm JPP((j_compress_ptr cinfo));
@@ -131,13 +131,13 @@
/* cjpeg support routines (in rdswitch.c) */
-EXTERN(boolean) read_quant_tables JPP((j_compress_ptr cinfo, char * filename,
- boolean force_baseline));
-EXTERN(boolean) read_scan_script JPP((j_compress_ptr cinfo, char * filename));
-EXTERN(boolean) set_quality_ratings JPP((j_compress_ptr cinfo, char *arg,
- boolean force_baseline));
-EXTERN(boolean) set_quant_slots JPP((j_compress_ptr cinfo, char *arg));
-EXTERN(boolean) set_sample_factors JPP((j_compress_ptr cinfo, char *arg));
+EXTERN(jpeg_boolean) read_quant_tables JPP((j_compress_ptr cinfo, char * filename,
+ jpeg_boolean force_baseline));
+EXTERN(jpeg_boolean) read_scan_script JPP((j_compress_ptr cinfo, char * filename));
+EXTERN(jpeg_boolean) set_quality_ratings JPP((j_compress_ptr cinfo, char *arg,
+ jpeg_boolean force_baseline));
+EXTERN(jpeg_boolean) set_quant_slots JPP((j_compress_ptr cinfo, char *arg));
+EXTERN(jpeg_boolean) set_sample_factors JPP((j_compress_ptr cinfo, char *arg));
/* djpeg support routines (in rdcolmap.c) */
@@ -149,7 +149,7 @@
EXTERN(void) start_progress_monitor JPP((j_common_ptr cinfo,
cd_progress_ptr progress));
EXTERN(void) end_progress_monitor JPP((j_common_ptr cinfo));
-EXTERN(boolean) keymatch JPP((char * arg, const char * keyword, int minchars));
+EXTERN(jpeg_boolean) keymatch JPP((char * arg, const char * keyword, int minchars));
EXTERN(FILE *) read_stdin JPP((void));
EXTERN(FILE *) write_stdout JPP((void));
--- transupp.h.orig 2009-08-20 12:05:33.467881022 +0200
+++ transupp.h 2009-08-20 12:05:51.331128614 +0200
@@ -119,10 +119,10 @@
typedef struct {
/* Options: set by caller */
JXFORM_CODE transform; /* image transform operator */
- boolean perfect; /* if TRUE, fail if partial MCUs are requested */
- boolean trim; /* if TRUE, trim partial MCUs as needed */
- boolean force_grayscale; /* if TRUE, convert color image to grayscale */
- boolean crop; /* if TRUE, crop source image */
+ jpeg_boolean perfect; /* if TRUE, fail if partial MCUs are requested */
+ jpeg_boolean trim; /* if TRUE, trim partial MCUs as needed */
+ jpeg_boolean force_grayscale; /* if TRUE, convert color image to grayscale */
+ jpeg_boolean crop; /* if TRUE, crop source image */
/* Crop parameters: application need not set these unless crop is TRUE.
* These can be filled in by jtransform_parse_crop_spec().
@@ -151,7 +151,7 @@
#if TRANSFORMS_SUPPORTED
/* Parse a crop specification (written in X11 geometry style) */
-EXTERN(boolean) jtransform_parse_crop_spec
+EXTERN(jpeg_boolean) jtransform_parse_crop_spec
JPP((jpeg_transform_info *info, const char *spec));
/* Request any required workspace */
EXTERN(void) jtransform_request_workspace
@@ -169,7 +169,7 @@
/* Determine whether lossless transformation is perfectly
* possible for a specified image and transformation.
*/
-EXTERN(boolean) jtransform_perfect_transform
+EXTERN(jpeg_boolean) jtransform_perfect_transform
JPP((JDIMENSION image_width, JDIMENSION image_height,
int MCU_width, int MCU_height,
JXFORM_CODE transform));
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libjpeg/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 30 Jan 2009 11:48:26 -0000 1.2
+++ .cvsignore 27 Aug 2009 20:42:36 -0000 1.3
@@ -1 +1 @@
-jpegsrc.v6b.tar.gz
+jpegsrc.v7.tar.gz
Index: mingw32-libjpeg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libjpeg/devel/mingw32-libjpeg.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mingw32-libjpeg.spec 25 Jul 2009 12:21:59 -0000 1.4
+++ mingw32-libjpeg.spec 27 Aug 2009 20:42:36 -0000 1.5
@@ -1,35 +1,33 @@
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
-%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw32_findrequires}
-%define __find_provides %{_mingw32_findprovides}
+%global __strip %{_mingw32_strip}
+%global __objdump %{_mingw32_objdump}
+%global _use_internal_dependency_generator 0
+%global __find_requires %{_mingw32_findrequires}
+%global __find_provides %{_mingw32_findprovides}
+%define __debug_install_post %{_mingw32_debug_install_post}
# Build the programs like cjpeg, etc.
-# https://bugzilla.redhat.com/show_bug.cgi?id=467401c7
-%define build_programs 0
+# https://bugzilla.redhat.com/show_bug.cgi?id=467401#c7
+%global build_programs 0
Name: mingw32-libjpeg
-Version: 6b
-Release: 11%{?dist}
+Version: 7
+Release: 1%{?dist}
Summary: MinGW Windows Libjpeg library
License: IJG
URL: http://www.ijg.org/
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v%{version}.tar.gz
-Source1: configure.in
+Source0: http://www.ijg.org/files/jpegsrc.v%{version}.tar.gz
-Patch1: jpeg-c++.patch
-Patch4: libjpeg-cflags.patch
Patch5: libjpeg-buf-oflo.patch
-Patch6: libjpeg-autoconf.patch
-Patch100: jpeg-mingw32.patch
+Patch101: jpeg-workaround-typedef-conflict.patch
+Patch102: jpeg-fix-typo.patch
BuildArch: noarch
-BuildRequires: mingw32-filesystem >= 49
+BuildRequires: mingw32-filesystem >= 52
BuildRequires: mingw32-dlfcn
BuildRequires: mingw32-gcc
BuildRequires: mingw32-binutils
@@ -42,49 +40,29 @@ BuildRequires: autoconf, libtool
MinGW Windows Libjpeg library.
-%prep
-%setup -q -n jpeg-6b
+%package static
+Summary: Static version of the MinGW Windows Libjpeg library
+Requires: %{name} = %{version}-%{release}
+Group: Development/Libraries
-%patch1 -p1 -b .c++
-%patch4 -p1 -b .cflags
-%patch5 -p1 -b .oflo
-%patch6 -p1
+%description static
+Static version of the MinGW Windows Libjpeg library.
-%patch100 -p1
-# For long-obsolete reasons, libjpeg 6b doesn't ship with a configure.in.
-# We need to re-autoconf though, in order to update libtool support,
-# so supply configure.in.
-cp %{SOURCE1} configure.in
-
-# libjpeg 6b includes a horribly obsolete version of libtool.
-# Blow it away and replace with build system's version.
-rm -f config.guess config.sub ltmain.sh ltconfig aclocal.m4
-
-cat /usr/share/aclocal/libtool.m4 > aclocal.m4
-# If this is the new libtool 2.x, we need to append some additional
-# files. Rather than hard-coding a version of libtool, just test
-# if the files exist and append them:
-for f in \
- /usr/share/aclocal/ltoptions.m4 \
- /usr/share/aclocal/ltversion.m4 \
- /usr/share/aclocal/ltsugar.m4 \
- /usr/share/aclocal/lt~obsolete.m4; do
- if [ -f $f ]; then cat $f >> aclocal.m4; fi
-done
+%{_mingw32_debug_package}
-# Now we can run libtool.
-libtoolize
-# Automake can fail - we only need this to get config.sub and config.guess.
-automake -a ||:
+%prep
+%setup -q -n jpeg-%{version}
-# Finally because we replaced configure.in:
-autoconf
+%patch5 -p1 -b .oflo
+
+%patch101 -p0
+%patch102 -p0
%build
-%{_mingw32_configure} --enable-shared --disable-static
+%{_mingw32_configure} --enable-shared --enable-static
make %{?_smp_mflags}
@@ -102,14 +80,10 @@ mkdir -p $RPM_BUILD_ROOT%{_mingw32_mandi
rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
pushd $RPM_BUILD_ROOT%{_mingw32_bindir}
-# Rename or remove win32 native binaries
-for i in cjpeg djpeg jpegtran rdjpgcom wrjpgcom ; do
-%if %build_programs
- mv $i $i.exe
-%else
- rm $i
+# Remove win32 native binaries if wanted
+%if %build_programs == 0
+ rm -f *.exe
%endif
-done
popd
@@ -118,16 +92,16 @@ rm -rf $RPM_BUILD_ROOT
%files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%doc README
%if %build_programs
-%{_mingw32_bindir}/cjpeg.exe
-%{_mingw32_bindir}/djpeg.exe
-%{_mingw32_bindir}/jpegtran.exe
-%{_mingw32_bindir}/rdjpgcom.exe
-%{_mingw32_bindir}/wrjpgcom.exe
+%{_mingw32_bindir}/i686-pc-mingw32-cjpeg.exe
+%{_mingw32_bindir}/i686-pc-mingw32-djpeg.exe
+%{_mingw32_bindir}/i686-pc-mingw32-jpegtran.exe
+%{_mingw32_bindir}/i686-pc-mingw32-rdjpgcom.exe
+%{_mingw32_bindir}/i686-pc-mingw32-wrjpgcom.exe
%endif
-%{_mingw32_bindir}/libjpeg-62.dll
+%{_mingw32_bindir}/libjpeg-7.dll
%{_mingw32_includedir}/jconfig.h
%{_mingw32_includedir}/jerror.h
%{_mingw32_includedir}/jmorecfg.h
@@ -135,8 +109,23 @@ rm -rf $RPM_BUILD_ROOT
%{_mingw32_libdir}/libjpeg.dll.a
%{_mingw32_libdir}/libjpeg.la
+%files static
+%defattr(-,root,root,-)
+%{_mingw32_libdir}/libjpeg.a
+
%changelog
+* Thu Aug 27 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 7-1
+- Update to version 7
+- Resolves typedef conflict (BZ #497492)
+- Use %%global instead of %%define
+- Automatically generate debuginfo subpackage
+- Fixed %%defattr line
+- Added -static subpackage
+- Dropped upstreamed patches
+- Dropped autoconf stuff
+- Fixed a comment typo
+
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6b-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libjpeg/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 30 Jan 2009 11:48:26 -0000 1.2
+++ sources 27 Aug 2009 20:42:36 -0000 1.3
@@ -1 +1 @@
-dbd5f3b47ed13132f04c685d608a7547 jpegsrc.v6b.tar.gz
+382ef33b339c299b56baf1296cda9785 jpegsrc.v7.tar.gz
--- jpeg-c++.patch DELETED ---
More information about the mingw
mailing list