|
 |
bf231a2 |
From efd33aad5e69f36ab343b1f28839a55db4538104 Mon Sep 17 00:00:00 2001
|
|
|
599c4ed |
From: Tom Hughes <tom@compton.nu>
|
|
|
599c4ed |
Date: Sun, 19 May 2013 10:55:37 +0100
|
|
|
bf231a2 |
Subject: [PATCH 01/15] Fix non-terminating loop conditions when len=1
|
|
|
599c4ed |
|
|
|
599c4ed |
- while(abs(sx - lp.x1) + abs(sy - lp.y1) > lp2.len)
|
|
|
599c4ed |
+ while(abs(sx - lp.x1) + abs(sy - lp.y1) > 1 + lp2.len)
|
|
|
599c4ed |
{
|
|
|
599c4ed |
sx = (lp.x1 + sx) >> 1;
|
|
|
599c4ed |
sy = (lp.y1 + sy) >> 1;
|
|
|
599c4ed |
}
|
|
|
599c4ed |
---
|
|
|
599c4ed |
include/agg_renderer_outline_aa.h | 8 ++++----
|
|
|
599c4ed |
include/agg_renderer_outline_image.h | 4 ++--
|
|
|
599c4ed |
2 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
599c4ed |
|
|
|
599c4ed |
diff --git a/include/agg_renderer_outline_aa.h b/include/agg_renderer_outline_aa.h
|
|
|
599c4ed |
index ce25a2e..cb2aa00 100644
|
|
|
599c4ed |
--- a/include/agg_renderer_outline_aa.h
|
|
|
599c4ed |
+++ b/include/agg_renderer_outline_aa.h
|
|
|
599c4ed |
@@ -1659,7 +1659,7 @@ namespace agg
|
|
|
599c4ed |
}
|
|
|
599c4ed |
else
|
|
|
599c4ed |
{
|
|
|
599c4ed |
- while(abs(sx - lp.x1) + abs(sy - lp.y1) > lp2.len)
|
|
|
599c4ed |
+ while(abs(sx - lp.x1) + abs(sy - lp.y1) > 1 + lp2.len)
|
|
|
599c4ed |
{
|
|
|
599c4ed |
sx = (lp.x1 + sx) >> 1;
|
|
|
599c4ed |
sy = (lp.y1 + sy) >> 1;
|
|
|
599c4ed |
@@ -1726,7 +1726,7 @@ namespace agg
|
|
|
599c4ed |
}
|
|
|
599c4ed |
else
|
|
|
599c4ed |
{
|
|
|
599c4ed |
- while(abs(ex - lp.x2) + abs(ey - lp.y2) > lp2.len)
|
|
|
599c4ed |
+ while(abs(ex - lp.x2) + abs(ey - lp.y2) > 1 + lp2.len)
|
|
|
599c4ed |
{
|
|
|
599c4ed |
ex = (lp.x2 + ex) >> 1;
|
|
|
599c4ed |
ey = (lp.y2 + ey) >> 1;
|
|
|
599c4ed |
@@ -1798,7 +1798,7 @@ namespace agg
|
|
|
599c4ed |
}
|
|
|
599c4ed |
else
|
|
|
599c4ed |
{
|
|
|
599c4ed |
- while(abs(sx - lp.x1) + abs(sy - lp.y1) > lp2.len)
|
|
|
599c4ed |
+ while(abs(sx - lp.x1) + abs(sy - lp.y1) > 1 + lp2.len)
|
|
|
599c4ed |
{
|
|
|
599c4ed |
sx = (lp.x1 + sx) >> 1;
|
|
|
599c4ed |
sy = (lp.y1 + sy) >> 1;
|
|
|
599c4ed |
@@ -1811,7 +1811,7 @@ namespace agg
|
|
|
599c4ed |
}
|
|
|
599c4ed |
else
|
|
|
599c4ed |
{
|
|
|
599c4ed |
- while(abs(ex - lp.x2) + abs(ey - lp.y2) > lp2.len)
|
|
|
599c4ed |
+ while(abs(ex - lp.x2) + abs(ey - lp.y2) > 1 + lp2.len)
|
|
|
599c4ed |
{
|
|
|
599c4ed |
ex = (lp.x2 + ex) >> 1;
|
|
|
599c4ed |
ey = (lp.y2 + ey) >> 1;
|
|
|
599c4ed |
diff --git a/include/agg_renderer_outline_image.h b/include/agg_renderer_outline_image.h
|
|
|
599c4ed |
index fbfac10..66d2b9a 100644
|
|
|
599c4ed |
--- a/include/agg_renderer_outline_image.h
|
|
|
599c4ed |
+++ b/include/agg_renderer_outline_image.h
|
|
|
599c4ed |
@@ -969,7 +969,7 @@ namespace agg
|
|
|
599c4ed |
}
|
|
|
599c4ed |
else
|
|
|
599c4ed |
{
|
|
|
599c4ed |
- while(abs(sx - lp.x1) + abs(sy - lp.y1) > lp2.len)
|
|
|
599c4ed |
+ while(abs(sx - lp.x1) + abs(sy - lp.y1) > 1 + lp2.len)
|
|
|
599c4ed |
{
|
|
|
599c4ed |
sx = (lp.x1 + sx) >> 1;
|
|
|
599c4ed |
sy = (lp.y1 + sy) >> 1;
|
|
|
599c4ed |
@@ -982,7 +982,7 @@ namespace agg
|
|
|
599c4ed |
}
|
|
|
599c4ed |
else
|
|
|
599c4ed |
{
|
|
|
599c4ed |
- while(abs(ex - lp.x2) + abs(ey - lp.y2) > lp2.len)
|
|
|
599c4ed |
+ while(abs(ex - lp.x2) + abs(ey - lp.y2) > 1 + lp2.len)
|
|
|
599c4ed |
{
|
|
|
599c4ed |
ex = (lp.x2 + ex) >> 1;
|
|
|
599c4ed |
ey = (lp.y2 + ey) >> 1;
|
|
|
599c4ed |
--
|
|
|
599c4ed |
1.8.1.4
|
|
|
599c4ed |
|