Code cleanup related to registering and deregistering GDAL drivers

git-svn-id: http://svn.osgeo.org/postgis/trunk@8704 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/raster/rt_core/rt_api.c b/raster/rt_core/rt_api.c
index 84b421cc68e8555aa1bf8fbaed9f7147037dcacf..a6ec2878273bf53b8ea38bcc479e9132b936e264 100644 (file)
--- a/raster/rt_core/rt_api.c
+++ b/raster/rt_core/rt_api.c
@@ -305,7 +305,7 @@ rt_util_extent_type(const char *name) {
 }
 
 char*
-rt_util_gdal_sr(const char *srs, int proj4) {
+rt_util_gdal_convert_sr(const char *srs, int proj4) {
        OGRSpatialReferenceH hsrs;
        char *rtn = NULL;
 
@@ -317,19 +317,40 @@ rt_util_gdal_sr(const char *srs, int proj4) {
                        OSRExportToWkt(hsrs, &rtn);
        }
        else {
-               rterror("rt_util_gdal_sr: Could not process the provided srs:%s", srs);
+               rterror("rt_util_gdal_convert_sr: Could not process the provided srs:%s", srs);
                return NULL;
        }
 
        OSRDestroySpatialReference(hsrs);
        if (rtn == NULL) {
-               rterror("rt_util_gdal_sr: Could not process the provided srs:%s", srs);
+               rterror("rt_util_gdal_convert_sr: Could not process the provided srs:%s", srs);
                return NULL;
        }
 
        return rtn;
 }
 
+int
+rt_util_gdal_driver_registered(const char *drv) {
+       int count = GDALGetDriverCount();
+       int i = 0;
+       GDALDriverH hdrv = NULL;
+
+       if (drv == NULL || !strlen(drv) || count < 1)
+               return 0;
+
+       for (i = 0; i < count; i++) {
+               hdrv = GDALGetDriver(i);
+               if (hdrv == NULL) continue;
+
+               if (strcmp(drv, GDALGetDriverShortName(hdrv)) == 0)
+                       return 1;
+       }
+
+       return 0;
+}
+
+
 /*- rt_context -------------------------------------------------------*/
 
 /* Functions definitions */
@@ -4603,9 +4624,6 @@ rt_raster_dump_as_wktpolygons(rt_raster raster, int nband, int * pnElements)
     if (NULL == memdatasource) {
         rterror("rt_raster_dump_as_wktpolygons: Couldn't create a OGR Datasource to store pols\n");
         GDALClose(memdataset);
-        GDALDeregisterDriver(gdal_drv);
-        GDALDestroyDriver(gdal_drv);
-
         return 0;
     }
 
@@ -4616,8 +4634,6 @@ rt_raster_dump_as_wktpolygons(rt_raster raster, int nband, int * pnElements)
         rterror("rt_raster_dump_as_wktpolygons: MEM driver can't create new layers, aborting\n");
         /* xxx jorgearevalo: what should we do now? */
         GDALClose(memdataset);
-        GDALDeregisterDriver(gdal_drv);
-        GDALDestroyDriver(gdal_drv);
         OGRReleaseDataSource(memdatasource);
         return 0;
     }
@@ -4639,8 +4655,6 @@ rt_raster_dump_as_wktpolygons(rt_raster raster, int nband, int * pnElements)
     if (NULL == hLayer) {
         rterror("rt_raster_dump_as_wktpolygons: Couldn't create layer to store polygons");
         GDALClose(memdataset);
-        GDALDeregisterDriver(gdal_drv);
-        GDALDestroyDriver(gdal_drv);
         OGRReleaseDataSource(memdatasource);
         return 0;
     }
