diff --git a/legacy/evas/src/lib/engines/common/evas_line_main.c b/legacy/evas/src/lib/engines/common/evas_line_main.c index 7e37d7b13b..04401cbe36 100644 --- a/legacy/evas/src/lib/engines/common/evas_line_main.c +++ b/legacy/evas/src/lib/engines/common/evas_line_main.c @@ -296,153 +296,151 @@ _evas_draw_simple_line(RGBA_Image *dst, RGBA_Draw_Context *dc, int x0, int y0, i } -#define SETUP_LINE_SHALLOW \ - if (x0 > x1) \ - { \ - EXCHANGE_POINTS(x0, y0, x1, y1) \ - dx = -dx; \ - dy = -dy; \ - } \ - \ - px = x0; \ - py = y0; \ - \ - p0_in = (IN_RANGE(x0 , y0 , clw, clh) ? 1 : 0); \ - p1_in = (IN_RANGE(x1 , y1 , clw, clh) ? 1 : 0); \ - \ - dely = 1; \ - dh = dstw; \ - if (dy < 0) \ - { \ - dely = -1; \ - dh = -dstw; \ - } \ - \ - dyy = ((dy) << 16) / (dx); \ - \ - if (!p0_in) \ - { \ - dxx = ((dx) << 16) / (dy); \ - if (px < 0) \ - { \ - x = -px; px = 0; \ - yy = x * dyy; \ - y = yy >> 16; \ - if (!a_a) \ - y += (yy - (y << 16)) >> 15; \ - py += y; \ - if ((dely > 0) && (py >= clh)) \ - return; \ - else if ((dely < 0) && (py < -1)) \ - return; \ - } \ - \ - y = 0; \ - if ((dely > 0) && (py < -1)) \ - y = (-1 - py); \ - else if ((dely < 0) && (py >= clh)) \ - y = (clh - 1 - py); \ - \ - xx = y * dxx; \ - x = xx >> 16; \ - if (!a_a) \ - x += (xx - (x << 16)) >> 15; \ - px += x; \ - if (px >= clw) return; \ - \ - yy = x * dyy; \ - y = yy >> 16; \ - if (!a_a) \ - y += (yy - (y << 16)) >> 15; \ - py += y; \ - if ((dely > 0) && (py >= clh)) \ - return; \ - else if ((dely < 0) && (py < -1)) \ - return; \ - } \ - \ - p = data + (dstw * py) + px; \ - \ - x = px - x0; \ - yy = x * dyy; \ - prev_y = (yy >> 16); \ - \ - rx = MIN(x1 + 1, clw); \ - by = clh - 1; +#define SETUP_LINE_SHALLOW \ + if (x0 > x1) \ + { \ + EXCHANGE_POINTS(x0, y0, x1, y1); \ + dx = -dx; \ + dy = -dy; \ + } \ + \ + px = x0; \ + py = y0; \ + \ + p0_in = (IN_RANGE(x0 , y0 , clw, clh) ? 1 : 0); \ + p1_in = (IN_RANGE(x1 , y1 , clw, clh) ? 1 : 0); \ + \ + dely = 1; \ + dh = dstw; \ + if (dy < 0) \ + { \ + dely = -1; \ + dh = -dstw; \ + } \ + \ + dyy = ((dy) << 16) / (dx); \ + \ + if (!p0_in) \ + { \ + dxx = ((dx) << 16) / (dy); \ + if (px < 0) \ + { \ + x = -px; px = 0; \ + yy = x * dyy; \ + y = yy >> 16; \ + if (!a_a) \ + y += (yy - (y << 16)) >> 15; \ + py += y; \ + if ((dely > 0) && (py >= clh)) \ + return; \ + else if ((dely < 0) && (py < -1)) \ + return; \ + } \ + \ + y = 0; \ + if ((dely > 0) && (py < 0)) \ + y = (-1 - py); \ + else if ((dely < 0) && (py >= clh)) \ + y = (clh - 1 - py); \ + \ + xx = y * dxx; \ + x = xx >> 16; \ + if (!a_a) \ + x += (xx - (x << 16)) >> 15; \ + px += x; \ + if (px >= clw) return; \ + \ + yy = x * dyy; \ + y = yy >> 16; \ + if (!a_a) \ + y += (yy - (y << 16)) >> 15; \ + py += y; \ + if ((dely > 0) && (py >= clh)) \ + return; \ + else if ((dely < 0) && (py < -1)) \ + return; \ + } \ + \ + p = data + (dstw * py) + px; \ + \ + x = px - x0; \ + yy = x * dyy; \ + prev_y = (yy >> 16); \ + \ + rx = MIN(x1 + 1, clw); \ + by = clh - 1; -#define SETUP_LINE_STEEP \ - if (y0 > y1) \ - { \ - EXCHANGE_POINTS(x0, y0, x1, y1) \ - dx = -dx; \ - dy = -dy; \ - } \ - \ - px = x0; \ - py = y0; \ - \ - p0_in = (IN_RANGE(x0 , y0 , clw, clh) ? 1 : 0); \ - p1_in = (IN_RANGE(x1 , y1 , clw, clh) ? 1 : 0); \ - \ - delx = 1; \ - if (dx < 0) \ - delx = -1; \ - \ - dxx = ((dx) << 16) / (dy); \ - \ - if (!p0_in) \ - { \ - dyy = ((dy) << 16) / (dx); \ - \ - if (py < 0) \ - { \ +#define SETUP_LINE_STEEP \ + if (y0 > y1) \ + { \ + EXCHANGE_POINTS(x0, y0, x1, y1); \ + dx = -dx; \ + dy = -dy; \ + } \ + \ + px = x0; \ + py = y0; \ + \ + p0_in = (IN_RANGE(x0 , y0 , clw, clh) ? 1 : 0); \ + p1_in = (IN_RANGE(x1 , y1 , clw, clh) ? 1 : 0); \ + \ + delx = 1; \ + if (dx < 0) \ + delx = -1; \ + \ + dxx = ((dx) << 16) / (dy); \ + \ + if (!p0_in) \ + { \ + dyy = ((dy) << 16) / (dx); \ + \ + if (py < 0) \ + { \ y = -py; py = 0; \ - xx = y * dxx; \ - x = xx >> 16; \ + xx = y * dxx; \ + x = xx >> 16; \ if (!a_a) \ - x += (xx - (x << 16)) >> 15; \ - px += x; \ + x += (xx - (x << 16)) >> 15; \ + px += x; \ if ((delx > 0) && (px >= clw)) \ - return; \ - else if ((delx < 0) && (px < -1)) \ - return; \ - } \ - \ - x = 0; \ - if ((delx > 0) && (px < -1)) \ - x = (-1 - px); \ - else if ((delx < 0) && (px >= clw)) \ - x = (clw - 1 - px); \ - \ - yy = x * dyy; \ - y = yy >> 16; \ - if (!a_a) \ - y += (yy - (y << 16)) >> 15; \ - py += y; \ - if (py >= clh) return; \ - \ - xx = y * dxx; \ - x = xx >> 16; \ - if (!a_a) \ - x += (xx - (x << 16)) >> 15; \ - px += x; \ - if ((delx > 0) && (px >= clw)) \ - return; \ - else if ((delx < 0) && (px < -1)) \ - return; \ - } \ - \ - p = data + (dstw * py) + px; \ - \ - y = py - y0; \ - xx = y * dxx; \ - prev_x = (xx >> 16); \ - \ - by = MIN(y1 + 1, clh); \ - rx = clw - 1; - - + return; \ + else if ((delx < 0) && (px < -1)) \ + return; \ + } \ + \ + x = 0; \ + if ((delx > 0) && (px < -1)) \ + x = (-1 - px); \ + else if ((delx < 0) && (px >= clw)) \ + x = (clw - 1 - px); \ + \ + yy = x * dyy; \ + y = yy >> 16; \ + if (!a_a) \ + y += (yy - (y << 16)) >> 15; \ + py += y; \ + if (py >= clh) return; \ + \ + xx = y * dxx; \ + x = xx >> 16; \ + if (!a_a) \ + x += (xx - (x << 16)) >> 15; \ + px += x; \ + if ((delx > 0) && (px >= clw)) \ + return; \ + else if ((delx < 0) && (px < -1)) \ + return; \ + } \ + \ + p = data + (dstw * py) + px; \ + \ + y = py - y0; \ + xx = y * dxx; \ + prev_x = (xx >> 16); \ + \ + by = MIN(y1 + 1, clh); \ + rx = clw - 1; static void _evas_draw_line(RGBA_Image *dst, RGBA_Draw_Context *dc, int x0, int y0, int x1, int y1) @@ -485,7 +483,7 @@ _evas_draw_line(RGBA_Image *dst, RGBA_Draw_Context *dc, int x0, int y0, int x1, /* shallow: x-parametric */ if ((dy < dx) || (dy < -dx)) { - SETUP_LINE_SHALLOW + SETUP_LINE_SHALLOW; while (px < rx) { @@ -523,7 +521,7 @@ _evas_draw_line(RGBA_Image *dst, RGBA_Draw_Context *dc, int x0, int y0, int x1, /* steep: y-parametric */ - SETUP_LINE_STEEP + SETUP_LINE_STEEP; while (py < by) { @@ -571,7 +569,7 @@ _evas_draw_line_aa(RGBA_Image *dst, RGBA_Draw_Context *dc, int x0, int y0, int x RGBA_Gfx_Pt_Func pfunc; if (y0 > y1) - EXCHANGE_POINTS(x0, y0, x1, y1) + EXCHANGE_POINTS(x0, y0, x1, y1); dx = x1 - x0; dy = y1 - y0; @@ -602,7 +600,7 @@ _evas_draw_line_aa(RGBA_Image *dst, RGBA_Draw_Context *dc, int x0, int y0, int x /* shallow: x-parametric */ if ((dy < dx) || (dy < -dx)) { - SETUP_LINE_SHALLOW + SETUP_LINE_SHALLOW; while (px < rx) { @@ -642,8 +640,7 @@ _evas_draw_line_aa(RGBA_Image *dst, RGBA_Draw_Context *dc, int x0, int y0, int x } /* steep: y-parametric */ - - SETUP_LINE_STEEP + SETUP_LINE_STEEP; while (py < by) {