Code

warning cleanup
authorjoncruz <joncruz@users.sourceforge.net>
Wed, 5 Dec 2007 06:01:15 +0000 (06:01 +0000)
committerjoncruz <joncruz@users.sourceforge.net>
Wed, 5 Dec 2007 06:01:15 +0000 (06:01 +0000)
src/helper/png-write.cpp
src/live_effects/effect.cpp

index 2128abd393f315e190f79d09c61b0546801cd3ad..6156f60e6c130e33b62ec17250ff174b85e25ca5 100644 (file)
@@ -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;
index b892c520e970123da3499229d9e155e13bb69ff6..ed2eb62fe286c62ed912ff29128a999ae4855b24 100644 (file)
@@ -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;
             }
         }