Commit d112c353 authored by Alan Boudreault's avatar Alan Boudreault

Imported upstream version 6.0.3

parent eac89801
MapServer Revision History
==========================
$Id: HISTORY.TXT 11896 2011-07-12 13:17:28Z dmorissette $
$Id$
This is a human-readable revision history which will attempt to document
required changes for users to migrate from one version of MapServer to the
......@@ -10,7 +9,99 @@ next. Developers are strongly encouraged to document their changes and
their impacts on the users here. (Please add the most recent changes to
the top of the list.)
For a complete change history, please see the Subversion log comments.
For a complete change history, please see the Git log comments.
Version 6.0.3 (2012-05-18):
---------------------------
- Fix creation of a vector symbolObj in mapscript (#4318)
- Added coverage metadata in WCS (#4306)
- Adjusted WCS 2.0 GetCapbilities response (#4003)
- Ignore unknown requets parameteres in WCS 2.0 (#4307).
- Fixed mapscript is unusable in a web application due to
memory leaks (#4262)
- Fixed getFeature request with custom output format fails on filter
encoding (#4190)
- Fixed resolution when UoM changes in WCS 2.0 (#4283)
- Added missing DEFRESOLUTION parameter to msCopyMap() function (#4272)
- Fixed Python MapScript layerObj/classObj Error (#3940)
- Fixed WCS 2.0 axis order, offset vector, and origin (#4006, #4191)
- Fixed PHP MapScript opacity property of StyleObj no longer works (#3920)
- Added MS_CJC_* constants in PHP/MapScript (#4183)
- Fixed Memory leak with fribidi strings (#4188)
- Added missing properties in styleObj setter of PHP/MapScript (#3901)
Version 6.0.2 (2012-02-08):
---------------------------
- Fix security issue with quote escape in WFS GetFeature Filter (#4087)
- Fixed lexer buffer size issue with single quotes in a string (#4175)
- Raster layer fails to be drawn if the window is less than half a pixel (#4172)
- Fixed SLD with FILTER doesn't apply properly to database layers (#4112)
- Fixed a problem with calls to labelInImage() (maplabel.c) when label gutter
and label buffers are both used (#3303). Also changed the usage around that
function to make it easier to understand. At a result the
"labelcache_map_edge_buffer" processing option (i.e. gutter) can be provided
as a positive or negative value. (closes #1355 too)
- Added label->style markers to collision detection (#4133)
- Fixed single pixel coverages in WCS 2.0 (#4110)
- Fixed subsetting in WCS 2.0 (#4099)
- Fixed segfault when calling classObj::updateFromString() with SYMBOL (#4062)
- fix rendering offset on thick GD lines (#3962)
- fix segfault on join with postgresql tables (#4074)
- Fixed Python Mapscript does not write COLOR to reference map (#4042)
- Fixed cannot add a style to a label in PHP/SWIG Mapscript (#4038)
- Add missing outputFormat support in WFS GetFeature POST XML requests (#4052)
- Fixed schema validity issue for WCS 1.1 GetCoverage responses (#4047)
- fix centroid geomtransform parser (#4029)
- PHP MapScript is missing many styleObj properties (#3901)
- Added GEOMTRANSFORM in writeStyle function
- WCS 1.0: Fix crash with some _rangeset_axes values (#4020)
- Changed msDrawVectorLayer() not to cache shapes if attribute binding is
present after the first style (#3976)
- Fix mapscript to build when TRUE macro is not defined (#3926)
- Fix mapscript php build issues with MSVC (#4004)
- PHP/Mapscript: Segmentation fault when getting complex object using
PHP 5.2 (#3930)
- Fixed contains operator in logical expresions (#3974)
- Fix incorrect rendering of GD lines between 1 and 2 pixels wide (#3962)
Version 6.0.1 (2011-07-12):
---------------------------
......@@ -23,6 +114,8 @@ IMPORTANT SECURITY FIXES:
enabled, with layers connecting to an SQL RDBMS backend, either
natively or via OGR (#3903)
Other fixes:
- Applied patch for ticket (symbol writing issues) (#3589)
- Fix performance issue with Oracle and scrollable cursors (#3905)
......
......@@ -123,7 +123,7 @@ allow us to support all features across all rendering drivers (GD,AGG,PDF,SVG, e
Mapfile Changes - line styling
------------------------------
All line styling must now be specified in layer STYLEs.
All line styling must now be specified in class STYLEs in the layer definition.
The following parameters/keywords have been moved from SYMBOL
to STYLE:
......
......@@ -9,7 +9,7 @@
# - Run the VCVARS32.BAT script to initialize the VC++ environment variables
# - Start the build with: nmake /f makefile.vc
#
# $Id: Makefile.vc 11154 2011-03-11 19:59:30Z aboudreault $
# $Id$
#
MAPSERVER_ROOT = .
......
......@@ -774,7 +774,7 @@ Java Mapscript Module:
http://trac.osgeo.org/mapserver/tickets/1209
----------------
$Id: README.CONFIGURE 11680 2011-05-12 13:07:06Z dmorissette $
$Id$
----------------
......
......@@ -191,4 +191,4 @@ The best option is to download the zip file containing the source code and build
- uncomment in the nmake.opt the flags related to PDF
$Id: README.WIN32 6833 2007-09-05 22:08:13Z hobu $
$Id$
/******************************************************************************
* $Id: cgiutil.c 11452 2011-04-04 13:25:43Z aboudreault $
* $Id$
*
* Project: MapServer
* Purpose: cgiRequestObj and CGI parameter parsing.
......@@ -36,7 +36,7 @@
#include "mapserver.h"
#include "cgiutil.h"
MS_CVSID("$Id: cgiutil.c 11452 2011-04-04 13:25:43Z aboudreault $")
MS_CVSID("$Id$")
#define LF 10
#define CR 13
......
/******************************************************************************
* $Id: cgiutil.h 10645 2010-10-22 20:42:59Z aboudreault $
* $Id$
*
* Project: MapServer
* Purpose: cgiRequestObj and CGI parsing utility related declarations.
......
/******************************************************************************
* $Id: classobject.c 7347 2008-02-06 16:55:30Z nsavard $
* $Id$
*
* Project: MapServer
* Purpose: Functions for operating on a classObj that don't belong in a
......@@ -36,7 +36,7 @@
# include "cpl_conv.h"
#endif
MS_CVSID("$Id: classobject.c 7347 2008-02-06 16:55:30Z nsavard $")
MS_CVSID("$Id$")
/**
* Move the style up inside the array of styles.
......
dnl **************************************************************************
dnl $Id: configure.in 11618 2011-04-27 15:06:17Z dmorissette $
dnl $Id$
dnl
dnl Project: MapServer
dnl Purpose: Main autoconf script ( Process this file with autoconf to
......
/******************************************************************************
* $Id: layerobject.c 11373 2011-03-29 23:37:29Z dmorissette $
* $Id$
*
* Project: MapServer
* Purpose: Functions for operating on a layerObj that don't belong in a
......@@ -36,7 +36,7 @@
# include "cpl_conv.h"
#endif
MS_CVSID("$Id: layerobject.c 11373 2011-03-29 23:37:29Z dmorissette $")
MS_CVSID("$Id$")
/* ===========================================================================
msInsertClass
......
/******************************************************************************
* $Id: legend.c 11372 2011-03-29 23:34:57Z dmorissette $
* $Id$
*
* Project: MapServer
* Purpose: Mainline of commandline legend generation test utility.
......@@ -29,7 +29,7 @@
#include "mapserver.h"
MS_CVSID("$Id: legend.c 11372 2011-03-29 23:34:57Z dmorissette $")
MS_CVSID("$Id$")
int main(int argc, char *argv[])
{
......
/******************************************************************************
* $Id: mapagg.cpp 11615 2011-04-21 10:13:42Z tbonfort $
* $Id$
*
* Project: MapServer
* Purpose: AGG rendering and other AGG related functions.
......
/******************************************************************************
* $Id: mapagg.h 10743 2010-11-19 17:05:38Z tbonfort $
* $Id$
*
* Project: MapServer
* Purpose: AGG template library types.
......
/******************************************************************************
* $Id: mapaxisorder.h 11646 2011-05-04 18:46:39Z assefa $
* $Id$
*
* Project: MapServer
* Purpose: Axis lookup table
......
/******************************************************************************
* $Id: mapbits.c 10017 2010-03-26 05:01:03Z warmerdam $
* $Id$
*
* Project: MapServer
* Purpose: Implementation of bit array functions.
......@@ -32,7 +32,7 @@
#include "mapserver.h"
MS_CVSID("$Id: mapbits.c 10017 2010-03-26 05:01:03Z warmerdam $")
MS_CVSID("$Id$")
#include <limits.h>
......
/******************************************************************************
* $Id: mapcairo.c 11591 2011-04-18 10:13:01Z tbonfort $
* $Id$
*
* Project: MapServer
* Purpose: Cairo Rendering functions
......
/******************************************************************************
* $Id: mapchart.c 11881 2011-07-07 19:55:43Z sdlime $
* $Id$
*
* Project: MapServer
* Purpose: Implementation of dynamic charting (MS-RFC-29)
......@@ -30,7 +30,7 @@
#include "mapserver.h"
MS_CVSID("$Id: mapchart.c 11881 2011-07-07 19:55:43Z sdlime $")
MS_CVSID("$Id$")
#define MS_CHART_TYPE_PIE 1
#define MS_CHART_TYPE_BAR 2
......
/******************************************************************************
* $Id: mapcluster.c 11881 2011-07-07 19:55:43Z sdlime $
* $Id$
*
* Project: MapServer
* Purpose: Implementation of the cluster layer data provider (RFC-69).
......@@ -29,11 +29,11 @@
#define _CRT_SECURE_NO_WARNINGS 1
/* $Id: mapcluster.c 11881 2011-07-07 19:55:43Z sdlime $ */
/* $Id$ */
#include <assert.h>
#include "mapserver.h"
MS_CVSID("$Id: mapcluster.c 11881 2011-07-07 19:55:43Z sdlime $")
MS_CVSID("$Id$")
#ifdef USE_CLUSTER_PLUGIN
......
/**********************************************************************
* $Id: mapcontext.c 10883 2011-01-21 19:38:21Z aboudreault $
* $Id$
*
* Project: MapServer
* Purpose: OGC Web Map Context implementation
......@@ -28,7 +28,7 @@
#include "mapserver.h"
MS_CVSID("$Id: mapcontext.c 10883 2011-01-21 19:38:21Z aboudreault $")
MS_CVSID("$Id$")
#if defined(USE_WMS_LYR) && defined(USE_OGR)
......
/******************************************************************************
* $Id: mapcopy.c 11084 2011-03-06 12:15:20Z rouault $
* $Id$
*
* Project: MapServer
* Purpose: Functions to allow copying/cloning of maps
......@@ -45,7 +45,7 @@
#include "mapserver.h"
#include "mapsymbol.h"
MS_CVSID("$Id: mapcopy.c 11084 2011-03-06 12:15:20Z rouault $")
MS_CVSID("$Id$")
#include "mapcopy.h"
......@@ -977,6 +977,7 @@ int msCopyMap(mapObj *dst, mapObj *src)
MS_COPYSTELEM(cellsize);
MS_COPYSTELEM(units);
MS_COPYSTELEM(scaledenom);
MS_COPYSTELEM(defresolution);
MS_COPYSTELEM(resolution);
MS_COPYSTRING(dst->shapepath, src->shapepath);
MS_COPYSTRING(dst->mappath, src->mappath);
......
/******************************************************************************
* $Id: mapcopy.h 9093 2009-06-07 09:52:59Z tbonfort $
* $Id$
*
* Project: MapServer
* Purpose: Declarations related to copyng mapObjs. Provided by Mladen Turk
......
/******************************************************************************
* $Id: mapcpl.c 10678 2010-10-28 13:38:27Z aboudreault $
* $Id$
*
* Project: MapServer
* Purpose: Functions copied from GDAL's CPL. This file contain utility
......@@ -36,12 +36,12 @@
* DEALINGS IN THE SOFTWARE.
****************************************************************************/
/* $Id: mapcpl.c 10678 2010-10-28 13:38:27Z aboudreault $ */
/* $Id$ */
#include <assert.h>
#include "mapserver.h"
MS_CVSID("$Id: mapcpl.c 10678 2010-10-28 13:38:27Z aboudreault $")
MS_CVSID("$Id$")
/* should be size of largest possible filename */
#define MS_PATH_BUF_SIZE 2048
......
/******************************************************************************
* $Id: mapcrypto.c 10678 2010-10-28 13:38:27Z aboudreault $
* $Id$
*
* Project: MapServer
* Purpose: Encryption functions (see MS-RFC-18)
......@@ -34,7 +34,7 @@
#include "mapserver.h"
MS_CVSID("$Id: mapcrypto.c 10678 2010-10-28 13:38:27Z aboudreault $")
MS_CVSID("$Id$")
/**********************************************************************
......
/******************************************************************************
* $Id: mapdebug.c 11503 2011-04-07 19:56:16Z dmorissette $
* $Id$
*
* Project: MapServer
* Purpose: Implementation of debug/logging, msDebug() and related functions.
......@@ -48,7 +48,7 @@
#include <windows.h> /* OutputDebugStringA() */
#endif
MS_CVSID("$Id: mapdebug.c 11503 2011-04-07 19:56:16Z dmorissette $")
MS_CVSID("$Id$")
#ifndef USE_THREAD
......
This diff is collapsed.
/******************************************************************************
* $Id: mapdrawgdal.c 11176 2011-03-16 19:01:00Z schpidi $
* $Id$
*
* Project: MapServer
* Purpose: Code for drawing GDAL raster layers. Called from
......@@ -33,7 +33,7 @@
#include "mapresample.h"
#include "mapthread.h"
MS_CVSID("$Id: mapdrawgdal.c 11176 2011-03-16 19:01:00Z schpidi $")
MS_CVSID("$Id$")
extern int InvGeoTransform( double *gt_in, double *gt_out );
......@@ -250,6 +250,18 @@ int msDrawRasterLayerGDAL(mapObj *map, layerObj *layer, imageObj *image,
src_ysize = MIN(MAX(0,(int) (lly - ury + 0.5)),
GDALGetRasterYSize(hDS) - src_yoff);
/* We want very small windows to use at least one source pixel (#4172) */
if( src_xsize == 0 && (urx - llx) > 0.0 )
{
src_xsize = 1;
src_xoff = MIN(src_xoff,GDALGetRasterXSize(hDS)-1);
}
if( src_ysize == 0 && (lly - ury) > 0.0 )
{
src_ysize = 1;
src_yoff = MIN(src_yoff,GDALGetRasterYSize(hDS)-1);
}
if( src_xsize == 0 || src_ysize == 0 )
{
if( layer->debug )
......
/******************************************************************************
* $Id: mapdummyrenderer.c 11592 2011-04-18 10:15:18Z tbonfort $
* $Id$
*
* Project: MapServer
* Purpose: Dummy functions to implement when using a pluggable renderer
......
/******************************************************************************
* $Id: mapentities.h 7056 2007-11-20 10:05:50Z tbonfort $
* $Id$
*
* Project: MapServer
* Purpose: HTML entity to unicode lookup table
......
/******************************************************************************
* $Id: maperror.c 11415 2011-03-31 08:50:39Z tbonfort $
* $Id$
*
* Project: MapServer
* Purpose: Implementation of msSetError(), msDebug() and related functions.
......@@ -41,7 +41,7 @@
#endif
#include <stdarg.h>
MS_CVSID("$Id: maperror.c 11415 2011-03-31 08:50:39Z tbonfort $")
MS_CVSID("$Id$")
static char *ms_errorCodes[MS_NUMERRORCODES] = {"",
"Unable to access file.",
......
/******************************************************************************
* $Id: maperror.h 11128 2011-03-09 20:38:48Z dmorissette $
* $Id$
*
* Project: MapServer
* Purpose: Declarations for Error and Debug functions.
......
This diff is collapsed.
/******************************************************************************
* $Id: mapfile.h 11177 2011-03-16 19:29:01Z sdlime $
* $Id$
*
* Project: MapServer
* Purpose: Keyword definitions for the mapfiles and symbolfiles.
......
/******************************************************************************
* $Id: mapgd.c 11583 2011-04-15 10:01:11Z tbonfort $
* $Id$
*
* Project: MapServer
* Purpose: GD rendering functions (using renderer plugin API)
......@@ -344,14 +344,14 @@ int renderLineGD(imageObj *img, shapeObj *p, strokeStyleObj *stroke)
}
if(stroke->width > 1) {
int brush_fc;
brush = gdImageCreate(stroke->width, stroke->width);
int brush_fc;
brush = gdImageCreate(ceil(stroke->width), ceil(stroke->width));
gdImageColorAllocate(brush, gdImageRed(ip,0), gdImageGreen(ip, 0), gdImageBlue(ip, 0));
gdImageColorTransparent(brush,0);
brush_fc = gdImageColorAllocate(brush, gdImageRed(ip,stroke->color->pen),
gdImageGreen(ip,stroke->color->pen), gdImageBlue(ip,stroke->color->pen));
gdImageFilledEllipse(brush,MS_NINT(stroke->width/2),MS_NINT(stroke->width/2),
stroke->width,stroke->width, brush_fc);
gdImageFilledEllipse(brush,MS_NINT(brush->sx/2),MS_NINT(brush->sy/2),
MS_NINT(stroke->width),MS_NINT(stroke->width), brush_fc);
gdImageSetBrush(ip, brush);
if(stroke->patternlength > 0) {
c = gdStyledBrushed;
......
/******************************************************************************
* $Id: mapgdal.c 11218 2011-03-18 13:41:32Z warmerdam $
* $Id$
*
* Project: MapServer
* Purpose: Implementation of support for output using GDAL.
......@@ -31,7 +31,7 @@
#include "mapserver.h"
#include "mapthread.h"
MS_CVSID("$Id: mapgdal.c 11218 2011-03-18 13:41:32Z warmerdam $")
MS_CVSID("$Id$")
#if defined(USE_GDAL) || defined(USE_OGR)
#include "cpl_conv.h"
......
/******************************************************************************
* $Id: mapgeomtransform.c 11513 2011-04-10 09:50:28Z tbonfort $
* $Id$
*
* Project: MapServer
* Purpose: RFC48 implementation of geometry transformations for styling
......@@ -53,6 +53,9 @@ void msStyleSetGeomTransform(styleObj *s, char *transform) {
else if(!strncasecmp("labelpoly",transform,9)) {
s->_geomtransform.type = MS_GEOMTRANSFORM_LABELPOLY;
}
else if(!strncasecmp("centroid",transform,8)) {
s->_geomtransform.type = MS_GEOMTRANSFORM_CENTROID;
}
else {
s->_geomtransform.type = MS_GEOMTRANSFORM_NONE;
msSetError(MS_MISCERR,"unknown transform expression","msStyleSetGeomTransform()");
......
/******************************************************************************
* $Id: mapgeomutil.cpp 11592 2011-04-18 10:15:18Z tbonfort $
* $Id$
*
* Project: MapServer
* Purpose: Rendering utility functions
......
/******************************************************************************
* $Id: mapgeos.c 11470 2011-04-05 20:11:33Z tamas $
* $Id$
*
* Project: MapServer
* Purpose: MapServer-GEOS integration.
......
/******************************************************************************
* $Id: mapgml.c 11544 2011-04-12 12:38:18Z aboudreault $
* $Id$
*
* Project: MapServer
* Purpose: shapeObj to GML output via MapServer queries.
......@@ -31,7 +31,7 @@
#include "maperror.h"
#include "mapgml.h"
MS_CVSID("$Id: mapgml.c 11544 2011-04-12 12:38:18Z aboudreault $")
MS_CVSID("$Id$")
/* Use only mapgml.c if WMS or WFS is available (with minor exceptions at end)*/
......
/******************************************************************************
* $Id: mapgml.h 7504 2008-04-08 21:13:45Z nsavard $
* $Id$
*
* Project: MapServer
* Purpose: Headers for mapgml.c. shapeObj to GML output via MapServer
......
/**********************************************************************
* $Id: mapgraticule.c 11881 2011-07-07 19:55:43Z sdlime $
* $Id$
*
* Project: MapServer
* Purpose: Graticule Renderer
......@@ -30,7 +30,7 @@
#include <assert.h>
#include "mapproject.h"
MS_CVSID("$Id: mapgraticule.c 11881 2011-07-07 19:55:43Z sdlime $")
MS_CVSID("$Id$")
/**********************************************************************************************************************
*
......
/******************************************************************************
* $Id: maphash.c 10772 2010-11-29 18:27:02Z aboudreault $
* $Id$
*
* Project: MapServer
* Purpose: Implement hashTableObj class.
......@@ -32,7 +32,7 @@
#include "mapserver.h"
#include "maphash.h"
MS_CVSID("$Id: maphash.c 10772 2010-11-29 18:27:02Z aboudreault $")
MS_CVSID("$Id$")
static unsigned hash(const char *key)
{
......