[GRASS-SVN] r40775 - grass/trunk/lib/raster

[svn_grass at osgeo.org]

Author: glynn
Date: 2010-02-01 18:28:01 -0500 (Mon, 01 Feb 2010)
New Revision: 40775

Modified:
   grass/trunk/lib/raster/init.c
   grass/trunk/lib/raster/set_window.c
Log:
Fix initialisation


Modified: grass/trunk/lib/raster/init.c
===================================================================
--- grass/trunk/lib/raster/init.c	2010-02-01 23:08:42 UTC (rev 40774)
+++ grass/trunk/lib/raster/init.c	2010-02-01 23:28:01 UTC (rev 40775)
@@ -78,7 +78,7 @@
 
 static int init(void)
 {
-    G__init_window();
+    Rast__init_window();
 
     /* no histograms */
     R__.want_histogram = 0;

Modified: grass/trunk/lib/raster/set_window.c
===================================================================
--- grass/trunk/lib/raster/set_window.c	2010-02-01 23:08:42 UTC (rev 40774)
+++ grass/trunk/lib/raster/set_window.c	2010-02-01 23:28:01 UTC (rev 40775)
@@ -22,8 +22,6 @@
 
 void Rast__init_window(void)
 {
-    Rast__init();
-
     if (G_is_initialized(&R__.window_set))
 	return;
 
@@ -42,7 +40,7 @@
  */
 void Rast_set_window(struct Cell_head *window)
 {
-    Rast__init_window();
+    Rast__init();
 
     if (R__.split_window)
 	G_warning(_("Rast_set_window() called while window split"));
@@ -63,7 +61,7 @@
  */
 void Rast_set_output_window(struct Cell_head *window)
 {
-    Rast__init_window();
+    Rast__init();
 
     G_adjust_Cell_head(window, 0, 0);
 
@@ -83,7 +81,7 @@
 
 void Rast_set_input_window(struct Cell_head *window)
 {
-    Rast__init_window();
+    Rast__init();
 
     G_adjust_Cell_head(window, 0, 0);