[mapserver-commits] r7513 - trunk/mapserver

[svn at osgeo.org]

Author: warmerdam
Date: 2008-04-10 01:03:52 -0400 (Thu, 10 Apr 2008)
New Revision: 7513

Modified:
   trunk/mapserver/mapwcs11.c
Log:
removed requirement for gdal formats for getcoverage

Modified: trunk/mapserver/mapwcs11.c
===================================================================
--- trunk/mapserver/mapwcs11.c	2008-04-10 05:01:46 UTC (rev 7512)
+++ trunk/mapserver/mapwcs11.c	2008-04-10 05:03:52 UTC (rev 7513)
@@ -1,5 +1,5 @@
 /******************************************************************************
- * $Id:$
+ * $Id$
  *
  * Project:  MapServer
  * Purpose:  OpenGIS Web Coverage Server (WCS) 1.1.0 Implementation.  This
@@ -131,10 +131,6 @@
         tokens = (char **) calloc(map->numoutputformats,sizeof(char*));
         for( i = 0; i < map->numoutputformats; i++ )
         {
-            /* Only GDAL based formats supported. */
-            if( !EQUALN(map->outputformatlist[i]->driver,"GDAL/",5) )
-                continue;
-
             switch( map->outputformatlist[i]->renderer )
             {
                 /* seeminly normal raster format */
@@ -1078,21 +1074,11 @@
 /*      VSIL IO.                                                        */
 /* -------------------------------------------------------------------- */
 #ifdef GDAL_DCAP_VIRTUALIO
+    if( EQUALN(image->format->driver,"GDAL/",5) )
     {
         GDALDriverH hDriver;
         const char *pszExtension = image->format->extension;
 
-        if( !EQUALN(image->format->driver,"GDAL/",5) )
-        {
-            msSetError( MS_MISCERR, 
-                        "Format %s (%s) inappropriate for WCS, only GDAL based outputformats supported.",
-                        "msWCSReturnCoverage11()", 
-                        image->format->driver,
-                        image->format->mimetype );
-            return msWCSException11(map, "mapserv", "NoApplicableCode", 
-                                    params->version);
-        }
-
         msAcquireLock( TLOCK_GDAL );
         hDriver = GDALGetDriverByName( image->format->driver+5 );
         if( hDriver == NULL )