mirror of https://github.com/odrling/Aegisub
Fix for auto4 compilation on non-win32
Originally committed to SVN as r694.
This commit is contained in:
parent
65b28d2737
commit
f75ad038bd
|
@ -143,9 +143,9 @@ namespace Automation4 {
|
||||||
if (style->spacing) {
|
if (style->spacing) {
|
||||||
// If there's inter-character spacing, kerning info must not be used, so calculate width per character
|
// If there's inter-character spacing, kerning info must not be used, so calculate width per character
|
||||||
// NOTE: Is kerning actually done either way?!
|
// NOTE: Is kerning actually done either way?!
|
||||||
for (unsigned int i = 0; i < intext.length(); i++) {
|
for (unsigned int i = 0; i < text.length(); i++) {
|
||||||
int a, b, c, d;
|
int a, b, c, d;
|
||||||
thedc.GetTextExtent(intext[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;
|
||||||
|
@ -153,7 +153,7 @@ namespace Automation4 {
|
||||||
}
|
}
|
||||||
} 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(intext, &width, &height, &descent, &extlead);
|
thedc.GetTextExtent(text, &width, &height, &descent, &extlead);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue