diff --git a/3rdparty/poppler/git/CairoFontEngine.cc b/3rdparty/poppler/git/CairoFontEngine.cc index 229a86c..3b7b69a 100644 --- a/3rdparty/poppler/git/CairoFontEngine.cc +++ b/3rdparty/poppler/git/CairoFontEngine.cc @@ -59,7 +59,7 @@ #endif /* - * multi thread disabled by WangLu + * pdf2htmlEX: disabled multi thread #if MULTITHREADED # define fontEngineLocker() MutexLocker locker(&mutex) #else @@ -768,7 +768,7 @@ CairoFontEngine::CairoFontEngine(FT_Library libA) { useCIDs = major > 2 || (major == 2 && (minor > 1 || (minor == 1 && patch > 7))); /* - * multi thread disabled by WangLu + * pdf2htmlEX: disabled multi thread #if MULTITHREADED gInitMutex(&mutex); #endif @@ -783,7 +783,7 @@ CairoFontEngine::~CairoFontEngine() { delete fontCache[i]; } /* - * multi thread disabled by WangLu + * pdf2htmlEX: disabled multi thread #if MULTITHREADED gDestroyMutex(&mutex); #endif diff --git a/3rdparty/poppler/git/CairoFontEngine.h b/3rdparty/poppler/git/CairoFontEngine.h index 432f107..96cc4c1 100644 --- a/3rdparty/poppler/git/CairoFontEngine.h +++ b/3rdparty/poppler/git/CairoFontEngine.h @@ -122,7 +122,7 @@ private: FT_Library lib; GBool useCIDs; /* - * multi thread disabled by WangLu + * pdf2htmlEX: disabled multi thread #if MULTITHREADED GooMutex mutex; #endif diff --git a/3rdparty/poppler/git/CairoOutputDev.h b/3rdparty/poppler/git/CairoOutputDev.h index 727c687..f345e39 100644 --- a/3rdparty/poppler/git/CairoOutputDev.h +++ b/3rdparty/poppler/git/CairoOutputDev.h @@ -272,7 +272,9 @@ protected: cairo_filter_t getFilterForSurface(cairo_surface_t *image, GBool interpolate); GBool getStreamData (Stream *str, char **buffer, int *length); - virtual void setMimeData(Stream *str, Object *ref, cairo_surface_t *image); + // pdf2htmlEX: make setMimeData virtual, we need to override it + virtual + void setMimeData(Stream *str, Object *ref, cairo_surface_t *image); void fillToStrokePathClip(GfxState *state); void alignStrokeCoords(GfxSubpath *subpath, int i, double *x, double *y);