projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed wxDateTime::ParseFormat to correctly handle '%x' on Windows
[wxWidgets.git]
/
src
/
common
/
quantize.cpp
diff --git
a/src/common/quantize.cpp
b/src/common/quantize.cpp
index b9d8c25a5c5d61cfb5b01180834e50233cf3ab2b..37674b2c4b40a8e078d5cab68d55bc7c9cbd64ad 100644
(file)
--- a/
src/common/quantize.cpp
+++ b/
src/common/quantize.cpp
@@
-6,7
+6,7
@@
// Created: 22/6/2000
// RCS-ID: $Id$
// Copyright: (c) Thomas G. Lane, Vaclav Slavik, Julian Smart
// Created: 22/6/2000
// RCS-ID: $Id$
// Copyright: (c) Thomas G. Lane, Vaclav Slavik, Julian Smart
-// Licence: wxWi
dget
s licence + JPEG library licence
+// Licence: wxWi
ndow
s licence + JPEG library licence
/////////////////////////////////////////////////////////////////////////////
/*
/////////////////////////////////////////////////////////////////////////////
/*
@@
-77,7
+77,9
@@
typedef unsigned short UINT16;
typedef signed short INT16;
typedef unsigned short UINT16;
typedef signed short INT16;
+#ifndef __WATCOMC__
typedef signed int INT32;
typedef signed int INT32;
+#endif
typedef unsigned char JSAMPLE;
typedef JSAMPLE *JSAMPROW;
typedef unsigned char JSAMPLE;
typedef JSAMPLE *JSAMPROW;
@@
-1116,13
+1118,13
@@
pass2_fs_dither (j_decompress_ptr cinfo,
dir = -1;
dir3 = -3;
errorptr = cquantize->fserrors + (width+1)*3; /* => entry after last column */
dir = -1;
dir3 = -3;
errorptr = cquantize->fserrors + (width+1)*3; /* => entry after last column */
- cquantize->on_odd_row =
FALSE
; /* flip for next time */
+ cquantize->on_odd_row =
false
; /* flip for next time */
} else {
/* work left to right in this row */
dir = 1;
dir3 = 3;
errorptr = cquantize->fserrors; /* => entry before first real column */
} else {
/* work left to right in this row */
dir = 1;
dir3 = 3;
errorptr = cquantize->fserrors; /* => entry before first real column */
- cquantize->on_odd_row =
TRUE
; /* flip for next time */
+ cquantize->on_odd_row =
true
; /* flip for next time */
}
/* Preset error values: no error propagated to first pixel from left */
cur0 = cur1 = cur2 = 0;
}
/* Preset error values: no error propagated to first pixel from left */
cur0 = cur1 = cur2 = 0;
@@
-1282,7
+1284,7
@@
finish_pass1 (j_decompress_ptr cinfo)
cinfo->colormap = cquantize->sv_colormap;
select_colors(cinfo, cquantize->desired);
/* Force next pass to zero the color index table */
cinfo->colormap = cquantize->sv_colormap;
select_colors(cinfo, cquantize->desired);
/* Force next pass to zero the color index table */
- cquantize->needs_zeroed =
TRUE
;
+ cquantize->needs_zeroed =
true
;
}
}
@@
-1307,7
+1309,7
@@
start_pass_2_quant (j_decompress_ptr cinfo, bool is_pre_scan)
/* Set up method pointers */
cquantize->pub.color_quantize = prescan_quantize;
cquantize->pub.finish_pass = finish_pass1;
/* Set up method pointers */
cquantize->pub.color_quantize = prescan_quantize;
cquantize->pub.finish_pass = finish_pass1;
- cquantize->needs_zeroed =
TRUE
; /* Always zero histogram */
+ cquantize->needs_zeroed =
true
; /* Always zero histogram */
} else {
/* Set up method pointers */
cquantize->pub.color_quantize = pass2_fs_dither;
} else {
/* Set up method pointers */
cquantize->pub.color_quantize = pass2_fs_dither;
@@
-1324,7
+1326,7
@@
start_pass_2_quant (j_decompress_ptr cinfo, bool is_pre_scan)
/* Make the error-limit table if we didn't already. */
if (cquantize->error_limiter == NULL)
init_error_limit(cinfo);
/* Make the error-limit table if we didn't already. */
if (cquantize->error_limiter == NULL)
init_error_limit(cinfo);
- cquantize->on_odd_row =
FALSE
;
+ cquantize->on_odd_row =
false
;
}
}
}
}
@@
-1334,7
+1336,7
@@
start_pass_2_quant (j_decompress_ptr cinfo, bool is_pre_scan)
memset((void *) histogram[i], 0,
HIST_C1_ELEMS*HIST_C2_ELEMS * sizeof(histcell));
}
memset((void *) histogram[i], 0,
HIST_C1_ELEMS*HIST_C2_ELEMS * sizeof(histcell));
}
- cquantize->needs_zeroed =
FALSE
;
+ cquantize->needs_zeroed =
false
;
}
}
}
}
@@
-1349,7
+1351,7
@@
new_color_map_2_quant (j_decompress_ptr cinfo)
my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
/* Reset the inverse color map */
my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
/* Reset the inverse color map */
- cquantize->needs_zeroed =
TRUE
;
+ cquantize->needs_zeroed =
true
;
}
}
@@
-1376,7
+1378,7
@@
jinit_2pass_quantizer (j_decompress_ptr cinfo)
for (i = 0; i < HIST_C0_ELEMS; i++) {
cquantize->histogram[i] = (hist2d) malloc(HIST_C1_ELEMS*HIST_C2_ELEMS * sizeof(histcell));
}
for (i = 0; i < HIST_C0_ELEMS; i++) {
cquantize->histogram[i] = (hist2d) malloc(HIST_C1_ELEMS*HIST_C2_ELEMS * sizeof(histcell));
}
- cquantize->needs_zeroed =
TRUE
; /* histogram is garbage now */
+ cquantize->needs_zeroed =
true
; /* histogram is garbage now */
/* Allocate storage for the completed colormap, if required.
* We do this now since it is storage and may affect
/* Allocate storage for the completed colormap, if required.
* We do this now since it is storage and may affect
@@
-1465,11
+1467,11
@@
void wxQuantize::DoQuantize(unsigned w, unsigned h, unsigned char **in_rows, uns
cquantize = (my_cquantize_ptr) dec.cquantize;
cquantize = (my_cquantize_ptr) dec.cquantize;
- cquantize->pub.start_pass(&dec,
TRUE
);
+ cquantize->pub.start_pass(&dec,
true
);
cquantize->pub.color_quantize(&dec, in_rows, out_rows, h);
cquantize->pub.finish_pass(&dec);
cquantize->pub.color_quantize(&dec, in_rows, out_rows, h);
cquantize->pub.finish_pass(&dec);
- cquantize->pub.start_pass(&dec,
FALSE
);
+ cquantize->pub.start_pass(&dec,
false
);
cquantize->pub.color_quantize(&dec, in_rows, out_rows, h);
cquantize->pub.finish_pass(&dec);
cquantize->pub.color_quantize(&dec, in_rows, out_rows, h);
cquantize->pub.finish_pass(&dec);
@@
-1569,7
+1571,7
@@
bool wxQuantize::Quantize(const wxImage& src, wxImage& dest,
// We need to shift the palette entries up
// to make room for the Windows system colours.
for (i = 0; i < w * h; i++)
// We need to shift the palette entries up
// to make room for the Windows system colours.
for (i = 0; i < w * h; i++)
- data8bit[i] =
data8bit[i] + paletteShift
;
+ data8bit[i] =
(unsigned char)(data8bit[i] + paletteShift)
;
}
#endif
*eightBitData = data8bit;
}
#endif
*eightBitData = data8bit;
@@
-1625,7
+1627,7
@@
bool wxQuantize::Quantize(const wxImage& src, wxImage& dest,
}
#endif // wxUSE_PALETTE
}
#endif // wxUSE_PALETTE
- return
TRUE
;
+ return
true
;
}
// This version sets a palette in the destination image so you don't
}
// This version sets a palette in the destination image so you don't
@@
-1639,7
+1641,7
@@
bool wxQuantize::Quantize(const wxImage& src,
{
wxPalette* palette = NULL;
if ( !Quantize(src, dest, & palette, desiredNoColours, eightBitData, flags) )
{
wxPalette* palette = NULL;
if ( !Quantize(src, dest, & palette, desiredNoColours, eightBitData, flags) )
- return
FALSE
;
+ return
false
;
#if wxUSE_PALETTE
if (palette)
#if wxUSE_PALETTE
if (palette)
@@
-1649,7
+1651,7
@@
bool wxQuantize::Quantize(const wxImage& src,
}
#endif // wxUSE_PALETTE
}
#endif // wxUSE_PALETTE
- return
TRUE
;
+ return
true
;
}
#endif
}
#endif