diff options
| author | marha <marha@users.sourceforge.net> | 2013-02-13 09:55:16 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-02-13 09:55:16 +0100 |
| commit | 88bcd02cfecbf8ba9cf726b0d337c56f9c9b2bc4 (patch) | |
| tree | ded42639873b943c7ec97b06961ad067228652d1 /freetype/src/autofit/afindic.c | |
| parent | 3247a4e031a7d5160332c0d7ca2a91a516c082bb (diff) | |
| parent | aaf21968deb85b635cb6aa6544df233ea5981346 (diff) | |
| download | vcxsrv-88bcd02cfecbf8ba9cf726b0d337c56f9c9b2bc4.tar.gz vcxsrv-88bcd02cfecbf8ba9cf726b0d337c56f9c9b2bc4.tar.bz2 vcxsrv-88bcd02cfecbf8ba9cf726b0d337c56f9c9b2bc4.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
Update to following packages:
Conflicts:
freetype/src/autofit/afhints.c
freetype/src/autofit/afmodule.c
freetype/src/psaux/psconv.c
freetype/src/sfnt/sfntpic.h
openssl/Makefile
openssl/util/pl/VC-32.pl
Diffstat (limited to 'freetype/src/autofit/afindic.c')
| -rw-r--r-- | freetype/src/autofit/afindic.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/freetype/src/autofit/afindic.c b/freetype/src/autofit/afindic.c index 9c74838fe..70de70ba9 100644 --- a/freetype/src/autofit/afindic.c +++ b/freetype/src/autofit/afindic.c @@ -4,7 +4,7 @@ /* */ /* Auto-fitter hinting routines for Indic scripts (body). */ /* */ -/* Copyright 2007, 2011 by */ +/* Copyright 2007, 2011, 2012 by */ /* Rahul Bhalerao <rahul.bhalerao@redhat.com>, <b.rahul.pm@gmail.com>. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -46,7 +46,7 @@ face->charmap = NULL; else { - af_cjk_metrics_init_widths( metrics, face, 0x7530 ); + af_cjk_metrics_init_widths( metrics, face ); #if 0 /* either need indic specific blue_chars[] or just skip blue zones */ af_cjk_metrics_init_blues( metrics, face, af_cjk_blue_chars ); @@ -116,6 +116,7 @@ AF_DEFINE_SCRIPT_CLASS( af_indic_script_class, AF_SCRIPT_INDIC, af_indic_uniranges, + 'o', /* XXX */ sizeof ( AF_CJKMetricsRec ), @@ -138,6 +139,7 @@ AF_DEFINE_SCRIPT_CLASS( af_indic_script_class, AF_SCRIPT_INDIC, af_indic_uniranges, + 0, sizeof ( AF_CJKMetricsRec ), |