Changeset 66450

Timestamp:

Oct 9, 2015, 9:55:34 AM (9 years ago)

Author:

wenzeslaus

Message:

r.patch: call Rast_cell_size just once, not for every cell (backport r64877 and part of 66449)

Location:

grass/branches/releasebranch_7_0/raster/r.patch

Files:

• do_patch.c (modified) (2 diffs)
• local_proto.h (modified) (1 diff)
• main.c (modified) (4 diffs)
• r.patch.html (modified) (2 diffs)

grass/branches/releasebranch_7_0/raster/r.patch/do_patch.c

@@ -22 +22 @@
 int do_patch(void *result, void *patch,
              struct Cell_stats *statf, int ncols,
-             RASTER_MAP_TYPE out_type, int use_zero)
+             RASTER_MAP_TYPE out_type, size_t out_cell_size, int use_zero)
 {
     int more;
@@ -57 +57 @@
             }                   /* NULL support */
         }
-        result = G_incr_void_ptr(result, Rast_cell_size(out_type));
-        patch = G_incr_void_ptr(patch, Rast_cell_size(out_type));
+        result = G_incr_void_ptr(result, out_cell_size);
+        patch = G_incr_void_ptr(patch, out_cell_size);
     }
     return more;

grass/branches/releasebranch_7_0/raster/r.patch/local_proto.h

@@ -1 +1 @@
 /* do_patch.c */
 int do_patch(void *result, void *, struct Cell_stats *, int, RASTER_MAP_TYPE,
-             int);
+             size_t, int);
 /* support.c */
 int support(char **, struct Cell_stats *, int, struct Categories *,

grass/branches/releasebranch_7_0/raster/r.patch/main.c

@@ -32 +32 @@
     int outfd;
     RASTER_MAP_TYPE out_type, map_type;
+    size_t out_cell_size;
     struct History history;
     void *presult, *patch;
@@ -55 +56 @@
     G_add_keyword(_("geometry"));
     G_add_keyword(_("mosaicking"));
+    G_add_keyword(_("merge"));
+    G_add_keyword(_("patching"));
     module->description =
         _("Creates a composite raster map layer by using "
@@ -112 +115 @@
     }
 
+    out_cell_size = Rast_cell_size(out_type);
+
     rname = opt2->answer;
     outfd = Rast_open_new(new_name = rname, out_type);
@@ -144 +149 @@
             Rast_get_row(infd[i], patch, row, out_type);
             if (!do_patch
-                (presult, patch, &statf[i], ncols, out_type, use_zero))
+                (presult, patch, &statf[i], ncols, out_type, out_cell_size,
+                 use_zero))
                 break;
         }

grass/branches/releasebranch_7_0/raster/r.patch/r.patch.html

@@ -22 +22 @@
 "no data" cells.
 
-<h2>EXAMPLE</h2>
+<h3>Example of filling areas</h3>
 
-Below, the raster map layer on the far left is <b>patched</b> 
-with the middle (<em>patching</em>) raster map layer, 
-to produce the <em>composite</em> raster map layer on the right. 
+<!-- this example is also used in the tests -->
+
+Below, the raster map layer on the far left is <b>patched</b>
+with the middle (<em>patching</em>) raster map layer,
+to produce the <em>composite</em> raster map layer on the right.
+The example assumes zero values to be treated as NULLs (<b>-z</b> flag).
 
 <div class="code"><pre>
@@ -48 +51 @@
   4 4 4 4 4 4 4 4    0 0 0 0 0 0 0 0    4 4 4 4 4 4 4 4
 </pre></div>
+
 
 <h2>NOTES</h2>