summaryrefslogtreecommitdiff
path: root/Build/source/libs/freetype2/freetype-src/src/cache/ftcsbits.c
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-02-12 23:56:45 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-02-12 23:56:45 +0000
commitb90dc59a1171567878be291e46e4b2dcc9f3e72a (patch)
tree1ab66691676db14c137e53f257696690775aacd6 /Build/source/libs/freetype2/freetype-src/src/cache/ftcsbits.c
parent683b449a0eecd29a5ea0927bf48b769c1b2f369b (diff)
freetype2 2.6.3
git-svn-id: svn://tug.org/texlive/trunk@39697 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/freetype2/freetype-src/src/cache/ftcsbits.c')
-rw-r--r--Build/source/libs/freetype2/freetype-src/src/cache/ftcsbits.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/Build/source/libs/freetype2/freetype-src/src/cache/ftcsbits.c b/Build/source/libs/freetype2/freetype-src/src/cache/ftcsbits.c
index 81417191672..d6f1ddcd4ee 100644
--- a/Build/source/libs/freetype2/freetype-src/src/cache/ftcsbits.c
+++ b/Build/source/libs/freetype2/freetype-src/src/cache/ftcsbits.c
@@ -4,7 +4,7 @@
/* */
/* FreeType sbits manager (body). */
/* */
-/* Copyright 2000-2015 by */
+/* Copyright 2000-2016 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -53,6 +53,8 @@
pitch = -pitch;
size = (FT_ULong)pitch * bitmap->rows;
+ if ( !size )
+ return FT_Err_Ok;
if ( !FT_ALLOC( sbit->buffer, size ) )
FT_MEM_COPY( sbit->buffer, bitmap->buffer, size );
@@ -215,7 +217,7 @@
FT_UInt gindex = gquery->gindex;
FTC_Family family = gquery->family;
- FTC_SFamilyClass clazz = FTC_CACHE__SFAMILY_CLASS( cache );
+ FTC_SFamilyClass clazz = FTC_CACHE_SFAMILY_CLASS( cache );
FT_UInt total;
FT_UInt node_count;