From 678ee16d6a9cdaad33ef9c05849329c14e8e6426 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= <superstippi@gmx.de>
Date: Fri, 19 Mar 2010 09:38:28 +0000
Subject: [PATCH] Fixed double conversion from view to screen space I
 introduced with the previous commit. PictureTest at least works again.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35910 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/servers/app/ServerPicture.cpp | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/src/servers/app/ServerPicture.cpp b/src/servers/app/ServerPicture.cpp
index d1b19a0789..347df1b6dd 100644
--- a/src/servers/app/ServerPicture.cpp
+++ b/src/servers/app/ServerPicture.cpp
@@ -88,9 +88,7 @@ ShapePainter::IterateMoveTo(BPoint* point)
 {
 	try {
 		fOpStack.push(OP_MOVETO);
-		BPoint transformed(*point);
-		fView->ConvertToScreenForDrawing(&transformed);
-		fPtStack.push(transformed);
+		fPtStack.push(*point);
 	} catch (std::bad_alloc) {
 		return B_NO_MEMORY;
 	}
@@ -104,11 +102,8 @@ ShapePainter::IterateLineTo(int32 lineCount, BPoint* linePts)
 {
 	try {
 		fOpStack.push(OP_LINETO | lineCount);
-		for (int32 i = 0; i < lineCount; i++) {
-			BPoint transformed(linePts[i]);
-			fView->ConvertToScreenForDrawing(&transformed);
-			fPtStack.push(transformed);
-		}
+		for (int32 i = 0; i < lineCount; i++)
+			fPtStack.push(linePts[i]);
 	} catch (std::bad_alloc) {
 		return B_NO_MEMORY;
 	}
@@ -123,11 +118,8 @@ ShapePainter::IterateBezierTo(int32 bezierCount, BPoint* bezierPts)
 	bezierCount *= 3;
 	try {
 		fOpStack.push(OP_BEZIERTO | bezierCount);
-		for (int32 i = 0; i < bezierCount; i++) {
-			BPoint transformed(bezierPts[i]);
-			fView->ConvertToScreenForDrawing(&transformed);
-			fPtStack.push(transformed);
-		}
+		for (int32 i = 0; i < bezierCount; i++)
+			fPtStack.push(bezierPts[i]);
 	} catch (std::bad_alloc) {
 		return B_NO_MEMORY;
 	}
@@ -155,11 +147,9 @@ ShapePainter::IterateArcTo(float& rx, float& ry,
 
 	try {
 		fOpStack.push(op | 3);
-		fPtStack.push(BPoint(rx * fView->Scale(), ry * fView->Scale()));
+		fPtStack.push(BPoint(rx, ry));
 		fPtStack.push(BPoint(angle, 0));
-		BPoint transformed(point);
-		fView->ConvertToScreenForDrawing(&transformed);
-		fPtStack.push(transformed);
+		fPtStack.push(point);
 	} catch (std::bad_alloc) {
 		return B_NO_MEMORY;
 	}
@@ -211,7 +201,7 @@ ShapePainter::Draw(BRect frame, bool filled)
 			fPtStack.pop();
 		}
 
-		BPoint offset;
+		BPoint offset(fView->CurrentState()->PenLocation());
 		fView->ConvertToScreenForDrawing(&offset);
 		fView->Window()->GetDrawingEngine()->DrawShape(frame, opCount,
 			opList, ptCount, ptList, filled, offset, fView->Scale());