Caolán McNamara
dce3608001
txNew, txFree and doSingleFileSet are public now, so the extern_tx patches go away. The mergeFonts crash fix is merged upstream. The noverbose patch is replaced by a SAL logger installed through slogger::getLogger. A new fatal-callback patch lets fatal errors raise exceptions, which appSpecificFree used to do. afdko 5.0 replaces makeotfexe with addfeatures, drops the typecomp Type 1 to CFF converter, and rewrites most of c/shared in C++. hotconv now only reads CFF, so makeotf() first converts its Type 1 input to bare CFF with tx, the same step the upstream makeotf driver script performs. Signed-off-by: Caolán McNamara <caolan.mcnamara@collabora.com> Change-Id: I1e5b6ac8413eb66d81034f4f1d0b7f2e46e12233 Reviewed-on: https://gerrit.collaboraoffice.com/c/online/+/4251 Tested-by: Jenkins CPCI <releng@collaboraoffice.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit 6c40019917bd6e88f6b54d0a2d53d64729c64166) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/207285 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Tested-by: Xisco Fauli <xiscofauli@libreoffice.org>
26 lines
767 B
Diff
26 lines
767 B
Diff
Give these two structs a tag name. C++20 forbids default member
|
|
initializers in an unnamed class that is given a typedef name for linkage
|
|
purposes, which MSVC reports as the hard error C7626. Naming the class
|
|
takes it out of that rule. clang and gcc accept it either way.
|
|
|
|
--- afdko/c/addfeatures/hotconv/sfnt.cpp
|
|
+++ afdko/c/addfeatures/hotconv/sfnt.cpp
|
|
@@ -77,7 +77,7 @@
|
|
|
|
/* ---------------------------- Table Definition --------------------------- */
|
|
|
|
-typedef struct {
|
|
+typedef struct Entry {
|
|
int32_t tag = 0;
|
|
uint32_t checksum = 0;
|
|
uint32_t offset = 0;
|
|
@@ -85,7 +85,7 @@
|
|
} Entry;
|
|
#define ENTRY_SIZE (uint32 * 4)
|
|
|
|
-typedef struct {
|
|
+typedef struct sfntTbl {
|
|
Fixed version = 0;
|
|
uint16_t numTables = 0;
|
|
uint16_t searchRange = 0;
|