summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/freetype/builds/unix/ftsystem.c
diff options
context:
space:
mode:
authorKonstantin Ritt <ritt.ks@gmail.com>2013-03-26 08:57:05 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-01 12:03:55 +0200
commit6845a4fb0147117e8517d66f18792ca7acdbe06e (patch)
tree68e35417b79989a7af8a4ea8c0d282b84dbe0a6e /src/3rdparty/freetype/builds/unix/ftsystem.c
parent0fcadcca3d0842354de07ffaa8c622e607aab22c (diff)
Update bundled FreeType sources to 2.3.12
Most important changes: * SFNT cmap 13 table format support; * fixed glitches when rasterizing stretched TTF (xsize!=ysize); * various fixes in Type1, CFF, and PCF drivers Change-Id: Ib9e2210ffbd0daa2fdbf518ea87f4be502de6b48 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/3rdparty/freetype/builds/unix/ftsystem.c')
-rw-r--r--src/3rdparty/freetype/builds/unix/ftsystem.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/3rdparty/freetype/builds/unix/ftsystem.c b/src/3rdparty/freetype/builds/unix/ftsystem.c
index 5c38090166..95f8271ec3 100644
--- a/src/3rdparty/freetype/builds/unix/ftsystem.c
+++ b/src/3rdparty/freetype/builds/unix/ftsystem.c
@@ -69,9 +69,6 @@
#include <string.h>
#include <errno.h>
-#ifdef VXWORKS
-#include <ioLib.h>
-#endif
/*************************************************************************/
/* */
@@ -241,7 +238,7 @@
return FT_Err_Invalid_Stream_Handle;
/* open the file */
- file = open( filepathname, O_RDONLY, 0);
+ file = open( filepathname, O_RDONLY );
if ( file < 0 )
{
FT_ERROR(( "FT_Stream_Open:" ));
@@ -325,11 +322,7 @@
read_count = read( file,
-#ifndef VXWORKS
stream->base + total_read_count,
-#else
- (char *) stream->base + total_read_count,
-#endif
stream->size - total_read_count );
if ( read_count <= 0 )