fofi/FoFiBase.h | 2 +- poppler/Annot.h | 2 +- poppler/Form.h | 2 +- poppler/GfxState.h | 2 +- poppler/GlobalParams.cc | 4 +--- splash/SplashPattern.h | 2 +- 6 files changed, 6 insertions(+), 8 deletions(-)
New commits: commit 17cb4acb1f2a37504c0268003b33e92e98df4d53 Author: Albert Astals Cid <[email protected]> Date: Fri Apr 1 16:52:47 2022 +0200 Export base classes of exported classes Fixes MSVC warning 4275 diff --git a/fofi/FoFiBase.h b/fofi/FoFiBase.h index 80e7f209..0246320e 100644 --- a/fofi/FoFiBase.h +++ b/fofi/FoFiBase.h @@ -32,7 +32,7 @@ typedef void (*FoFiOutputFunc)(void *stream, const char *data, int len); // FoFiBase //------------------------------------------------------------------------ -class FoFiBase +class POPPLER_PRIVATE_EXPORT FoFiBase { public: FoFiBase(const FoFiBase &) = delete; diff --git a/poppler/Annot.h b/poppler/Annot.h index 8d1f18bc..19688712 100644 --- a/poppler/Annot.h +++ b/poppler/Annot.h @@ -254,7 +254,7 @@ protected: // AnnotBorder //------------------------------------------------------------------------ -class AnnotBorder +class POPPLER_PRIVATE_EXPORT AnnotBorder { public: enum AnnotBorderType diff --git a/poppler/Form.h b/poppler/Form.h index c48ae83f..43a59f95 100644 --- a/poppler/Form.h +++ b/poppler/Form.h @@ -335,7 +335,7 @@ private: // only interact with FormWidgets. //------------------------------------------------------------------------ -class FormField +class POPPLER_PRIVATE_EXPORT FormField { public: FormField(PDFDoc *docA, Object &&aobj, const Ref aref, FormField *parent, std::set<int> *usedParents, FormFieldType t = formUndef); diff --git a/poppler/GfxState.h b/poppler/GfxState.h index 5abcc9ed..13496d28 100644 --- a/poppler/GfxState.h +++ b/poppler/GfxState.h @@ -851,7 +851,7 @@ private: // GfxShading //------------------------------------------------------------------------ -class GfxShading +class POPPLER_PRIVATE_EXPORT GfxShading { public: explicit GfxShading(int typeA); diff --git a/splash/SplashPattern.h b/splash/SplashPattern.h index c99302c0..2a50aa82 100644 --- a/splash/SplashPattern.h +++ b/splash/SplashPattern.h @@ -31,7 +31,7 @@ class SplashScreen; // SplashPattern //------------------------------------------------------------------------ -class SplashPattern +class POPPLER_PRIVATE_EXPORT SplashPattern { public: SplashPattern(); commit 3608d950c0f90bcb64062fca30fb08ec918f02e1 Author: Albert Astals Cid <[email protected]> Date: Fri Apr 1 16:49:36 2022 +0200 We don't need this define anymore The define is provided by config.h diff --git a/poppler/GlobalParams.cc b/poppler/GlobalParams.cc index 4ed4a879..a95d940e 100644 --- a/poppler/GlobalParams.cc +++ b/poppler/GlobalParams.cc @@ -78,9 +78,7 @@ # include <fontconfig/fontconfig.h> #endif -#ifdef _MSC_VER -# define strcasecmp stricmp -#else +#ifndef _MSC_VER # include <strings.h> #endif
