Skip to content

lib/raster: read vrt tile only if needed #7334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
metzm wants to merge 6 commits into
base: main
Choose a base branch
from
+9 −19
Open

lib/raster: read vrt tile only if needed #7334

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c5044a1
read vrt tile only if needed
metzm Apr 19, 2026
768a87b
fix bugs in initial commit
metzm Apr 21, 2026
d94fa2c
remove unneeded pointer assignement
metzm Apr 21, 2026
d1f8208
avoid switch
metzm Apr 21, 2026
f4ef1b9
avoid switch
metzm Apr 21, 2026
861d937
avoid switch
metzm Apr 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 9 additions & 19 deletions lib/raster/vrt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#include "R.h"

int cmp_wnd(const void *a, const void *b)
static int cmp_wnd(const void *a, const void *b)
{
struct Cell_head *cellhda = &((struct tileinfo *)a)->cellhd;
struct Cell_head *cellhdb = &((struct tileinfo *)b)->cellhd;
Expand Down Expand Up @@ -123,9 +123,9 @@ struct R_vrt *Rast_get_vrt(const char *vname, const char *vmapset)

if (rd_window->proj == PROJECTION_LL) {
while (east > p->cellhd.east)
east -= 360;
east -= 360.0;
while (east < p->cellhd.west)
east += 360;
east += 360.0;
}
if (east >= p->cellhd.west && east < p->cellhd.east)
G_ilist_add(p->clist, col);
Expand Down Expand Up @@ -206,7 +206,11 @@ int Rast_get_vrt_row(int fd, void *buf, int row, RASTER_MAP_TYPE data_type)
for (i = 0; i < vrt->tlist->n_values; i++) {
struct tileinfo *p = &ti[vrt->tlist->value[i]];

if (p->cellhd.north > rows && p->cellhd.south <= rown) {
/* open the tile only if it overlaps with the current reading
* row and the current reading EW extents */
if (p->cellhd.north > rows && p->cellhd.south <= rown &&
p->cellhd.west < rd_window->east &&
p->cellhd.east > rd_window->west) {
int tfd;
void *p1, *p2;

Expand All @@ -219,27 +223,13 @@ int Rast_get_vrt_row(int fd, void *buf, int row, RASTER_MAP_TYPE data_type)
Rast_get_row_nomask(tfd, tmpbuf, row, data_type);
Rast_unopen(tfd);

p1 = buf;
p2 = tmpbuf;
/* restrict to start and end col ? */
for (j = 0; j < p->clist->n_values; j++) {
p1 = (unsigned char *)buf + size * p->clist->value[j];
p2 = (unsigned char *)tmpbuf + size * p->clist->value[j];

if (!Rast_is_null_value(p2, data_type)) {
switch (data_type) {
case CELL_TYPE:
*(CELL *)p1 = *(CELL *)p2;
break;
case FCELL_TYPE:
*(FCELL *)p1 = *(FCELL *)p2;
break;
case DCELL_TYPE:
*(DCELL *)p1 = *(DCELL *)p2;
break;
default:
break;
}
memcpy(p1, p2, size);
}
}
have_tile = 1;
Expand Down
Loading