Changeset 319 for cpp/frams/canvas

Timestamp:

02/01/15 01:08:50 (10 years ago)

Author:

Maciej Komosinski

Message:

Fixed compilation warnings

File:

• cpp/frams/canvas/nn_smart_layout.cpp (modified) (7 diffs)

cpp/frams/canvas/nn_smart_layout.cpp

@@ -13 +13 @@
 #endif
 
-#define DB(x) 
+//#define DB(x) x
+#define DB(x)
 
 #if DB(1)+0
@@ -105 +106 @@
                 h = maxy - miny + 1;
                 map = (char*)calloc(1, w*h);
-                int i, e;
-                DB(printf("mapa bloku #%ld\n", id));
-                for (i = 0; i < elementy.size(); i++)
-                {
-                        e = elementy[i];
+                DB(printf("mapa bloku #%d\n", id));
+                for (size_t i = 0; i < elementy.size(); i++)
+                {
+                        int e = elementy[i];
                         map[w*(einfo[e].y - miny) + (einfo[e].x - minx)] = 1;
                 }
-                DB(for (i = 0; i < h; i++){ for (e = 0; e < w; e++)printf("%c", map[w*i + e] ? '*' : '.'); printf("\n"); })
+                DB(for (int i = 0; i < h; i++){ for (int e = 0; e < w; e++)printf("%c", map[w*i + e] ? '*' : '.'); printf("\n"); })
         }
 
@@ -154 +154 @@
 { // return 1 if successful
         if (!moznadolaczyc(b, b2, dx, dy)) return 0; // merging causes no collision
-        DB(printf("#%ld(%ld,%ld,%ld,%ld) + #%ld(%ld,%ld,%ld,%ld)<%ld,%ld>", b->id, b->minx, b->miny, b->maxx, b->maxy, b2->id, b2->minx, b2->miny, b2->maxx, b2->maxy, dx, dy));
+        DB(printf("#%d(%d,%d,%d,%d) + #%d(%d,%d,%d,%d)<%d,%d>", b->id, b->minx, b->miny, b->maxx, b->maxy, b2->id, b2->minx, b2->miny, b2->maxx, b2->maxy, dx, dy));
 
         b->zwolnijmape();
-        int i, e;
-        for (i = 0; i < b2->elementy.size(); i++)
-        {
-                e = b2->elementy[i];
+        for (size_t i = 0; i < b2->elementy.size(); i++)
+        {
+                int e = b2->elementy[i];
                 b->dodajelement(e, einfo[e].x + dx, einfo[e].y + dy);
         }
@@ -168 +167 @@
         b->maxy = max(b->maxy, dy + b2->maxy);
 
-        DB(printf(" -> (%ld,%ld,%ld,%ld)\n", b->minx, b->miny, b->maxx, b->maxy));
-
-        DB(printf(" ...#%ld...(%ld)...", b->id, b->elementy.size()));
-        for (i = 0; i < b->elementy.size(); i++)
-        {
-                e = b->elementy[i];
-                DB(assert(einfo[e].x >= b->minx);)
-                        DB(assert(einfo[e].x <= b->maxx);)
-                        DB(assert(einfo[e].y >= b->miny);)
-                        DB(assert(einfo[e].y <= b->maxy);)
-                        DB(printf("(%ld)%ld,%ld ", e, einfo[e].x, einfo[e].y));
-        }
-
-        DB(printf("\n"));
+        DB(
+        printf(" -> (%d,%d,%d,%d)\n", b->minx, b->miny, b->maxx, b->maxy);
+
+        printf(" ...#%d...(%d)...", b->id, b->elementy.size());
+        for (size_t i = 0; i < b->elementy.size(); i++)
+        {
+                int e = b->elementy[i];
+                assert(einfo[e].x >= b->minx);
+                        assert(einfo[e].x <= b->maxx);
+                        assert(einfo[e].y >= b->miny);
+                        assert(einfo[e].y <= b->maxy);
+                        printf("(%d)%d,%d ", e, einfo[e].x, einfo[e].y);
+        }
+
+        printf("\n")
+        );
 
         delete b2;
@@ -205 +206 @@
         dx = einfo[e].x - einfo[e2].x;
         dy = einfo[e].y - einfo[e2].y;
-        DB(printf("  elem.%ld (%ld,%ld@%ld) + elem.%ld (%ld,%ld@%ld)...\n", e, einfo[e].x, einfo[e].y, b->id, e2, einfo[e2].x, einfo[e2].y, b2->id));
+        DB(printf("  elem.%d (%d,%d@%d) + elem.%d (%d,%d@%d)...\n", e, einfo[e].x, einfo[e].y, b->id, e2, einfo[e2].x, einfo[e2].y, b2->id));
         if (dolaczblock(b, b2, dx - 1, dy)) return;
         int proba; // retry - increasing the y offset (keeps x offset at -1)
@@ -222 +223 @@
         if (einfo[e].block)
         {
-                DB(printf("block#%ld exists\n", e));
+                DB(printf("block#%d exists\n", e));
                 return;
         }
@@ -312 +313 @@
         {
                 DB(printf(" - - setting coordinates - -\n"));
-                int i;
                 DB(first->odtworzmape());
-                for (i = 0; i < first->elementy.size(); i++)
+                for (size_t i = 0; i < first->elementy.size(); i++)
                 {
                         el = first->elementy[i];