[GRASS-SVN] r67036 - grass/branches/releasebranch_7_0/vector/v.surf.bspline

[svn_grass at osgeo.org]

Author: annakrat
Date: 2015-12-07 07:01:52 -0800 (Mon, 07 Dec 2015)
New Revision: 67036

Modified:
   grass/branches/releasebranch_7_0/vector/v.surf.bspline/main.c
Log:
v.surf.bspline: move opening raster after opening driver, closing is in reverse order, attempt to fix #2434 (merge from trunk, r67020)

Modified: grass/branches/releasebranch_7_0/vector/v.surf.bspline/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.surf.bspline/main.c	2015-12-07 14:54:58 UTC (rev 67035)
+++ grass/branches/releasebranch_7_0/vector/v.surf.bspline/main.c	2015-12-07 15:01:52 UTC (rev 67036)
@@ -362,17 +362,7 @@
                           vector);
     }
 
-    /* raster output */
-    raster = -1;
-    Rast_set_fp_type(DCELL_TYPE);
-    if (!vector && map) {
-	grid = TRUE;
-	raster = Rast_open_fp_new(out_map_opt->answer);
 
-	G_verbose_message(_("Cells for raster map <%s> will be interpolated"),
-                          map);
-    }
-
     /* read z values from attribute table */
     if (bspline_field > 0) {
         G_message(_("Reading values from attribute table..."));
@@ -431,6 +421,17 @@
 	driver = db_start_driver_open_database(drv, db);
     }
 
+    /* raster output */
+    raster = -1;
+    Rast_set_fp_type(DCELL_TYPE);
+    if (!vector && map) {
+	grid = TRUE;
+	raster = Rast_open_fp_new(out_map_opt->answer);
+
+	G_verbose_message(_("Cells for raster map <%s> will be interpolated"),
+                          map);
+    }
+
     /* Setting regions and boxes */
     G_debug(1, "Interpolation: Setting regions and boxes");
     G_get_window(&original_reg);