[mapguide-commits] r7079 - branches/2.4/MgDev/Common/Renderers
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sat Oct 6 03:20:06 PDT 2012
Author: jng
Date: 2012-10-06 03:20:05 -0700 (Sat, 06 Oct 2012)
New Revision: 7079
Added:
branches/2.4/MgDev/Common/Renderers/MapQuantization.cpp
branches/2.4/MgDev/Common/Renderers/MapQuantization.h
Modified:
branches/2.4/MgDev/Common/Renderers/AGGImageIO.cpp
branches/2.4/MgDev/Common/Renderers/Makefile.am
branches/2.4/MgDev/Common/Renderers/Renderers.vcproj
branches/2.4/MgDev/Common/Renderers/Renderers.vcxproj
branches/2.4/MgDev/Common/Renderers/Renderers.vcxproj.filters
Log:
#743: Preserve PNG8 transparency when using the AGG renderer and improve PNG8 quantization. Patch provided by Bruno Scott with several changes by me to preserve the computed palette and to eliminate some dead code paths.
Modified: branches/2.4/MgDev/Common/Renderers/AGGImageIO.cpp
===================================================================
--- branches/2.4/MgDev/Common/Renderers/AGGImageIO.cpp 2012-10-05 09:02:19 UTC (rev 7078)
+++ branches/2.4/MgDev/Common/Renderers/AGGImageIO.cpp 2012-10-06 10:20:05 UTC (rev 7079)
@@ -29,7 +29,7 @@
//from the alpha channel, which is not desirable for high quality output
#include "GDUtils.h"
-
+#include "MapQuantization.h"
#include <assert.h>
#ifdef _DEBUG_PNG8
@@ -40,7 +40,7 @@
#pragma warning(disable : 4611)
-enum MS_RETURN_VALUE {MS_SUCCESS, MS_FAILURE, MS_DONE};
+//enum MS_RETURN_VALUE {MS_SUCCESS, MS_FAILURE, MS_DONE};
// in-memory switch to permit disabling colormapping at runtime
// (could be in debug ifdefs but will be optimized away in release build anyway)
@@ -666,6 +666,129 @@
return 0;
}
+/*
+ * sort a given list of rgba entries so that all the opaque pixels are at the end
+ */
+int remapPaletteForPNG(unsigned char *apixels,int height,int width,rgbaPixel *palette,int palette_num_entries,unsigned int palette_scaling_maxval, rgbPixel *rgb, unsigned char *a, int *num_a) {
+ int bot_idx, top_idx, x;
+ int remap[256];
+ unsigned int maxval = palette_scaling_maxval;
+
+
+ /*
+ ** remap the palette colors so that all entries with
+ ** the maximal alpha value (i.e., fully opaque) are at the end and can
+ ** therefore be omitted from the tRNS chunk. Note that the ordering of
+ ** opaque entries is reversed from how they were previously arranged
+ ** --not that this should matter to anyone.
+ */
+
+ for (top_idx = palette_num_entries-1, bot_idx = x = 0; x < palette_num_entries; ++x) {
+ if (palette[x].a == maxval)
+ remap[x] = top_idx--;
+ else
+ remap[x] = bot_idx++;
+ }
+ /* sanity check: top and bottom indices should have just crossed paths */
+ if (bot_idx != top_idx + 1) {
+ //msSetError(MS_MISCERR,"quantization sanity check failed","createPNGPalette()");
+ return MS_FAILURE;
+ }
+
+ *num_a = bot_idx;
+
+ for(x=0;x<width*height;x++)
+ apixels[x] = remap[apixels[x]];
+
+
+ for (x = 0; x < palette_num_entries; ++x) {
+ if (maxval == 255) {
+ a[remap[x]] = palette[x].a;
+ rgb[remap[x]].r = palette[x].r;
+ rgb[remap[x]].g = palette[x].g;
+ rgb[remap[x]].b = palette[x].b;
+ } else {
+ /* rescale palette */
+ rgb[remap[x]].r = (palette[x].r * 255 + (maxval >> 1)) / maxval;
+ rgb[remap[x]].g = (palette[x].g * 255 + (maxval >> 1)) / maxval;
+ rgb[remap[x]].b = (palette[x].b * 255 + (maxval >> 1)) / maxval;
+ a[remap[x]] = (palette[x].a * 255 + (maxval >> 1)) / maxval;
+ }
+ if (a[remap[x]] != 255) {
+ /* un-premultiply pixels */
+ double da = 255.0/a[remap[x]];
+ rgb[remap[x]].r *= da;
+ rgb[remap[x]].g *= da;
+ rgb[remap[x]].b *= da;
+ }
+ }
+
+ return MS_SUCCESS;
+}
+
+int savePalettePNG(unsigned char *apixels,int height,int width,rgbaPixel *palette,int palette_num_entries,unsigned int palette_scaling_maxval, png_write_context* cxt, int compression)
+{
+ png_infop info_ptr;
+ rgbPixel rgb[256];
+ unsigned char a[256];
+ int num_a;
+ int row,sample_depth;
+ png_structp png_ptr = png_create_write_struct(
+ PNG_LIBPNG_VER_STRING, NULL,NULL,NULL);
+
+ if (!png_ptr)
+ return (MS_FAILURE);
+
+ info_ptr = png_create_info_struct(png_ptr);
+ if (!info_ptr)
+ {
+ png_destroy_write_struct(&png_ptr,
+ (png_infopp)NULL);
+ return (MS_FAILURE);
+ }
+
+ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+ return (MS_FAILURE);
+ }
+
+ png_set_write_fn(png_ptr, (void *)cxt, png_write_cb, NULL);
+
+ png_set_compression_level(png_ptr, compression);
+
+ if (palette_num_entries <= 2)
+ sample_depth = 1;
+ else if (palette_num_entries <= 4)
+ sample_depth = 2;
+ else if (palette_num_entries <= 16)
+ sample_depth = 4;
+ else
+ sample_depth = 8;
+
+ png_set_IHDR(png_ptr, info_ptr, width, height,
+ sample_depth, PNG_COLOR_TYPE_PALETTE,
+ 0, PNG_COMPRESSION_TYPE_DEFAULT,
+ PNG_FILTER_TYPE_DEFAULT);
+
+ remapPaletteForPNG(apixels,height,width,palette,palette_num_entries,palette_scaling_maxval,rgb,a,&num_a);
+
+ png_set_PLTE(png_ptr, info_ptr, (png_colorp)(rgb),palette_num_entries);
+ if(num_a)
+ png_set_tRNS(png_ptr, info_ptr, a,num_a, NULL);
+
+ png_write_info(png_ptr, info_ptr);
+ png_set_packing(png_ptr);
+
+ for(row=0;row<height;row++) {
+ unsigned char *rowptr = &(apixels[row*width]);
+ png_write_row(png_ptr, rowptr);
+ }
+ png_write_end(png_ptr, info_ptr);
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+ return MS_SUCCESS;
+}
+
////////////////////////////////////////////////////////////////////////////////////////
/******************************************************************************
* mapgd.c 7803 2008-07-09 05:17:40Z sdlime
@@ -964,12 +1087,14 @@
{
double gamma = 1.0; //TODO: will use this once we allow user setting of gamma for AGG gendering
- UnmultiplyAlpha(src, src_width * src_height);
+
//NOTE: We do not use gd for reading or writing PNG since internally gd drops a bit
//from the alpha channel, which is not desirable for high quality output
if (format == L"PNG")
{
+ UnmultiplyAlpha(src, src_width * src_height);
+
png_write_context cxt;
memset(&cxt, 0, sizeof(cxt));
write_png(&cxt, src, dst_width, dst_height, gamma, drop_alpha);
@@ -978,8 +1103,71 @@
delete [] cxt.buf;
return byteData;
}
- else if (format == L"JPG" || format == L"GIF" || format == L"PNG8")
+ //NOTE: We do not use gd for reading or writing PNG8 for the same reason as for the PNG
+ else if (format == L"PNG8")
{
+ // copy the src data into the rgbaPixel array
+ rgbaPixel *apixelsIn=(rgbaPixel*)malloc(dst_height*dst_width*sizeof(rgbaPixel));
+ unsigned int* ptr = src;
+ for (int i=0; i<dst_height*dst_width; i++)
+ {
+ unsigned int c = *ptr++;
+ rgbaPixel *pixel = &(apixelsIn[i]);
+ pixel->a = c >> 24;
+ pixel->b = (c >> 16) & 0xff; // some simple optimization ;-)
+ pixel->g = (c >> 8) & 0xff;
+ pixel->r = c & 0xff;
+ }
+ int ncolors = baseColorPalette ? baseColorPalette->size() : 0;
+ //jng: Incorporate the colors that have been handed down to us into the final palette
+ bool bWithinPalette = (ncolors < 256 && ncolors > 0);
+ unsigned int reqcolor = (bWithinPalette) ? (256 - ncolors) : 256;
+ unsigned int palette_scaling_maxval = 255;
+ rgbaPixel *palette=(rgbaPixel*)malloc(256*sizeof(rgbaPixel));
+ msQuantizeRasterBuffer(apixelsIn,dst_height,dst_width, &reqcolor, palette, &palette_scaling_maxval);
+
+ if (bWithinPalette)
+ {
+ //A [256 - #colors] color palette has been generated. So fill in the rest with the colors
+ //handed down from the baseColorPalette
+ unsigned int added = 0;
+ for (int i = reqcolor; i < 256; i++)
+ {
+ //Requested Colors + baseColorPalette size may not actually reach 256, so guard
+ //against overrun
+ if ((i - reqcolor) >= baseColorPalette->size())
+ break;
+
+ RS_Color c = baseColorPalette->at(i - reqcolor);
+ //bscott: If the palette_scaling_maxval is lower than 255 we have to scale down all the map palette
+ //colors so the resulting png palette will be remap correctly.
+ palette[i].a = (c.alpha() * (palette_scaling_maxval) + (255) / 2 ) / (255);
+ palette[i].r = (c.red() * (palette_scaling_maxval) + (255) / 2 ) / (255);
+ palette[i].g = (c.green() * (palette_scaling_maxval) + (255) / 2 ) / (255);
+ palette[i].b = (c.blue() * (palette_scaling_maxval) + (255) / 2 ) / (255);
+ added++;
+ }
+ reqcolor += added;
+ }
+
+ unsigned char *apixelsOut=(unsigned char *)malloc(dst_height*dst_width);
+ msClassifyRasterBuffer(apixelsIn,dst_height,dst_width, palette,reqcolor,apixelsOut) ;
+
+ png_write_context cxt;
+ memset(&cxt, 0, sizeof(cxt));
+ savePalettePNG(apixelsOut,dst_height,dst_width,palette,reqcolor,palette_scaling_maxval,&cxt,-1);
+ RS_ByteData* byteData = (cxt.used > 0)? new RS_ByteData(cxt.buf, (unsigned int)cxt.used) : NULL;
+ delete [] cxt.buf;
+
+ free(apixelsIn);
+ free(palette);
+ free(apixelsOut);
+
+ return byteData;
+ }
+ else if (format == L"JPG" || format == L"GIF")
+ {
+ UnmultiplyAlpha(src, src_width * src_height);
// gdimg24 contains the 24bit image
gdImagePtr gdimg24 = gdImageCreateTrueColor(dst_width, dst_height);
@@ -1028,7 +1216,7 @@
// convert to 256 color paletted image for PNG8, GIF
gdImagePtr gdImgPalette = NULL;
- if (format == L"GIF" || format == L"PNG8")
+ if (format == L"GIF")
{
/// skip color quantization if no palette given or empty
if (baseColorPalette && !baseColorPalette->empty() && s_bUseColorMap) // memory based switch
@@ -1055,8 +1243,6 @@
if (format == L"GIF") // MgImageFormats::Gif
data = (unsigned char*)gdImageGifPtr(gdImgPalette, &size);
- else if (format == L"PNG8") // MgImageFormats::Png8
- data = (unsigned char*)gdImagePngPtr(gdImgPalette, &size);
else if (format == L"JPG") // MgImageFormats::Jpeg
data = (unsigned char*)gdImageJpegPtr(gdimg24, &size, 75);
Modified: branches/2.4/MgDev/Common/Renderers/Makefile.am
===================================================================
--- branches/2.4/MgDev/Common/Renderers/Makefile.am 2012-10-05 09:02:19 UTC (rev 7078)
+++ branches/2.4/MgDev/Common/Renderers/Makefile.am 2012-10-06 10:20:05 UTC (rev 7079)
@@ -38,6 +38,7 @@
KmlPolyStyle.cpp \
KmlIconStyle.cpp \
KmlRenderer.cpp \
+ MapQuantization.cpp \
ObservationMesh.cpp \
RenderUtil.cpp \
RS_ByteData.cpp \
@@ -68,6 +69,7 @@
KmlPolyStyle.h \
KmlIconStyle.h \
KmlRenderer.h \
+ MapQuantization.h \
ObservationMesh.h \
Renderers.h \
RenderUtil.h \
Added: branches/2.4/MgDev/Common/Renderers/MapQuantization.cpp
===================================================================
--- branches/2.4/MgDev/Common/Renderers/MapQuantization.cpp (rev 0)
+++ branches/2.4/MgDev/Common/Renderers/MapQuantization.cpp 2012-10-06 10:20:05 UTC (rev 7079)
@@ -0,0 +1,713 @@
+/******************************************************************************
+ * Adapted for Mapguide by Bruno Scott / Geomap
+ * $Id: mapquantization.c 11599 2011-04-19 05:14:17Z tbonfort $
+ *
+ * Project: MapServer
+ * Purpose: RGB(A) to Palette Support Functions
+ * Author: Thomas Bonfort
+ *
+ ******************************************************************************
+ * Copyright (c) 1996-2005 Regents of the University of Minnesota.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies of this Software or works derived from this Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ ******************************************************************************
+ */
+/*
+ * derivations from pngquant and ppmquant
+ *
+ ** pngquant.c - quantize the colors in an alphamap down to a specified number
+ **
+ ** Copyright (C) 1989, 1991 by Jef Poskanzer.
+ ** Copyright (C) 1997, 2000, 2002 by Greg Roelofs; based on an idea by
+ ** Stefan Schneider.
+ **
+ ** Permission to use, copy, modify, and distribute this software and its
+ ** documentation for any purpose and without fee is hereby granted, provided
+ ** that the above copyright notice appear in all copies and that both that
+ ** copyright notice and this permission notice appear in supporting
+ ** documentation. This software is provided "as is" without express or
+ ** implied warranty.
+ */
+#include "stdafx.h"
+#include "gd.h"
+#include "MapQuantization.h"
+
+
+
+
+static acolorhist_vector mediancut
+(acolorhist_vector achv, int colors, int sum, unsigned char maxval, int newcolors);
+static int redcompare (const void *ch1, const void *ch2);
+static int greencompare (const void *ch1, const void *ch2);
+static int bluecompare (const void *ch1, const void *ch2);
+static int alphacompare (const void *ch1, const void *ch2);
+static int sumcompare (const void *b1, const void *b2);
+
+static acolorhist_vector pam_acolorhashtoacolorhist
+(acolorhash_table acht, int maxacolors);
+static acolorhist_vector pam_computeacolorhist
+(rgbaPixel **apixels, int cols, int rows, int maxacolors, int* acolorsP);
+static acolorhash_table pam_computeacolorhash
+(rgbaPixel** apixels, int cols, int rows, int maxacolors, int* acolorsP);
+static acolorhash_table pam_allocacolorhash (void);
+static int pam_addtoacolorhash
+(acolorhash_table acht, rgbaPixel *acolorP, int value);
+static int pam_lookupacolor (acolorhash_table acht, rgbaPixel* acolorP);
+static void pam_freeacolorhist (acolorhist_vector achv);
+static void pam_freeacolorhash (acolorhash_table acht);
+
+/**
+ * Compute a palette for the given RGBA rasterBuffer using a median cut quantization.
+ * - pixelsIn: the rasterBuffer to quantize
+ * - height: the height of the rasterBuffer
+ * - width: the width of the rasterBuffer
+ * - reqcolors: the desired number of colors the palette should contain. will be set
+ * with the actual number of entries in the computed palette
+ * - palette: the resulting palette
+ * - palette_scaling_maxval: the quantization process may have to reduce the image depth
+ * by iteratively dividing the pixels by 2. In case palette_scaling_maxval is set to
+ * something different than 255, the returned palette colors have to be scaled back up to
+ * 255, and rb's pixels will have been scaled down to maxsize (see bug #3848)
+ */
+
+int msQuantizeRasterBuffer(rgbaPixel *pixelsIn,int height,int width,
+ unsigned int *reqcolors, rgbaPixel *palette,
+ unsigned int *palette_scaling_maxval)
+{
+ register rgbaPixel *pP;
+ register int col;
+ unsigned char newmaxval;
+ acolorhist_vector achv, acolormap=NULL;
+ int row;
+ int colors;
+ int newcolors = 0;
+ int x;
+ *palette_scaling_maxval = 255;
+ int row_step = width*4;
+
+ rgbaPixel **apixels=(rgbaPixel**)malloc(height*sizeof(rgbaPixel**));
+
+ for(row=0;row<height;row++) {
+ apixels[row]=(rgbaPixel*)(&(pixelsIn[row*width]));
+ }
+
+ /*
+ ** Step 2: attempt to make a histogram of the colors, unclustered.
+ ** If at first we don't succeed, lower maxval to increase color
+ ** coherence and try again. This will eventually terminate, with
+ ** maxval at worst 15, since 32^3 is approximately MAXCOLORS.
+ [GRR POSSIBLE BUG: what about 32^4 ?]
+ */
+ for ( ; ; ) {
+ achv = pam_computeacolorhist(
+ apixels, width, height, MAXCOLORS, &colors );
+ if ( achv != (acolorhist_vector) 0 )
+ break;
+ newmaxval = *palette_scaling_maxval / 2;
+ for ( row = 0; row < height; ++row )
+ for ( col = 0, pP = apixels[row]; col < width; ++col, ++pP )
+ PAM_DEPTH( *pP, *pP, *palette_scaling_maxval, newmaxval );
+ *palette_scaling_maxval = newmaxval;
+ }
+ newcolors = MS_MIN(colors, *reqcolors);
+ acolormap = mediancut(achv, colors, width*height, *palette_scaling_maxval, newcolors);
+ pam_freeacolorhist(achv);
+
+
+ *reqcolors = newcolors;
+
+ for (x = 0; x < newcolors; ++x) {
+ palette[x].r = acolormap[x].acolor.r;
+ palette[x].g = acolormap[x].acolor.g;
+ palette[x].b = acolormap[x].acolor.b;
+ palette[x].a = acolormap[x].acolor.a;
+ }
+
+ free(acolormap);
+ free(apixels);
+ return MS_SUCCESS;
+}
+
+int msClassifyRasterBuffer(rgbaPixel *imgIn,int height,int width,rgbaPixel *palette,int palette_num_entries,unsigned char *imgOut) {
+ register int ind;
+ unsigned char *outrow,*pQ;
+ register rgbaPixel *pP;
+ acolorhash_table acht;
+ int usehash, row, col;
+ int row_step = width*4;
+ /*
+ ** Step 4: map the colors in the image to their closest match in the
+ ** new colormap, and write 'em out.
+ */
+ acht = pam_allocacolorhash( );
+ usehash = 1;
+
+ for ( row = 0; row < height; ++row ) {
+ outrow = &(imgOut[row*width]);
+ pP = (rgbaPixel*)(&(imgIn[row*width]));
+ pQ = outrow;
+ for( col=0; col<width; col++) {
+ /* Check hash table to see if we have already matched this color. */
+ ind = pam_lookupacolor( acht, pP );
+ if ( ind == -1 ) {
+ /* No; search acolormap for closest match. */
+ register int i, r1, g1, b1, a1, r2, g2, b2, a2;
+ register long dist, newdist;
+
+ r1 = PAM_GETR( *pP );
+ g1 = PAM_GETG( *pP );
+ b1 = PAM_GETB( *pP );
+ a1 = PAM_GETA( *pP );
+ dist = 2000000000;
+ for ( i = 0; i < palette_num_entries; ++i ) {
+ r2 = PAM_GETR( palette[i] );
+ g2 = PAM_GETG( palette[i] );
+ b2 = PAM_GETB( palette[i] );
+ a2 = PAM_GETA( palette[i] );
+ /* GRR POSSIBLE BUG */
+ newdist = ( r1 - r2 ) * ( r1 - r2 ) + /* may overflow? */
+ ( g1 - g2 ) * ( g1 - g2 ) +
+ ( b1 - b2 ) * ( b1 - b2 ) +
+ ( a1 - a2 ) * ( a1 - a2 );
+ if ( newdist < dist ) {
+ ind = i;
+ dist = newdist;
+ }
+ }
+ if ( usehash ) {
+ if ( pam_addtoacolorhash( acht, pP, ind ) < 0 ) {
+ usehash = 0;
+ }
+ }
+ }
+
+ /* *pP = acolormap[ind].acolor; */
+ *pQ = (unsigned char)ind;
+
+ ++pP;
+ ++pQ;
+ }
+
+ }
+ pam_freeacolorhash(acht);
+
+ return MS_SUCCESS;
+}
+
+/*
+ ** Here is the fun part, the median-cut colormap generator. This is based
+ ** on Paul Heckbert's paper, "Color Image Quantization for Frame Buffer
+ ** Display," SIGGRAPH 1982 Proceedings, page 297.
+ */
+
+static acolorhist_vector mediancut (acolorhist_vector achv, int colors, int sum, unsigned char maxval, int newcolors)
+{
+ acolorhist_vector acolormap;
+ box_vector bv;
+ register int bi, i;
+ int boxes;
+
+ bv = (box_vector) malloc( sizeof(struct box) * newcolors );
+ acolormap =
+ (acolorhist_vector) malloc( sizeof(struct acolorhist_item) * newcolors);
+ if ( bv == (box_vector) 0 || acolormap == (acolorhist_vector) 0 ) {
+ #ifdef _DEBUG_PNG8
+ printf( " out of memory allocating box vector\n" );
+ #endif
+ exit(6);
+ }
+ for ( i = 0; i < newcolors; ++i )
+ PAM_ASSIGN( acolormap[i].acolor, 0, 0, 0, 0 );
+
+ /*
+ ** Set up the initial box.
+ */
+ bv[0].ind = 0;
+ bv[0].colors = colors;
+ bv[0].sum = sum;
+ boxes = 1;
+
+ /*
+ ** Main loop: split boxes until we have enough.
+ */
+ while ( boxes < newcolors ) {
+ register int indx, clrs;
+ int sm;
+ register int minr, maxr, ming, mina, maxg, minb, maxb, maxa, v;
+ int halfsum, lowersum;
+
+ /*
+ ** Find the first splittable box.
+ */
+ for ( bi = 0; bi < boxes; ++bi )
+ if ( bv[bi].colors >= 2 )
+ break;
+ if ( bi == boxes )
+ break; /* ran out of colors! */
+ indx = bv[bi].ind;
+ clrs = bv[bi].colors;
+ sm = bv[bi].sum;
+
+ /*
+ ** Go through the box finding the minimum and maximum of each
+ ** component - the boundaries of the box.
+ */
+ minr = maxr = PAM_GETR( achv[indx].acolor );
+ ming = maxg = PAM_GETG( achv[indx].acolor );
+ minb = maxb = PAM_GETB( achv[indx].acolor );
+ mina = maxa = PAM_GETA( achv[indx].acolor );
+ for ( i = 1; i < clrs; ++i )
+ {
+ v = PAM_GETR( achv[indx + i].acolor );
+ if ( v < minr ) minr = v;
+ if ( v > maxr ) maxr = v;
+ v = PAM_GETG( achv[indx + i].acolor );
+ if ( v < ming ) ming = v;
+ if ( v > maxg ) maxg = v;
+ v = PAM_GETB( achv[indx + i].acolor );
+ if ( v < minb ) minb = v;
+ if ( v > maxb ) maxb = v;
+ v = PAM_GETA( achv[indx + i].acolor );
+ if ( v < mina ) mina = v;
+ if ( v > maxa ) maxa = v;
+ }
+
+ /*
+ ** Find the largest dimension, and sort by that component. I have
+ ** included two methods for determining the "largest" dimension;
+ ** first by simply comparing the range in RGB space, and second
+ ** by transforming into luminosities before the comparison. You
+ ** can switch which method is used by switching the commenting on
+ ** the LARGE_ defines at the beginning of this source file.
+ */
+#ifdef LARGE_NORM
+ if ( maxa - mina >= maxr - minr && maxa - mina >= maxg - ming && maxa - mina >= maxb - minb )
+ qsort(
+ (char*) &(achv[indx]), clrs, sizeof(struct acolorhist_item),
+ alphacompare );
+ else if ( maxr - minr >= maxg - ming && maxr - minr >= maxb - minb )
+ qsort(
+ (char*) &(achv[indx]), clrs, sizeof(struct acolorhist_item),
+ redcompare );
+ else if ( maxg - ming >= maxb - minb )
+ qsort(
+ (char*) &(achv[indx]), clrs, sizeof(struct acolorhist_item),
+ greencompare );
+ else
+ qsort(
+ (char*) &(achv[indx]), clrs, sizeof(struct acolorhist_item),
+ bluecompare );
+#endif /*LARGE_NORM*/
+#ifdef LARGE_LUM
+ {
+ apixel p;
+ float rl, gl, bl, al;
+
+ PAM_ASSIGN(p, maxr - minr, 0, 0, 0);
+ rl = PPM_LUMIN(p);
+ PAM_ASSIGN(p, 0, maxg - ming, 0, 0);
+ gl = PPM_LUMIN(p);
+ PAM_ASSIGN(p, 0, 0, maxb - minb, 0);
+ bl = PPM_LUMIN(p);
+
+ /*
+GRR: treat alpha as grayscale and assign (maxa - mina) to each of R, G, B?
+ assign (maxa - mina)/3 to each?
+ use alpha-fractional luminosity? (normalized_alpha * lum(r,g,b))
+ al = dunno ...
+ [probably should read Heckbert's paper to decide]
+ */
+
+ if ( al >= rl && al >= gl && al >= bl )
+ qsort(
+ (char*) &(achv[indx]), clrs, sizeof(struct acolorhist_item),
+ alphacompare );
+ else if ( rl >= gl && rl >= bl )
+ qsort(
+ (char*) &(achv[indx]), clrs, sizeof(struct acolorhist_item),
+ redcompare );
+ else if ( gl >= bl )
+ qsort(
+ (char*) &(achv[indx]), clrs, sizeof(struct acolorhist_item),
+ greencompare );
+ else
+ qsort(
+ (char*) &(achv[indx]), clrs, sizeof(struct acolorhist_item),
+ bluecompare );
+ }
+#endif /*LARGE_LUM*/
+
+ /*
+ ** Now find the median based on the counts, so that about half the
+ ** pixels (not colors, pixels) are in each subdivision.
+ */
+ lowersum = achv[indx].value;
+ halfsum = sm / 2;
+ for ( i = 1; i < clrs - 1; ++i )
+ {
+ if ( lowersum >= halfsum )
+ break;
+ lowersum += achv[indx + i].value;
+ }
+
+ /*
+ ** Split the box, and sort to bring the biggest boxes to the top.
+ */
+ bv[bi].colors = i;
+ bv[bi].sum = lowersum;
+ bv[boxes].ind = indx + i;
+ bv[boxes].colors = clrs - i;
+ bv[boxes].sum = sm - lowersum;
+ ++boxes;
+ qsort( (char*) bv, boxes, sizeof(struct box), sumcompare );
+ }
+
+ /*
+ ** Ok, we've got enough boxes. Now choose a representative color for
+ ** each box. There are a number of possible ways to make this choice.
+ ** One would be to choose the center of the box; this ignores any structure
+ ** within the boxes. Another method would be to average all the colors in
+ ** the box - this is the method specified in Heckbert's paper. A third
+ ** method is to average all the pixels in the box. You can switch which
+ ** method is used by switching the commenting on the REP_ defines at
+ ** the beginning of this source file.
+ */
+ for ( bi = 0; bi < boxes; ++bi ) {
+#ifdef REP_CENTER_BOX
+ register int indx = bv[bi].ind;
+ register int clrs = bv[bi].colors;
+ register int minr, maxr, ming, maxg, minb, maxb, mina, maxa, v;
+
+ minr = maxr = PAM_GETR( achv[indx].acolor );
+ ming = maxg = PAM_GETG( achv[indx].acolor );
+ minb = maxb = PAM_GETB( achv[indx].acolor );
+ mina = maxa = PAM_GETA( achv[indx].acolor );
+ for ( i = 1; i < clrs; ++i )
+ {
+ v = PAM_GETR( achv[indx + i].acolor );
+ minr = min( minr, v );
+ maxr = max( maxr, v );
+ v = PAM_GETG( achv[indx + i].acolor );
+ ming = min( ming, v );
+ maxg = max( maxg, v );
+ v = PAM_GETB( achv[indx + i].acolor );
+ minb = min( minb, v );
+ maxb = max( maxb, v );
+ v = PAM_GETA( achv[indx + i].acolor );
+ mina = min( mina, v );
+ maxa = max( maxa, v );
+ }
+ PAM_ASSIGN(
+ acolormap[bi].acolor, ( minr + maxr ) / 2, ( ming + maxg ) / 2,
+ ( minb + maxb ) / 2, ( mina + maxa ) / 2 );
+#endif /*REP_CENTER_BOX*/
+#ifdef REP_AVERAGE_COLORS
+ register int indx = bv[bi].ind;
+ register int clrs = bv[bi].colors;
+ register long r = 0, g = 0, b = 0, a = 0;
+
+ for ( i = 0; i < clrs; ++i )
+ {
+ r += PAM_GETR( achv[indx + i].acolor );
+ g += PAM_GETG( achv[indx + i].acolor );
+ b += PAM_GETB( achv[indx + i].acolor );
+ a += PAM_GETA( achv[indx + i].acolor );
+ }
+ r = r / clrs;
+ g = g / clrs;
+ b = b / clrs;
+ a = a / clrs;
+ PAM_ASSIGN( acolormap[bi].acolor, r, g, b, a );
+#endif /*REP_AVERAGE_COLORS*/
+#ifdef REP_AVERAGE_PIXELS
+ register int indx = bv[bi].ind;
+ register int clrs = bv[bi].colors;
+ register long r = 0, g = 0, b = 0, a = 0, sum = 0;
+
+ for ( i = 0; i < clrs; ++i )
+ {
+ r += PAM_GETR( achv[indx + i].acolor ) * achv[indx + i].value;
+ g += PAM_GETG( achv[indx + i].acolor ) * achv[indx + i].value;
+ b += PAM_GETB( achv[indx + i].acolor ) * achv[indx + i].value;
+ a += PAM_GETA( achv[indx + i].acolor ) * achv[indx + i].value;
+ sum += achv[indx + i].value;
+ }
+ r = r / sum;
+ if ( r > maxval ) r = maxval; /* avoid math errors */
+ g = g / sum;
+ if ( g > maxval ) g = maxval;
+ b = b / sum;
+ if ( b > maxval ) b = maxval;
+ a = a / sum;
+ if ( a > maxval ) a = maxval;
+ /* GRR 20001228: added casts to quiet warnings; 255 DEPENDENCY */
+ PAM_ASSIGN( acolormap[bi].acolor, (unsigned char)r, (unsigned char)g, (unsigned char)b, (unsigned char)a );
+#endif /*REP_AVERAGE_PIXELS*/
+ }
+
+ /*
+ ** All done.
+ */
+ free(bv);
+ return acolormap;
+}
+
+static int
+redcompare( const void *ch1, const void *ch2 )
+{
+ return (int) PAM_GETR( ((acolorhist_vector)ch1)->acolor ) -
+ (int) PAM_GETR( ((acolorhist_vector)ch2)->acolor );
+}
+
+static int
+greencompare( const void *ch1, const void *ch2 )
+{
+ return (int) PAM_GETG( ((acolorhist_vector)ch1)->acolor ) -
+ (int) PAM_GETG( ((acolorhist_vector)ch2)->acolor );
+}
+
+static int
+bluecompare( const void *ch1, const void *ch2 )
+{
+ return (int) PAM_GETB( ((acolorhist_vector)ch1)->acolor ) -
+ (int) PAM_GETB( ((acolorhist_vector)ch2)->acolor );
+}
+
+static int
+alphacompare( const void *ch1, const void *ch2 )
+{
+ return (int) PAM_GETA( ((acolorhist_vector)ch1)->acolor ) -
+ (int) PAM_GETA( ((acolorhist_vector)ch2)->acolor );
+}
+
+static int
+sumcompare( const void *b1, const void *b2 )
+{
+ return ((box_vector)b2)->sum -
+ ((box_vector)b1)->sum;
+}
+
+
+/*===========================================================================*/
+
+
+/* libpam3.c - pam (portable alpha map) utility library part 3
+ **
+ ** Colormap routines.
+ **
+ ** Copyright (C) 1989, 1991 by Jef Poskanzer.
+ ** Copyright (C) 1997 by Greg Roelofs.
+ **
+ ** Permission to use, copy, modify, and distribute this software and its
+ ** documentation for any purpose and without fee is hereby granted, provided
+ ** that the above copyright notice appear in all copies and that both that
+ ** copyright notice and this permission notice appear in supporting
+ ** documentation. This software is provided "as is" without express or
+ ** implied warranty.
+ */
+
+/*
+#include "pam.h"
+#include "pamcmap.h"
+ */
+
+#define HASH_SIZE 20023
+
+#define pam_hashapixel(p) ( ( ( (long) PAM_GETR(p) * 33023 + \
+ (long) PAM_GETG(p) * 30013 + \
+ (long) PAM_GETB(p) * 27011 + \
+ (long) PAM_GETA(p) * 24007 ) \
+ & 0x7fffffff ) % HASH_SIZE )
+
+static acolorhist_vector pam_computeacolorhist(rgbaPixel **apixels, int cols, int rows, int maxacolors, int* acolorsP)
+{
+ acolorhash_table acht;
+ acolorhist_vector achv;
+
+ acht = pam_computeacolorhash( apixels, cols, rows, maxacolors, acolorsP );
+ if ( acht == (acolorhash_table) 0 )
+ return (acolorhist_vector) 0;
+ achv = pam_acolorhashtoacolorhist( acht, maxacolors );
+ pam_freeacolorhash( acht );
+ return achv;
+}
+
+
+
+static acolorhash_table pam_computeacolorhash(rgbaPixel** apixels, int cols, int rows, int maxacolors, int* acolorsP)
+{
+ acolorhash_table acht;
+ register rgbaPixel* pP;
+ acolorhist_list achl;
+ int col, row, hash;
+
+ acht = pam_allocacolorhash( );
+ *acolorsP = 0;
+
+ /* Go through the entire image, building a hash table of colors. */
+ for ( row = 0; row < rows; ++row )
+ for ( col = 0, pP = apixels[row]; col < cols; ++col, ++pP )
+ {
+ hash = pam_hashapixel( *pP );
+ for ( achl = acht[hash]; achl != (acolorhist_list) 0; achl = achl->next )
+ if ( PAM_EQUAL( achl->ch.acolor, *pP ) )
+ break;
+ if ( achl != (acolorhist_list) 0 )
+ ++(achl->ch.value);
+ else
+ {
+ if ( ++(*acolorsP) > maxacolors )
+ {
+ pam_freeacolorhash( acht );
+ return (acolorhash_table) 0;
+ }
+ achl = (acolorhist_list) malloc( sizeof(struct acolorhist_list_item) );
+ if ( achl == 0 ) {
+ #ifdef _DEBUG_PNG8
+ printf( stderr, " out of memory computing hash table\n" );
+ #endif
+ exit(7);
+ }
+ achl->ch.acolor = *pP;
+ achl->ch.value = 1;
+ achl->next = acht[hash];
+ acht[hash] = achl;
+ }
+ }
+
+ return acht;
+}
+
+
+
+static acolorhash_table
+pam_allocacolorhash( )
+{
+ acolorhash_table acht;
+ int i;
+
+ acht = (acolorhash_table) malloc( HASH_SIZE * sizeof(acolorhist_list) );
+ if ( acht == 0 ) {
+ #ifdef _DEBUG_PNG8
+ printf( stderr, " out of memory allocating hash table\n" );
+ #endif
+ exit(8);
+ }
+
+ for ( i = 0; i < HASH_SIZE; ++i )
+ acht[i] = (acolorhist_list) 0;
+
+ return acht;
+}
+
+
+
+static int
+pam_addtoacolorhash(acolorhash_table acht, rgbaPixel *acolorP, int value)
+{
+ register int hash;
+ register acolorhist_list achl;
+
+ //achl = (acolorhist_list) msSmallMalloc( sizeof(struct acolorhist_list_item) );
+ achl = (acolorhist_list) malloc( sizeof(struct acolorhist_list_item) );
+
+ hash = pam_hashapixel( *acolorP );
+ achl->ch.acolor = *acolorP;
+ achl->ch.value = value;
+ achl->next = acht[hash];
+ acht[hash] = achl;
+ return 0;
+}
+
+
+
+static acolorhist_vector
+pam_acolorhashtoacolorhist(acolorhash_table acht, int maxacolors)
+{
+ acolorhist_vector achv;
+ acolorhist_list achl;
+ int i, j;
+
+ /* Now collate the hash table into a simple acolorhist array. */
+ achv = (acolorhist_vector) malloc( maxacolors * sizeof(struct acolorhist_item) );
+ /* (Leave room for expansion by caller.) */
+ if ( achv == (acolorhist_vector) 0 ) {
+ #ifdef _DEBUG_PNG8
+ printf( stderr, " out of memory generating histogram\n" );
+ #endif
+ exit(9);
+ }
+
+ /* Loop through the hash table. */
+ j = 0;
+ for ( i = 0; i < HASH_SIZE; ++i )
+ for ( achl = acht[i]; achl != (acolorhist_list) 0; achl = achl->next )
+ {
+ /* Add the new entry. */
+ achv[j] = achl->ch;
+ ++j;
+ }
+
+ /* All done. */
+ return achv;
+}
+
+
+
+static int
+pam_lookupacolor(acolorhash_table acht, rgbaPixel* acolorP)
+{
+ int hash;
+ acolorhist_list achl;
+
+ hash = pam_hashapixel( *acolorP );
+ for ( achl = acht[hash]; achl != (acolorhist_list) 0; achl = achl->next )
+ if ( PAM_EQUAL( achl->ch.acolor, *acolorP ) )
+ return achl->ch.value;
+
+ return -1;
+}
+
+
+
+static void
+pam_freeacolorhist(acolorhist_vector achv )
+{
+ free( (char*) achv );
+}
+
+
+
+static void
+pam_freeacolorhash(acolorhash_table acht )
+{
+ int i;
+ acolorhist_list achl, achlnext;
+
+ for ( i = 0; i < HASH_SIZE; ++i )
+ for ( achl = acht[i]; achl != (acolorhist_list) 0; achl = achlnext )
+ {
+ achlnext = achl->next;
+ free( (char*) achl );
+ }
+ free( (char*) acht );
+}
+
+
+
Added: branches/2.4/MgDev/Common/Renderers/MapQuantization.h
===================================================================
--- branches/2.4/MgDev/Common/Renderers/MapQuantization.h (rev 0)
+++ branches/2.4/MgDev/Common/Renderers/MapQuantization.h 2012-10-06 10:20:05 UTC (rev 7079)
@@ -0,0 +1,222 @@
+/******************************************************************************
+ * $Id: mapquantization.c 11599 2011-04-19 05:14:17Z tbonfort $
+ *
+ * Project: MapServer
+ * Purpose: RGB(A) to Palette Support Functions
+ * Author: Thomas Bonfort
+ *
+ ******************************************************************************
+ * Copyright (c) 1996-2005 Regents of the University of Minnesota.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies of this Software or works derived from this Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ ******************************************************************************
+ */
+/*
+ * derivations from pngquant and ppmquant
+ *
+ ** pngquant.c - quantize the colors in an alphamap down to a specified number
+ **
+ ** Copyright (C) 1989, 1991 by Jef Poskanzer.
+ ** Copyright (C) 1997, 2000, 2002 by Greg Roelofs; based on an idea by
+ ** Stefan Schneider.
+ **
+ ** Permission to use, copy, modify, and distribute this software and its
+ ** documentation for any purpose and without fee is hereby granted, provided
+ ** that the above copyright notice appear in all copies and that both that
+ ** copyright notice and this permission notice appear in supporting
+ ** documentation. This software is provided "as is" without express or
+ ** implied warranty.
+ */
+
+#ifndef MAPQUANTIZATION_H
+#define MAPQUANTIZATION_H
+
+typedef struct {
+ unsigned char b,g,r,a;
+} rgbaPixel;
+
+typedef struct {
+ unsigned char r,g,b;
+} rgbPixel;
+
+
+#define PAM_GETR(p) ((p).r)
+#define PAM_GETG(p) ((p).g)
+#define PAM_GETB(p) ((p).b)
+#define PAM_GETA(p) ((p).a)
+#define PAM_ASSIGN(p,red,grn,blu,alf) \
+ do { (p).r = (red); (p).g = (grn); (p).b = (blu); (p).a = (alf); } while (0)
+#define PAM_EQUAL(p,q) \
+ ((p).r == (q).r && (p).g == (q).g && (p).b == (q).b && (p).a == (q).a)
+#define PAM_DEPTH(newp,p,oldmaxval,newmaxval) \
+ PAM_ASSIGN( (newp), \
+ ( (int) PAM_GETR(p) * (newmaxval) + (oldmaxval) / 2 ) / (oldmaxval), \
+ ( (int) PAM_GETG(p) * (newmaxval) + (oldmaxval) / 2 ) / (oldmaxval), \
+ ( (int) PAM_GETB(p) * (newmaxval) + (oldmaxval) / 2 ) / (oldmaxval), \
+ ( (int) PAM_GETA(p) * (newmaxval) + (oldmaxval) / 2 ) / (oldmaxval) )
+
+
+/* from pamcmap.h */
+
+typedef struct acolorhist_item *acolorhist_vector;
+struct acolorhist_item {
+ rgbaPixel acolor;
+ int value;
+};
+
+typedef struct acolorhist_list_item *acolorhist_list;
+struct acolorhist_list_item {
+ struct acolorhist_item ch;
+ acolorhist_list next;
+};
+
+typedef acolorhist_list *acolorhash_table;
+
+#define MAXCOLORS 32767
+
+#define LARGE_NORM
+#define REP_AVERAGE_PIXELS
+
+typedef struct box *box_vector;
+struct box {
+ int ind;
+ int colors;
+ int sum;
+};
+
+#define MS_MIN(a,b) (((a)<(b))?(a):(b))
+enum MS_RETURN_VALUE {MS_SUCCESS, MS_FAILURE, MS_DONE};
+enum MS_RASTER_BUFFER_TYPE { MS_BUFFER_NONE=2000, MS_BUFFER_BYTE_RGBA, MS_BUFFER_BYTE_PALETTE, MS_BUFFER_GD };
+
+
+int msQuantizeRasterBuffer(rgbaPixel *apixels,int width,int height,unsigned int *reqcolors, rgbaPixel *palette,unsigned int *palette_scaling_maxval);
+int msClassifyRasterBuffer(rgbaPixel *imgIn,int height,int width,rgbaPixel *palette,int palette_num_entries,unsigned char *imgOut);
+
+#endif //MAPQUANTIZATION_H
+/******************************************************************************
+ * $Id: mapquantization.c 11599 2011-04-19 05:14:17Z tbonfort $
+ *
+ * Project: MapServer
+ * Purpose: RGB(A) to Palette Support Functions
+ * Author: Thomas Bonfort
+ *
+ ******************************************************************************
+ * Copyright (c) 1996-2005 Regents of the University of Minnesota.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies of this Software or works derived from this Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ ******************************************************************************
+ */
+/*
+ * derivations from pngquant and ppmquant
+ *
+ ** pngquant.c - quantize the colors in an alphamap down to a specified number
+ **
+ ** Copyright (C) 1989, 1991 by Jef Poskanzer.
+ ** Copyright (C) 1997, 2000, 2002 by Greg Roelofs; based on an idea by
+ ** Stefan Schneider.
+ **
+ ** Permission to use, copy, modify, and distribute this software and its
+ ** documentation for any purpose and without fee is hereby granted, provided
+ ** that the above copyright notice appear in all copies and that both that
+ ** copyright notice and this permission notice appear in supporting
+ ** documentation. This software is provided "as is" without express or
+ ** implied warranty.
+ */
+
+#ifndef MAPQUANTIZATION_H
+#define MAPQUANTIZATION_H
+
+typedef struct {
+ unsigned char b,g,r,a;
+} rgbaPixel;
+
+typedef struct {
+ unsigned char r,g,b;
+} rgbPixel;
+
+
+#define PAM_GETR(p) ((p).r)
+#define PAM_GETG(p) ((p).g)
+#define PAM_GETB(p) ((p).b)
+#define PAM_GETA(p) ((p).a)
+#define PAM_ASSIGN(p,red,grn,blu,alf) \
+ do { (p).r = (red); (p).g = (grn); (p).b = (blu); (p).a = (alf); } while (0)
+#define PAM_EQUAL(p,q) \
+ ((p).r == (q).r && (p).g == (q).g && (p).b == (q).b && (p).a == (q).a)
+#define PAM_DEPTH(newp,p,oldmaxval,newmaxval) \
+ PAM_ASSIGN( (newp), \
+ ( (int) PAM_GETR(p) * (newmaxval) + (oldmaxval) / 2 ) / (oldmaxval), \
+ ( (int) PAM_GETG(p) * (newmaxval) + (oldmaxval) / 2 ) / (oldmaxval), \
+ ( (int) PAM_GETB(p) * (newmaxval) + (oldmaxval) / 2 ) / (oldmaxval), \
+ ( (int) PAM_GETA(p) * (newmaxval) + (oldmaxval) / 2 ) / (oldmaxval) )
+
+
+/* from pamcmap.h */
+
+typedef struct acolorhist_item *acolorhist_vector;
+struct acolorhist_item {
+ rgbaPixel acolor;
+ int value;
+};
+
+typedef struct acolorhist_list_item *acolorhist_list;
+struct acolorhist_list_item {
+ struct acolorhist_item ch;
+ acolorhist_list next;
+};
+
+typedef acolorhist_list *acolorhash_table;
+
+#define MAXCOLORS 32767
+
+#define LARGE_NORM
+#define REP_AVERAGE_PIXELS
+
+typedef struct box *box_vector;
+struct box {
+ int ind;
+ int colors;
+ int sum;
+};
+
+#define MS_MIN(a,b) (((a)<(b))?(a):(b))
+enum MS_RETURN_VALUE {MS_SUCCESS, MS_FAILURE, MS_DONE};
+enum MS_RASTER_BUFFER_TYPE { MS_BUFFER_NONE=2000, MS_BUFFER_BYTE_RGBA, MS_BUFFER_BYTE_PALETTE, MS_BUFFER_GD };
+
+
+int msQuantizeRasterBuffer(rgbaPixel *apixels,int width,int height,unsigned int *reqcolors, rgbaPixel *palette,unsigned int *palette_scaling_maxval);
+int msClassifyRasterBuffer(rgbaPixel *imgIn,int height,int width,rgbaPixel *palette,int palette_num_entries,unsigned char *imgOut);
+
+#endif //MAPQUANTIZATION_H
Modified: branches/2.4/MgDev/Common/Renderers/Renderers.vcproj
===================================================================
--- branches/2.4/MgDev/Common/Renderers/Renderers.vcproj 2012-10-05 09:02:19 UTC (rev 7078)
+++ branches/2.4/MgDev/Common/Renderers/Renderers.vcproj 2012-10-06 10:20:05 UTC (rev 7079)
@@ -692,6 +692,14 @@
>
</File>
<File
+ RelativePath=".\MapQuantization.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\MapQuantization.h"
+ >
+ </File>
+ <File
RelativePath=".\Renderers.h"
>
</File>
Modified: branches/2.4/MgDev/Common/Renderers/Renderers.vcxproj
===================================================================
--- branches/2.4/MgDev/Common/Renderers/Renderers.vcxproj 2012-10-05 09:02:19 UTC (rev 7078)
+++ branches/2.4/MgDev/Common/Renderers/Renderers.vcxproj 2012-10-06 10:20:05 UTC (rev 7079)
@@ -208,6 +208,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="MapQuantization.cpp" />
<ClCompile Include="SymbolTrans.cpp" />
<ClCompile Include="DWFRenderer.cpp" />
<ClCompile Include="EMapRenderer.cpp" />
@@ -253,6 +254,7 @@
<ClCompile Include="RenderUtil.cpp" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="MapQuantization.h" />
<ClInclude Include="SymbolTrans.h" />
<ClInclude Include="DWFRenderer.h" />
<ClInclude Include="DWFRSInputStream.h" />
Modified: branches/2.4/MgDev/Common/Renderers/Renderers.vcxproj.filters
===================================================================
--- branches/2.4/MgDev/Common/Renderers/Renderers.vcxproj.filters 2012-10-05 09:02:19 UTC (rev 7078)
+++ branches/2.4/MgDev/Common/Renderers/Renderers.vcxproj.filters 2012-10-06 10:20:05 UTC (rev 7079)
@@ -119,6 +119,7 @@
</ClCompile>
<ClCompile Include="CriticalSection.cpp" />
<ClCompile Include="RenderUtil.cpp" />
+ <ClCompile Include="MapQuantization.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="SymbolTrans.h">
@@ -215,6 +216,7 @@
<ClInclude Include="Renderers.h" />
<ClInclude Include="RenderUtil.h" />
<ClInclude Include="stdafx.h" />
+ <ClInclude Include="MapQuantization.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Renderers.rc" />
More information about the mapguide-commits
mailing list