From bafd2b461acb32cfb40755067d408e480b0d099e Mon Sep 17 00:00:00 2001
From: Julian Harnath <julian.harnath@rwth-aachen.de>
Date: Sun, 23 Aug 2015 00:31:10 +0200
Subject: [PATCH] app_server: PictureBoundingBoxPlayer fixups

* TODO: squash commit before merge into master
---
 src/servers/app/PictureBoundingBoxPlayer.cpp | 12 ++++++------
 src/servers/app/PictureBoundingBoxPlayer.h   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/servers/app/PictureBoundingBoxPlayer.cpp b/src/servers/app/PictureBoundingBoxPlayer.cpp
index b330a78265..c8b931ce0c 100644
--- a/src/servers/app/PictureBoundingBoxPlayer.cpp
+++ b/src/servers/app/PictureBoundingBoxPlayer.cpp
@@ -50,12 +50,12 @@ typedef PictureBoundingBoxPlayer::State BoundingBoxState;
 
 class PictureBoundingBoxPlayer::State {
 public:
-	State(DrawState* drawState, BRect* boundingBox)
+	State(const DrawState* drawState, BRect* boundingBox)
 		:
 		fDrawState(drawState->Squash()),
 		fBoundingBox(boundingBox)
 	{
-		fBoundingBox->Set(INT_MAX, INT_MAX, 0, 0);
+		fBoundingBox->Set(INT_MAX, INT_MAX, INT_MIN, INT_MIN);
 	}
 
 	~State()
@@ -97,7 +97,7 @@ public:
 private:
 	void _AffineTransformRect(BRect& rect)
 	{
-		BAffineTransform transform = fDrawState->Transform();
+		BAffineTransform transform = fDrawState->CombinedTransform();
 		if (transform.IsIdentity())
 			return;
 
@@ -111,8 +111,8 @@ private:
 
 		float minX = INT_MAX;
 		float minY = INT_MAX;
-		float maxX = 0;
-		float maxY = 0;
+		float maxX = INT_MIN;
+		float maxY = INT_MIN;
 
 		for (uint32 i = 0; i < 4; i++) {
 			if (transformedShape[i].x < minX)
@@ -776,7 +776,7 @@ const static void* kTableEntries[] = {
 
 /* static */ void
 PictureBoundingBoxPlayer::Play(ServerPicture* picture,
-	DrawState* drawState, BRect* outBoundingBox)
+	const DrawState* drawState, BRect* outBoundingBox)
 {
 	State state(drawState, outBoundingBox);
 
diff --git a/src/servers/app/PictureBoundingBoxPlayer.h b/src/servers/app/PictureBoundingBoxPlayer.h
index 37ae88e2c3..115f1acbfb 100644
--- a/src/servers/app/PictureBoundingBoxPlayer.h
+++ b/src/servers/app/PictureBoundingBoxPlayer.h
@@ -20,7 +20,7 @@ public:
 
 public:
 	static	void				Play(ServerPicture* picture,
-									DrawState* drawState,
+									const DrawState* drawState,
 									BRect* outBoundingBox);
 };