浏览代码

libraster: optimize and comment Rast_get_vrt_row()

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@72767 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Metz 7 年之前
父节点
当前提交
3b618405bb
共有 1 个文件被更改,包括 6 次插入1 次删除
  1. 6 1
      lib/raster/vrt.c

+ 6 - 1
lib/raster/vrt.c

@@ -163,6 +163,8 @@ void Rast_close_vrt(struct R_vrt *vrt)
     G_free(vrt);
     G_free(vrt);
 }
 }
 
 
+/* must only be called by get_map_row_nomask() 
+ * move to get_row.c as read_data_vrt() ? */
 int Rast_get_vrt_row(int fd, void *buf, int row, RASTER_MAP_TYPE data_type)
 int Rast_get_vrt_row(int fd, void *buf, int row, RASTER_MAP_TYPE data_type)
 {
 {
     struct fileinfo *fcb = &R__.fileinfo[fd];
     struct fileinfo *fcb = &R__.fileinfo[fd];
@@ -189,9 +191,12 @@ int Rast_get_vrt_row(int fd, void *buf, int row, RASTER_MAP_TYPE data_type)
 	    int tfd;
 	    int tfd;
 	    void *p1, *p2;
 	    void *p1, *p2;
 
 
+	    /* recurse into get_map_row(), collect data for all tiles 
+	     * a mask is applied to the collected data 
+	     * after this function returns */
 	    Rast_set_null_value(tmpbuf, rd_window->cols, data_type);
 	    Rast_set_null_value(tmpbuf, rd_window->cols, data_type);
 	    tfd = Rast_open_old(p->name, p->mapset);
 	    tfd = Rast_open_old(p->name, p->mapset);
-	    Rast_get_row(tfd, tmpbuf, row, data_type);
+	    Rast_get_row_nomask(tfd, tmpbuf, row, data_type);
 	    Rast_unopen(tfd);
 	    Rast_unopen(tfd);
 	    
 	    
 	    p1 = buf;
 	    p1 = buf;