self-hosted/postgis
self-hosted/postgis
1
0
Fork 0
mirror of https://git.osgeo.org/gitea/postgis/postgis synced 2024-10-24 00:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Slightly simplify a loop setting projection parameters for gdal warp

Browse source 
git-svn-id: http://svn.osgeo.org/postgis/trunk@12929 b70326c6-7e19-0410-871a-916f4a2858ee
This commit is contained in:
Sandro Santilli 2014-08-29 16:37:02 +00:00
parent 790f448d6d
commit a389e0a96b
1 changed files with 6 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
raster/rt_core/rt_warp.c
View file

@ -325,52 +325,17 @@ rt_raster rt_raster_gdal_warp(
memset(arg->transform.option.item, 0, sizeof(char *) * (arg->transform.option.len + 1));
for (i = 0; i < arg->transform.option.len; i++) {
switch (i) {
case 1:
if (arg->dst.srs != NULL)
arg->transform.option.item[i] = (char *) rtalloc(sizeof(char) * (strlen("DST_SRS=") + strlen(arg->dst.srs) + 1));
else
arg->transform.option.item[i] = (char *) rtalloc(sizeof(char) * (strlen("DST_SRS=") + 1));
break;
case 0:
if (arg->src.srs != NULL)
arg->transform.option.item[i] = (char *) rtalloc(sizeof(char) * (strlen("SRC_SRS=") + strlen(arg->src.srs) + 1));
else
arg->transform.option.item[i] = (char *) rtalloc(sizeof(char) * (strlen("SRC_SRS=") + 1));
break;
}
const char *srs = i ? arg->dst.srs : arg->src.srs;
const char *lbl = i ? "DST_SRS=" : "SRC_SRS=";
size_t sz = sizeof(char) * (strlen(lbl) + 1);
if ( srs ) sz += strlen(srs);
arg->transform.option.item[i] = (char *) rtalloc(sz);
if (NULL == arg->transform.option.item[i]) {
rterror("rt_raster_gdal_warp: Could not allocation memory for transform options");
_rti_warp_arg_destroy(arg);
return NULL;
}
switch (i) {
case 1:
if (arg->dst.srs != NULL) {
snprintf(
arg->transform.option.item[i],
sizeof(char) * (strlen("DST_SRS=") + strlen(arg->dst.srs) + 1),
"DST_SRS=%s",
arg->dst.srs
);
}
else
sprintf(arg->transform.option.item[i], "%s", "DST_SRS=");
break;
case 0:
if (arg->src.srs != NULL) {
snprintf(
arg->transform.option.item[i],
sizeof(char) * (strlen("SRC_SRS=") + strlen(arg->src.srs) + 1),
"SRC_SRS=%s",
arg->src.srs
);
}
else
sprintf(arg->transform.option.item[i], "%s", "SRC_SRS=");
break;
}
sprintf(arg->transform.option.item[i], "%s%s", lbl, srs ? srs : "");
RASTER_DEBUGF(4, "arg->transform.option.item[%d] = %s", i, arg->transform.option.item[i]);
}
}