From: joncruz Date: Wed, 5 Dec 2007 06:01:15 +0000 (+0000) Subject: warning cleanup X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f9504c822b72a774b910958446fd1e730235b7cb;p=inkscape.git warning cleanup --- diff --git a/src/helper/png-write.cpp b/src/helper/png-write.cpp index 2128abd39..6156f60e6 100644 --- a/src/helper/png-write.cpp +++ b/src/helper/png-write.cpp @@ -216,8 +216,8 @@ sp_export_get_rows(guchar const **rows, int row, int num_rows, void *data) if (!ebp->status((float) row / ebp->height, ebp->data)) return 0; } - num_rows = MIN(num_rows, ebp->sheight); - num_rows = MIN(num_rows, ebp->height - row); + num_rows = MIN(num_rows, static_cast(ebp->sheight)); + num_rows = MIN(num_rows, static_cast(ebp->height - row)); /* Set area of interest */ // bbox is now set to the entire image to prevent discontinuities @@ -242,7 +242,7 @@ sp_export_get_rows(guchar const **rows, int row, int num_rows, void *data) for (int r = 0; r < num_rows; r++) { guchar *p = NR_PIXBLOCK_PX(&pb) + r * pb.rs; - for (int c = 0; c < ebp->width; c++) { + for (int c = 0; c < static_cast(ebp->width); c++) { *p++ = ebp->r; *p++ = ebp->g; *p++ = ebp->b; diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index b892c520e..ed2eb62fe 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -297,7 +297,7 @@ Parameter * Effect::getNextOncanvasEditableParam() { oncanvasedit_it++; - if (oncanvasedit_it == param_vector.size()) { + if (oncanvasedit_it == static_cast(param_vector.size())) { oncanvasedit_it = 0; } int old_it = oncanvasedit_it; @@ -308,7 +308,7 @@ Effect::getNextOncanvasEditableParam() return param; } else { oncanvasedit_it++; - if (oncanvasedit_it == param_vector.size()) { // loop round the map + if (oncanvasedit_it == static_cast(param_vector.size())) { // loop round the map oncanvasedit_it = 0; } }