[mapserver-commits] r7222 - trunk/mapserver

[svn at osgeo.org]

Author: tamas
Date: 2007-12-29 07:06:19 -0500 (Sat, 29 Dec 2007)
New Revision: 7222

Modified:
   trunk/mapserver/Makefile.vc
   trunk/mapserver/nmake.opt
Log:
Enable support for quantization of rgba pngs

Modified: trunk/mapserver/Makefile.vc
===================================================================
--- trunk/mapserver/Makefile.vc	2007-12-29 10:54:04 UTC (rev 7221)
+++ trunk/mapserver/Makefile.vc	2007-12-29 12:06:19 UTC (rev 7222)
@@ -26,7 +26,7 @@
 #
 MS_DLL = libmap.dll
 
-MS_OBJS = 	mapbits.obj maphash.obj mapshape.obj mapxbase.obj \
+MS_OBJS = maprgbapng.obj mapbits.obj maphash.obj mapshape.obj mapxbase.obj \
 		mapparser.obj maplexer.obj maptree.obj \
 		mapsearch.obj mapstring.obj mapsymbol.obj mapfile.obj \
 		maplegend.obj maputil.obj mapscale.obj mapquery.obj \

Modified: trunk/mapserver/nmake.opt
===================================================================
--- trunk/mapserver/nmake.opt	2007-12-29 10:54:04 UTC (rev 7221)
+++ trunk/mapserver/nmake.opt	2007-12-29 12:06:19 UTC (rev 7222)
@@ -254,6 +254,14 @@
 FT_DIR=$(MS_BASE)\..\freetype-2.1.10
 !ENDIF
 
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# Optional RGBA palette png output
+# ----------------------------------------------------------------------
+# Enable support for quantization of rgba pngs
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!IFDEF PNG_DIR
+#RGBA_PNG_ENABLED=-DUSE_RGBA_PNG
+!ENDIF
 
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # MING (Macromedia Flash SWF output support) 
@@ -790,7 +798,7 @@
           $(USE_POINT_Z_M) $(GDAL) $(FCGIDEF) \
           $(WFS) $(WFSCLIENT) $(WCS) $(PDF) $(EGIS) \
           $(USE_GD_ANTIALIAS) $(ORACLE) $(MING_VERSION) \
-          $(SDE_OPT) $(ICONV) $(GEOS) $(ZLIB) $(SOS)  $(AGG)
+          $(SDE_OPT) $(ICONV) $(GEOS) $(ZLIB) $(SOS)  $(AGG) $(RGBA_PNG_ENABLED)
 
 !IFDEF WIN64
 MS_CFLAGS=$(INCLUDES) $(MS_DEFS) -DWIN32 -D_WIN32 -DUSE_GENERIC_MS_NINT