|
@@ -135,15 +135,11 @@ int IL_resample_output_2d(struct interp_params *params, double zmin, double zmax
|
|
|
}
|
|
|
|
|
|
if (params->elev != NULL) {
|
|
|
- fseek(params->Tmp_fd_z, 0L, 0); /* seek to the beginning */
|
|
|
+ G_fseek(params->Tmp_fd_z, 0L, 0); /* seek to the beginning */
|
|
|
for (i = 0; i < params->nsizr; i++) {
|
|
|
/* seek to the right row */
|
|
|
- if (fseek(params->Tmp_fd_z, (long)
|
|
|
- ((params->nsizr - 1 -
|
|
|
- i) * params->nsizc * sizeof(FCELL)), 0) == -1) {
|
|
|
- G_warning(_("Unable to fseek to the right spot"));
|
|
|
- return -1;
|
|
|
- }
|
|
|
+ G_fseek(params->Tmp_fd_z, (off_t) (params->nsizr - 1 - i) *
|
|
|
+ params->nsizc * sizeof(FCELL), 0);
|
|
|
fread(cell1, sizeof(FCELL), params->nsizc, params->Tmp_fd_z);
|
|
|
if (Rast_put_f_row(cf1, cell1) < 0) {
|
|
|
G_warning(_("Failed writing raster map"));
|
|
@@ -153,15 +149,11 @@ int IL_resample_output_2d(struct interp_params *params, double zmin, double zmax
|
|
|
}
|
|
|
|
|
|
if (params->slope != NULL) {
|
|
|
- fseek(params->Tmp_fd_dx, 0L, 0); /* seek to the beginning */
|
|
|
+ G_fseek(params->Tmp_fd_dx, 0L, 0); /* seek to the beginning */
|
|
|
for (i = 0; i < params->nsizr; i++) {
|
|
|
/* seek to the right row */
|
|
|
- if (fseek(params->Tmp_fd_dx, (long)
|
|
|
- ((params->nsizr - 1 -
|
|
|
- i) * params->nsizc * sizeof(FCELL)), 0) == -1) {
|
|
|
- G_warning(_("Unable to fseek to the right spot"));
|
|
|
- return -1;
|
|
|
- }
|
|
|
+ G_fseek(params->Tmp_fd_dx, (off_t) (params->nsizr - 1 - i) *
|
|
|
+ params->nsizc * sizeof(FCELL), 0);
|
|
|
fread(cell1, sizeof(FCELL), params->nsizc, params->Tmp_fd_dx);
|
|
|
/*
|
|
|
* for (ii==0;ii<params->nsizc;ii++) { fprintf(stderr,"ii=%d ",ii);
|
|
@@ -176,15 +168,11 @@ int IL_resample_output_2d(struct interp_params *params, double zmin, double zmax
|
|
|
}
|
|
|
|
|
|
if (params->aspect != NULL) {
|
|
|
- fseek(params->Tmp_fd_dy, 0L, 0); /* seek to the beginning */
|
|
|
+ G_fseek(params->Tmp_fd_dy, 0L, 0); /* seek to the beginning */
|
|
|
for (i = 0; i < params->nsizr; i++) {
|
|
|
/* seek to the right row */
|
|
|
- if (fseek(params->Tmp_fd_dy, (long)
|
|
|
- ((params->nsizr - 1 -
|
|
|
- i) * params->nsizc * sizeof(FCELL)), 0) == -1) {
|
|
|
- G_warning(_("Unable to fseek to the right spot"));
|
|
|
- return -1;
|
|
|
- }
|
|
|
+ G_fseek(params->Tmp_fd_dy, (off_t) (params->nsizr - 1 - i) *
|
|
|
+ params->nsizc * sizeof(FCELL), 0);
|
|
|
fread(cell1, sizeof(FCELL), params->nsizc, params->Tmp_fd_dy);
|
|
|
if (Rast_put_f_row(cf3, cell1) < 0) {
|
|
|
G_warning(_("Failed writing raster map"));
|
|
@@ -194,15 +182,11 @@ int IL_resample_output_2d(struct interp_params *params, double zmin, double zmax
|
|
|
}
|
|
|
|
|
|
if (params->pcurv != NULL) {
|
|
|
- fseek(params->Tmp_fd_xx, 0L, 0); /* seek to the beginning */
|
|
|
+ G_fseek(params->Tmp_fd_xx, 0L, 0); /* seek to the beginning */
|
|
|
for (i = 0; i < params->nsizr; i++) {
|
|
|
/* seek to the right row */
|
|
|
- if (fseek(params->Tmp_fd_xx, (long)
|
|
|
- ((params->nsizr - 1 -
|
|
|
- i) * params->nsizc * sizeof(FCELL)), 0) == -1) {
|
|
|
- G_warning(_("Unable to fseek to the right spot"));
|
|
|
- return -1;
|
|
|
- }
|
|
|
+ G_fseek(params->Tmp_fd_xx, (off_t) (params->nsizr - 1 - i) *
|
|
|
+ params->nsizc * sizeof(FCELL), 0);
|
|
|
fread(cell1, sizeof(FCELL), params->nsizc, params->Tmp_fd_xx);
|
|
|
if (Rast_put_f_row(cf4, cell1) < 0) {
|
|
|
G_warning(_("Failed writing raster map"));
|
|
@@ -212,15 +196,11 @@ int IL_resample_output_2d(struct interp_params *params, double zmin, double zmax
|
|
|
}
|
|
|
|
|
|
if (params->tcurv != NULL) {
|
|
|
- fseek(params->Tmp_fd_yy, 0L, 0); /* seek to the beginning */
|
|
|
+ G_fseek(params->Tmp_fd_yy, 0L, 0); /* seek to the beginning */
|
|
|
for (i = 0; i < params->nsizr; i++) {
|
|
|
/* seek to the right row */
|
|
|
- if (fseek(params->Tmp_fd_yy, (long)
|
|
|
- ((params->nsizr - 1 -
|
|
|
- i) * params->nsizc * sizeof(FCELL)), 0) == -1) {
|
|
|
- G_warning(_("Unable to fseek to the right spot"));
|
|
|
- return -1;
|
|
|
- }
|
|
|
+ G_fseek(params->Tmp_fd_yy, (off_t) (params->nsizr - 1 - i) *
|
|
|
+ params->nsizc * sizeof(FCELL), 0);
|
|
|
fread(cell1, sizeof(FCELL), params->nsizc, params->Tmp_fd_yy);
|
|
|
if (Rast_put_f_row(cf5, cell1) < 0) {
|
|
|
G_warning(_("Failed writing raster map"));
|
|
@@ -230,15 +210,11 @@ int IL_resample_output_2d(struct interp_params *params, double zmin, double zmax
|
|
|
}
|
|
|
|
|
|
if (params->mcurv != NULL) {
|
|
|
- fseek(params->Tmp_fd_xy, 0L, 0); /* seek to the beginning */
|
|
|
+ G_fseek(params->Tmp_fd_xy, 0L, 0); /* seek to the beginning */
|
|
|
for (i = 0; i < params->nsizr; i++) {
|
|
|
/* seek to the right row */
|
|
|
- if (fseek(params->Tmp_fd_xy, (long)
|
|
|
- ((params->nsizr - 1 -
|
|
|
- i) * params->nsizc * sizeof(FCELL)), 0) == -1) {
|
|
|
- G_warning(_("Unable to fseek to the right spot"));
|
|
|
- return -1;
|
|
|
- }
|
|
|
+ G_fseek(params->Tmp_fd_xy, (off_t) (params->nsizr - 1 - i) *
|
|
|
+ params->nsizc * sizeof(FCELL), 0);
|
|
|
fread(cell1, sizeof(FCELL), params->nsizc, params->Tmp_fd_xy);
|
|
|
if (Rast_put_f_row(cf6, cell1) < 0) {
|
|
|
G_warning(_("Failed writing raster map"));
|