[GRASS-SVN] r44530 - grass/trunk/raster/r.resamp.bspline
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Dec 2 10:21:08 EST 2010
Author: mmetz
Date: 2010-12-02 07:21:08 -0800 (Thu, 02 Dec 2010)
New Revision: 44530
Modified:
grass/trunk/raster/r.resamp.bspline/main.c
Log:
do not align elaboration box; use full bandwidth for special cases
Modified: grass/trunk/raster/r.resamp.bspline/main.c
===================================================================
--- grass/trunk/raster/r.resamp.bspline/main.c 2010-12-02 15:17:19 UTC (rev 44529)
+++ grass/trunk/raster/r.resamp.bspline/main.c 2010-12-02 15:21:08 UTC (rev 44530)
@@ -411,7 +411,7 @@
/* only works if source reg = dest reg with buffer */
/* messing with elaboration region is dangerous... */
- align_elaboration_box(&elaboration_reg, &src_reg, GENERAL_ROW);
+ /* align_elaboration_box(&elaboration_reg, &src_reg, GENERAL_ROW); */
align_interp_boxes(&general_box, &overlap_box, &dest_reg,
last_general_box, last_overlap_box, GENERAL_ROW);
@@ -419,7 +419,7 @@
P_set_regions(&elaboration_reg, &general_box, &overlap_box, dims,
FIRST_ROW);
- align_elaboration_box(&elaboration_reg, &src_reg, GENERAL_ROW);
+ /* align_elaboration_box(&elaboration_reg, &src_reg, GENERAL_ROW); */
align_interp_boxes(&general_box, &overlap_box, &dest_reg,
last_general_box, last_overlap_box, FIRST_ROW);
}
@@ -459,7 +459,7 @@
/* only works if source reg = dest reg with buffer */
/* messing with elaboration region is dangerous... */
- align_elaboration_box(&elaboration_reg, &src_reg, GENERAL_COLUMN);
+ /* align_elaboration_box(&elaboration_reg, &src_reg, GENERAL_COLUMN); */
align_interp_boxes(&general_box, &overlap_box, &dest_reg,
last_general_box, last_overlap_box, GENERAL_COLUMN);
@@ -467,7 +467,7 @@
P_set_regions(&elaboration_reg, &general_box, &overlap_box,
dims, FIRST_COLUMN);
- align_elaboration_box(&elaboration_reg, &src_reg, GENERAL_COLUMN);
+ /* align_elaboration_box(&elaboration_reg, &src_reg, GENERAL_COLUMN); */
align_interp_boxes(&general_box, &overlap_box, &dest_reg,
last_general_box, last_overlap_box, FIRST_COLUMN);
}
@@ -549,7 +549,7 @@
int i;
nparameters = nsplx * nsply;
- BW = P_get_BandWidth(P_BILINEAR, nsply) + 2 * (interp_method == P_BICUBIC);
+ BW = P_get_BandWidth(interp_method, nsply > nsplx ? nsply : nsplx);
/* Least Squares system */
N = G_alloc_matrix(nparameters, BW); /* Normal matrix */
More information about the grass-commit
mailing list