Merging upstream.

.gitignore

@@ -5,6 +5,7 @@ config.log
 config.status
 *.dll
 *.swp
+*.pyc
 Makefile
 legend
 libmapserver.a

HISTORY.TXT

@@ -11,9 +11,19 @@ the top of the list.)
 
 For a complete change history, please see the Git log comments.
 
-Current Version (git master, 6.1-dev, future 6.2): 
+Current Version (git master, 6.3-dev, future 6.4):
 -------------------------------------------------
 
+- Add notable changes here. Less important changes should go only in the
+  commit message and not appear here.
+
+Version 6.2 (beta1: 20120629): 
+-------------------------------------------------
+
+- Fix WFS filter is produced as non-standard XML (#4171)
+
+- Fix pixmap symbol loading issue (#4329)
+
 - Added INSPIRE ExtendedCapabilities and DOCTYPE definition to WMS 1.1.1 (#3608)
 
 - Fix wms_enable_request-related errors are not properly tagged (#4187)

MIGRATION_GUIDE.txt

@@ -18,10 +18,6 @@ applications when migrating from version 6.0.x (or earlier versions)
 to 6.2 (i.e. backwards incompatibilities), as well as information
 on some of the new features.
 
-TODO:document changes in gap calculation for line markers and polygon
-tile symbols (#3879 and #3867)
-TODO: document vector type symbol size calculation change (#4116)
-
 --------------------
 Build system changes
 --------------------
@@ -32,7 +28,47 @@ If you are building MapServer from source, then the following may be of interest
 
 * The --with-php configure option has been changed to point directly to the php-config script instead of to the directory where the PHP headers are located.
 
+-----------------
+Rendering changes
+-----------------
+
+* STYLE->GAP interpretation
+  Starting in 6.2, STYLE->GAP specifies the gap between the symbols
+  using the centre to centre distance.
+  In earlier versions of Mapserver, GAP was used as the approximate
+  distance between the symbol boundaries.
+  See ticket #3867 for more information.
+
+  In order to get the same effect with 6.2 as with 6.0, STYLE->GAP
+  must be increased with the size of the symbol.
+
+* Removal of one pixel gap between symbols
+  In earlier versions of Mapserver, an extra gap of one pixel was
+  added between the symbols (in addition to the gap specified in
+  STYLE->GAP).  This has been discontinued in 6.2.
+  See ticket #3868 for more information.
+
+  In order to get the same effect with 6.2 as with 6.0, STYLE->GAP
+  must be increased with one pixel.
 
+* STYLE->INITIALGAP introduced
+  Support for more powerful line styling has been provided with the
+  introduction of STYLE->INITIALGAP.  See ticket #3879 and the
+  documentation for more information.
+
+* SYMBOL->ANCHORPOINT introduced
+  A symbol anchorpoint has been introduced to facilitate precise
+  positioning of symbols.  See ticket #4066 and the documentation for
+  more information.
+
+* Change in vector symbol size calculation.
+  In 6.2, vector symbol coordinates are shifted to get rid of
+  negative x and y coordinate values.
+  See ticket #4116 for more information.
+
+  In order to get the shifting effect that could be obtained using
+  negative coordinate values, SYMBOL->ANCHORPOINT should be used
+  instead.
 
 MapServer 5.6 to 6.0 Migration
 ==============================
@@ -201,6 +237,21 @@ are evaluated in OGC WCS services. Previous versions used "wms_*"
 prefixed entries as fallback which is dropped in version 6.0 in favor of
 forcing explicit decisions.
 
+-------------------------------------------------------
+Mapfile Changes - OGC requests - DUMP parameter removed
+-------------------------------------------------------
+
+The DUMP LAYER parameter has been removed.  To enable output of
+geometries in WMS getfeatureinfo requests - GML
+(INFO_FORMAT=application/vnd.ogc.gml), LAYER METADATA is used
+instead::
+
+   METADATA
+     gml_geometries "geom"
+     gml_geom_type "polygon"
+     ...
+   END
+
 --------------------------------------------------------
 Mapfile Changes - Ability to escape single/double quotes
 --------------------------------------------------------

Makefile.in

@@ -244,7 +244,7 @@ INCLUDES = $(FT_INC) $(REGEX_INC) $(PNG_INC) $(GIF_INC) $(JPEG_INC) $(GD_INC) \
         $(AGG_INC) $(OGL_INC) $(FTGL_INC) $(PROJ_INC) $(EGIS_INC) \
         $(SDE_INC) $(GDAL_INC) $(POSTGIS_INC) $(MYSQL_INC) \
         $(CURL_INC) $(ORACLESPATIAL_INC) $(GEOS_INC) $(ICONV_INC) \
-        $(FASTCGI_INC) $(EXEMPI_INC) $(XML2_INC) $(FRIBIDI_INC) $(CAIRO_INC) $(LIBSVG_CAIRO_INC) \
+        $(EXEMPI_INC) $(XML2_INC) $(FRIBIDI_INC) $(CAIRO_INC) $(LIBSVG_CAIRO_INC) \
 		  $(APR_INC) $(APACHE_INC)
 
 FLAGS = @DEBUG_FLAGS@ $(DEFINES) $(INCLUDES)
@@ -256,7 +256,7 @@ CXXFLAGS = @CXXFLAGS@ $(FLAGS)
 SUP_LIBS =  $(FT_LIB) $(GD_LIB) $(OGL_LIB) $(FTGL_LIB) $(PROJ_LIBS) \
           $(JPEG_LIB) $(PNG_LIB) $(GIF_LIB) $(SDE_LIB) $(GDAL_LIB) $(POSTGIS_LIB) \
 	  $(MYSQL_LIB) $(CURL_LIB) $(ORACLESPATIAL_LIB) $(GEOS_LIB) \
-	  $(THREAD_LIB) $(ICONV_LIB) $(FASTCGI_LIB) $(EXEMPI_LIB) $(XSLT_LIB) $(EXSLT_LIB) \
+	  $(THREAD_LIB) $(ICONV_LIB) $(EXEMPI_LIB) $(XSLT_LIB) $(EXSLT_LIB) \
 	  $(XML2_LIB) $(FRIBIDI_LIB) $(XTRALIBS)  $(CAIRO_LIB) $(LIBSVG_CAIRO_LIB) \
 	  $(APR_LIB)
 
@@ -306,7 +306,6 @@ EXE_LIST = 	shp2img legend mapserv shptree shptreevis \
 # --- You shouldn't have to edit anything else. ---
 #
 all: $(LIBMAP) $(EXE_LIST) @MAKE_PHP_MAPSCRIPT@ @MAKE_PYTHON_MAPSCRIPT@ 
-EXE_LDFLAGS = $(LIBMAP)
 
 # Explicitly invoke this rule when maplexer.l is altered.  We don't do
 # it automatically for the reasons listed in #2310
@@ -338,6 +337,9 @@ mapserver.h: $(HEADERS)
 .c.$(OBJ_SUFFIX): $(HEADERS)
 	$(LTCC) $(CC) -c $(CFLAGS) $< -o $@
 
+mapserv.$(OBJ_SUFFIX): mapserv.c $(HEADERS)
+	$(LTCC) $(CC) -c $(CFLAGS) $(FASTCGI_INC) mapserv.c -o $@
+
 .cpp.$(OBJ_SUFFIX): mapserver.h
 	$(LTCXX) $(CXX) -c $(CXXFLAGS) $< -o $@
 
@@ -357,58 +359,59 @@ $(LIBMAP): $(OBJS)
 	$(LINK) -release $(MS_VERSION)  $(OBJS) $(SUP_LIBS) -o $(LIBMAP)
 
 shp2pdf: $(LIBMAP) shp2pdf.$(OBJ_SUFFIX)
-	$(LINK) shp2pdf.$(OBJ_SUFFIX) $(EXE_LDFLAGS) -o shp2pdf
+	$(LINK) shp2pdf.$(OBJ_SUFFIX) $(LIBMAP) -o shp2pdf
 
 shp2img: $(LIBMAP) shp2img.$(OBJ_SUFFIX)
-	$(LINK) shp2img.$(OBJ_SUFFIX) $(EXE_LDFLAGS) -o shp2img
+	$(LINK) shp2img.$(OBJ_SUFFIX) $(LIBMAP) -o shp2img
 
 sym2img:  sym2img.$(OBJ_SUFFIX) $(LIBMAP)
-	$(LINK) sym2img.$(OBJ_SUFFIX) $(EXE_LDFLAGS) -o sym2img
+	$(LINK) sym2img.$(OBJ_SUFFIX) $(LIBMAP) -o sym2img
 
 legend: legend.$(OBJ_SUFFIX) $(LIBMAP)
-	$(LINK) legend.$(OBJ_SUFFIX) $(EXE_LDFLAGS) -o legend
+	$(LINK) legend.$(OBJ_SUFFIX) $(LIBMAP) -o legend
 
 scalebar: scalebar.$(OBJ_SUFFIX) $(LIBMAP)
-	$(LINK) scalebar.$(OBJ_SUFFIX) $(EXE_LDFLAGS) -o scalebar
+	$(LINK) scalebar.$(OBJ_SUFFIX) $(LIBMAP) -o scalebar
 
 mapserv: mapserv.$(OBJ_SUFFIX) $(LIBMAP)
-	$(LINK) mapserv.$(OBJ_SUFFIX) $(EXE_LDFLAGS) -o mapserv
+	$(LINK) mapserv.$(OBJ_SUFFIX) $(LIBMAP) $(FASTCGI_LIB) -o mapserv
 
 shpindex: shpindex.$(OBJ_SUFFIX) $(LIBMAP)
-	$(LINK) shpindex.$(OBJ_SUFFIX) $(EXE_LDFLAGS) -o shpindex
+	$(LINK) shpindex.$(OBJ_SUFFIX) $(LIBMAP) -o shpindex
 
 shptree: shptree.$(OBJ_SUFFIX) $(LIBMAP)
-	$(LINK) shptree.$(OBJ_SUFFIX) $(EXE_LDFLAGS) -o shptree
+	$(LINK) shptree.$(OBJ_SUFFIX) $(LIBMAP) -o shptree
 
 shptreevis: shptreevis.$(OBJ_SUFFIX) $(LIBMAP)
-	$(LINK) shptreevis.$(OBJ_SUFFIX) $(EXE_LDFLAGS) -o shptreevis
+	$(LINK) shptreevis.$(OBJ_SUFFIX) $(LIBMAP) -o shptreevis
 
 shptreetst: shptreetst.$(OBJ_SUFFIX) $(LIBMAP)
-	$(LINK) shptreetst.$(OBJ_SUFFIX) $(EXE_LDFLAGS) -o shptreetst
+	$(LINK) shptreetst.$(OBJ_SUFFIX) $(LIBMAP) -o shptreetst
 
 sortshp: sortshp.$(OBJ_SUFFIX) $(LIBMAP)
-	$(LINK) sortshp.$(OBJ_SUFFIX) $(EXE_LDFLAGS) -o sortshp
+	$(LINK) sortshp.$(OBJ_SUFFIX) $(LIBMAP) -o sortshp
 
 tile4ms: tile4ms.$(OBJ_SUFFIX) $(LIBMAP)
-	$(LINK) tile4ms.$(OBJ_SUFFIX) $(EXE_LDFLAGS) -o tile4ms
+	$(LINK) tile4ms.$(OBJ_SUFFIX) $(LIBMAP) -o tile4ms
 
 msencrypt: msencrypt.$(OBJ_SUFFIX) $(LIBMAP)
-	$(LINK) msencrypt.$(OBJ_SUFFIX) $(EXE_LDFLAGS) -o msencrypt
+	$(LINK) msencrypt.$(OBJ_SUFFIX) $(LIBMAP) -o msencrypt
 
 testexpr: testexpr.$(OBJ_SUFFIX) mapparser.$(OBJ_SUFFIX) maplexer.$(OBJ_SUFFIX) $(LIBMAP)
-	$(LINK) testexpr.$(OBJ_SUFFIX) $(EXE_LDFLAGS) -o testexpr
+	$(LINK) testexpr.$(OBJ_SUFFIX) $(LIBMAP) -o testexpr
 
 testcopy: testcopy.$(OBJ_SUFFIX) $(LIBMAP)
-	$(LINK) testcopy.$(OBJ_SUFFIX) $(EXE_LDFLAGS) -o testcopy
+	$(LINK) testcopy.$(OBJ_SUFFIX) $(LIBMAP) -o testcopy
 
 test_mapcrypto: mapcrypto.c mapserver.h $(LIBMAP)
-	$(LINK) mapcrypto.c -DTEST_MAPCRYPTO $(EXE_LDFLAGS) -o test_mapcrypto
+	$(LINK) mapcrypto.c -DTEST_MAPCRYPTO $(LIBMAP) -o test_mapcrypto
 
 mapscriptvars:	Makefile
 	touch mapscriptvars
 	pwd > mapscriptvars
 	echo $(IGNORE_MISSING_DATA) $(USE_POINT_Z_M) $(STRINGS) @ALL_ENABLED@ >> mapscriptvars
 	echo -I. $(PROJ_INC) $(GD_INC) $(TTF_INC) $(JPEG_INC) $(SDE_INC) $(OGR_INC) $(GDAL_INC) $(GEOS_INC) >> mapscriptvars
+	echo $(LIBMAP) >> mapscriptvars
 	echo $(EXE_LDFLAGS) >> mapscriptvars
 	grep '#define MS_VERSION ' mapserver.h >> mapscriptvars
 

astyle.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+ASTYLEOPTS="--style=kr --indent=spaces=2 -c --lineend=linux -S"
+ASTYLEBIN=astyle
+
+$ASTYLEBIN $ASTYLEOPTS *.c *.h *.cpp opengl/*.h
+$ASTYLEBIN $ASTYLEOPTS -R 'mapscript/*.c'
+$ASTYLEBIN $ASTYLEOPTS -R 'mapscript/*.h'
+
+#find . -name '*.orig' -exec rm -f {} \;