From 958f166d427ee035ce32aec726812874c7217895 Mon Sep 17 00:00:00 2001 From: Markus Metz Date: Mon, 1 Mar 2021 15:16:12 +0100 Subject: [PATCH] i.edge do not compare signed and unsigned integers --- grass7/imagery/i.edge/canny.c | 2 +- grass7/imagery/i.edge/main.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/grass7/imagery/i.edge/canny.c b/grass7/imagery/i.edge/canny.c index a4f3e7c784..d98691b9e8 100644 --- a/grass7/imagery/i.edge/canny.c +++ b/grass7/imagery/i.edge/canny.c @@ -337,7 +337,7 @@ void performHysteresis(CELL * edges, CELL * magnitude, int low, int high, void thresholdEdges(CELL * edges, int rows, int cols) { - int i; + size_t i; size_t max = (size_t)rows * cols; for (i = 0; i < max; i++) { diff --git a/grass7/imagery/i.edge/main.c b/grass7/imagery/i.edge/main.c index f59847cdc9..65fca44ec9 100644 --- a/grass7/imagery/i.edge/main.c +++ b/grass7/imagery/i.edge/main.c @@ -134,7 +134,7 @@ int main(int argc, char *argv[]) static const int MAGNITUDE_LIMIT = 1000; int lowThreshold, highThreshold, low, high; - int nrows, ncols; + int nrows, ncols, i; size_t dim_2; DCELL *mat1; @@ -270,7 +270,7 @@ int main(int argc, char *argv[]) outrast = Rast_allocate_buf(CELL_TYPE); Rast_set_c_null_value(outrast, ncols); - for (r = 0; r < nrows; r++) { + for (i = 0; i < nrows; i++) { Rast_put_row(outfd, outrast, CELL_TYPE); } @@ -283,7 +283,7 @@ int main(int argc, char *argv[]) if (anglesMapName) { outfd = Rast_open_new(anglesMapName, CELL_TYPE); - for (r = 0; r < nrows; r++) { + for (i = 0; i < nrows; i++) { Rast_put_row(outfd, outrast, CELL_TYPE); }