[haiku-commits] haiku: hrev45576 - in src/servers/app: . font
- From: korli@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 28 Apr 2013 16:41:00 +0200 (CEST)
hrev45576 adds 2 changesets to branch 'master'
old head: a01dd963464e7a1dd3e4f7fa1db77307f701b123
new head: 849683f4c8d4b83e80aa6344fa634c1f21b57f62
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=849683f+%5Ea01dd96
----------------------------------------------------------------------------
7db03c6: FontManager: fixed trace mode
849683f: app_server: workaround for GCC 4.7 misbehavior in IntRect.
* moved the inlined BRect constructor of IntRect to the cpp file. GCC will
inline the method
anyway.
* impacted methods were both AGGTextRenderer::RenderString() in
src/servers/app/drawing/Painter/AGGTextRenderer.cpp, calling the
StringRenderer constructor
with a BRect reference.
* unless someone comes up with an explanation, I'll try to come with a
smaller testcase to
submit this problem upstream.
[ Jérôme Duval <jerome.duval@xxxxxxxxx> ]
----------------------------------------------------------------------------
3 files changed, 11 insertions(+), 12 deletions(-)
src/servers/app/IntRect.cpp | 9 +++++++++
src/servers/app/IntRect.h | 10 ----------
src/servers/app/font/FontManager.cpp | 4 ++--
############################################################################
Commit: 7db03c63a05d4485e8d90d2ce737615e8b0efbfe
URL: http://cgit.haiku-os.org/haiku/commit/?id=7db03c6
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Sun Apr 28 12:10:15 2013 UTC
FontManager: fixed trace mode
----------------------------------------------------------------------------
diff --git a/src/servers/app/font/FontManager.cpp
b/src/servers/app/font/FontManager.cpp
index 1e5e2cf..c8e9969 100644
--- a/src/servers/app/font/FontManager.cpp
+++ b/src/servers/app/font/FontManager.cpp
@@ -223,7 +223,7 @@ FontManager::MessageReceived(BMessage* message)
if (fromDirectory ==
NULL) {
// there is a
new directory to watch for us
_AddPath(entry);
- FTRACE("new
directory moved in");
+ FTRACE(("new
directory moved in"));
} else {
// A directory
from our watched directories has
// been renamed
or moved within the watched
@@ -237,7 +237,7 @@ FontManager::MessageReceived(BMessage* message)
style->UpdatePath(directory->directory);
}
}
-
FTRACE("directory renamed");
+
FTRACE(("directory renamed"));
}
} else {
if (fromDirectory !=
NULL) {
############################################################################
Revision: hrev45576
Commit: 849683f4c8d4b83e80aa6344fa634c1f21b57f62
URL: http://cgit.haiku-os.org/haiku/commit/?id=849683f
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Sun Apr 28 14:12:32 2013 UTC
app_server: workaround for GCC 4.7 misbehavior in IntRect.
* moved the inlined BRect constructor of IntRect to the cpp file. GCC will
inline the method
anyway.
* impacted methods were both AGGTextRenderer::RenderString() in
src/servers/app/drawing/Painter/AGGTextRenderer.cpp, calling the StringRenderer
constructor
with a BRect reference.
* unless someone comes up with an explanation, I'll try to come with a smaller
testcase to
submit this problem upstream.
----------------------------------------------------------------------------
diff --git a/src/servers/app/IntRect.cpp b/src/servers/app/IntRect.cpp
index 7c9a53d..c72433b 100644
--- a/src/servers/app/IntRect.cpp
+++ b/src/servers/app/IntRect.cpp
@@ -12,6 +12,15 @@
#include <stdio.h>
+IntRect::IntRect(const BRect &r)
+{
+ left = (int32)r.left;
+ top = (int32)r.top;
+ right = (int32)r.right;
+ bottom = (int32)r.bottom;
+}
+
+
void
IntRect::SetLeftTop(const IntPoint& p)
{
diff --git a/src/servers/app/IntRect.h b/src/servers/app/IntRect.h
index f273bb8..a6f01f3 100644
--- a/src/servers/app/IntRect.h
+++ b/src/servers/app/IntRect.h
@@ -150,16 +150,6 @@ IntRect::IntRect(const IntRect &r)
inline
-IntRect::IntRect(const BRect &r)
-{
- left = (int32)r.left;
- top = (int32)r.top;
- right = (int32)r.right;
- bottom = (int32)r.bottom;
-}
-
-
-inline
IntRect::IntRect(const IntPoint& leftTop, const IntPoint& rightBottom)
{
left = leftTop.x;
Other related posts:
