[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2-demos] master 9843cd9: TrueType mode v38 is gone.
|
From: |
Werner Lemberg |
|
Subject: |
[freetype2-demos] master 9843cd9: TrueType mode v38 is gone. |
|
Date: |
Mon, 27 Feb 2023 01:23:38 -0500 (EST) |
branch: master
commit 9843cd9d7b6f7602bc7b2c2d66d4a4f29be8379c
Author: Werner Lemberg <wl@gnu.org>
Commit: Werner Lemberg <wl@gnu.org>
TrueType mode v38 is gone.
Synchronize with FreeType commit 'Hide Infinality.' from 2023-Feb-17.
Both macros `TT_INTERPRETER_VERSION_38` and `TT_INTERPRETER_VERSION_40` have
now the same value, leading to numerous compilation errors because we use
these two macros as (different) case labels in switch statements.
* src/ftbench.c (tt_interpreter_versions, header, usage, main): Don't use
`TT_INTERPRETER_VERSION_38`.
* src/ftcommon.c (FTDemo_Hinting_Engine_Change, FTDemo_Get_Info): Ditto.
* src/ftdiff.c (ColumnStateRec, render_state_init, render_state_draw):
Ditto.
* src/ftmulti.c (tt_interpreter_versions, main): Ditto.
* src/ttdebug.c (tt_interpreter_versions, Usage, main): Ditto.
* src/ftinspect/engine/engine.hpp (EngineDefaultValues): Ditto.
* src/ftinspect/engine/engine.cpp (Engine::queryEngine): Ditto.
* src/ftinspect/models/customcomboboxmodels.hpp (HintingModeComboBoxModel):
Ditto.
* src/ftinspect/models/customcomboboxmodels.cpp
(HintingModeComboBoxModel::HintingModeComboBoxModel): Ditto.
* src/ftinspect/panels/settingpanel.cpp (SettingPanel::setDefaults): Ditto.
---
src/ftbench.c | 22 ++++++++--------------
src/ftcommon.c | 9 ---------
src/ftdiff.c | 14 ++++----------
src/ftinspect/engine/engine.cpp | 15 ++-------------
src/ftinspect/engine/engine.hpp | 1 -
src/ftinspect/models/customcomboboxmodels.cpp | 7 -------
src/ftinspect/models/customcomboboxmodels.hpp | 1 -
src/ftinspect/panels/settingpanel.cpp | 3 +--
src/ftmulti.c | 13 +++++--------
src/ttdebug.c | 19 ++++++++-----------
10 files changed, 28 insertions(+), 76 deletions(-)
diff --git a/src/ftbench.c b/src/ftbench.c
index 81fcb64..836c501 100644
--- a/src/ftbench.c
+++ b/src/ftbench.c
@@ -159,7 +159,7 @@
static FT_Render_Mode render_mode = FT_RENDER_MODE_NORMAL;
static FT_Int32 load_flags = FT_LOAD_DEFAULT;
- static unsigned int tt_interpreter_versions[3];
+ static unsigned int tt_interpreter_versions[2];
static int num_tt_interpreter_versions;
static unsigned int dflt_tt_interpreter_version;
@@ -856,9 +856,6 @@
case TT_INTERPRETER_VERSION_35:
hinting_engine = "v35";
break;
- case TT_INTERPRETER_VERSION_38:
- hinting_engine = "v38";
- break;
case TT_INTERPRETER_VERSION_40:
hinting_engine = "v40";
break;
@@ -968,17 +965,15 @@
/* we expect that at least one interpreter version is available */
- if ( num_tt_interpreter_versions == 2 )
+ if ( num_tt_interpreter_versions == 1 )
snprintf( interpreter_versions, sizeof ( interpreter_versions ),
- "%u and %u",
- tt_interpreter_versions[0],
- tt_interpreter_versions[1] );
+ "%u",
+ tt_interpreter_versions[0]);
else
snprintf( interpreter_versions, sizeof ( interpreter_versions ),
- "%u, %u, and %u",
+ "%u and %u",
tt_interpreter_versions[0],
- tt_interpreter_versions[1],
- tt_interpreter_versions[2] );
+ tt_interpreter_versions[1] );
/* we expect that at least one hinting engine is available */
if ( num_ps_hinting_engines == 1 )
@@ -1070,8 +1065,7 @@
int compare_cached = 0;
int j;
- unsigned int versions[3] = { TT_INTERPRETER_VERSION_35,
- TT_INTERPRETER_VERSION_38,
+ unsigned int versions[2] = { TT_INTERPRETER_VERSION_35,
TT_INTERPRETER_VERSION_40 };
unsigned int engines[2] = { FT_HINTING_FREETYPE,
FT_HINTING_ADOBE };
@@ -1098,7 +1092,7 @@
FT_Property_Get( lib,
"truetype",
"interpreter-version", &dflt_tt_interpreter_version );
- for ( j = 0; j < 3; j++ )
+ for ( j = 0; j < 2; j++ )
{
error = FT_Property_Set( lib,
"truetype",
diff --git a/src/ftcommon.c b/src/ftcommon.c
index b8ba2ea..b090141 100644
--- a/src/ftcommon.c
+++ b/src/ftcommon.c
@@ -996,12 +996,6 @@
{
S1:
case TT_INTERPRETER_VERSION_35:
- prop = TT_INTERPRETER_VERSION_38;
- if ( !FT_Property_Set( library, module_name,
- "interpreter-version", &prop ) )
- break;
- /* fall through */
- case TT_INTERPRETER_VERSION_38:
prop = TT_INTERPRETER_VERSION_40;
if ( !FT_Property_Set( library, module_name,
"interpreter-version", &prop ) )
@@ -1084,9 +1078,6 @@
case TT_INTERPRETER_VERSION_35:
hinting_engine = "\372v35";
break;
- case TT_INTERPRETER_VERSION_38:
- hinting_engine = "\372v38";
- break;
case TT_INTERPRETER_VERSION_40:
hinting_engine = "\372v40";
break;
diff --git a/src/ftdiff.c b/src/ftdiff.c
index 2ee4137..8677e8f 100644
--- a/src/ftdiff.c
+++ b/src/ftdiff.c
@@ -181,7 +181,7 @@
unsigned int cff_hinting_engine;
unsigned int type1_hinting_engine;
unsigned int t1cid_hinting_engine;
- unsigned int tt_interpreter_versions[3];
+ unsigned int tt_interpreter_versions[2];
int num_tt_interpreter_versions;
int tt_interpreter_version_idx;
@@ -229,14 +229,13 @@
FT_UInt type1_hinting_engine;
FT_UInt t1cid_hinting_engine;
- unsigned int tt_interpreter_versions[3] = { 0, 0, 0 };
+ unsigned int tt_interpreter_versions[2] = { 0, 0 };
int num_tt_interpreter_versions = 0;
int tt_interpreter_version_idx = 0;
unsigned int dflt_tt_interpreter_version;
int i;
- unsigned int versions[3] = { TT_INTERPRETER_VERSION_35,
- TT_INTERPRETER_VERSION_38,
+ unsigned int versions[2] = { TT_INTERPRETER_VERSION_35,
TT_INTERPRETER_VERSION_40 };
@@ -267,7 +266,7 @@
FT_Property_Get( library,
"truetype",
"interpreter-version", &dflt_tt_interpreter_version );
- for ( i = 0; i < 3; i++ )
+ for ( i = 0; i < 2; i++ )
{
error = FT_Property_Set( library,
"truetype",
@@ -295,8 +294,6 @@
tt_interpreter_versions[0];
state->columns[0].tt_interpreter_versions[1] =
tt_interpreter_versions[1];
- state->columns[0].tt_interpreter_versions[2] =
- tt_interpreter_versions[2];
state->columns[0].num_tt_interpreter_versions =
num_tt_interpreter_versions;
state->columns[0].tt_interpreter_version_idx =
@@ -845,9 +842,6 @@
case TT_INTERPRETER_VERSION_35:
extra = " (TT v35)";
break;
- case TT_INTERPRETER_VERSION_38:
- extra = " (TT v38)";
- break;
case TT_INTERPRETER_VERSION_40:
extra = " (TT v40)";
break;
diff --git a/src/ftinspect/engine/engine.cpp b/src/ftinspect/engine/engine.cpp
index d6debe4..06ff845 100644
--- a/src/ftinspect/engine/engine.cpp
+++ b/src/ftinspect/engine/engine.cpp
@@ -981,23 +981,21 @@ Engine::queryEngine()
// No TrueType engine.
engineDefaults_.ttInterpreterVersionDefault = -1;
engineDefaults_.ttInterpreterVersionOther = -1;
- engineDefaults_.ttInterpreterVersionOther1 = -1;
}
else
{
int interpreters[] =
{
TT_INTERPRETER_VERSION_35,
- TT_INTERPRETER_VERSION_38,
TT_INTERPRETER_VERSION_40
};
int i;
- for (i = 0; i < 3; i++)
+ for (i = 0; i < 2; i++)
if (engineDefaults_.ttInterpreterVersionDefault == interpreters[i])
break;
- engineDefaults_.ttInterpreterVersionOther = interpreters[(i + 1) % 3];
+ engineDefaults_.ttInterpreterVersionOther = interpreters[(i + 1) % 2];
error = FT_Property_Set(library_,
"truetype",
@@ -1006,15 +1004,6 @@ Engine::queryEngine()
if (error)
engineDefaults_.ttInterpreterVersionOther = -1;
- engineDefaults_.ttInterpreterVersionOther1 = interpreters[(i + 2) % 3];
-
- error = FT_Property_Set(library_,
- "truetype",
- "interpreter-version",
- &engineDefaults_.ttInterpreterVersionOther1);
- if (error)
- engineDefaults_.ttInterpreterVersionOther1 = -1;
-
// Reset.
FT_Property_Set(library_,
"truetype",
diff --git a/src/ftinspect/engine/engine.hpp b/src/ftinspect/engine/engine.hpp
index 253f525..dc1e0a9 100644
--- a/src/ftinspect/engine/engine.hpp
+++ b/src/ftinspect/engine/engine.hpp
@@ -63,7 +63,6 @@ public:
int ttInterpreterVersionDefault;
int ttInterpreterVersionOther;
- int ttInterpreterVersionOther1;
};
//////// Ctors & Dtors
diff --git a/src/ftinspect/models/customcomboboxmodels.cpp
b/src/ftinspect/models/customcomboboxmodels.cpp
index 8739ad9..182135f 100644
--- a/src/ftinspect/models/customcomboboxmodels.cpp
+++ b/src/ftinspect/models/customcomboboxmodels.cpp
@@ -29,13 +29,6 @@ HintingModeComboBoxModel::HintingModeComboBoxModel(QObject*
parent)
false, false,
"TrueType v35"
};
- items_[HintingMode_TrueType_v38] = {
- HintingEngineType_TrueType,
- HintingMode_TrueType_v38,
- TT_INTERPRETER_VERSION_38,
- false, false,
- "TrueType v38"
- };
items_[HintingMode_TrueType_v40] = {
HintingEngineType_TrueType,
HintingMode_TrueType_v40,
diff --git a/src/ftinspect/models/customcomboboxmodels.hpp
b/src/ftinspect/models/customcomboboxmodels.hpp
index 8403596..814ea21 100644
--- a/src/ftinspect/models/customcomboboxmodels.hpp
+++ b/src/ftinspect/models/customcomboboxmodels.hpp
@@ -64,7 +64,6 @@ public:
enum HintingMode : int
{
HintingMode_TrueType_v35 = 0,
- HintingMode_TrueType_v38,
HintingMode_TrueType_v40,
HintingMode_CFF_FreeType,
HintingMode_CFF_Adobe
diff --git a/src/ftinspect/panels/settingpanel.cpp
b/src/ftinspect/panels/settingpanel.cpp
index f0e0ed8..f1e6de6 100644
--- a/src/ftinspect/panels/settingpanel.cpp
+++ b/src/ftinspect/panels/settingpanel.cpp
@@ -758,8 +758,7 @@ SettingPanel::setDefaults()
hintingModeComboBoxModel_->setSupportedModes(
{ defaults.ttInterpreterVersionDefault,
- defaults.ttInterpreterVersionOther,
- defaults.ttInterpreterVersionOther1 },
+ defaults.ttInterpreterVersionOther },
{ defaults.cffHintingEngineDefault,
defaults.cffHintingEngineOther });
diff --git a/src/ftmulti.c b/src/ftmulti.c
index 8b7fa1f..40dd84b 100644
--- a/src/ftmulti.c
+++ b/src/ftmulti.c
@@ -74,7 +74,7 @@
static unsigned int cff_hinting_engine;
static unsigned int type1_hinting_engine;
static unsigned int t1cid_hinting_engine;
- static unsigned int tt_interpreter_versions[3];
+ static unsigned int tt_interpreter_versions[2];
static unsigned int num_tt_interpreter_versions;
static unsigned int tt_interpreter_version_idx;
@@ -911,8 +911,7 @@
unsigned int n;
unsigned int dflt_tt_interpreter_version;
- unsigned int versions[3] = { TT_INTERPRETER_VERSION_35,
- TT_INTERPRETER_VERSION_38,
+ unsigned int versions[2] = { TT_INTERPRETER_VERSION_35,
TT_INTERPRETER_VERSION_40 };
const char* execname = ft_basename( argv[0] );
@@ -937,7 +936,7 @@
FT_Property_Get( library,
"truetype",
"interpreter-version", &dflt_tt_interpreter_version );
- for ( n = 0; n < 3; n++ )
+ for ( n = 0; n < 2; n++ )
{
error = FT_Property_Set( library,
"truetype",
@@ -1205,10 +1204,8 @@
: "CID Type 1 (Adobe)" );
else if ( !strcmp( font_format, "TrueType" ) )
format_str = ( tt_ver == TT_INTERPRETER_VERSION_35
- ? "TrueType (v35)"
- : ( tt_ver == TT_INTERPRETER_VERSION_38
- ? "TrueType (v38)"
- : "TrueType (v40)" ) );
+ ? "TrueType (v35)"
+ : "TrueType (v40)" );
strbuf_reset( header );
strbuf_format(
diff --git a/src/ttdebug.c b/src/ttdebug.c
index 188a213..27cc3d4 100644
--- a/src/ttdebug.c
+++ b/src/ttdebug.c
@@ -85,7 +85,7 @@
static FT_Fixed* requested_pos;
static unsigned int requested_cnt;
- static unsigned int tt_interpreter_versions[3];
+ static unsigned int tt_interpreter_versions[2];
static int num_tt_interpreter_versions;
static unsigned int dflt_tt_interpreter_version;
@@ -2860,17 +2860,15 @@
/* we expect that at least one interpreter version is available */
- if ( num_tt_interpreter_versions == 2 )
+ if ( num_tt_interpreter_versions == 1 )
snprintf( versions, sizeof ( versions ),
- "%d and %d",
- tt_interpreter_versions[0],
- tt_interpreter_versions[1] );
+ "%d",
+ tt_interpreter_versions[0] );
else
snprintf( versions, sizeof ( versions ),
- "%d, %d, and %d",
+ "%d and %d",
tt_interpreter_versions[0],
- tt_interpreter_versions[1],
- tt_interpreter_versions[2] );
+ tt_interpreter_versions[1] );
fprintf( stderr,
"\n"
@@ -2916,8 +2914,7 @@
int i;
const char* execname;
- unsigned int versions[3] = { TT_INTERPRETER_VERSION_35,
- TT_INTERPRETER_VERSION_38,
+ unsigned int versions[2] = { TT_INTERPRETER_VERSION_35,
TT_INTERPRETER_VERSION_40 };
int version;
int face_index = 0;
@@ -2955,7 +2952,7 @@
FT_Property_Get( library,
"truetype",
"interpreter-version", &dflt_tt_interpreter_version );
- for ( i = 0; i < 3; i++ )
+ for ( i = 0; i < 2; i++ )
{
error = FT_Property_Set( library,
"truetype",
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2-demos] master 9843cd9: TrueType mode v38 is gone.,
Werner Lemberg <=