diff options
| author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2018-05-19 21:28:31 -0400 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2018-05-22 12:17:20 +0200 |
| commit | d4eaa026efde056ad4d429bccaa0b18f0388d6ec (patch) | |
| tree | e862d95b2a92db09dec85f51e30dcb6331b8494f /svx | |
| parent | 4deee18e254fbfc71e5882d1181620d853abd6b8 (diff) | |
svx: update PDFium patch and code
Change-Id: I07c6a7c65d5631b70da64927a35d7a3b371eff25
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdpdf.cxx | 3 | ||||
| -rw-r--r-- | svx/source/svdraw/svdpdf.hxx | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/svx/source/svdraw/svdpdf.cxx b/svx/source/svdraw/svdpdf.cxx index b0a06abda9e2..4aa05fb30551 100644 --- a/svx/source/svdraw/svdpdf.cxx +++ b/svx/source/svdraw/svdpdf.cxx @@ -1024,7 +1024,8 @@ void ImpSdrPdfImport::MapScaling() void ImpSdrPdfImport::ImportImage(FPDF_PAGEOBJECT pPageObject, int /*nPageObjectIndex*/) { - std::unique_ptr<void, FPDFBitmapDeleter> bitmap(FPDFImageObj_GetBitmapBgra(pPageObject)); + std::unique_ptr<std::remove_pointer<FPDF_BITMAP>::type, FPDFBitmapDeleter> + bitmap(FPDFImageObj_GetBitmapBgra(pPageObject)); if (!bitmap) { SAL_WARN("sd.filter", "Failed to get IMAGE"); diff --git a/svx/source/svdraw/svdpdf.hxx b/svx/source/svdraw/svdpdf.hxx index e461c1f5e014..b4b83d9ac235 100644 --- a/svx/source/svdraw/svdpdf.hxx +++ b/svx/source/svdraw/svdpdf.hxx @@ -40,9 +40,9 @@ class SdrModel; class SdrPage; class SdrObject; class SvdProgressInfo; -typedef void* FPDF_DOCUMENT; -typedef void* FPDF_PAGEOBJECT; -typedef void* FPDF_TEXTPAGE; +typedef struct fpdf_document_t__* FPDF_DOCUMENT; +typedef struct fpdf_pageobject_t__* FPDF_PAGEOBJECT; // (text, path, etc.) +typedef struct fpdf_textpage_t__* FPDF_TEXTPAGE; // Helper Class to import PDF class ImpSdrPdfImport final |