[mapserver-commits] r10344 - trunk/mapserver

[svn at osgeo.org]

Author: aboudreault
Date: 2010-07-13 15:06:53 +0000 (Tue, 13 Jul 2010)
New Revision: 10344

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapscale.c
Log:
Fixed synchronized MS_UNITS and inchesPerUnits array (#3173)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2010-07-13 04:51:48 UTC (rev 10343)
+++ trunk/mapserver/HISTORY.TXT	2010-07-13 15:06:53 UTC (rev 10344)
@@ -20,6 +20,8 @@
   them and who understand the potential security risk (not recommended for 
   production servers or those who don't understand the security implications).
 
+- Fixed synchronized MS_UNITS and inchesPerUnits array (#3173) 
+
 - Fixed possible buffer overflow in msTmpFile() (#3484)
 
 - Fixed Using STYLEITEM AUTO, loadExpression fails when the label text contains a double quote (#3481)

Modified: trunk/mapserver/mapscale.c
===================================================================
--- trunk/mapserver/mapscale.c	2010-07-13 04:51:48 UTC (rev 10343)
+++ trunk/mapserver/mapscale.c	2010-07-13 15:06:53 UTC (rev 10344)
@@ -39,8 +39,8 @@
 /*
 ** Match this with with unit enumerations is mapserver.h
 */
-static char *unitText[6]={"in", "ft", "mi", "m", "km", "NM"};
-double inchesPerUnit[7]={1, 12, 63360.0, 39.3701, 39370.1, 72913.3858, 4374754};
+static char *unitText[9]={"in", "ft", "mi", "m", "km", "dd", "??", "??", "NM"}; //MS_PIXEL and MS_PERCENTAGE not used
+double inchesPerUnit[9]={1, 12, 63360.0, 39.3701, 39370.1, 4374754, 1, 1, 72913.3858 };
 
 
 static double roundInterval(double d)