[Scummvm-git-logs] scummvm master -> b5d4c302d0661fe1bfd5144a5eab4d1e3b02ffab
sev-
sev at scummvm.org
Wed Oct 12 22:12:48 CEST 2016
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
b5d4c302d0 GRAPHICS: Fix built-in font parameters
Commit: b5d4c302d0661fe1bfd5144a5eab4d1e3b02ffab
https://github.com/scummvm/scummvm/commit/b5d4c302d0661fe1bfd5144a5eab4d1e3b02ffab
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-10-12T22:12:40+02:00
Commit Message:
GRAPHICS: Fix built-in font parameters
Changed paths:
devtools/convbdf.cpp
graphics/fonts/consolefont.cpp
graphics/fonts/newfont.cpp
graphics/fonts/newfont_big.cpp
diff --git a/devtools/convbdf.cpp b/devtools/convbdf.cpp
index 6ec453d..31fdbd0 100644
--- a/devtools/convbdf.cpp
+++ b/devtools/convbdf.cpp
@@ -508,8 +508,8 @@ int main(int argc, char *argv[]) {
"\t\"%s\", // Family name\n"
"\t\"%s\", // Slant\n"
"\t%d, // Max advance\n"
- "\t%d, // Size\n"
"\t%d, // Height\n"
+ "\t%d, // Size\n"
"\t{ %d, %d, %d, %d }, // Bounding box\n"
"\t%d, // Ascent\n"
"\n"
diff --git a/graphics/fonts/consolefont.cpp b/graphics/fonts/consolefont.cpp
index 9dcf1dc..6a84cde 100644
--- a/graphics/fonts/consolefont.cpp
+++ b/graphics/fonts/consolefont.cpp
@@ -5853,8 +5853,8 @@ static const BdfFontData desc = {
"Fixed", // Family name
"R", // Slant
5, // Max advance
- 8, // Size
8, // Height
+ 8, // Size
{ 5, 8, 0, -1 }, // Bounding box
7, // Ascent
diff --git a/graphics/fonts/newfont.cpp b/graphics/fonts/newfont.cpp
index ff06211..8d1ce8b 100644
--- a/graphics/fonts/newfont.cpp
+++ b/graphics/fonts/newfont.cpp
@@ -7637,8 +7637,8 @@ static const BdfFontData desc = {
"Schumacher", // Family name
"R", // Slant
6, // Max advance
- 12, // Size
12, // Height
+ 12, // Size
{ 6, 12, 0, -3 }, // Bounding box
9, // Ascent
diff --git a/graphics/fonts/newfont_big.cpp b/graphics/fonts/newfont_big.cpp
index e44e2ce..28a1162 100644
--- a/graphics/fonts/newfont_big.cpp
+++ b/graphics/fonts/newfont_big.cpp
@@ -5832,8 +5832,8 @@ static const BdfFontData desc = {
"Helvetica", // Family name
"R", // Slant
13, // Max advance
- 12, // Size
14, // Height
+ 12, // Size
{ 13, 15, -1, -3 }, // Bounding box
11, // Ascent
More information about the Scummvm-git-logs
mailing list