Changeset 53874

Timestamp:

Nov 17, 2012, 11:46:43 PM (12 years ago)

Author:

hcho

Message:

Fixed the broken -s barscale (ticket 422).

File:

• grass/trunk/display/d.barscale/draw_scale.c (modified) (2 diffs)

grass/trunk/display/d.barscale/draw_scale.c

@@ -202 +202 @@
         D_pos_rel(0, 1 - 4);
         for (i = 1; i <= scales[incr].seg; i++) {
-            xarr[0] = 0;            yarr[0] = 0;
-            xarr[1] = seg_len;      yarr[1] = 0;
-            xarr[2] = 0;            yarr[2] = (i % 2 ? -4 : 4);
-            xarr[3] = -seg_len;     yarr[3] = 0;
-            xarr[4] = 0;            yarr[4] = (i % 2 ? 4 : -4);
+            xarr[0] = 0;                    yarr[0] = 0;
+            xarr[1] = (int)seg_len;         yarr[1] = 0;
+            xarr[2] = 0;                    yarr[2] = (i % 2 ? -4 : 4);
+            xarr[3] = -(int)seg_len;        yarr[3] = 0;
+            xarr[4] = 0;                    yarr[4] = (i % 2 ? 4 : -4);
             /* width is seg_len and height is 4 */
-            D_polygon_rel(xarr, yarr, 4);
-            D_pos_rel(seg_len, 0);
+            D_polygon_rel(xarr, yarr, 5);
+            D_pos_rel((int)seg_len, 0);
         }
     }
@@ -226 +226 @@
         for (i = 1; i <= scales[incr].seg; i += 2) {
             /* width is seg_len and height is 5 */
-            D_box_rel(seg_len, -5);
-            D_pos_rel(seg_len * 2, 0);
+            D_box_rel((int)seg_len, -5);
+            D_pos_rel((int)seg_len * 2, 0);
         }
     }