projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update To 11.40.268.0
[platform/framework/web/crosswalk.git]
/
src
/
third_party
/
freetype2
/
src
/
src
/
sfnt
/
ttsbit.c
diff --git
a/src/third_party/freetype2/src/src/sfnt/ttsbit.c
b/src/third_party/freetype2/src/src/sfnt/ttsbit.c
index
833bb2a
..
283ba7e
100644
(file)
--- a/
src/third_party/freetype2/src/src/sfnt/ttsbit.c
+++ b/
src/third_party/freetype2/src/src/sfnt/ttsbit.c
@@
-4,7
+4,8
@@
/* */
/* TrueType and OpenType embedded bitmap support (body). */
/* */
/* */
/* TrueType and OpenType embedded bitmap support (body). */
/* */
-/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 by */
+/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, */
+/* 2010 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@
-417,7
+418,7
@@
tt_face_load_eblc( TT_Face face,
FT_Stream stream )
{
tt_face_load_eblc( TT_Face face,
FT_Stream stream )
{
- FT_Error error =
0
;
+ FT_Error error =
SFNT_Err_Ok
;
FT_Memory memory = stream->memory;
FT_Fixed version;
FT_ULong num_strikes;
FT_Memory memory = stream->memory;
FT_Fixed version;
FT_ULong num_strikes;
@@
-1342,7
+1343,7
@@
/* All right, we have a compound format. First of all, read */
/* the array of elements. */
{
/* All right, we have a compound format. First of all, read */
/* the array of elements. */
{
- TT_SBit_Component components;
+ TT_SBit_Component components
= NULL
;
TT_SBit_Component comp;
FT_UShort num_components, count;
TT_SBit_Component comp;
FT_UShort num_components, count;