Changeset 17207

Timestamp:

02/03/14 09:39:08 (11 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixinf segmentation fault due to bad indexing

File:

• issm/trunk-jpl/src/c/modules/InterpFromMeshToGridx/InterpFromMeshToGridx.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/modules/InterpFromMeshToGridx/InterpFromMeshToGridx.cpp

@@ -107 +107 @@
                 /*Get indices i and j that form a square around the currant triangle*/
                 if (yflip){
-                        i1=max(0,      (int)floor((y_tria_max-y_grid_max)/yposting)-1);
-                        i2=min(nlines, (int)ceil((y_tria_min-y_grid_max)/yposting));
+                        i1=max(0,       (int)floor((y_tria_max-y_grid_max)/yposting)-1);
+                        i2=min(nlines-1,(int)ceil((y_tria_min-y_grid_max)/yposting));
                 }
                 else{
-                        i1=max(0,      (int)floor((y_tria_min-y_grid_min)/yposting)-1);
-                        i2=min(nlines, (int)ceil((y_tria_max-y_grid_min)/yposting));
+                        i1=max(0,       (int)floor((y_tria_min-y_grid_min)/yposting)-1);
+                        i2=min(nlines-1,(int)ceil((y_tria_max-y_grid_min)/yposting));
                 }
                 if (xflip){
-                        j1=max(0,     (int)floor((x_tria_max-x_grid_max)/xposting)-1);
-                        j2=min(ncols, (int)ceil((x_tria_min-x_grid_max)/xposting));
+                        j1=max(0,      (int)floor((x_tria_max-x_grid_max)/xposting)-1);
+                        j2=min(ncols-1,(int)ceil((x_tria_min-x_grid_max)/xposting));
                 }
                 else{
-                        j1=max(0,     (int)floor((x_tria_min-x_grid_min)/xposting)-1);
-                        j2=min(ncols, (int)ceil((x_tria_max-x_grid_min)/xposting));
+                        j1=max(0,      (int)floor((x_tria_min-x_grid_min)/xposting)-1);
+                        j2=min(ncols-1,(int)ceil((x_tria_max-x_grid_min)/xposting));
                 }