diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2007-12-05 06:01:15 +0000 |
|---|---|---|
| committer | joncruz <joncruz@users.sourceforge.net> | 2007-12-05 06:01:15 +0000 |
| commit | 6770db9e0d85349552efd0d2f18359462ede53a9 (patch) | |
| tree | 8956c38c6e97e5bd615f885a87db6ff5bd7aab98 /src | |
| parent | Add entry fields for x/y coordinates of selected nodes (fixes bugs #170116 an... (diff) | |
| download | inkscape-6770db9e0d85349552efd0d2f18359462ede53a9.tar.gz inkscape-6770db9e0d85349552efd0d2f18359462ede53a9.zip | |
warning cleanup
(bzr r4175)
Diffstat (limited to 'src')
| -rw-r--r-- | src/helper/png-write.cpp | 6 | ||||
| -rw-r--r-- | src/live_effects/effect.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
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<int>(ebp->sheight)); + num_rows = MIN(num_rows, static_cast<int>(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<int>(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<int>(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<int>(param_vector.size())) { // loop round the map oncanvasedit_it = 0; } } |