github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-09-05 17:44:55 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

plugin/FT_fontsys: compilation fix, Core: *Maps now have operator() sugar

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6391 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2013-10-04 16:11:53 +00:00
parent d01de789e9
commit 88ac854823
236 changed files with 356 additions and 328 deletions
Download patch file Download diff file Expand all files Collapse all files

4
uppsrc/Core/InVector.h
View file

@ -590,6 +590,8 @@ public:
T Pop() { T h = B::Top(); B::Drop(); return h; }
SortedVectorMap& operator()(const K& k, const T& v) { Add(k, v); return *this; }
SortedVectorMap(const SortedVectorMap& s, int) : B(s, 1) {}
SortedVectorMap() {}
@ -644,6 +646,8 @@ public:
T *Detach(int i) { T *x = B::value.Detach(i); B::Remove(i); return x; }
T *PopDetach() { return Detach(B::GetCount() - 1); }
SortedArrayMap& operator()(const K& k, const T& v) { Add(k, v); return *this; }
SortedArrayMap(const SortedArrayMap& s, int) : B(s, 1) {}
SortedArrayMap() {}

7
uppsrc/Core/Map.h
View file

@ -47,11 +47,6 @@ public:
T *FindPtr(const K& k) { int i = Find(k); return i >= 0 ? &value[i] : NULL; }
const T *FindPtr(const K& k) const { int i = Find(k); return i >= 0 ? &value[i] : NULL; }
// PRECHANGE VACATION :)
// T& operator()(const K& k) { return Get(k); }
// const T& operator()(const K& k) const { return Get(k); }
// const T& operator()(const K& k, const T& d) const { return Get(k, d); }
void Unlink(int i) { key.Unlink(i); }
int UnlinkKey(const K& k, unsigned h) { return key.UnlinkKey(k, h); }
int UnlinkKey(const K& k) { return key.UnlinkKey(k); }
@ -107,6 +102,8 @@ public:
bool IsPicked() const { return value.IsPicked() || key.IsPicked(); }
AMap& operator()(const K& k, const T& v) { Add(k, v); return *this; }
AMap() {}
AMap(const AMap& s, int) : key(s.key, 0), value(s.value, 0) {}
AMap(pick_ Index<K, HashFn>& ndx, pick_ V& val) : key(ndx), value(val) {}

6
uppsrc/Core/ValueUtil.h
View file

@ -311,6 +311,12 @@ public:
void Add(const char *key, const Value& value) { Add(Value(key), value); }
void Add(int key, const Value& value) { Add(Value(key), value); }
void Add(Id key, const Value& value) { Add(Value(key.ToString()), value); }
ValueMap& operator()(const Value& key, const Value& value) { Add(key, value); return *this; }
ValueMap& operator()(const String& key, const Value& value) { Add(Value(key), value); return *this; }
ValueMap& operator()(const char *key, const Value& value) { Add(Value(key), value); return *this; }
ValueMap& operator()(int key, const Value& value) { Add(Value(key), value); return *this; }
ValueMap& operator()(Id key, const Value& value) { Add(Value(key.ToString()), value); return *this; }
void Set(const Value& key, const Value& value);
void Set(const String& key, const Value& value) { Set(Value(key), value); }

7
uppsrc/Core/src.tpp/AMap$en-us.tpp
View file

