[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2-demos] master 6a7b3b7 1/2: Update to Freetype changes from 20
|
From: |
Werner LEMBERG |
|
Subject: |
[freetype2-demos] master 6a7b3b7 1/2: Update to Freetype changes from 2017-12-08. |
|
Date: |
Fri, 8 Dec 2017 14:47:30 -0500 (EST) |
branch: master
commit 6a7b3b71f1b68ecff0e0a49e0b875b27dc6138d2
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>
Update to Freetype changes from 2017-12-08.
* src/*.c: s/FT_{CFF,TRUETYPE}_DRIVER_H/FT_DRIVER_H/.
s/FT_CFF_HINTING_/FT_HINTING_/.
s/N_CFF_HINTING_ENGINES/N_HINTING_ENGINES/.
---
ChangeLog | 8 ++++++++
src/ftbench.c | 7 +++----
src/ftdiff.c | 7 +++----
src/ftgrid.c | 9 ++++-----
src/ftinspect/engine/engine.cpp | 7 +++----
src/ftinspect/maingui.cpp | 7 +++----
src/ftmulti.c | 9 ++++-----
src/ftview.c | 11 +++++------
src/ttdebug.c | 2 +-
9 files changed, 34 insertions(+), 33 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3368703..180059a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2017-12-08 Werner Lemberg <address@hidden>
+
+ Update to Freetype changes from 2017-12-08.
+
+ * src/*.c: s/FT_{CFF,TRUETYPE}_DRIVER_H/FT_DRIVER_H/.
+ s/FT_CFF_HINTING_/FT_HINTING_/.
+ s/N_CFF_HINTING_ENGINES/N_HINTING_ENGINES/.
+
2017-12-02 Werner Lemberg <address@hidden>
[ftview] Fix `-l' option.
diff --git a/src/ftbench.c b/src/ftbench.c
index c6b2b3c..219e7e2 100644
--- a/src/ftbench.c
+++ b/src/ftbench.c
@@ -31,8 +31,7 @@
#include FT_OUTLINE_H
#include FT_BBOX_H
#include FT_MODULE_H
-#include FT_CFF_DRIVER_H
-#include FT_TRUETYPE_DRIVER_H
+#include FT_DRIVER_H
#include FT_LCD_FILTER_H
#ifdef UNIX
@@ -894,8 +893,8 @@
unsigned int versions[3] = { TT_INTERPRETER_VERSION_35,
TT_INTERPRETER_VERSION_38,
TT_INTERPRETER_VERSION_40 };
- unsigned int engines[2] = { FT_CFF_HINTING_FREETYPE,
- FT_CFF_HINTING_ADOBE };
+ unsigned int engines[2] = { FT_HINTING_FREETYPE,
+ FT_HINTING_ADOBE };
int version;
char *engine;
diff --git a/src/ftdiff.c b/src/ftdiff.c
index ee1535d..00b1799 100644
--- a/src/ftdiff.c
+++ b/src/ftdiff.c
@@ -19,8 +19,7 @@
#include FT_OUTLINE_H
#include FT_LCD_FILTER_H
-#include FT_CFF_DRIVER_H
-#include FT_TRUETYPE_DRIVER_H
+#include FT_DRIVER_H
/* showing driver name -- the two internal header files */
/* shouldn't be used in normal programs */
@@ -806,10 +805,10 @@
{
switch ( column->cff_hinting_engine )
{
- case FT_CFF_HINTING_FREETYPE:
+ case FT_HINTING_FREETYPE:
extra = " (CFF FT)";
break;
- case FT_CFF_HINTING_ADOBE:
+ case FT_HINTING_ADOBE:
extra = " (CFF Adobe)";
break;
}
diff --git a/src/ftgrid.c b/src/ftgrid.c
index 48ee53a..29cdbaf 100644
--- a/src/ftgrid.c
+++ b/src/ftgrid.c
@@ -30,8 +30,7 @@
#include FT_STROKER_H
#include FT_SYNTHESIS_H
#include FT_LCD_FILTER_H
-#include FT_CFF_DRIVER_H
-#include FT_TRUETYPE_DRIVER_H
+#include FT_DRIVER_H
#include FT_MULTIPLE_MASTERS_H
#include FT_SFNT_NAMES_H
#include FT_TRUETYPE_IDS_H
@@ -44,7 +43,7 @@
#define snprintf _snprintf
#endif
-#define N_CFF_HINTING_ENGINES 2
+#define N_HINTING_ENGINES 2
#ifdef FT_DEBUG_AUTOFIT
@@ -1221,7 +1220,7 @@
new_cff_hinting_engine =
( (int)status.cff_hinting_engine +
delta +
- N_CFF_HINTING_ENGINES ) % N_CFF_HINTING_ENGINES;
+ N_HINTING_ENGINES ) % N_HINTING_ENGINES;
error = FT_Property_Set( handle->library,
"cff",
@@ -1239,7 +1238,7 @@
}
sprintf( status.header_buffer, "CFF engine changed to %s",
- status.cff_hinting_engine == FT_CFF_HINTING_FREETYPE
+ status.cff_hinting_engine == FT_HINTING_FREETYPE
? "FreeType" : "Adobe" );
status.header = (const char *)status.header_buffer;
diff --git a/src/ftinspect/engine/engine.cpp b/src/ftinspect/engine/engine.cpp
index c5271c2..6856beb 100644
--- a/src/ftinspect/engine/engine.cpp
+++ b/src/ftinspect/engine/engine.cpp
@@ -9,9 +9,8 @@
#include <stdexcept>
#include <stdint.h>
-#include FT_CFF_DRIVER_H
+#include FT_DRIVER_H
#include FT_LCD_FILTER_H
-#include FT_TRUETYPE_DRIVER_H
// internal FreeType header files; only available in the source code bundle
#include FT_INTERNAL_DRIVER_H
@@ -171,8 +170,8 @@ Engine::Engine(MainGUI* g)
{
int engines[] =
{
- FT_CFF_HINTING_FREETYPE,
- FT_CFF_HINTING_ADOBE
+ FT_HINTING_FREETYPE,
+ FT_HINTING_ADOBE
};
int i;
diff --git a/src/ftinspect/maingui.cpp b/src/ftinspect/maingui.cpp
index 8393559..7fd185f 100644
--- a/src/ftinspect/maingui.cpp
+++ b/src/ftinspect/maingui.cpp
@@ -12,8 +12,7 @@
#include <QMessageBox>
#include <QSettings>
-#include FT_CFF_DRIVER_H
-#include FT_TRUETYPE_DRIVER_H
+#include FT_DRIVER_H
MainGUI::MainGUI()
@@ -1180,8 +1179,8 @@ MainGUI::setDefaults()
hintingModesTrueTypeHash[TT_INTERPRETER_VERSION_38] =
HintingMode_TrueType_v38;
hintingModesTrueTypeHash[TT_INTERPRETER_VERSION_40] =
HintingMode_TrueType_v40;
- hintingModesCFFHash[FT_CFF_HINTING_FREETYPE] = HintingMode_CFF_FreeType;
- hintingModesCFFHash[FT_CFF_HINTING_ADOBE] = HintingMode_CFF_Adobe;
+ hintingModesCFFHash[FT_HINTING_FREETYPE] = HintingMode_CFF_FreeType;
+ hintingModesCFFHash[FT_HINTING_ADOBE] = HintingMode_CFF_Adobe;
lcdFilterHash[FT_LCD_FILTER_DEFAULT] = LCDFilter_Default;
lcdFilterHash[FT_LCD_FILTER_LIGHT] = LCDFilter_Light;
diff --git a/src/ftmulti.c b/src/ftmulti.c
index 6f5d3e4..351cfd5 100644
--- a/src/ftmulti.c
+++ b/src/ftmulti.c
@@ -16,8 +16,7 @@
#include FT_FREETYPE_H
#include FT_FONT_FORMATS_H
#include FT_MODULE_H
-#include FT_TRUETYPE_DRIVER_H
-#include FT_CFF_DRIVER_H
+#include FT_DRIVER_H
#include FT_MULTIPLE_MASTERS_H
#include "common.h"
@@ -37,7 +36,7 @@
#define MAXPTSIZE 500 /* dtp */
#define MAX_MM_AXES 6
-#define N_CFF_HINTING_ENGINES 2
+#define N_HINTING_ENGINES 2
static char Header[256];
@@ -475,7 +474,7 @@
new_cff_hinting_engine =
( (int)cff_hinting_engine +
delta +
- N_CFF_HINTING_ENGINES ) % N_CFF_HINTING_ENGINES;
+ N_HINTING_ENGINES ) % N_HINTING_ENGINES;
error = FT_Property_Set( library,
"cff",
@@ -1080,7 +1079,7 @@
: ( tt_ver == TT_INTERPRETER_VERSION_38
? "TrueType (v38)"
: "TrueType (v40)" ) )
- : ( cff_hinting_engine == FT_CFF_HINTING_FREETYPE
+ : ( cff_hinting_engine == FT_HINTING_FREETYPE
? "CFF (FreeType)"
: "CFF (Adobe)" ) );
}
diff --git a/src/ftview.c b/src/ftview.c
index fbb947d..3723f2d 100644
--- a/src/ftview.c
+++ b/src/ftview.c
@@ -32,8 +32,7 @@
#include FT_STROKER_H
#include FT_SYNTHESIS_H
#include FT_LCD_FILTER_H
-#include FT_CFF_DRIVER_H
-#include FT_TRUETYPE_DRIVER_H
+#include FT_DRIVER_H
#define MAXPTSIZE 500 /* dtp */
@@ -68,7 +67,7 @@
#endif
-#define N_CFF_HINTING_ENGINES 2
+#define N_HINTING_ENGINES 2
/* omit LCD_MODE_LIGHT_SUBPIXEL; we don't need it in this application */
@@ -777,7 +776,7 @@
new_cff_hinting_engine =
( status.cff_hinting_engine +
delta +
- N_CFF_HINTING_ENGINES ) % N_CFF_HINTING_ENGINES;
+ N_HINTING_ENGINES ) % N_HINTING_ENGINES;
error = FT_Property_Set( handle->library,
"cff",
@@ -1501,10 +1500,10 @@
{
switch ( status.cff_hinting_engine )
{
- case FT_CFF_HINTING_FREETYPE:
+ case FT_HINTING_FREETYPE:
hinting_engine = "FreeType";
break;
- case FT_CFF_HINTING_ADOBE:
+ case FT_HINTING_ADOBE:
hinting_engine = "Adobe";
break;
}
diff --git a/src/ttdebug.c b/src/ttdebug.c
index 5dd3549..3108995 100644
--- a/src/ttdebug.c
+++ b/src/ttdebug.c
@@ -55,7 +55,7 @@
#include "common.h"
#include "mlgetopt.h"
-#include FT_TRUETYPE_DRIVER_H
+#include FT_DRIVER_H
/* The following header shouldn't be used in normal programs. */
/* `freetype2/src/truetype' must be in the current include path. */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2-demos] master 6a7b3b7 1/2: Update to Freetype changes from 2017-12-08.,
Werner LEMBERG <=