Index: third_party/freetype/src/sfnt/ttkern.c |
diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/src/sfnt/ttkern.c b/third_party/freetype/src/sfnt/ttkern.c |
similarity index 95% |
rename from core/src/fxge/fx_freetype/fxft2.5.01/src/sfnt/ttkern.c |
rename to third_party/freetype/src/sfnt/ttkern.c |
index da38cf7d30384cb02904b8c93f7c9d28983d0eca..455e7b5e3dc1103d831db052f85aa002356b13a6 100644 |
--- a/core/src/fxge/fx_freetype/fxft2.5.01/src/sfnt/ttkern.c |
+++ b/third_party/freetype/src/sfnt/ttkern.c |
@@ -5,7 +5,7 @@ |
/* Load the basic TrueType kerning table. This doesn't handle */ |
/* kerning data within the GPOS table at the moment. */ |
/* */ |
-/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010 by */ |
+/* Copyright 1996-2007, 2009, 2010, 2013 by */ |
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ |
/* */ |
/* This file is part of the FreeType project, and may only be used, */ |
@@ -17,10 +17,10 @@ |
/***************************************************************************/ |
-#include "../../include/ft2build.h" |
-#include "../../include/freetype/internal/ftdebug.h" |
-#include "../../include/freetype/internal/ftstream.h" |
-#include "../../include/freetype/tttags.h" |
+#include <ft2build.h> |
+#include FT_INTERNAL_DEBUG_H |
+#include FT_INTERNAL_STREAM_H |
+#include FT_TRUETYPE_TAGS_H |
#include "ttkern.h" |
#include "sferrors.h" |
@@ -99,7 +99,7 @@ |
length = FT_NEXT_USHORT( p ); |
coverage = FT_NEXT_USHORT( p ); |
- if ( length <= 6 ) |
+ if ( length <= 6 + 8 ) |
break; |
p_next += length; |
@@ -183,7 +183,7 @@ |
FT_UInt right_glyph ) |
{ |
FT_Int result = 0; |
- FT_UInt count, mask = 1; |
+ FT_UInt count, mask; |
FT_Byte* p = face->kern_table; |
FT_Byte* p_limit = p + face->kern_table_size; |
@@ -196,7 +196,7 @@ |
count--, mask <<= 1 ) |
{ |
FT_Byte* base = p; |
- FT_Byte* next = base; |
+ FT_Byte* next; |
FT_UInt version = FT_NEXT_USHORT( p ); |
FT_UInt length = FT_NEXT_USHORT( p ); |
FT_UInt coverage = FT_NEXT_USHORT( p ); |