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

[svn at osgeo.org]

Author: aboudreault
Date: 2010-07-13 15:09:38 +0000 (Tue, 13 Jul 2010)
New Revision: 10345

Modified:
   branches/branch-5-6/mapserver/HISTORY.TXT
   branches/branch-5-6/mapserver/mapscale.c
Log:
Backport in 5.6: Fixed synchronized MS_UNITS and inchesPerUnits array (#3173)

Modified: branches/branch-5-6/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-6/mapserver/HISTORY.TXT	2010-07-13 15:06:53 UTC (rev 10344)
+++ branches/branch-5-6/mapserver/HISTORY.TXT	2010-07-13 15:09:38 UTC (rev 10345)
@@ -15,7 +15,7 @@
 Current version (SVN branch-5-6)
 --------------------------------
 
-- ...
+- Fixed synchronized MS_UNITS and inchesPerUnits array (#3173)
 
 Version 5.6.4 (2010-07-08):
 ---------------------------

Modified: branches/branch-5-6/mapserver/mapscale.c
===================================================================
--- branches/branch-5-6/mapserver/mapscale.c	2010-07-13 15:06:53 UTC (rev 10344)
+++ branches/branch-5-6/mapserver/mapscale.c	2010-07-13 15:09:38 UTC (rev 10345)
@@ -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)