@@ -4669,8 +4683,6 @@ rt_raster_dump_as_wktpolygons(rt_raster raster, int nband, int * pnElements)
     if (NULL == gdal_band) {
         rterror("rt_raster_dump_as_wktpolygons: Couldn't get GDAL band to polygonize");
         GDALClose(memdataset);
-        GDALDeregisterDriver(gdal_drv);
-        GDALDestroyDriver(gdal_drv);
 
         OGR_Fld_Destroy(hFldDfn);
         OGR_DS_DeleteLayer(memdatasource, 0);
@@ -4726,8 +4738,6 @@ rt_raster_dump_as_wktpolygons(rt_raster raster, int nband, int * pnElements)
         rterror("rt_raster_dump_as_wktpolygons: Couldn't allocate memory for "
                 "geomval structure");
         GDALClose(memdataset);
-        GDALDeregisterDriver(gdal_drv);
-        GDALDestroyDriver(gdal_drv);
 
         OGR_Fld_Destroy(hFldDfn);
         OGR_DS_DeleteLayer(memdatasource, 0);
@@ -4782,8 +4792,6 @@ rt_raster_dump_as_wktpolygons(rt_raster raster, int nband, int * pnElements)
     RASTER_DEBUG(3, "destroying GDAL MEM raster");
 
     GDALClose(memdataset);
-    GDALDeregisterDriver(gdal_drv);
-    GDALDestroyDriver(gdal_drv);
 
     RASTER_DEBUG(3, "destroying OGR MEM vector");
 
@@ -6466,10 +6474,6 @@ rt_raster_to_gdal(rt_raster raster, const char *srs,
        src_ds = rt_raster_to_gdal_mem(raster, srs, NULL, 0, &src_drv);
        if (NULL == src_ds) {
                rterror("rt_raster_to_gdal: Unable to convert raster to GDAL MEM format\n");
-               if (NULL != src_drv) {
-                       GDALDeregisterDriver(src_drv);
-                       GDALDestroyDriver(src_drv);
-               }
                return 0;
        }
 
@@ -6478,8 +6482,6 @@ rt_raster_to_gdal(rt_raster raster, const char *srs,
        if (NULL == rtn_drv) {
                rterror("rt_raster_to_gdal: Unable to load the output GDAL driver\n");
                GDALClose(src_ds);
-               GDALDeregisterDriver(src_drv);
-               GDALDestroyDriver(src_drv);
                return 0;
        }
        RASTER_DEBUG(3, "rt_raster_to_gdal: Output driver loaded");
@@ -6498,23 +6500,15 @@ rt_raster_to_gdal(rt_raster raster, const char *srs,
        if (NULL == rtn_ds) {
                rterror("rt_raster_to_gdal: Unable to create the output GDAL dataset\n");
                GDALClose(src_ds);
-               GDALDeregisterDriver(rtn_drv);
-               GDALDestroyDriver(rtn_drv);
-               GDALDeregisterDriver(src_drv);
-               GDALDestroyDriver(src_drv);
                return 0;
        }
 
        /* close source dataset */
        GDALClose(src_ds);
-       GDALDeregisterDriver(src_drv);
-       GDALDestroyDriver(src_drv);
        RASTER_DEBUG(3, "rt_raster_to_gdal: Closed GDAL MEM raster");
 
        /* close dataset, this also flushes any pending writes */
        GDALClose(rtn_ds);
-       GDALDeregisterDriver(rtn_drv);
-       GDALDestroyDriver(rtn_drv);
        RASTER_DEBUG(3, "rt_raster_to_gdal: Closed GDAL output raster");
 
        RASTER_DEBUG(3, "rt_raster_to_gdal: Done copying GDAL MEM raster to memory file in output format");
@@ -6632,7 +6626,6 @@ GDALDatasetH
 rt_raster_to_gdal_mem(rt_raster raster, const char *srs,
        uint32_t *bandNums, int count, GDALDriverH *rtn_drv) {
        GDALDriverH drv = NULL;
-       int drv_gen = 0;
        GDALDatasetH ds = NULL;
        double gt[6] = {0.0};
        CPLErr cplerr;
@@ -6653,26 +6646,19 @@ rt_raster_to_gdal_mem(rt_raster raster, const char *srs,
        assert(NULL != raster);
 
        /* store raster in GDAL MEM raster */
-       GDALRegister_MEM();
-       if (NULL == *rtn_drv) {
-               drv = GDALGetDriverByName("MEM");
-               if (NULL == drv) {
-                       rterror("rt_raster_to_gdal_mem: Unable to load the MEM GDAL driver\n");
-                       return 0;
-               }
-
-               *rtn_drv = drv;
-               drv_gen = 1;
+       if (!rt_util_gdal_driver_registered("MEM"))
+               GDALRegister_MEM();
+       drv = GDALGetDriverByName("MEM");
+       if (NULL == drv) {
+               rterror("rt_raster_to_gdal_mem: Unable to load the MEM GDAL driver\n");
+               return 0;
        }
+       *rtn_drv = drv;
 
        ds = GDALCreate(drv, "", rt_raster_get_width(raster),
                rt_raster_get_height(raster), 0, GDT_Byte, NULL);
        if (NULL == ds) {
                rterror("rt_raster_to_gdal_mem: Could not create a GDALDataset to convert into\n");
-               if (drv_gen) {
-                       GDALDeregisterDriver(drv);
-                       GDALDestroyDriver(drv);
-               }
                return 0;
        }
 
@@ -6682,10 +6668,6 @@ rt_raster_to_gdal_mem(rt_raster raster, const char *srs,
        if (cplerr != CE_None) {
                rterror("rt_raster_to_gdal_mem: Unable to set geotransformation\n");
                GDALClose(ds);
-               if (drv_gen) {
-                       GDALDeregisterDriver(drv);
-                       GDALDestroyDriver(drv);
-               }
                return 0;
        }
 
@@ -6695,10 +6677,6 @@ rt_raster_to_gdal_mem(rt_raster raster, const char *srs,
                if (cplerr != CE_None) {
                        rterror("rt_raster_to_gdal_mem: Unable to set projection\n");
                        GDALClose(ds);
-                       if (drv_gen) {
-                               GDALDeregisterDriver(drv);
-                               GDALDestroyDriver(drv);
-                       }
                        return 0;
                }
                RASTER_DEBUGF(3, "Projection set to: %s", srs);
@@ -6711,10 +6689,6 @@ rt_raster_to_gdal_mem(rt_raster raster, const char *srs,
                        if (bandNums[i] < 0 || bandNums[i] >= numBands) {
                                rterror("rt_raster_to_gdal_mem: The band index %d is invalid\n", bandNums[i]);
                                GDALClose(ds);
-                               if (drv_gen) {
-                                       GDALDeregisterDriver(drv);
-                                       GDALDestroyDriver(drv);
-                               }
                                return 0;
                        }
                }
@@ -6725,10 +6699,6 @@ rt_raster_to_gdal_mem(rt_raster raster, const char *srs,
                if (NULL == bandNums) {
                        rterror("rt_raster_to_gdal_mem: Unable to allocate memory for band indices\n");
                        GDALClose(ds);
-                       if (drv_gen) {
-                               GDALDeregisterDriver(drv);
-                               GDALDestroyDriver(drv);
-                       }
                        return 0;
                }
                allocBandNums = 1;
@@ -6742,10 +6712,6 @@ rt_raster_to_gdal_mem(rt_raster raster, const char *srs,
                        rterror("rt_raster_to_gdal_mem: Unable to get requested band index %d\n", bandNums[i]);
                        if (allocBandNums) rtdealloc(bandNums);
                        GDALClose(ds);
-                       if (drv_gen) {
-                               GDALDeregisterDriver(drv);
-                               GDALDestroyDriver(drv);
-                       }
                        return 0;
                }
 
@@ -6781,10 +6747,6 @@ rt_raster_to_gdal_mem(rt_raster raster, const char *srs,
                        rterror("rt_raster_to_gdal_mem: Could not add GDAL raster band\n");
                        if (allocBandNums) rtdealloc(bandNums);
                        GDALClose(ds);
-                       if (drv_gen) {
-                               GDALDeregisterDriver(drv);
-                               GDALDestroyDriver(drv);
-                       }
                        return 0;
                }
 
@@ -6793,10 +6755,6 @@ rt_raster_to_gdal_mem(rt_raster raster, const char *srs,
                        rterror("rt_raster_to_gdal_mem: Error creating GDAL MEM raster band\n");
                        if (allocBandNums) rtdealloc(bandNums);
                        GDALClose(ds);
-                       if (drv_gen) {
-                               GDALDeregisterDriver(drv);
-                               GDALDestroyDriver(drv);
-                       }
                        return 0;
                }
 
@@ -6807,10 +6765,6 @@ rt_raster_to_gdal_mem(rt_raster raster, const char *srs,
                        rterror("rt_raster_to_gdal_mem: Could not get GDAL band for additional processing\n");
                        if (allocBandNums) rtdealloc(bandNums);
                        GDALClose(ds);
-                       if (drv_gen) {
-                               GDALDeregisterDriver(drv);
-                               GDALDestroyDriver(drv);
-                       }
                        return 0;
                }
 
@@ -7177,21 +7131,17 @@ rt_raster rt_raster_gdal_warp(
        if (max_err < 0.) max_err = 0.125;
        RASTER_DEBUGF(4, "max_err = %f", max_err);
 
-       _src_srs = rt_util_gdal_sr(src_srs, 0);
+       _src_srs = rt_util_gdal_convert_sr(src_srs, 0);
        /* dst_srs not provided, set to src_srs */
        if (NULL == dst_srs)
-               _dst_srs = rt_util_gdal_sr(src_srs, 0);
+               _dst_srs = rt_util_gdal_convert_sr(src_srs, 0);
        else
-               _dst_srs = rt_util_gdal_sr(dst_srs, 0);
+               _dst_srs = rt_util_gdal_convert_sr(dst_srs, 0);
 
        /* load raster into a GDAL MEM dataset */
        src_ds = rt_raster_to_gdal_mem(raster, _src_srs, NULL, 0, &src_drv);
        if (NULL == src_ds) {
                rterror("rt_raster_gdal_warp: Unable to convert raster to GDAL MEM format\n");
-               if (NULL != src_drv) {
-                       GDALDeregisterDriver(src_drv);
-                       GDALDestroyDriver(src_drv);
-               }
 
                CPLFree(_src_srs);
                CPLFree(_dst_srs);
@@ -7207,9 +7157,6 @@ rt_raster rt_raster_gdal_warp(
 
                GDALClose(src_ds);
 
-               GDALDeregisterDriver(src_drv);
-               GDALDestroyDriver(src_drv);
-
                CPLFree(_src_srs);
                CPLFree(_dst_srs);
 
@@ -7231,9 +7178,6 @@ rt_raster rt_raster_gdal_warp(
                        rtdealloc(transform_opts);
                        GDALClose(src_ds);
 
-                       GDALDeregisterDriver(src_drv);
-                       GDALDestroyDriver(src_drv);
-
                        CPLFree(_src_srs);
                        CPLFree(_dst_srs);
 
@@ -7274,9 +7218,6 @@ rt_raster rt_raster_gdal_warp(
                for (i = 0; i < transform_opts_len; i++) rtdealloc(transform_opts[i]);
                rtdealloc(transform_opts);
 
-               GDALDeregisterDriver(src_drv);
-               GDALDestroyDriver(src_drv);
-
                return NULL;
        }
 
@@ -7292,9 +7233,6 @@ rt_raster rt_raster_gdal_warp(
                for (i = 0; i < transform_opts_len; i++) rtdealloc(transform_opts[i]);
                rtdealloc(transform_opts);
 
-               GDALDeregisterDriver(src_drv);
-               GDALDestroyDriver(src_drv);
-
                return NULL;
        }
 
@@ -7323,9 +7261,6 @@ rt_raster rt_raster_gdal_warp(
                for (i = 0; i < transform_opts_len; i++) rtdealloc(transform_opts[i]);
                rtdealloc(transform_opts);
 
-               GDALDeregisterDriver(src_drv);
-               GDALDestroyDriver(src_drv);
-
                return NULL;
        }
 
@@ -7347,9 +7282,6 @@ rt_raster rt_raster_gdal_warp(
                for (i = 0; i < transform_opts_len; i++) rtdealloc(transform_opts[i]);
                rtdealloc(transform_opts);
 
-               GDALDeregisterDriver(src_drv);
-               GDALDestroyDriver(src_drv);
-
                return NULL;
        }
 
@@ -7384,9 +7316,6 @@ rt_raster rt_raster_gdal_warp(
                for (i = 0; i < transform_opts_len; i++) rtdealloc(transform_opts[i]);
                rtdealloc(transform_opts);
 
-               GDALDeregisterDriver(src_drv);
-               GDALDestroyDriver(src_drv);
-
                return NULL;
        }
 
@@ -7407,9 +7336,6 @@ rt_raster rt_raster_gdal_warp(
                        for (i = 0; i < transform_opts_len; i++) rtdealloc(transform_opts[i]);
                        rtdealloc(transform_opts);
 
-                       GDALDeregisterDriver(src_drv);
-                       GDALDestroyDriver(src_drv);
-
                        return NULL;
                }
 
@@ -7529,23 +7455,18 @@ rt_raster rt_raster_gdal_warp(
                for (i = 0; i < transform_opts_len; i++) rtdealloc(transform_opts[i]);
                rtdealloc(transform_opts);
 
-               GDALDeregisterDriver(src_drv);
-               GDALDestroyDriver(src_drv);
-
                return NULL;
        }
 
        /* load VRT driver */
-       GDALRegister_VRT();
+       if (!rt_util_gdal_driver_registered("VRT"))
+               GDALRegister_VRT();
        dst_drv = GDALGetDriverByName("VRT");
        if (NULL == dst_drv) {
                rterror("rt_raster_gdal_warp: Unable to load the output GDAL VRT driver\n");
 
                GDALClose(src_ds);
 
-               GDALDeregisterDriver(src_drv);
-               GDALDestroyDriver(src_drv);
-
                return NULL;
        }
 
@@ -7559,11 +7480,6 @@ rt_raster rt_raster_gdal_warp(
                for (i = 0; i < transform_opts_len; i++) rtdealloc(transform_opts[i]);
                rtdealloc(transform_opts);
 
-               GDALDeregisterDriver(dst_drv);
-               GDALDestroyDriver(dst_drv);
-               GDALDeregisterDriver(src_drv);
-               GDALDestroyDriver(src_drv);
-
                return NULL;
        }
 
@@ -7580,11 +7496,6 @@ rt_raster rt_raster_gdal_warp(
                        for (i = 0; i < transform_opts_len; i++) rtdealloc(transform_opts[i]);
                        rtdealloc(transform_opts);
 
-                       GDALDeregisterDriver(dst_drv);
-                       GDALDestroyDriver(dst_drv);
-                       GDALDeregisterDriver(src_drv);
-                       GDALDestroyDriver(src_drv);
-
                        return NULL;
                }
 
@@ -7603,11 +7514,6 @@ rt_raster rt_raster_gdal_warp(
                        for (i = 0; i < transform_opts_len; i++) rtdealloc(transform_opts[i]);
                        rtdealloc(transform_opts);
 
-                       GDALDeregisterDriver(dst_drv);
-                       GDALDestroyDriver(dst_drv);
-                       GDALDeregisterDriver(src_drv);
-                       GDALDestroyDriver(src_drv);
-
                        return NULL;
                }
 
@@ -7623,11 +7529,6 @@ rt_raster rt_raster_gdal_warp(
                        for (i = 0; i < transform_opts_len; i++) rtdealloc(transform_opts[i]);
                        rtdealloc(transform_opts);
 
-                       GDALDeregisterDriver(dst_drv);
-                       GDALDestroyDriver(dst_drv);
-                       GDALDeregisterDriver(src_drv);
-                       GDALDestroyDriver(src_drv);
-
                        return NULL;
                }
 
@@ -7641,7 +7542,7 @@ rt_raster rt_raster_gdal_warp(
        }
 
        /* set dst srs */
-       _dst_srs = rt_util_gdal_sr((NULL == dst_srs ? src_srs : dst_srs), 1);
+       _dst_srs = rt_util_gdal_convert_sr((NULL == dst_srs ? src_srs : dst_srs), 1);
        cplerr = GDALSetProjection(dst_ds, _dst_srs);
        CPLFree(_dst_srs);
        if (cplerr != CE_None) {
@@ -7653,11 +7554,6 @@ rt_raster rt_raster_gdal_warp(
                for (i = 0; i < transform_opts_len; i++) rtdealloc(transform_opts[i]);
                rtdealloc(transform_opts);
 
-               GDALDeregisterDriver(dst_drv);
-               GDALDestroyDriver(dst_drv);
-               GDALDeregisterDriver(src_drv);
-               GDALDestroyDriver(src_drv);
-
                return NULL;
        }
 
@@ -7672,11 +7568,6 @@ rt_raster rt_raster_gdal_warp(
                for (i = 0; i < transform_opts_len; i++) rtdealloc(transform_opts[i]);
                rtdealloc(transform_opts);
 
-               GDALDeregisterDriver(dst_drv);
-               GDALDestroyDriver(dst_drv);
-               GDALDeregisterDriver(src_drv);
-               GDALDestroyDriver(src_drv);
-
                return NULL;
        }
 
@@ -7691,11 +7582,6 @@ rt_raster rt_raster_gdal_warp(
                for (i = 0; i < transform_opts_len; i++) rtdealloc(transform_opts[i]);
                rtdealloc(transform_opts);
 
-               GDALDeregisterDriver(dst_drv);
-               GDALDestroyDriver(dst_drv);
-               GDALDeregisterDriver(src_drv);
-               GDALDestroyDriver(src_drv);
-
                return NULL;
        }
        transform_func = GDALGenImgProjTransform;
@@ -7716,11 +7602,6 @@ rt_raster rt_raster_gdal_warp(
                        for (i = 0; i < transform_opts_len; i++) rtdealloc(transform_opts[i]);
                        rtdealloc(transform_opts);
 
-                       GDALDeregisterDriver(dst_drv);
-                       GDALDestroyDriver(dst_drv);
-                       GDALDeregisterDriver(src_drv);
-                       GDALDestroyDriver(src_drv);
-
                        return NULL;
                }
 
@@ -7740,11 +7621,6 @@ rt_raster rt_raster_gdal_warp(
                for (i = 0; i < transform_opts_len; i++) rtdealloc(transform_opts[i]);
                rtdealloc(transform_opts);
 
-               GDALDeregisterDriver(dst_drv);
-               GDALDestroyDriver(dst_drv);
-               GDALDeregisterDriver(src_drv);
-               GDALDestroyDriver(src_drv);
-
                return NULL;
        }
 
@@ -7789,11 +7665,6 @@ rt_raster rt_raster_gdal_warp(
                for (i = 0; i < transform_opts_len; i++) rtdealloc(transform_opts[i]);
                rtdealloc(transform_opts);
 
-               GDALDeregisterDriver(dst_drv);
-               GDALDestroyDriver(dst_drv);
-               GDALDeregisterDriver(src_drv);
-               GDALDestroyDriver(src_drv);
-
                return NULL;
        }
        for (i = 0; i < numBands; i++) {
@@ -7810,11 +7681,6 @@ rt_raster rt_raster_gdal_warp(
                        for (i = 0; i < transform_opts_len; i++) rtdealloc(transform_opts[i]);
                        rtdealloc(transform_opts);
 
-                       GDALDeregisterDriver(dst_drv);
-                       GDALDestroyDriver(dst_drv);
-                       GDALDeregisterDriver(src_drv);
-                       GDALDestroyDriver(src_drv);
-
                        return NULL;
                }
 
@@ -7853,11 +7719,6 @@ rt_raster rt_raster_gdal_warp(
                for (i = 0; i < transform_opts_len; i++) rtdealloc(transform_opts[i]);
                rtdealloc(transform_opts);
 
-               GDALDeregisterDriver(dst_drv);
-               GDALDestroyDriver(dst_drv);
-               GDALDeregisterDriver(src_drv);
-               GDALDestroyDriver(src_drv);
-
                return NULL;
        }
        GDALFlushCache(dst_ds);
@@ -7876,11 +7737,6 @@ rt_raster rt_raster_gdal_warp(
        for (i = 0; i < transform_opts_len; i++) rtdealloc(transform_opts[i]);
        rtdealloc(transform_opts);
 
-       GDALDeregisterDriver(dst_drv);
-       GDALDestroyDriver(dst_drv);
-       GDALDeregisterDriver(src_drv);
-       GDALDestroyDriver(src_drv);
-
        if (NULL == rast) {
                rterror("rt_raster_gdal_warp: Unable to warp raster\n");
                return NULL;
@@ -8264,7 +8120,8 @@ rt_raster_gdal_rasterize(const unsigned char *wkb,
                _width, _height);
 
        /* load GDAL mem */
-       GDALRegister_MEM();
+       if (!rt_util_gdal_driver_registered("MEM"))
+               GDALRegister_MEM();
        dst_drv = GDALGetDriverByName("MEM");
        if (NULL == dst_drv) {
                rterror("rt_raster_gdal_rasterize: Unable to load the MEM GDAL driver");
@@ -8300,9 +8157,6 @@ rt_raster_gdal_rasterize(const unsigned char *wkb,
                OSRDestroySpatialReference(src_sr);
                OGRCleanupAll();
 
-               GDALDeregisterDriver(dst_drv);
-               GDALDestroyDriver(dst_drv);
-
                return NULL;
        }
 
@@ -8324,8 +8178,6 @@ rt_raster_gdal_rasterize(const unsigned char *wkb,
                OGRCleanupAll();
 
                GDALClose(dst_ds);
-               GDALDeregisterDriver(dst_drv);
-               GDALDestroyDriver(dst_drv);
 
                return NULL;
        }
@@ -8349,8 +8201,6 @@ rt_raster_gdal_rasterize(const unsigned char *wkb,
                        OGRCleanupAll();
 
                        GDALClose(dst_ds);
-                       GDALDeregisterDriver(dst_drv);
-                       GDALDestroyDriver(dst_drv);
 
                        return NULL;
                }
@@ -8410,8 +8260,6 @@ rt_raster_gdal_rasterize(const unsigned char *wkb,
                        OGRCleanupAll();
 
                        GDALClose(dst_ds);
-                       GDALDeregisterDriver(dst_drv);
-                       GDALDestroyDriver(dst_drv);
 
                        return NULL;
                }
@@ -8447,8 +8295,6 @@ rt_raster_gdal_rasterize(const unsigned char *wkb,
                OGRCleanupAll();
 
                GDALClose(dst_ds);
-               GDALDeregisterDriver(dst_drv);
-               GDALDestroyDriver(dst_drv);
 
                return NULL;
        }
@@ -8471,8 +8317,6 @@ rt_raster_gdal_rasterize(const unsigned char *wkb,
        OGRCleanupAll();
 
        GDALClose(dst_ds);
-       GDALDeregisterDriver(dst_drv);
-       GDALDestroyDriver(dst_drv);
 
        if (NULL == rast) {
                rterror("rt_raster_gdal_rasterize: Unable to rasterize geometry\n");

diff --git a/raster/rt_core/rt_api.h b/raster/rt_core/rt_api.h
index d661bd271cbb992bdef0ff16906d16f5536b863c..22a2dd38bf449399e910319a503b9e173240dcbc 100644 (file)
--- a/raster/rt_core/rt_api.h
+++ b/raster/rt_core/rt_api.h
@@ -1309,7 +1309,10 @@ rt_extenttype
 rt_util_extent_type(const char *name);
 
 char*
-rt_util_gdal_sr(const char *srs, int proj4);
+rt_util_gdal_convert_sr(const char *srs, int proj4);
+
+int
+rt_util_gdal_driver_registered(const char *drv);
 
 /*
        helper macros for consistent floating point equality checks

diff --git a/raster/test/core/testapi.c b/raster/test/core/testapi.c
index 56a6e61f8cba7220e56ab3ede94e77a6a4d6751a..63a15e70c8ec464d3f7ca449b3dd0fdbcfd3be65 100644 (file)
--- a/raster/test/core/testapi.c
+++ b/raster/test/core/testapi.c
@@ -1310,7 +1310,7 @@ static void testGDALDrivers() {
 
        drv = (rt_gdaldriver) rt_raster_gdal_drivers(&size, 1);
        /*printf("size: %d\n", size);*/
-       CHECK(size);
+       CHECK(drv);
 
        for (i = 0; i < size; i++) {
                /*printf("gdal_driver: %s\n", drv[i].short_name);*/
@@ -1477,8 +1477,6 @@ static void testGDALToRaster() {
        }
 
        GDALClose(gdds);
-       GDALDeregisterDriver(gddrv);
-       GDALDestroyDriver(gddrv);
 
        deepRelease(rast);
        deepRelease(raster);