aboutsummaryrefslogtreecommitdiff
path: root/freetype/src/truetype/ttdriver.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2015-02-22 14:47:01 +0100
committermarha <marha@users.sourceforge.net>2015-02-22 14:47:01 +0100
commit7785694244cdfc5939ca4754cab4e08bd6980f99 (patch)
treee317021c83941073a12d69494425f0dbcbc9eaf8 /freetype/src/truetype/ttdriver.c
parentc9aad1ae6227c434d480d1d3aa8eae3c3c910c18 (diff)
downloadvcxsrv-7785694244cdfc5939ca4754cab4e08bd6980f99.tar.gz
vcxsrv-7785694244cdfc5939ca4754cab4e08bd6980f99.tar.bz2
vcxsrv-7785694244cdfc5939ca4754cab4e08bd6980f99.zip
Upgraded to freetype 2.5.5
Diffstat (limited to 'freetype/src/truetype/ttdriver.c')
-rw-r--r--freetype/src/truetype/ttdriver.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/freetype/src/truetype/ttdriver.c b/freetype/src/truetype/ttdriver.c
index 36d23a282..ecf4cdcb4 100644
--- a/freetype/src/truetype/ttdriver.c
+++ b/freetype/src/truetype/ttdriver.c
@@ -4,7 +4,7 @@
/* */
/* TrueType font driver implementation (body). */
/* */
-/* Copyright 1996-2013 by */
+/* Copyright 1996-2014 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -267,7 +267,7 @@
/* use the scaled metrics, even when tt_size_reset fails */
FT_Select_Metrics( size->face, strike_index );
- tt_size_reset( ttsize );
+ tt_size_reset( ttsize ); /* ignore return value */
}
else
{
@@ -370,7 +370,7 @@
return FT_THROW( Invalid_Size_Handle );
if ( !face )
- return FT_THROW( Invalid_Argument );
+ return FT_THROW( Invalid_Face_Handle );
#ifdef FT_CONFIG_OPTION_INCREMENTAL
if ( glyph_index >= (FT_UInt)face->num_glyphs &&
@@ -481,7 +481,7 @@
SFNT_Service sfnt;
- /* TT_SERVICES_GET derefers `library' in PIC mode */
+ /* TT_SERVICES_GET dereferences `library' in PIC mode */
#ifdef FT_CONFIG_OPTION_PIC
if ( !driver )
return NULL;