[mapserver-commits] r10243 - branches/branch-5-6/mapserver

[svn at osgeo.org]

Author: aboudreault
Date: 2010-06-23 17:41:14 +0000 (Wed, 23 Jun 2010)
New Revision: 10243

Modified:
   branches/branch-5-6/mapserver/
   branches/branch-5-6/mapserver/HISTORY.TXT
   branches/branch-5-6/mapserver/mapfile.c
   branches/branch-5-6/mapserver/mapprojhack.c
   branches/branch-5-6/mapserver/mapserver.h
Log:
Backport 5.6: Modified mapserver units enum order to fix some problems with external softwares (#3173)


Property changes on: branches/branch-5-6/mapserver
___________________________________________________________________
Modified: svn:mergeinfo
   - /sandbox/aboudreault:9103-9193
/trunk/mapserver:9973-9982
   + /sandbox/aboudreault:9103-9193
/trunk/mapserver:9973-9982,10242

Modified: branches/branch-5-6/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-6/mapserver/HISTORY.TXT	2010-06-23 17:35:04 UTC (rev 10242)
+++ branches/branch-5-6/mapserver/HISTORY.TXT	2010-06-23 17:41:14 UTC (rev 10243)
@@ -15,6 +15,8 @@
 Version 5.6.4 (????-??-??):
 ---------------------------
 
+- Modified mapserver units enum order to fix some problems with external softwares (#3173)
+
 - fix blending of transparent layers with AGG on MSB archs (#3471)
 
 - Fixed imageObj->saveImage() sends unnecessary headers (#3418) 

Modified: branches/branch-5-6/mapserver/mapfile.c
===================================================================
--- branches/branch-5-6/mapserver/mapfile.c	2010-06-23 17:35:04 UTC (rev 10242)
+++ branches/branch-5-6/mapserver/mapfile.c	2010-06-23 17:41:14 UTC (rev 10243)
@@ -67,7 +67,7 @@
 ** Symbol to string static arrays needed for writing map files.
 ** Must be kept in sync with enumerations and defines found in mapserver.h.
 */
-static char *msUnits[9]={"INCHES", "FEET", "MILES", "METERS", "KILOMETERS", "NAUTICALMILES", "DD", "PIXELS", "PERCENTAGES"};
+static char *msUnits[9]={"INCHES", "FEET", "MILES", "METERS", "KILOMETERS", "DD", "PIXELS", "PERCENTAGES", "NAUTICALMILES"};
 static char *msLayerTypes[9]={"POINT", "LINE", "POLYGON", "RASTER", "ANNOTATION", "QUERY", "CIRCLE", "TILEINDEX","CHART"};
 char *msPositionsText[MS_POSITIONS_LENGTH] = {"UL", "LR", "UR", "LL", "CR", "CL", "UC", "LC", "CC", "AUTO", "XY", "FOLLOW"}; /* msLabelPositions[] also used in mapsymbols.c (not static) */
 static char *msBitmapFontSizes[5]={"TINY", "SMALL", "MEDIUM", "LARGE", "GIANT"};

Modified: branches/branch-5-6/mapserver/mapprojhack.c
===================================================================
--- branches/branch-5-6/mapserver/mapprojhack.c	2010-06-23 17:35:04 UTC (rev 10242)
+++ branches/branch-5-6/mapserver/mapprojhack.c	2010-06-23 17:41:14 UTC (rev 10243)
@@ -44,7 +44,7 @@
 #include "mapproject.h"
 
 enum MS_UNITS {MS_INCHES, MS_FEET, MS_MILES, MS_METERS, MS_KILOMETERS,
-               MS_NAUTICALMILES, MS_DD, MS_PIXELS};
+               MS_DD, MS_PIXELS, MS_NAUTICALMILES};
 
 
 /************************************************************************/

Modified: branches/branch-5-6/mapserver/mapserver.h
===================================================================
--- branches/branch-5-6/mapserver/mapserver.h	2010-06-23 17:35:04 UTC (rev 10242)
+++ branches/branch-5-6/mapserver/mapserver.h	2010-06-23 17:41:14 UTC (rev 10243)
@@ -377,7 +377,7 @@
 
 /* General enumerated types - needed by scripts */
 enum MS_FILE_TYPE {MS_FILE_MAP, MS_FILE_SYMBOL};
-enum MS_UNITS {MS_INCHES, MS_FEET, MS_MILES, MS_METERS, MS_KILOMETERS, MS_NAUTICALMILES, MS_DD, MS_PIXELS, MS_PERCENTAGES};
+enum MS_UNITS {MS_INCHES, MS_FEET, MS_MILES, MS_METERS, MS_KILOMETERS, MS_DD, MS_PIXELS, MS_PERCENTAGES, MS_NAUTICALMILES};
 enum MS_SHAPE_TYPE {MS_SHAPE_POINT, MS_SHAPE_LINE, MS_SHAPE_POLYGON, MS_SHAPE_NULL};
 enum MS_LAYER_TYPE {MS_LAYER_POINT, MS_LAYER_LINE, MS_LAYER_POLYGON, MS_LAYER_RASTER, MS_LAYER_ANNOTATION, MS_LAYER_QUERY, MS_LAYER_CIRCLE, MS_LAYER_TILEINDEX, MS_LAYER_CHART};
 enum MS_FONT_TYPE {MS_TRUETYPE, MS_BITMAP};