ref: 95609cbc7a973bb5a781d76b00f3649d038be7bd
parent: dc2f2769a366d34988472e9a088151a43851cf2f
author: Sebastian Rasmussen <[email protected]>
date: Thu Oct 17 08:11:54 EDT 2019
jbig2dec: Fix memento interfering with allocator callback names. Memento changes the names of the callbacks when they are set, but not when the structure is defined in the command line tool. Work around this by including memento prior to the structure being defined so that memento changes the names in both places. The alternative would be changing the jbig2dec API yet again.
--- a/jbig2dec.c
+++ b/jbig2dec.c
@@ -35,6 +35,12 @@
#include "os_types.h"
#include "sha1.h"
+#ifdef JBIG_EXTERNAL_MEMENTO_H
+#include JBIG_EXTERNAL_MEMENTO_H
+#else
+#include "memento.h"
+#endif
+
#include "jbig2.h"
#include "jbig2_priv.h"
#include "jbig2_image.h"