/////////////////////////////////////////////////////////////////////////////
-// Name: quantize.cpp
+// Name: src/common/quantize.cpp
// Purpose: wxQuantize implementation
// Author: Julian Smart
// Modified by:
// Created: 22/6/2000
-// RCS-ID: $Id$
// Copyright: (c) Thomas G. Lane, Vaclav Slavik, Julian Smart
// Licence: wxWindows licence + JPEG library licence
/////////////////////////////////////////////////////////////////////////////
/* modified by Vaclav Slavik for use as jpeglib-independent module */
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "quantize.h"
-#endif
-
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
#pragma hdrstop
#endif
-#ifndef WX_PRECOMP
- #include "wx/palette.h"
-#endif
-
#if wxUSE_IMAGE
-#include "wx/image.h"
#include "wx/quantize.h"
+#ifndef WX_PRECOMP
+ #include "wx/palette.h"
+ #include "wx/image.h"
+#endif
+
#ifdef __WXMSW__
-#include "wx/msw/private.h"
+ #include "wx/msw/private.h"
#endif
#include <stdlib.h>
typedef unsigned short UINT16;
typedef signed short INT16;
+#if !(defined(__WATCOMC__) && (defined(__WXMSW__) || defined(__WXMOTIF__)))
typedef signed int INT32;
+#endif
typedef unsigned char JSAMPLE;
typedef JSAMPLE *JSAMPROW;
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 */
- 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;
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;
}
{
my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
hist3d histogram = cquantize->histogram;
- int i;
if (is_pre_scan) {
/* 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;
cquantize->pub.finish_pass = finish_pass2;
- /* Make sure color count is acceptable */
- i = cinfo->actual_number_of_colors;
-
{
size_t arraysize = (size_t) ((cinfo->output_width + 2) *
(3 * sizeof(FSERROR)));
/* 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;
}
}
/* Zero the histogram or inverse color map, if necessary */
if (cquantize->needs_zeroed) {
- for (i = 0; i < HIST_C0_ELEMS; i++) {
+ for (int i = 0; i < HIST_C0_ELEMS; i++) {
memset((void *) histogram[i], 0,
HIST_C1_ELEMS*HIST_C2_ELEMS * sizeof(histcell));
}
- cquantize->needs_zeroed = FALSE;
+ cquantize->needs_zeroed = false;
}
}
my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
/* Reset the inverse color map */
- cquantize->needs_zeroed = TRUE;
+ cquantize->needs_zeroed = true;
}
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
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.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);
{
int i;
- int w = src.GetWidth();
- int h = src.GetHeight();
int windowsSystemColourCount = 20;
#endif
// create rows info:
+ int h = src.GetHeight();
+ int w = src.GetWidth();
unsigned char **rows = new unsigned char *[h];
- h = src.GetHeight(), w = src.GetWidth();
unsigned char *imgdt = src.GetData();
for (i = 0; i < h; i++)
rows[i] = imgdt + 3/*RGB*/ * w * i;
if (flags & wxQUANTIZE_FILL_DESTINATION_IMAGE)
{
- if (!dest.Ok())
+ if (!dest.IsOk())
dest.Create(w, h);
imgdt = dest.GetData();
// 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;
delete[] data8bit;
#if wxUSE_PALETTE
- // Make a wxWindows palette
+ // Make a wxWidgets palette
if (pPalette)
{
unsigned char* r = new unsigned char[256];
delete[] g;
delete[] b;
}
-#endif // wxUSE_PALETTE
+#else // !wxUSE_PALETTE
+ wxUnusedVar(pPalette);
+#endif // wxUSE_PALETTE/!wxUSE_PALETTE
- return TRUE;
+ return true;
}
// This version sets a palette in the destination image so you don't
{
wxPalette* palette = NULL;
if ( !Quantize(src, dest, & palette, desiredNoColours, eightBitData, flags) )
- return FALSE;
+ return false;
#if wxUSE_PALETTE
if (palette)
}
#endif // wxUSE_PALETTE
- return TRUE;
+ return true;
}
#endif
// wxUSE_IMAGE
-
projects / wxWidgets.git / blobdiff