Changeset 64877

Timestamp:

Mar 16, 2015, 2:44:25 PM (9 years ago)

Author:

wenzeslaus

Message:

r.patch: call Rast_cell_size just once, not for every cell

Function do_patch has one more parameter but the speedup is approximately 10% (e.g., real 0m37.935s, user 0m37.405s, sys 0m0.480s to real 0m34.181s, user 0m33.697s, sys 0m0.436s).

Location:

grass/trunk/raster/r.patch

Files:

• do_patch.c (modified) (2 diffs)
• local_proto.h (modified) (1 diff)
• main.c (modified) (3 diffs)

grass/trunk/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/trunk/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/trunk/raster/r.patch/main.c

@@ -35 +35 @@
     int outfd;
     RASTER_MAP_TYPE out_type, map_type;
+    size_t out_cell_size;
     struct History history;
     void *presult, *patch;
@@ -115 +116 @@
     }
 
+    out_cell_size = Rast_cell_size(out_type);
+
     rname = opt2->answer;
     outfd = Rast_open_new(new_name = rname, out_type);
@@ -147 +150 @@
             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;
         }