diff options
| author | OBATA Akio <[email protected]> | 2020-01-11 16:04:07 +0900 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2020-02-02 20:54:36 +0100 |
| commit | d8f7228782b3856e06f8df31220b588a300404bb (patch) | |
| tree | 1d0d2a5207ecc98681774d96f39edf3762f03465 /tdefile-plugins/dependencies/poppler-tqt/poppler-private.h | |
| parent | 3f0e47a0878cf80a64facc442755cd63f823532a (diff) | |
| download | tdegraphics-d8f7228782b3856e06f8df31220b588a300404bb.tar.gz tdegraphics-d8f7228782b3856e06f8df31220b588a300404bb.zip | |
Add support for Poppler >= 0.82
Follow change that FontInfo::scan return a std::vector object rather than
a pointer to a std::vector.
Signed-off-by: OBATA Akio <[email protected]>
(cherry picked from commit cc5ec0c71abf322ca4fbde633875933097b05b52)
Diffstat (limited to 'tdefile-plugins/dependencies/poppler-tqt/poppler-private.h')
| -rw-r--r-- | tdefile-plugins/dependencies/poppler-tqt/poppler-private.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/tdefile-plugins/dependencies/poppler-tqt/poppler-private.h b/tdefile-plugins/dependencies/poppler-tqt/poppler-private.h index 33b8cfc3..26a9bb62 100644 --- a/tdefile-plugins/dependencies/poppler-tqt/poppler-private.h +++ b/tdefile-plugins/dependencies/poppler-tqt/poppler-private.h @@ -54,14 +54,25 @@ class SplashOutputDev; class OutlineItem; #define OUTLINE_ITEMS_TYPE const std::vector<OutlineItem*> #define OUTLINE_ITEMS_LENGTH(goo) goo->size() +# if defined(HAVE_POPPLER_082) #define FONTS_LIST_TYPE std::vector<::FontInfo*> +#define FONTS_LIST_LENGTH(goo) goo.size() +#define FONTS_LIST_IS_EMPTY(goo) goo.empty() +#define FONTS_LIST_GET(goo, i) goo[i] +# else +#define FONTS_LIST_TYPE std::vector<::FontInfo*>* #define FONTS_LIST_LENGTH(goo) goo->size() +#define FONTS_LIST_IS_EMPTY(goo) goo->empty() +#define FONTS_LIST_GET(goo, i) (*goo)[i] +# endif #define FIND_PAGE_ARGS(ref) ref #else #define OUTLINE_ITEMS_TYPE CONST_064 GooList #define OUTLINE_ITEMS_LENGTH(goo) goo->getLength() -#define FONTS_LIST_TYPE GooList +#define FONTS_LIST_TYPE GooList* #define FONTS_LIST_LENGTH(goo) goo->getLength() +#define FONTS_LIST_IS_EMPTY(goo) (goo == NULL || goo->getLength() == 0) +#define FONTS_LIST_GET(goo, i) (::FontInfo*)goo->get(i) #define FIND_PAGE_ARGS(ref) ref.num, ref.gen #endif |