[Gemrb-commits] gemrb: branch master updated. v0.7.1-54-gaa63236

[Brad A. <br...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  aa63236db5c67d0a8ae2be6c8608cdaa82082b03 (commit)

Summary of changes:
 gemrb/plugins/TTFImporter/TTFFontManager.cpp |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
      from  5b8745401502797e337aa2238a207a2c5c2ea40a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=aa63236db5c67d0a8ae2be6c8608cdaa82082b03

commit aa63236db5c67d0a8ae2be6c8608cdaa82082b03
Author: Brad Allred <bra...@me...>
Date:   Thu Aug 9 13:00:45 2012 -0600

    TTF: fix the Freetype error list

diff --git a/gemrb/plugins/TTFImporter/TTFFontManager.cpp b/gemrb/plugins/TTFImporter/TTFFontManager.cpp
index 8dbdc59..8be64ae 100644
--- a/gemrb/plugins/TTFImporter/TTFFontManager.cpp
+++ b/gemrb/plugins/TTFImporter/TTFFontManager.cpp
@@ -74,13 +74,17 @@ TTFFontManager::TTFFontManager(void)
 
 void TTFFontManager::LogFTError(FT_Error errCode) const
 {
+#undef __FTERRORS_H__
+#define FT_ERRORDEF( e, v, s )  { e, s },
+#define FT_ERROR_START_LIST     {
+#define FT_ERROR_END_LIST       { 0, 0 } };
+
 	static const struct
 	{
 		int          err_code;
 		const char*  err_msg;
-	} ft_errors[] = {
-#include <freetype/fterrors.h>
-	};
+	} ft_errors[] =
+		 #include FT_ERRORS_H
 	int i;
 	const char *err_msg;
 

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator