DO NOT REPLY TO THIS MESSAGE. INSTEAD, POST ANY RESPONSES TO THE LINK BELOW.
[STR New]
Link: http://www.fltk.org/str.php?L2405
Version: 1.3-current
Link: http://www.fltk.org/str.php?L2405
Version: 1.3-current
Index: src/fl_boxtype.cxx
===================================================================
--- src/fl_boxtype.cxx (revision 7680)
+++ src/fl_boxtype.cxx (working copy)
@@ -81,19 +81,19 @@
uchar *g = fl_gray_ramp();
if (h > 0 && w > 0) for (;*s;) {
// draw top line:
- fl_color(g[*s++]);
+ fl_color(g[(uchar)*s++]);
fl_xyline(x, y, x+w-1);
y++; if (--h <= 0) break;
// draw left line:
- fl_color(g[*s++]);
+ fl_color(g[(uchar)*s++]);
fl_yxline(x, y+h-1, y);
x++; if (--w <= 0) break;
// draw bottom line:
- fl_color(g[*s++]);
+ fl_color(g[(uchar)*s++]);
fl_xyline(x, y+h-1, x+w-1);
if (--h <= 0) break;
// draw right line:
- fl_color(g[*s++]);
+ fl_color(g[(uchar)*s++]);
fl_yxline(x+w-1, y+h-1, y);
if (--w <= 0) break;
}
@@ -115,19 +115,19 @@
uchar *g = fl_gray_ramp();
if (h > 0 && w > 0) for (;*s;) {
// draw bottom line:
- fl_color(g[*s++]);
+ fl_color(g[(uchar)*s++]);
fl_xyline(x, y+h-1, x+w-1);
if (--h <= 0) break;
// draw right line:
- fl_color(g[*s++]);
+ fl_color(g[(uchar)*s++]);
fl_yxline(x+w-1, y+h-1, y);
if (--w <= 0) break;
// draw top line:
- fl_color(g[*s++]);
+ fl_color(g[(uchar)*s++]);
fl_xyline(x, y, x+w-1);
y++; if (--h <= 0) break;
// draw left line:
- fl_color(g[*s++]);
+ fl_color(g[(uchar)*s++]);
fl_yxline(x, y+h-1, y);
x++; if (--w <= 0) break;
}
Index: src/fl_plastic.cxx
===================================================================
--- src/fl_plastic.cxx (revision 7680)
+++ src/fl_plastic.cxx (working copy)
@@ -87,13 +87,13 @@
{
// Draw lines around the perimeter of the button, 4 colors per
// circuit.
- fl_color(shade_color(g[*c++], bc));
+ fl_color(shade_color(g[(uchar)*c++], bc));
fl_line(x, y + h + b, x + w - 1, y + h + b, x + w + b - 1, y + h);
- fl_color(shade_color(g[*c++], bc));
+ fl_color(shade_color(g[(uchar)*c++], bc));
fl_line(x + w + b - 1, y + h, x + w + b - 1, y, x + w - 1, y - b);
- fl_color(shade_color(g[*c++], bc));
+ fl_color(shade_color(g[(uchar)*c++], bc));
fl_line(x + w - 1, y - b, x, y - b, x - b, y);
- fl_color(shade_color(g[*c++], bc));
+ fl_color(shade_color(g[(uchar)*c++], bc));
fl_line(x - b, y, x - b, y + h, x, y + h + b);
}
}
@@ -106,45 +106,45 @@
if (w==h) {
for (; b > 1; b --, x ++, y ++, w -= 2, h -= 2)
{
- fl_color(shade_color(g[*c++], bc));
+ fl_color(shade_color(g[(uchar)*c++], bc));
fl_arc(x, y, w, h, 45.0, 135.0);
- fl_color(shade_color(g[*c++], bc));
+ fl_color(shade_color(g[(uchar)*c++], bc));
fl_arc(x, y, w, h, 315.0, 405.0);
- fl_color(shade_color(g[*c++], bc));
+ fl_color(shade_color(g[(uchar)*c++], bc));
fl_arc(x, y, w, h, 225.0, 315.0);
- fl_color(shade_color(g[*c++], bc));
+ fl_color(shade_color(g[(uchar)*c++], bc));
fl_arc(x, y, w, h, 135.0, 225.0);
}
} else if (w>h) {
int d = h/2;
for (; b > 1; d--, b --, x ++, y ++, w -= 2, h -= 2)
{
- fl_color(shade_color(g[*c++], bc));
+ fl_color(shade_color(g[(uchar)*c++], bc));
fl_arc(x, y, h, h, 90.0, 135.0);
fl_xyline(x+d, y, x+w-d);
fl_arc(x+w-h, y, h, h, 45.0, 90.0);
- fl_color(shade_color(g[*c++], bc));
+ fl_color(shade_color(g[(uchar)*c++], bc));
fl_arc(x+w-h, y, h, h, 315.0, 405.0);
- fl_color(shade_color(g[*c++], bc));
+ fl_color(shade_color(g[(uchar)*c++], bc));
fl_arc(x+w-h, y, h, h, 270.0, 315.0);
fl_xyline(x+d, y+h-1, x+w-d);
fl_arc(x, y, h, h, 225.0, 270.0);
- fl_color(shade_color(g[*c++], bc));
+ fl_color(shade_color(g[(uchar)*c++], bc));
fl_arc(x, y, h, h, 135.0, 225.0);
}
} else if (w<h) {
int d = w/2;
for (; b > 1; d--, b --, x ++, y ++, w -= 2, h -= 2)
{
- fl_color(shade_color(g[*c++], bc));
+ fl_color(shade_color(g[(uchar)*c++], bc));
fl_arc(x, y, w, w, 45.0, 135.0);
- fl_color(shade_color(g[*c++], bc));
+ fl_color(shade_color(g[(uchar)*c++], bc));
fl_arc(x, y, w, w, 0.0, 45.0);
fl_yxline(x+w-1, y+d, y+h-d);
fl_arc(x, y+h-w, w, w, 315.0, 360.0);
- fl_color(shade_color(g[*c++], bc));
+ fl_color(shade_color(g[(uchar)*c++], bc));
fl_arc(x, y+h-w, w, w, 225.0, 315.0);
- fl_color(shade_color(g[*c++], bc));
+ fl_color(shade_color(g[(uchar)*c++], bc));
fl_arc(x, y+h-w, w, w, 180.0, 225.0);
fl_yxline(x, y+d, y+h-d);
fl_arc(x, y, w, w, 135.0, 180.0);
@@ -166,7 +166,7 @@
for (i = 0, j = 0; j < chalf; i ++, j += cstep) {
// Draw the top line and points...
- fl_color(shade_color(g[c[i]], bc));
+ fl_color(shade_color(g[(uchar)c[i]], bc));
fl_xyline(x + 1, y + i, x + w - 2);
fl_color(shade_color(g[c[i] - 2], bc));
@@ -174,7 +174,7 @@
fl_point(x + w - 1, y + i + 1);
// Draw the bottom line and points...
- fl_color(shade_color(g[c[clen - i]], bc));
+ fl_color(shade_color(g[(uchar)c[clen - i]], bc));
fl_xyline(x + 1, y + h - i, x + w - 2);
fl_color(shade_color(g[c[clen - i] - 2], bc));
@@ -185,7 +185,7 @@
// Draw the interior and sides...
i = chalf / cstep;
- fl_color(shade_color(g[c[chalf]], bc));
+ fl_color(shade_color(g[(uchar)c[chalf]], bc));
fl_rectf(x + 1, y + i, w - 2, h - 2 * i + 1);
fl_color(shade_color(g[c[chalf] - 2], bc));
@@ -197,7 +197,7 @@
for (i = 0, j = 0; j < chalf; i ++, j += cstep) {
// Draw the left line and points...
- fl_color(shade_color(g[c[i]], bc));
+ fl_color(shade_color(g[(uchar)c[i]], bc));
fl_yxline(x + i, y + 1, y + h - 1);
fl_color(shade_color(g[c[i] - 2], bc));
@@ -205,7 +205,7 @@
fl_point(x + i + 1, y + h);
// Draw the right line and points...
- fl_color(shade_color(g[c[clen - i]], bc));
+ fl_color(shade_color(g[(uchar)c[clen - i]], bc));
fl_yxline(x + w - 1 - i, y + 1, y + h - 1);
fl_color(shade_color(g[c[clen - i] - 2], bc));
@@ -216,7 +216,7 @@
// Draw the interior, top, and bottom...
i = chalf / cstep;
- fl_color(shade_color(g[c[chalf]], bc));
+ fl_color(shade_color(g[(uchar)c[chalf]], bc));
fl_rectf(x + i, y + 1, w - 2 * i, h - 1);
fl_color(shade_color(g[c[chalf] - 2], bc));
@@ -236,20 +236,20 @@
const int na = 8;
for (i=0; i<chalf; i++, d--, x++, y++, w-=2, h-=2)
{
- fl_color(shade_color(g[c[i]], bc));
+ fl_color(shade_color(g[(uchar)c[i]], bc));
fl_pie(x, y, h, h, 90.0, 135.0+i*na);
fl_xyline(x+d, y, x+w-d);
fl_pie(x+w-h, y, h, h, 45.0+i*na, 90.0);
fl_color(shade_color(g[c[i] - 2], bc));
fl_pie(x+w-h, y, h, h, 315.0+i*na, 405.0+i*na);
- fl_color(shade_color(g[c[clen - i]], bc));
+ fl_color(shade_color(g[(uchar)c[clen - i]], bc));
fl_pie(x+w-h, y, h, h, 270.0, 315.0+i*na);
fl_xyline(x+d, y+h-1, x+w-d);
fl_pie(x, y, h, h, 225.0+i*na, 270.0);
fl_color(shade_color(g[c[clen - i] - 2], bc));
fl_pie(x, y, h, h, 135.0+i*na, 225.0+i*na);
}
- fl_color(shade_color(g[c[chalf]], bc));
+ fl_color(shade_color(g[(uchar)c[chalf]], bc));
fl_rectf(x+d, y, w-h+1, h+1);
fl_pie(x, y, h, h, 90.0, 270.0);
fl_pie(x+w-h, y, h, h, 270.0, 90.0);
@@ -258,20 +258,20 @@
const int na = 8;
for (i=0; i<chalf; i++, d--, x++, y++, w-=2, h-=2)
{
- fl_color(shade_color(g[c[i]], bc));
+ fl_color(shade_color(g[(uchar)c[i]], bc));
fl_pie(x, y, w, w, 45.0+i*na, 135.0+i*na);
fl_color(shade_color(g[c[i] - 2], bc));
fl_pie(x, y, w, w, 0.0, 45.0+i*na);
fl_yxline(x+w-1, y+d, y+h-d);
fl_pie(x, y+h-w, w, w, 315.0+i*na, 360.0);
- fl_color(shade_color(g[c[clen - i]], bc));
+ fl_color(shade_color(g[(uchar)c[clen - i]], bc));
fl_pie(x, y+h-w, w, w, 225.0+i*na, 315.0+i*na);
fl_color(shade_color(g[c[clen - i] - 2], bc));
fl_pie(x, y+h-w, w, w, 180.0, 225.0+i*na);
fl_yxline(x, y+d, y+h-d);
fl_pie(x, y, w, w, 135.0+i*na, 180.0);
}
- fl_color(shade_color(g[c[chalf]], bc));
+ fl_color(shade_color(g[(uchar)c[chalf]], bc));
fl_rectf(x, y+d, w+1, h-w+1);
fl_pie(x, y, w, w, 0.0, 180.0);
fl_pie(x, y+h-w, w, w, 180.0, 360.0);
_______________________________________________
fltk-bugs mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-bugs
