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>
22 lines
855 B
Diff
22 lines
855 B
Diff
--- afdko/c/shared/include/tx_shared.h
|
|
+++ afdko/c/shared/include/tx_shared.h
|
|
@@ -288,6 +288,7 @@
|
|
int mode; /* Current mode */
|
|
const char *modename; /* Name of current mode */
|
|
txExtCtx ext; /* Extension context (if any) */
|
|
+ void (*fatalCallback)(struct txCtx_ *h); /* Called by fatal() in place of process exit. Must not return. */
|
|
abfTopDict *top; /* Top dictionary */
|
|
struct { /* Source data */
|
|
int type; /* Font technology type */
|
|
--- afdko/c/shared/tx_shared.cpp
|
|
+++ afdko/c/shared/tx_shared.cpp
|
|
@@ -33,6 +33,8 @@
|
|
} else {
|
|
h->logger->msg(sFATAL, "fatal error");
|
|
}
|
|
+ if (h->fatalCallback != NULL)
|
|
+ h->fatalCallback(h);
|
|
txFree(h);
|
|
exit(EXIT_FAILURE);
|
|
}
|