From 727dee178a392d20eb050d0c446f2fcc29058fa1 Mon Sep 17 00:00:00 2001
From: Victoria Lease <violets@google.com>
Date: Mon, 10 Jun 2013 13:55:54 -0700
Subject: Update freetype to 5e094c6fb2ddd6e8901a5679e2cbb8fa476a38ee

Integrated patches from freetype2 git repository, up to hashval
5e094c6fb2ddd6e8901a5679e2cbb8fa476a38ee, which is post-2.4.12.

Most recent commit message from freetype git:
  [truetype] Improve handling of broken sbit advance widths.

Noteworthy patches included:
  [cff] Add a new Type 2 interpreter and hinter.
  Add support for color embedded bitmaps (eg. color emoji).

Change-Id: Ia8b6a67bc18f841b24f44edf80f81f663185b598
---
 src/base/ftwinfnt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/base/ftwinfnt.c')

diff --git a/src/base/ftwinfnt.c b/src/base/ftwinfnt.c
index bc2e90e..463ae76 100644
--- a/src/base/ftwinfnt.c
+++ b/src/base/ftwinfnt.c
@@ -32,7 +32,7 @@
     FT_Error           error;
 
 
-    error = FT_Err_Invalid_Argument;
+    error = FT_ERR( Invalid_Argument );
 
     if ( face != NULL )
     {
-- 
cgit v1.2.3