vcl/source/gdi/embeddedfontsafdko.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
New commits: commit 6e01d09620d92a8f0bc97279aebb0ec03435ff89 Author: Noel Grandin <[email protected]> AuthorDate: Wed Oct 29 07:52:13 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Wed Oct 29 09:57:33 2025 +0100 fix non-afdko build after commit d701d7526dae6a693e201f7a4df59538f8b0c338 Author: Caolán McNamara <[email protected]> Date: Tue Oct 28 11:27:07 2025 +0000 throw exception on afdko error Change-Id: I0177e5ba78ba35fa6f82b8d060671264b812d57a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193130 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Jenkins diff --git a/vcl/source/gdi/embeddedfontsafdko.cxx b/vcl/source/gdi/embeddedfontsafdko.cxx index 0d4a3cee75a4..57f56c7d4836 100644 --- a/vcl/source/gdi/embeddedfontsafdko.cxx +++ b/vcl/source/gdi/embeddedfontsafdko.cxx @@ -65,7 +65,6 @@ static bool convertTx(txCtx h) return true; } -#endif static void suppressDebugMessagess(txCtx h) { @@ -89,6 +88,7 @@ static void txFatalCallback(txCtx h) txFree(h); throw std::runtime_error("fatal tx error"); } +#endif // System afdko could be used by calling: tx -dump src dest here bool EmbeddedFontsManager::tx_dump(const OUString& srcFontUrl, const OUString& destFileUrl) @@ -179,11 +179,13 @@ bool EmbeddedFontsManager::tx_t1(const OUString& srcFontUrl, const OUString& des return false; } +#if HAVE_FEATURE_AFDKO static void mergeFontsFatalCallback(txCtx h) { mergeFontsFree(h); throw std::runtime_error("fatal mergeFonts error"); } +#endif // System afdko could be used by calling: mergefonts -cid cidfontinfo destfile [glyphaliasfile mergefontfile]+ here bool EmbeddedFontsManager::mergefonts(const OUString& cidFontInfoUrl, const OUString& destFileUrl, @@ -293,9 +295,9 @@ static void* cb_memory(ctlMemoryCallbacks* /*cb*/, void* old, size_t size) return malloc(size); } -#endif static void makeOtfFatalCallback(void*) { throw std::runtime_error("fatal tx error"); } +#endif // System afdko could be used by calling: makeotf[exe] -mf fontMenuNameDB -f srcFont -o destFile -ch charMap [-ff features] bool EmbeddedFontsManager::makeotf(const OUString& srcFontUrl, const OUString& destFileUrl,
