[mapserver-commits] r11830 - branches/branch-6-0/mapserver

[svn at osgeo.org]

Author: warmerdam
Date: 2011-06-17 06:45:41 -0700 (Fri, 17 Jun 2011)
New Revision: 11830

Modified:
   branches/branch-6-0/mapserver/HISTORY.TXT
   branches/branch-6-0/mapserver/mapprojhack.c
Log:
Fix GetMapserverUnitUsingProj() for proj=latlong (#3883)

Modified: branches/branch-6-0/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-6-0/mapserver/HISTORY.TXT	2011-06-17 13:44:38 UTC (rev 11829)
+++ branches/branch-6-0/mapserver/HISTORY.TXT	2011-06-17 13:45:41 UTC (rev 11830)
@@ -48,6 +48,9 @@
 - Improve rangeset item checking so that Bands=1,2,3 is supported with WCS 1.0
   (#3919).
 
+- Fix GetMapserverUnitUsingProj() for proj=latlong (#3883)
+
+
 Version 6.0.0 (2011-05-11)
 --------------------------
 

Modified: branches/branch-6-0/mapserver/mapprojhack.c
===================================================================
--- branches/branch-6-0/mapserver/mapprojhack.c	2011-06-17 13:44:38 UTC (rev 11829)
+++ branches/branch-6-0/mapserver/mapprojhack.c	2011-06-17 13:45:41 UTC (rev 11830)
@@ -81,8 +81,13 @@
 int GetMapserverUnitUsingProj(projectionObj *psProj)
 {
 #ifdef USE_PROJ
-    char *proj_str = pj_get_def( psProj->proj, 0 );
+    char *proj_str;
 
+    if( pj_is_latlong( psProj ) )
+        return MS_DD;
+
+    proj_str = pj_get_def( psProj->proj, 0 );
+
 /* -------------------------------------------------------------------- */
 /*      Handle case of named units.                                     */
 /* -------------------------------------------------------------------- */