Browse Source

Fix initialisation

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@40775 15284696-431f-4ddb-bdfa-cd5b030d7da7
Glynn Clements 15 years ago
parent
commit
1de6f4074f
2 changed files with 4 additions and 6 deletions
  1. 1 1
      lib/raster/init.c
  2. 3 5
      lib/raster/set_window.c

+ 1 - 1
lib/raster/init.c

@@ -78,7 +78,7 @@ void Rast__error_handler(void *p)
 
 static int init(void)
 {
-    G__init_window();
+    Rast__init_window();
 
     /* no histograms */
     R__.want_histogram = 0;

+ 3 - 5
lib/raster/set_window.c

@@ -22,8 +22,6 @@ static void update_window_mappings(void);
 
 void Rast__init_window(void)
 {
-    Rast__init();
-
     if (G_is_initialized(&R__.window_set))
 	return;
 
@@ -42,7 +40,7 @@ void Rast__init_window(void)
  */
 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_window(struct Cell_head *window)
  */
 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_output_window(struct Cell_head *window)
 
 void Rast_set_input_window(struct Cell_head *window)
 {
-    Rast__init_window();
+    Rast__init();
 
     G_adjust_Cell_head(window, 0, 0);