From 4247fa0ceb061b6fe6b3be75310c282a11b4e292 Mon Sep 17 00:00:00 2001
From: David Lamparter <equinox@diac24.net>
Date: Wed, 24 Jan 2007 02:35:09 +0000
Subject: [PATCH] fix linux extent getting screwups

Originally committed to SVN as r889.
---
 aegisub/auto4_base.cpp  | 6 ++++--
 aegisub/posix/defines.h | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/aegisub/auto4_base.cpp b/aegisub/auto4_base.cpp
index e9f56722d..b5b4ad26e 100644
--- a/aegisub/auto4_base.cpp
+++ b/aegisub/auto4_base.cpp
@@ -147,14 +147,16 @@ namespace Automation4 {
 			for (unsigned int i = 0; i < text.length(); i++) {
 				int a, b, c, d;
 				thedc.GetTextExtent(text[i], &a, &b, &c, &d);
-				width += a + >spacing;
+				width += a + spacing;
 				height = b > height ? b : height;
 				descent = c > descent ? c : descent;
 				extlead= d > extlead ? d : extlead;
 			}
 		} else {
 			// If the inter-character spacing should be zero, kerning info can (and must) be used, so calculate everything in one go
-			thedc.GetTextExtent(text, &width, &height, &descent, &extlead);
+			long lwidth, lheight, ldescent, lextlead;
+			thedc.GetTextExtent(text, &lwidth, &lheight, &ldescent, &lextlead);
+			width = lwidth; height = lheight; descent = ldescent; extlead = lextlead;
 		}
 #endif
 
diff --git a/aegisub/posix/defines.h b/aegisub/posix/defines.h
index ab4bf8a51..386cd820b 100644
--- a/aegisub/posix/defines.h
+++ b/aegisub/posix/defines.h
@@ -15,6 +15,8 @@
 #include <inttypes.h>
 #endif
 
+#include <stdwx.h>
+
 typedef int64_t __int64;
 typedef uint64_t __uint64;
 #define abs64 llabs