iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

fix linux extent getting screwups 

Originally committed to SVN as r889.
This commit is contained in:
David Lamparter 2007-01-24 02:35:09 +00:00
parent 3c46ab72ac
commit 4247fa0ceb
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
aegisub/auto4_base.cpp
View File

@ -147,14 +147,16 @@ namespace Automation4 {
for (unsigned int i = 0; i < text.length(); i++) { for (unsigned int i = 0; i < text.length(); i++) {
int a, b, c, d; int a, b, c, d;
thedc.GetTextExtent(text[i], &a, &b, &c, &d); thedc.GetTextExtent(text[i], &a, &b, &c, &d);
width += a + >spacing; width += a + spacing;
height = b > height ? b : height; height = b > height ? b : height;
descent = c > descent ? c : descent; descent = c > descent ? c : descent;
extlead= d > extlead ? d : extlead; extlead= d > extlead ? d : extlead;
} }
} else { } else {
// If the inter-character spacing should be zero, kerning info can (and must) be used, so calculate everything in one go // 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 #endif

2
aegisub/posix/defines.h
View File

@ -15,6 +15,8 @@
#include <inttypes.h> #include <inttypes.h>
#endif #endif
#include <stdwx.h>
typedef int64_t __int64; typedef int64_t __int64;
typedef uint64_t __uint64; typedef uint64_t __uint64;
#define abs64 llabs #define abs64 llabs