@ -755,6 +755,13 @@ by picking.&]
[s7; [*/ Return value]-|Basic random access container of values.&]
[s3;%- &]
[s4;%- &]
[s5;:AMap`:`:operator`(`)`(const K`&`,const T`&`):%- [_^AMap^ AMap][@(0.0.255) `&]_[* opera
tor()]([@(0.0.255) const]_[*@4 K][@(0.0.255) `&]_[*@3 k], [@(0.0.255) const]_[*@4 T][@(0.0.255) `&
]_[*@3 v])&]
[s2; Same as Add([%-*@3 k], [%-*@3 v]), returns `*this. Syntax sugar
for creating map.&]
[s3; &]
[s4;%- &]
[s5;:AMap`:`:KeyType`:`:typedef:%- [@(0.0.255) typedef]_K_[* KeyType]&]
[s2; Typedef of K for use in templated algorithms.&]
[s3;%- &]

7
uppsrc/Core/src.tpp/SortedArrayMap$en-us.tpp
View file

@ -94,6 +94,13 @@ This pointer should be deleted by client code.&]
[s2; Removes the last element and returns the pointer to value. This
pointer should be deleted by client code.&]
[s3; &]
[s4;%- &]
[s5;:SortedArrayMap`:`:operator`(`)`(const K`&`,const T`&`):%- [_^SortedArrayMap^ Sorte
dArrayMap][@(0.0.255) `&]_[* operator()]([@(0.0.255) const]_[*@4 K][@(0.0.255) `&]_[*@3 k],
[@(0.0.255) const]_[*@4 T][@(0.0.255) `&]_[*@3 v])&]
[s2; Same as Add([%-*@3 k], [%-*@3 v]), returns `*this. Syntax sugar
for creating map.&]
[s3; &]
[s4; &]
[s5;:SortedArrayMap`:`:SortedArrayMap`(const SortedArrayMap`&`,int`):%- [* SortedArrayM
ap]([@(0.0.255) const]_[* SortedArrayMap][@(0.0.255) `&]_[*@3 s], [@(0.0.255) int])&]

7
uppsrc/Core/src.tpp/SortedVectorMap$en-us.tpp
View file

@ -73,6 +73,13 @@ from [%-*@3 x].&]
[s5;:SortedVectorMap`:`:Pop`(`):%- [*@4 T]_[* Pop]()&]
[s2; Drops the last element and returns its value.&]
[s3; &]
[s4;%- &]
[s5;:SortedVectorMap`:`:operator`(`)`(const K`&`,const T`&`):%- [_^SortedVectorMap^ Sor
tedVectorMap][@(0.0.255) `&]_[* operator()]([@(0.0.255) const]_[*@4 K][@(0.0.255) `&]_[*@3 k],
[@(0.0.255) const]_[*@4 T][@(0.0.255) `&]_[*@3 v])&]
[s2; Same as Add([%-*@3 k], [%-*@3 v]), returns `*this. Syntax sugar
for creating map.&]
[s3; &]
[s4; &]
[s5;:SortedVectorMap`:`:SortedVectorMap`(const SortedVectorMap`&`,int`):%- [* SortedVec
torMap]([@(0.0.255) const]_[* SortedVectorMap][@(0.0.255) `&]_[*@3 s],

4
uppsrc/plugin/FT_fontsys/FT_fontsys.cpp
View file

@ -1,8 +1,8 @@
#include "FT_fontsys.h"
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include <freetype/ftoutln.h>
#include <plugin/FT_fontsys/ftoutln.h>
#define LLOG(x) // DLOG(x)
#define LTIMING(x) // TIMING(x)

2
uppsrc/plugin/FT_fontsys/config/ftconfig.h
View file

@ -38,7 +38,7 @@
#ifndef __FTCONFIG_H__
#define __FTCONFIG_H__
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_CONFIG_OPTIONS_H
#include FT_CONFIG_STANDARD_LIBRARY_H

112
uppsrc/plugin/FT_fontsys/config/ftheader.h
View file

@ -107,7 +107,7 @@
*
*/
#ifndef FT_CONFIG_CONFIG_H
#define FT_CONFIG_CONFIG_H <freetype/config/ftconfig.h>
#define FT_CONFIG_CONFIG_H <plugin/FT_fontsys/config/ftconfig.h>
#endif
@ -122,7 +122,7 @@
*
*/
#ifndef FT_CONFIG_STANDARD_LIBRARY_H
#define FT_CONFIG_STANDARD_LIBRARY_H <freetype/config/ftstdlib.h>
#define FT_CONFIG_STANDARD_LIBRARY_H <plugin/FT_fontsys/config/ftstdlib.h>
#endif
@ -137,7 +137,7 @@
*
*/
#ifndef FT_CONFIG_OPTIONS_H
#define FT_CONFIG_OPTIONS_H <freetype/config/ftoption.h>
#define FT_CONFIG_OPTIONS_H <plugin/FT_fontsys/config/ftoption.h>
#endif
@ -153,7 +153,7 @@
*
*/
#ifndef FT_CONFIG_MODULES_H
#define FT_CONFIG_MODULES_H <freetype/config/ftmodule.h>
#define FT_CONFIG_MODULES_H <plugin/FT_fontsys/config/ftmodule.h>
#endif
/* */
@ -170,7 +170,7 @@
* base FreeType~2 API.
*
*/
#define FT_FREETYPE_H <freetype/freetype.h>
#define FT_FREETYPE_H <plugin/FT_fontsys/freetype.h>
/*************************************************************************
@ -185,7 +185,7 @@
* It is included by @FT_FREETYPE_H.
*
*/
#define FT_ERRORS_H <freetype/fterrors.h>
#define FT_ERRORS_H <plugin/FT_fontsys/fterrors.h>
/*************************************************************************
@ -198,7 +198,7 @@
* list of FreeType~2 module error offsets (and messages).
*
*/
#define FT_MODULE_ERRORS_H <freetype/ftmoderr.h>
#define FT_MODULE_ERRORS_H <plugin/FT_fontsys/ftmoderr.h>
/*************************************************************************
@ -214,7 +214,7 @@
* It is included by @FT_FREETYPE_H.
*
*/
#define FT_SYSTEM_H <freetype/ftsystem.h>
#define FT_SYSTEM_H <plugin/FT_fontsys/ftsystem.h>
/*************************************************************************
@ -230,7 +230,7 @@
* It is included by @FT_FREETYPE_H.
*
*/
#define FT_IMAGE_H <freetype/ftimage.h>
#define FT_IMAGE_H <plugin/FT_fontsys/ftimage.h>
/*************************************************************************
@ -245,7 +245,7 @@
* It is included by @FT_FREETYPE_H.
*
*/
#define FT_TYPES_H <freetype/fttypes.h>
#define FT_TYPES_H <plugin/FT_fontsys/fttypes.h>
/*************************************************************************
@ -260,7 +260,7 @@
* (Most applications will never need to include this file.)
*
*/
#define FT_LIST_H <freetype/ftlist.h>
#define FT_LIST_H <plugin/FT_fontsys/ftlist.h>
/*************************************************************************
@ -273,7 +273,7 @@
* scalable outline management API of FreeType~2.
*
*/
#define FT_OUTLINE_H <freetype/ftoutln.h>
#define FT_OUTLINE_H <plugin/FT_fontsys/ftoutln.h>
/*************************************************************************
@ -286,7 +286,7 @@
* API which manages multiple @FT_Size objects per face.
*
*/
#define FT_SIZES_H <freetype/ftsizes.h>
#define FT_SIZES_H <plugin/FT_fontsys/ftsizes.h>
/*************************************************************************
@ -299,7 +299,7 @@
* module management API of FreeType~2.
*
*/
#define FT_MODULE_H <freetype/ftmodapi.h>
#define FT_MODULE_H <plugin/FT_fontsys/ftmodapi.h>
/*************************************************************************
@ -312,7 +312,7 @@
* renderer module management API of FreeType~2.
*
*/
#define FT_RENDER_H <freetype/ftrender.h>
#define FT_RENDER_H <plugin/FT_fontsys/ftrender.h>
/*************************************************************************
@ -325,7 +325,7 @@
* types and API specific to the Type~1 format.
*
*/
#define FT_TYPE1_TABLES_H <freetype/t1tables.h>
#define FT_TYPE1_TABLES_H <plugin/FT_fontsys/t1tables.h>
/*************************************************************************
@ -340,7 +340,7 @@
* definitions, taken from the TrueType and OpenType specifications.
*
*/
#define FT_TRUETYPE_IDS_H <freetype/ttnameid.h>
#define FT_TRUETYPE_IDS_H <plugin/FT_fontsys/ttnameid.h>
/*************************************************************************
@ -353,7 +353,7 @@
* types and API specific to the TrueType (as well as OpenType) format.
*
*/
#define FT_TRUETYPE_TABLES_H <freetype/tttables.h>
#define FT_TRUETYPE_TABLES_H <plugin/FT_fontsys/tttables.h>
/*************************************************************************
@ -367,7 +367,7 @@
* SFNT-based font formats (i.e., TrueType and OpenType).
*
*/
#define FT_TRUETYPE_TAGS_H <freetype/tttags.h>
#define FT_TRUETYPE_TAGS_H <plugin/FT_fontsys/tttags.h>
/*************************************************************************
@ -381,7 +381,7 @@
* face.
*
*/
#define FT_BDF_H <freetype/ftbdf.h>
#define FT_BDF_H <plugin/FT_fontsys/ftbdf.h>
/*************************************************************************
@ -395,7 +395,7 @@
* face.
*
*/
#define FT_CID_H <freetype/ftcid.h>
#define FT_CID_H <plugin/FT_fontsys/ftcid.h>
/*************************************************************************
@ -408,7 +408,7 @@
* definitions of an API which supports gzip-compressed files.
*
*/
#define FT_GZIP_H <freetype/ftgzip.h>
#define FT_GZIP_H <plugin/FT_fontsys/ftgzip.h>
/*************************************************************************
@ -421,7 +421,7 @@
* definitions of an API which supports LZW-compressed files.
*
*/
#define FT_LZW_H <freetype/ftlzw.h>
#define FT_LZW_H <plugin/FT_fontsys/ftlzw.h>
/*************************************************************************
@ -434,7 +434,7 @@
* definitions of an API which supports bzip2-compressed files.
*
*/
#define FT_BZIP2_H <freetype/ftbzip2.h>
#define FT_BZIP2_H <plugin/FT_fontsys/ftbzip2.h>
/*************************************************************************
@ -447,7 +447,7 @@
* definitions of an API which supports Windows FNT files.
*
*/
#define FT_WINFONTS_H <freetype/ftwinfnt.h>
#define FT_WINFONTS_H <plugin/FT_fontsys/ftwinfnt.h>
/*************************************************************************
@ -460,7 +460,7 @@
* API of the optional glyph management component.
*
*/
#define FT_GLYPH_H <freetype/ftglyph.h>
#define FT_GLYPH_H <plugin/FT_fontsys/ftglyph.h>
/*************************************************************************
@ -473,7 +473,7 @@
* API of the optional bitmap conversion component.
*
*/
#define FT_BITMAP_H <freetype/ftbitmap.h>
#define FT_BITMAP_H <plugin/FT_fontsys/ftbitmap.h>
/*************************************************************************
@ -486,7 +486,7 @@
* API of the optional exact bounding box computation routines.
*
*/
#define FT_BBOX_H <freetype/ftbbox.h>
#define FT_BBOX_H <plugin/FT_fontsys/ftbbox.h>
/*************************************************************************
@ -499,7 +499,7 @@
* API of the optional FreeType~2 cache sub-system.
*
*/
#define FT_CACHE_H <freetype/ftcache.h>
#define FT_CACHE_H <plugin/FT_fontsys/ftcache.h>
/*************************************************************************
@ -573,7 +573,7 @@
* compiled on the Mac (note that the base API still works though).
*
*/
#define FT_MAC_H <freetype/ftmac.h>
#define FT_MAC_H <plugin/FT_fontsys/ftmac.h>
/*************************************************************************
@ -586,7 +586,7 @@
* optional multiple-masters management API of FreeType~2.
*
*/
#define FT_MULTIPLE_MASTERS_H <freetype/ftmm.h>
#define FT_MULTIPLE_MASTERS_H <plugin/FT_fontsys/ftmm.h>
/*************************************************************************
@ -600,7 +600,7 @@
* SFNT-based font formats (i.e., TrueType and OpenType).
*
*/
#define FT_SFNT_NAMES_H <freetype/ftsnames.h>
#define FT_SFNT_NAMES_H <plugin/FT_fontsys/ftsnames.h>
/*************************************************************************
@ -614,7 +614,7 @@
* GPOS, GSUB, JSTF).
*
*/
#define FT_OPENTYPE_VALIDATE_H <freetype/ftotval.h>
#define FT_OPENTYPE_VALIDATE_H <plugin/FT_fontsys/ftotval.h>
/*************************************************************************
@ -628,7 +628,7 @@
* mort, morx, bsln, just, kern, opbd, trak, prop).
*
*/
#define FT_GX_VALIDATE_H <freetype/ftgxval.h>
#define FT_GX_VALIDATE_H <plugin/FT_fontsys/ftgxval.h>
/*************************************************************************
@ -641,7 +641,7 @@
* FreeType~2 API which accesses PFR-specific data.
*
*/
#define FT_PFR_H <freetype/ftpfr.h>
#define FT_PFR_H <plugin/FT_fontsys/ftpfr.h>
/*************************************************************************
@ -653,7 +653,7 @@
* A macro used in #include statements to name the file containing the
* FreeType~2 API which provides functions to stroke outline paths.
*/
#define FT_STROKER_H <freetype/ftstroke.h>
#define FT_STROKER_H <plugin/FT_fontsys/ftstroke.h>
/*************************************************************************
@ -665,7 +665,7 @@
* A macro used in #include statements to name the file containing the
* FreeType~2 API which performs artificial obliquing and emboldening.
*/
#define FT_SYNTHESIS_H <freetype/ftsynth.h>
#define FT_SYNTHESIS_H <plugin/FT_fontsys/ftsynth.h>
/*************************************************************************
@ -678,7 +678,7 @@
* FreeType~2 API which provides functions specific to the XFree86 and
* X.Org X11 servers.
*/
#define FT_XFREE86_H <freetype/ftxf86.h>
#define FT_XFREE86_H <plugin/FT_fontsys/ftxf86.h>
/*************************************************************************
@ -691,7 +691,7 @@
* FreeType~2 API which performs trigonometric computations (e.g.,
* cosines and arc tangents).
*/
#define FT_TRIGONOMETRY_H <freetype/fttrigon.h>
#define FT_TRIGONOMETRY_H <plugin/FT_fontsys/fttrigon.h>
/*************************************************************************
@ -703,7 +703,7 @@
* A macro used in #include statements to name the file containing the
* FreeType~2 API which performs color filtering for subpixel rendering.
*/
#define FT_LCD_FILTER_H <freetype/ftlcdfil.h>
#define FT_LCD_FILTER_H <plugin/FT_fontsys/ftlcdfil.h>
/*************************************************************************
@ -715,7 +715,7 @@
* A macro used in #include statements to name the file containing the
* FreeType~2 API which performs color filtering for subpixel rendering.
*/
#define FT_UNPATENTED_HINTING_H <freetype/ttunpat.h>
#define FT_UNPATENTED_HINTING_H <plugin/FT_fontsys/ttunpat.h>
/*************************************************************************
@ -727,7 +727,7 @@
* A macro used in #include statements to name the file containing the
* FreeType~2 API which performs color filtering for subpixel rendering.
*/
#define FT_INCREMENTAL_H <freetype/ftincrem.h>
#define FT_INCREMENTAL_H <plugin/FT_fontsys/ftincrem.h>
/*************************************************************************
@ -739,7 +739,7 @@
* A macro used in #include statements to name the file containing the
* FreeType~2 API which returns entries from the TrueType GASP table.
*/
#define FT_GASP_H <freetype/ftgasp.h>
#define FT_GASP_H <plugin/FT_fontsys/ftgasp.h>
/*************************************************************************
@ -751,38 +751,38 @@
* A macro used in #include statements to name the file containing the
* FreeType~2 API which returns individual and ranged glyph advances.
*/
#define FT_ADVANCES_H <freetype/ftadvanc.h>
#define FT_ADVANCES_H <plugin/FT_fontsys/ftadvanc.h>
/* */
#define FT_ERROR_DEFINITIONS_H <freetype/fterrdef.h>
#define FT_ERROR_DEFINITIONS_H <plugin/FT_fontsys/fterrdef.h>
/* The internals of the cache sub-system are no longer exposed. We */
/* default to FT_CACHE_H at the moment just in case, but we know of */
/* no rogue client that uses them. */
/* */
#define FT_CACHE_MANAGER_H <freetype/ftcache.h>
#define FT_CACHE_INTERNAL_MRU_H <freetype/ftcache.h>
#define FT_CACHE_INTERNAL_MANAGER_H <freetype/ftcache.h>
#define FT_CACHE_INTERNAL_CACHE_H <freetype/ftcache.h>
#define FT_CACHE_INTERNAL_GLYPH_H <freetype/ftcache.h>
#define FT_CACHE_INTERNAL_IMAGE_H <freetype/ftcache.h>
#define FT_CACHE_INTERNAL_SBITS_H <freetype/ftcache.h>
#define FT_CACHE_MANAGER_H <plugin/FT_fontsys/ftcache.h>
#define FT_CACHE_INTERNAL_MRU_H <plugin/FT_fontsys/ftcache.h>
#define FT_CACHE_INTERNAL_MANAGER_H <plugin/FT_fontsys/ftcache.h>
#define FT_CACHE_INTERNAL_CACHE_H <plugin/FT_fontsys/ftcache.h>
#define FT_CACHE_INTERNAL_GLYPH_H <plugin/FT_fontsys/ftcache.h>
#define FT_CACHE_INTERNAL_IMAGE_H <plugin/FT_fontsys/ftcache.h>
#define FT_CACHE_INTERNAL_SBITS_H <plugin/FT_fontsys/ftcache.h>
#define FT_INCREMENTAL_H <freetype/ftincrem.h>
#define FT_INCREMENTAL_H <plugin/FT_fontsys/ftincrem.h>
#define FT_TRUETYPE_UNPATENTED_H <freetype/ttunpat.h>
#define FT_TRUETYPE_UNPATENTED_H <plugin/FT_fontsys/ttunpat.h>
/*
* Include internal headers definitions from <freetype/internal/...>
* Include internal headers definitions from <plugin/FT_fontsys/internal/...>
* only when building the library.
*/
#ifdef FT2_BUILD_LIBRARY
#define FT_INTERNAL_INTERNAL_H <freetype/internal/internal.h>
#define FT_INTERNAL_INTERNAL_H <plugin/FT_fontsys/internal/internal.h>
#include FT_INTERNAL_INTERNAL_H
#endif /* FT2_BUILD_LIBRARY */

6
uppsrc/plugin/FT_fontsys/config/ftoption.h
View file

@ -20,7 +20,7 @@
#define __FTOPTION_H__
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
FT_BEGIN_HEADER
@ -51,7 +51,7 @@ FT_BEGIN_HEADER
/* locate this file during the build. For example, */
/* */
/* #define FT_CONFIG_OPTIONS_H <myftoptions.h> */
/* #include <freetype/config/ftheader.h> */
/* #include <plugin/FT_fontsys/config/ftheader.h> */
/* */
/* will use `$BUILD/myftoptions.h' instead of this file for macro */
/* definitions. */
@ -59,7 +59,7 @@ FT_BEGIN_HEADER
/* Note also that you can similarly pre-define the macro */
/* FT_CONFIG_MODULES_H used to locate the file listing of the modules */
/* that are statically linked to the library at compile time. By */
/* default, this file is <freetype/config/ftmodule.h>. */
/* default, this file is <plugin/FT_fontsys/config/ftmodule.h>. */
/* */
/* We highly recommend using the third method whenever possible. */
/* */

2
uppsrc/plugin/FT_fontsys/freetype.h
View file

@ -29,7 +29,7 @@
#define __FREETYPE_H__
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_CONFIG_CONFIG_H
#include FT_ERRORS_H
#include FT_TYPES_H

2
uppsrc/plugin/FT_fontsys/ft2build.h
View file

@ -31,7 +31,7 @@
#ifndef __FT2_BUILD_GENERIC_H__
#define __FT2_BUILD_GENERIC_H__
#include <freetype/config/ftheader.h>
#include <plugin/FT_fontsys/config/ftheader.h>
#endif /* __FT2_BUILD_GENERIC_H__ */

2
uppsrc/plugin/FT_fontsys/ftbbox.h
View file

@ -31,7 +31,7 @@
#define __FTBBOX_H__
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_FREETYPE_H
#ifdef FREETYPE_H

2
uppsrc/plugin/FT_fontsys/ftmac.h
View file

@ -18,7 +18,7 @@
/***************************************************************************/
/* */
/* NOTE: Include this file after <freetype/freetype.h> and after any */
/* NOTE: Include this file after <plugin/FT_fontsys/freetype.h> and after any */
/* Mac-specific headers (because this header uses Mac types such as */
/* Handle, FSSpec, FSRef, etc.) */
/* */

2
uppsrc/plugin/FT_fontsys/internal/autohint.h
View file

@ -70,7 +70,7 @@
/*************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_FREETYPE_H

2
uppsrc/plugin/FT_fontsys/internal/ftcalc.h
View file

@ -20,7 +20,7 @@
#define __FTCALC_H__
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_FREETYPE_H

2
uppsrc/plugin/FT_fontsys/internal/ftdebug.h
View file

@ -25,7 +25,7 @@
#define __FTDEBUG_H__
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_CONFIG_CONFIG_H
#include FT_FREETYPE_H

2
uppsrc/plugin/FT_fontsys/internal/ftdriver.h
View file

@ -20,7 +20,7 @@
#define __FTDRIVER_H__
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_MODULE_H

2
uppsrc/plugin/FT_fontsys/internal/ftgloadr.h
View file

@ -20,7 +20,7 @@
#define __FTGLOADR_H__
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_FREETYPE_H

2
uppsrc/plugin/FT_fontsys/internal/ftmemory.h
View file

@ -20,7 +20,7 @@
#define __FTMEMORY_H__
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_CONFIG_CONFIG_H
#include FT_TYPES_H

2
uppsrc/plugin/FT_fontsys/internal/ftobjs.h
View file

@ -26,7 +26,7 @@
#ifndef __FTOBJS_H__
#define __FTOBJS_H__
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_RENDER_H
#include FT_SIZES_H
#include FT_LCD_FILTER_H

2
uppsrc/plugin/FT_fontsys/internal/ftrfork.h
View file

@ -25,7 +25,7 @@
#define __FTRFORK_H__
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_INTERNAL_OBJECTS_H

34
uppsrc/plugin/FT_fontsys/internal/ftserv.h
View file

@ -592,23 +592,23 @@ FT_BEGIN_HEADER
* The header files containing the services.
*/
#define FT_SERVICE_BDF_H <freetype/internal/services/svbdf.h>
#define FT_SERVICE_CID_H <freetype/internal/services/svcid.h>
#define FT_SERVICE_GLYPH_DICT_H <freetype/internal/services/svgldict.h>
#define FT_SERVICE_GX_VALIDATE_H <freetype/internal/services/svgxval.h>
#define FT_SERVICE_KERNING_H <freetype/internal/services/svkern.h>
#define FT_SERVICE_MULTIPLE_MASTERS_H <freetype/internal/services/svmm.h>
#define FT_SERVICE_OPENTYPE_VALIDATE_H <freetype/internal/services/svotval.h>
#define FT_SERVICE_PFR_H <freetype/internal/services/svpfr.h>
#define FT_SERVICE_POSTSCRIPT_CMAPS_H <freetype/internal/services/svpscmap.h>
#define FT_SERVICE_POSTSCRIPT_INFO_H <freetype/internal/services/svpsinfo.h>
#define FT_SERVICE_POSTSCRIPT_NAME_H <freetype/internal/services/svpostnm.h>
#define FT_SERVICE_SFNT_H <freetype/internal/services/svsfnt.h>
#define FT_SERVICE_TRUETYPE_ENGINE_H <freetype/internal/services/svtteng.h>
#define FT_SERVICE_TT_CMAP_H <freetype/internal/services/svttcmap.h>
#define FT_SERVICE_WINFNT_H <freetype/internal/services/svwinfnt.h>
#define FT_SERVICE_XFREE86_NAME_H <freetype/internal/services/svxf86nm.h>
#define FT_SERVICE_TRUETYPE_GLYF_H <freetype/internal/services/svttglyf.h>
#define FT_SERVICE_BDF_H <plugin/FT_fontsys/internal/services/svbdf.h>
#define FT_SERVICE_CID_H <plugin/FT_fontsys/internal/services/svcid.h>
#define FT_SERVICE_GLYPH_DICT_H <plugin/FT_fontsys/internal/services/svgldict.h>
#define FT_SERVICE_GX_VALIDATE_H <plugin/FT_fontsys/internal/services/svgxval.h>
#define FT_SERVICE_KERNING_H <plugin/FT_fontsys/internal/services/svkern.h>
#define FT_SERVICE_MULTIPLE_MASTERS_H <plugin/FT_fontsys/internal/services/svmm.h>
#define FT_SERVICE_OPENTYPE_VALIDATE_H <plugin/FT_fontsys/internal/services/svotval.h>
#define FT_SERVICE_PFR_H <plugin/FT_fontsys/internal/services/svpfr.h>
#define FT_SERVICE_POSTSCRIPT_CMAPS_H <plugin/FT_fontsys/internal/services/svpscmap.h>
#define FT_SERVICE_POSTSCRIPT_INFO_H <plugin/FT_fontsys/internal/services/svpsinfo.h>
#define FT_SERVICE_POSTSCRIPT_NAME_H <plugin/FT_fontsys/internal/services/svpostnm.h>
#define FT_SERVICE_SFNT_H <plugin/FT_fontsys/internal/services/svsfnt.h>
#define FT_SERVICE_TRUETYPE_ENGINE_H <plugin/FT_fontsys/internal/services/svtteng.h>
#define FT_SERVICE_TT_CMAP_H <plugin/FT_fontsys/internal/services/svttcmap.h>
#define FT_SERVICE_WINFNT_H <plugin/FT_fontsys/internal/services/svwinfnt.h>
#define FT_SERVICE_XFREE86_NAME_H <plugin/FT_fontsys/internal/services/svxf86nm.h>
#define FT_SERVICE_TRUETYPE_GLYF_H <plugin/FT_fontsys/internal/services/svttglyf.h>
/* */

2
uppsrc/plugin/FT_fontsys/internal/ftstream.h
View file

@ -20,7 +20,7 @@
#define __FTSTREAM_H__
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_SYSTEM_H
#include FT_INTERNAL_OBJECTS_H

2
uppsrc/plugin/FT_fontsys/internal/ftvalid.h
View file

@ -19,7 +19,7 @@
#ifndef __FTVALID_H__
#define __FTVALID_H__
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_CONFIG_STANDARD_LIBRARY_H /* for ft_setjmp and ft_longjmp */

38
uppsrc/plugin/FT_fontsys/internal/internal.h
View file

@ -24,28 +24,28 @@
/*************************************************************************/
#define FT_INTERNAL_OBJECTS_H <freetype/internal/ftobjs.h>
#define FT_INTERNAL_PIC_H <freetype/internal/ftpic.h>
#define FT_INTERNAL_STREAM_H <freetype/internal/ftstream.h>
#define FT_INTERNAL_MEMORY_H <freetype/internal/ftmemory.h>
#define FT_INTERNAL_DEBUG_H <freetype/internal/ftdebug.h>
#define FT_INTERNAL_CALC_H <freetype/internal/ftcalc.h>
#define FT_INTERNAL_DRIVER_H <freetype/internal/ftdriver.h>
#define FT_INTERNAL_TRACE_H <freetype/internal/fttrace.h>
#define FT_INTERNAL_GLYPH_LOADER_H <freetype/internal/ftgloadr.h>
#define FT_INTERNAL_SFNT_H <freetype/internal/sfnt.h>
#define FT_INTERNAL_SERVICE_H <freetype/internal/ftserv.h>
#define FT_INTERNAL_RFORK_H <freetype/internal/ftrfork.h>
#define FT_INTERNAL_VALIDATE_H <freetype/internal/ftvalid.h>
#define FT_INTERNAL_OBJECTS_H <plugin/FT_fontsys/internal/ftobjs.h>
#define FT_INTERNAL_PIC_H <plugin/FT_fontsys/internal/ftpic.h>
#define FT_INTERNAL_STREAM_H <plugin/FT_fontsys/internal/ftstream.h>
#define FT_INTERNAL_MEMORY_H <plugin/FT_fontsys/internal/ftmemory.h>
#define FT_INTERNAL_DEBUG_H <plugin/FT_fontsys/internal/ftdebug.h>
#define FT_INTERNAL_CALC_H <plugin/FT_fontsys/internal/ftcalc.h>
#define FT_INTERNAL_DRIVER_H <plugin/FT_fontsys/internal/ftdriver.h>
#define FT_INTERNAL_TRACE_H <plugin/FT_fontsys/internal/fttrace.h>
#define FT_INTERNAL_GLYPH_LOADER_H <plugin/FT_fontsys/internal/ftgloadr.h>
#define FT_INTERNAL_SFNT_H <plugin/FT_fontsys/internal/sfnt.h>
#define FT_INTERNAL_SERVICE_H <plugin/FT_fontsys/internal/ftserv.h>
#define FT_INTERNAL_RFORK_H <plugin/FT_fontsys/internal/ftrfork.h>
#define FT_INTERNAL_VALIDATE_H <plugin/FT_fontsys/internal/ftvalid.h>
#define FT_INTERNAL_TRUETYPE_TYPES_H <freetype/internal/tttypes.h>
#define FT_INTERNAL_TYPE1_TYPES_H <freetype/internal/t1types.h>
#define FT_INTERNAL_TRUETYPE_TYPES_H <plugin/FT_fontsys/internal/tttypes.h>
#define FT_INTERNAL_TYPE1_TYPES_H <plugin/FT_fontsys/internal/t1types.h>
#define FT_INTERNAL_POSTSCRIPT_AUX_H <freetype/internal/psaux.h>
#define FT_INTERNAL_POSTSCRIPT_HINTS_H <freetype/internal/pshints.h>
#define FT_INTERNAL_POSTSCRIPT_GLOBALS_H <freetype/internal/psglobal.h>
#define FT_INTERNAL_POSTSCRIPT_AUX_H <plugin/FT_fontsys/internal/psaux.h>
#define FT_INTERNAL_POSTSCRIPT_HINTS_H <plugin/FT_fontsys/internal/pshints.h>
#define FT_INTERNAL_POSTSCRIPT_GLOBALS_H <plugin/FT_fontsys/internal/psglobal.h>
#define FT_INTERNAL_AUTOHINT_H <freetype/internal/autohint.h>
#define FT_INTERNAL_AUTOHINT_H <plugin/FT_fontsys/internal/autohint.h>
/* END */

2
uppsrc/plugin/FT_fontsys/internal/psaux.h
View file

@ -21,7 +21,7 @@
#define __PSAUX_H__
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_INTERNAL_OBJECTS_H
#include FT_INTERNAL_TYPE1_TYPES_H
#include FT_SERVICE_POSTSCRIPT_CMAPS_H

2
uppsrc/plugin/FT_fontsys/internal/pshints.h
View file

@ -22,7 +22,7 @@
#define __PSHINTS_H__
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_FREETYPE_H
#include FT_TYPE1_TABLES_H

2
uppsrc/plugin/FT_fontsys/internal/sfnt.h
View file

@ -20,7 +20,7 @@
#define __SFNT_H__
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_INTERNAL_DRIVER_H
#include FT_INTERNAL_TRUETYPE_TYPES_H

2
uppsrc/plugin/FT_fontsys/internal/t1types.h
View file

@ -21,7 +21,7 @@
#define __T1TYPES_H__
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_TYPE1_TABLES_H
#include FT_INTERNAL_POSTSCRIPT_HINTS_H
#include FT_INTERNAL_SERVICE_H

2
uppsrc/plugin/FT_fontsys/internal/tttypes.h
View file

@ -21,7 +21,7 @@
#define __TTTYPES_H__
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_TRUETYPE_TABLES_H
#include FT_INTERNAL_OBJECTS_H

2
uppsrc/plugin/FT_fontsys/src/autofit/afcjk.c
View file

@ -22,7 +22,7 @@
*
*/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_ADVANCES_H
#include FT_INTERNAL_DEBUG_H

2
uppsrc/plugin/FT_fontsys/src/autofit/aflatin.c
View file

@ -16,7 +16,7 @@
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_ADVANCES_H
#include FT_INTERNAL_DEBUG_H

2
uppsrc/plugin/FT_fontsys/src/autofit/afmodule.h
View file

@ -19,7 +19,7 @@
#ifndef __AFMODULE_H__
#define __AFMODULE_H__
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_INTERNAL_OBJECTS_H
#include FT_MODULE_H

2
uppsrc/plugin/FT_fontsys/src/autofit/afpic.c
View file

@ -16,7 +16,7 @@
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_FREETYPE_H
#include FT_INTERNAL_OBJECTS_H
#include "afpic.h"

2
uppsrc/plugin/FT_fontsys/src/autofit/aftypes.h
View file

@ -35,7 +35,7 @@
#ifndef __AFTYPES_H__
#define __AFTYPES_H__
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_FREETYPE_H
#include FT_OUTLINE_H

2
uppsrc/plugin/FT_fontsys/src/autofit/autofit.c
View file

@ -17,7 +17,7 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include "afpic.c"
#include "afangles.c"
#include "afglobal.c"

2
uppsrc/plugin/FT_fontsys/src/base/basepic.c
View file

@ -16,7 +16,7 @@
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_FREETYPE_H
#include FT_INTERNAL_OBJECTS_H
#include "basepic.h"

2
uppsrc/plugin/FT_fontsys/src/base/ftadvanc.c
View file

@ -16,7 +16,7 @@
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_ADVANCES_H
#include FT_INTERNAL_OBJECTS_H

2
uppsrc/plugin/FT_fontsys/src/base/ftapi.c
View file

@ -16,7 +16,7 @@
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_LIST_H
#include FT_OUTLINE_H
#include FT_INTERNAL_OBJECTS_H

2
uppsrc/plugin/FT_fontsys/src/base/ftbase.c
View file

@ -16,7 +16,7 @@
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#define FT_MAKE_OPTION_SINGLE_OBJECT

2
uppsrc/plugin/FT_fontsys/src/base/ftbase.h
View file

@ -20,7 +20,7 @@
#define __FTBASE_H__
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_INTERNAL_OBJECTS_H

2
uppsrc/plugin/FT_fontsys/src/base/ftbbox.c
View file

@ -24,7 +24,7 @@
/*************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_BBOX_H
#include FT_IMAGE_H
#include FT_OUTLINE_H

2
uppsrc/plugin/FT_fontsys/src/base/ftbdf.c
View file

@ -16,7 +16,7 @@
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_INTERNAL_OBJECTS_H
#include FT_SERVICE_BDF_H

2
uppsrc/plugin/FT_fontsys/src/base/ftbitmap.c
View file

@ -16,7 +16,7 @@
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_BITMAP_H
#include FT_IMAGE_H
#include FT_INTERNAL_OBJECTS_H

2
uppsrc/plugin/FT_fontsys/src/base/ftcalc.c
View file

@ -32,7 +32,7 @@
/*************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_GLYPH_H
#include FT_INTERNAL_CALC_H
#include FT_INTERNAL_DEBUG_H

2
uppsrc/plugin/FT_fontsys/src/base/ftcid.c
View file

@ -15,7 +15,7 @@
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_CID_H
#include FT_INTERNAL_OBJECTS_H
#include FT_SERVICE_CID_H

2
uppsrc/plugin/FT_fontsys/src/base/ftdbgmem.c
View file

@ -16,7 +16,7 @@
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_CONFIG_CONFIG_H
#include FT_INTERNAL_DEBUG_H
#include FT_INTERNAL_MEMORY_H

2
uppsrc/plugin/FT_fontsys/src/base/ftdebug.c
View file

@ -41,7 +41,7 @@
/*************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_FREETYPE_H
#include FT_INTERNAL_DEBUG_H

2
uppsrc/plugin/FT_fontsys/src/base/ftfstype.c
View file

@ -15,7 +15,7 @@
/* */
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_TYPE1_TABLES_H
#include FT_TRUETYPE_TABLES_H
#include FT_INTERNAL_SERVICE_H

2
uppsrc/plugin/FT_fontsys/src/base/ftgasp.c
View file

@ -16,7 +16,7 @@
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_GASP_H
#include FT_INTERNAL_TRUETYPE_TYPES_H

2
uppsrc/plugin/FT_fontsys/src/base/ftgloadr.c
View file

@ -16,7 +16,7 @@
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_INTERNAL_GLYPH_LOADER_H
#include FT_INTERNAL_MEMORY_H
#include FT_INTERNAL_OBJECTS_H

2
uppsrc/plugin/FT_fontsys/src/base/ftglyph.c
View file

@ -28,7 +28,7 @@
/*************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_GLYPH_H
#include FT_OUTLINE_H
#include FT_BITMAP_H

2
uppsrc/plugin/FT_fontsys/src/base/ftgxval.c
View file

@ -25,7 +25,7 @@
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_INTERNAL_OBJECTS_H
#include FT_SERVICE_GX_VALIDATE_H

2
uppsrc/plugin/FT_fontsys/src/base/ftinit.c
View file

@ -37,7 +37,7 @@
/*************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_CONFIG_CONFIG_H
#include FT_INTERNAL_OBJECTS_H
#include FT_INTERNAL_DEBUG_H

2
uppsrc/plugin/FT_fontsys/src/base/ftlcdfil.c
View file

@ -16,7 +16,7 @@
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_LCD_FILTER_H
#include FT_IMAGE_H
#include FT_INTERNAL_OBJECTS_H

2
uppsrc/plugin/FT_fontsys/src/base/ftmac.c
View file

@ -66,7 +66,7 @@
*/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_FREETYPE_H
#include FT_TRUETYPE_TAGS_H
#include FT_INTERNAL_STREAM_H

2
uppsrc/plugin/FT_fontsys/src/base/ftmm.c
View file

@ -16,7 +16,7 @@
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_MULTIPLE_MASTERS_H
#include FT_INTERNAL_OBJECTS_H
#include FT_SERVICE_MULTIPLE_MASTERS_H

2
uppsrc/plugin/FT_fontsys/src/base/ftobjs.c
View file

@ -16,7 +16,7 @@
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_LIST_H
#include FT_OUTLINE_H
#include FT_INTERNAL_VALIDATE_H

2
uppsrc/plugin/FT_fontsys/src/base/ftotval.c
View file

@ -15,7 +15,7 @@
/* */
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_INTERNAL_OBJECTS_H
#include FT_SERVICE_OPENTYPE_VALIDATE_H
#include FT_OPENTYPE_VALIDATE_H

2
uppsrc/plugin/FT_fontsys/src/base/ftoutln.c
View file

@ -23,7 +23,7 @@
/*************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_OUTLINE_H
#include FT_INTERNAL_OBJECTS_H
#include FT_INTERNAL_DEBUG_H

2
uppsrc/plugin/FT_fontsys/src/base/ftpatent.c
View file

@ -15,7 +15,7 @@
/* */
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_FREETYPE_H
#include FT_TRUETYPE_TAGS_H
#include FT_INTERNAL_OBJECTS_H

2
uppsrc/plugin/FT_fontsys/src/base/ftpfr.c
View file

@ -15,7 +15,7 @@
/* */
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_INTERNAL_OBJECTS_H
#include FT_SERVICE_PFR_H

2
uppsrc/plugin/FT_fontsys/src/base/ftpic.c
View file

@ -16,7 +16,7 @@
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_FREETYPE_H
#include FT_INTERNAL_OBJECTS_H
#include "basepic.h"

2
uppsrc/plugin/FT_fontsys/src/base/ftrfork.c
View file

@ -24,7 +24,7 @@
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_INTERNAL_DEBUG_H
#include FT_INTERNAL_STREAM_H
#include FT_INTERNAL_RFORK_H

2
uppsrc/plugin/FT_fontsys/src/base/ftsnames.c
View file

@ -19,7 +19,7 @@
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_SFNT_NAMES_H
#include FT_INTERNAL_TRUETYPE_TYPES_H
#include FT_INTERNAL_STREAM_H

2
uppsrc/plugin/FT_fontsys/src/base/ftstream.c
View file

@ -16,7 +16,7 @@
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_INTERNAL_STREAM_H
#include FT_INTERNAL_DEBUG_H

2
uppsrc/plugin/FT_fontsys/src/base/ftstroke.c
View file

@ -16,7 +16,7 @@
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_STROKER_H
#include FT_TRIGONOMETRY_H
#include FT_OUTLINE_H

2
uppsrc/plugin/FT_fontsys/src/base/ftsynth.c
View file

@ -16,7 +16,7 @@
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_SYNTHESIS_H
#include FT_INTERNAL_DEBUG_H
#include FT_INTERNAL_OBJECTS_H

2
uppsrc/plugin/FT_fontsys/src/base/ftsystem.c
View file

@ -25,7 +25,7 @@
/*************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_CONFIG_CONFIG_H
#include FT_INTERNAL_DEBUG_H
#include FT_INTERNAL_STREAM_H

2
uppsrc/plugin/FT_fontsys/src/base/fttrigon.c
View file

@ -16,7 +16,7 @@
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_INTERNAL_OBJECTS_H
#include FT_TRIGONOMETRY_H

2
uppsrc/plugin/FT_fontsys/src/base/fttype1.c
View file

@ -16,7 +16,7 @@
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_INTERNAL_OBJECTS_H
#include FT_INTERNAL_SERVICE_H
#include FT_SERVICE_POSTSCRIPT_INFO_H

2
uppsrc/plugin/FT_fontsys/src/base/ftutil.c
View file

@ -16,7 +16,7 @@
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_INTERNAL_DEBUG_H
#include FT_INTERNAL_MEMORY_H
#include FT_INTERNAL_OBJECTS_H

2
uppsrc/plugin/FT_fontsys/src/base/ftwinfnt.c
View file

@ -16,7 +16,7 @@
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_WINFONTS_H
#include FT_INTERNAL_OBJECTS_H
#include FT_SERVICE_WINFNT_H

2
uppsrc/plugin/FT_fontsys/src/base/ftxf86.c
View file

@ -16,7 +16,7 @@
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_XFREE86_H
#include FT_INTERNAL_OBJECTS_H
#include FT_SERVICE_XFREE86_NAME_H

2
uppsrc/plugin/FT_fontsys/src/bdf/bdf.c
View file

@ -26,7 +26,7 @@ THE SOFTWARE.
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include "bdflib.c"
#include "bdfdrivr.c"

2
uppsrc/plugin/FT_fontsys/src/bdf/bdf.h
View file

@ -30,7 +30,7 @@
* Based on bdf.h,v 1.16 2000/03/16 20:08:51 mleisher
*/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_INTERNAL_OBJECTS_H
#include FT_INTERNAL_STREAM_H

2
uppsrc/plugin/FT_fontsys/src/bdf/bdfdrivr.c
View file

@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_INTERNAL_DEBUG_H
#include FT_INTERNAL_STREAM_H

2
uppsrc/plugin/FT_fontsys/src/bdf/bdfdrivr.h
View file

@ -28,7 +28,7 @@ THE SOFTWARE.
#ifndef __BDFDRIVR_H__
#define __BDFDRIVR_H__
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_INTERNAL_DRIVER_H
#include "bdf.h"

2
uppsrc/plugin/FT_fontsys/src/bdf/bdflib.c
View file

@ -31,7 +31,7 @@
/*************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_FREETYPE_H
#include FT_INTERNAL_DEBUG_H

2
uppsrc/plugin/FT_fontsys/src/bzip2/ftbzip2.c
View file

@ -23,7 +23,7 @@
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_INTERNAL_MEMORY_H
#include FT_INTERNAL_STREAM_H
#include FT_INTERNAL_DEBUG_H

2
uppsrc/plugin/FT_fontsys/src/cache/ftcache.c vendored
View file

@ -18,7 +18,7 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include "ftcmru.c"
#include "ftcmanag.c"
#include "ftccache.c"

2
uppsrc/plugin/FT_fontsys/src/cache/ftcbasic.c vendored
View file

@ -16,7 +16,7 @@
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_INTERNAL_OBJECTS_H
#include FT_INTERNAL_DEBUG_H
#include FT_CACHE_H

2
uppsrc/plugin/FT_fontsys/src/cache/ftccache.c vendored
View file

@ -17,7 +17,7 @@
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include "ftcmanag.h"
#include FT_INTERNAL_OBJECTS_H
#include FT_INTERNAL_DEBUG_H

2
uppsrc/plugin/FT_fontsys/src/cache/ftccback.h vendored
View file

@ -18,7 +18,7 @@
#ifndef __FTCCBACK_H__
#define __FTCCBACK_H__
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_CACHE_H
#include "ftcmru.h"
#include "ftcimage.h"

2
uppsrc/plugin/FT_fontsys/src/cache/ftccmap.c vendored
View file

@ -17,7 +17,7 @@
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_FREETYPE_H
#include FT_CACHE_H
#include "ftcmanag.h"

2
uppsrc/plugin/FT_fontsys/src/cache/ftcglyph.c vendored
View file

@ -16,7 +16,7 @@
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_INTERNAL_OBJECTS_H
#include FT_CACHE_H
#include "ftcglyph.h"

2
uppsrc/plugin/FT_fontsys/src/cache/ftcglyph.h vendored
View file

@ -117,7 +117,7 @@
#define __FTCGLYPH_H__
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include "ftcmanag.h"

2
uppsrc/plugin/FT_fontsys/src/cache/ftcimage.c vendored
View file

@ -16,7 +16,7 @@
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_CACHE_H
#include "ftcimage.h"
#include FT_INTERNAL_MEMORY_H

2
uppsrc/plugin/FT_fontsys/src/cache/ftcimage.h vendored
View file

@ -36,7 +36,7 @@
#define __FTCIMAGE_H__
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_CACHE_H
#include "ftcglyph.h"

2
uppsrc/plugin/FT_fontsys/src/cache/ftcmanag.c vendored
View file

@ -16,7 +16,7 @@
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_CACHE_H
#include "ftcmanag.h"
#include FT_INTERNAL_OBJECTS_H

2
uppsrc/plugin/FT_fontsys/src/cache/ftcmanag.h vendored
View file

@ -63,7 +63,7 @@
#define __FTCMANAG_H__
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_CACHE_H
#include "ftcmru.h"
#include "ftccache.h"

2
uppsrc/plugin/FT_fontsys/src/cache/ftcmru.c vendored
View file

@ -16,7 +16,7 @@
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_CACHE_H
#include "ftcmru.h"
#include FT_INTERNAL_OBJECTS_H

2
uppsrc/plugin/FT_fontsys/src/cache/ftcmru.h vendored
View file

@ -44,7 +44,7 @@
#define __FTCMRU_H__
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_FREETYPE_H
#ifdef FREETYPE_H

2
uppsrc/plugin/FT_fontsys/src/cache/ftcsbits.c vendored
View file

@ -16,7 +16,7 @@
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_CACHE_H
#include "ftcsbits.h"
#include FT_INTERNAL_OBJECTS_H

2
uppsrc/plugin/FT_fontsys/src/cache/ftcsbits.h vendored
View file

@ -20,7 +20,7 @@
#define __FTCSBITS_H__
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_CACHE_H
#include "ftcglyph.h"

2
uppsrc/plugin/FT_fontsys/src/cff/cff.c
View file

@ -18,7 +18,7 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include "cffpic.c"
#include "cffdrivr.c"
#include "cffparse.c"

2
uppsrc/plugin/FT_fontsys/src/cff/cffdrivr.c
View file

@ -17,7 +17,7 @@
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_FREETYPE_H
#include FT_INTERNAL_DEBUG_H
#include FT_INTERNAL_STREAM_H

2
uppsrc/plugin/FT_fontsys/src/cff/cffdrivr.h
View file

@ -20,7 +20,7 @@
#define __CFFDRIVER_H__
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_INTERNAL_DRIVER_H

2
uppsrc/plugin/FT_fontsys/src/cff/cffgload.c
View file

@ -16,7 +16,7 @@
/***************************************************************************/
#include <freetype/ft2build.h>
#include <plugin/FT_fontsys/ft2build.h>
#include FT_INTERNAL_DEBUG_H
#include FT_INTERNAL_STREAM_H
#include FT_INTERNAL_SFNT_H

Some files were not shown because too many files have changed in this diff Show more