[mapserver-commits] r9719 - trunk/mapserver

[svn at osgeo.org]

Author: aboudreault
Date: 2010-01-20 17:30:07 -0500 (Wed, 20 Jan 2010)
New Revision: 9719

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/maporaclespatial.c
Log:
Added support of 44xx gtypes in oracle spatial driver (#2830)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2010-01-20 22:30:06 UTC (rev 9718)
+++ trunk/mapserver/HISTORY.TXT	2010-01-20 22:30:07 UTC (rev 9719)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Added support of 44xx gtypes in oracle spatial driver (#2830)
+
 - Fixed curl proxy auth support for http connections (#571)
 
 - PHP/MapScript: removed deprecated class properties (#2170)

Modified: trunk/mapserver/maporaclespatial.c
===================================================================
--- trunk/mapserver/maporaclespatial.c	2010-01-20 22:30:06 UTC (rev 9718)
+++ trunk/mapserver/maporaclespatial.c	2010-01-20 22:30:07 UTC (rev 9719)
@@ -1514,10 +1514,10 @@
 static int osCheck4DGtype(int pIntGtype)
 {
   
-  if (pIntGtype > 4000 && pIntGtype < 4308)
+  if (pIntGtype > 4000 && pIntGtype < 4408)
    {
       if (pIntGtype > 4007)
-          pIntGtype-= 300;
+          pIntGtype-= 400;
 
       if (pIntGtype <= 4007 && pIntGtype != 4004)
            return MS_TRUE;