Revert "sw_engine shape/image: substituting logical 'and' with 'or'"

This reverts commit 74b27c74af220e30fef274e07f8ad4f19430d217.

This patch breaks Stroke example. 1 line drawings...

There is a possibility that less 1 (i.e: 0.5) width axis-aligned line drawings...

So logically "&&" is correct.

Change-Id: Ia98622d7df464f55a255a35ccb37fc9664ed6954

diff --git a/src/lib/sw_engine/tvgSwImage.cpp b/src/lib/sw_engine/tvgSwImage.cpp
index 0c25b5b..5a58443 100644 (file)
--- a/src/lib/sw_engine/tvgSwImage.cpp
+++ b/src/lib/sw_engine/tvgSwImage.cpp
@@ -68,7 +68,7 @@ static bool _updateBBox(const SwOutline* outline, SwBBox& bbox, const SwSize& cl
     bbox.max.x = min(bbox.max.x, clip.w);
     bbox.max.y = min(bbox.max.y, clip.h);
 
-    if (xMax - xMin < 1 || yMax - yMin < 1) return false;
+    if (xMax - xMin < 1 && yMax - yMin < 1) return false;
 
     return true;
 }

diff --git a/src/lib/sw_engine/tvgSwShape.cpp b/src/lib/sw_engine/tvgSwShape.cpp
index e749aac..02284ff 100644 (file)
--- a/src/lib/sw_engine/tvgSwShape.cpp
+++ b/src/lib/sw_engine/tvgSwShape.cpp
@@ -193,7 +193,7 @@ static bool _updateBBox(const SwOutline* outline, SwBBox& bbox)
     bbox.min.y = yMin >> 6;
     bbox.max.y = (yMax + 63) >> 6;
 
-    if (xMax - xMin < 1 || yMax - yMin < 1) return false;
+    if (xMax - xMin < 1 && yMax - yMin < 1) return false;
 
     return true;
 }