[dolphin-emu] 01/01: Update new fonts to match the ones merged upstream

[James Cowgill]

This is an automated email from the git hooks/post-receive script.

jcowgill-guest pushed a commit to branch master
in repository dolphin-emu.

commit de77242e4fc81be135da33ccedc014834ab25dea
Author: James Cowgill <james410 at cowgill.org.uk>
Date:   Wed Jan 14 23:21:41 2015 +0000

    Update new fonts to match the ones merged upstream
---
 debian/copyright                 |  12 +++---------
 debian/gc-fonts/font_ansi.bin    | Bin 6480 -> 6478 bytes
 debian/gc-fonts/font_sjis.bin    | Bin 258712 -> 259626 bytes
 debian/gc-fonts/gc-font-tool.cpp |  14 +++++++++++---
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index a03072c..f16372b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -192,20 +192,14 @@ Copyright:
  2010-2013, Glenn Rice <glennricster at gmail.com>
 License: GPL-2
 
-Files: debian/gc-fonts/font_ansi.bin
+Files:
+ debian/gc-fonts/font_ansi.bin
+ debian/gc-fonts/font_sjis.bin
 Copyright: 2006-2014, Google Corporation
 License: Apache-2.0
 Comment:
  Font file generated from "Droid Sans" using gc-font-tool.
 
-Files: debian/gc-fonts/font_sjis.bin
-Copyright:
- 2008-2009, The WenQuanYi Project Board of Trustees
- 2006-2008, Google Corporation
-License: Apache-2.0
-Comment:
- Font file generated from "WenQuanYi Micro Hei" using gc-font-tool.
-
 Files: debian/gc-fonts/gc-font-tool.cpp
 Copyright:
  2015, Dolphin Emulator Project
diff --git a/debian/gc-fonts/font_ansi.bin b/debian/gc-fonts/font_ansi.bin
index 4f704db..863f877 100644
Binary files a/debian/gc-fonts/font_ansi.bin and b/debian/gc-fonts/font_ansi.bin differ
diff --git a/debian/gc-fonts/font_sjis.bin b/debian/gc-fonts/font_sjis.bin
index b907d95..132dbfc 100644
Binary files a/debian/gc-fonts/font_sjis.bin and b/debian/gc-fonts/font_sjis.bin differ
diff --git a/debian/gc-fonts/gc-font-tool.cpp b/debian/gc-fonts/gc-font-tool.cpp
index 35ed5d6..9f4a2e8 100644
--- a/debian/gc-fonts/gc-font-tool.cpp
+++ b/debian/gc-fonts/gc-font-tool.cpp
@@ -66,7 +66,12 @@
 // 22 Offset to character widths table
 // 24 Offset to tile data
 // 28 Tile data size
-// 2A Colour data
+// 2A Greyscale colour for 0 values
+// 2B Greyscale colour for 1 values
+// 2C Greyscale colour for 2 values
+// 2D Greyscale colour for 3 values
+//  This program ignores these values and justs assumes it uses the linear
+//  4-bit colours: 00, 55, AA, FF (FIXME?)
 //
 // Font data is encoded in 2 bit greyscale and in 8x8 blocks.
 
@@ -588,6 +593,9 @@ const uint16_t sjis_font_table[] =
 	0x9E93, 0x7984, 0x808B, 0x9332, 0x8AD6, 0x502D, 0x548C, 0x8A71,
 	0x6B6A, 0x8CC4, 0x8107, 0x60D1, 0x67A0, 0x9DF2, 0x4E99, 0x4E98,
 	0x9C10, 0x8A6B, 0x85C1, 0x8568, 0x6900, 0x6E7E, 0x7897, 0x8155,
+
+	// Padding to ensure size is 4-byte aligned
+	0, 0, 0,
 };
 
 // Font conversion error
@@ -1127,8 +1135,8 @@ static std::vector<uint8_t> generate_fnt(
 	write_be16(out, FNT_PIXMAP_WIDTH);
 	write_be16(out, 0x30);
 	write_be32(out, 0x30 + widths.size());
-	write_be32(out, pixmap.data.size());
-	write_be32(out, type == font_type::ansi ? 0x0099EEFF : 0x00DDEEFF);
+	write_be32(out, 2 * pixmap.data.size());
+	write_be32(out, 0x0055AAFF);
 
 	out.insert(out.end(), widths.begin(), widths.end());
 	out.insert(out.end(), pixmap.data.begin(), pixmap.data.end());

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/dolphin-emu.git