Kaydet (Commit) 87e3539d authored tarafından Miklos Vajna's avatar Miklos Vajna

pdfium: remove not needed FPDFImageObj_GetBitmapBgra() patch

Last usage was removed in commit
45c753af (svx: pdfium's
FPDFImageObj_GetBitmapBgra() is not needed after all, 2018-09-28).

Change-Id: I2412fa24859ad5bcd3ced634d3c4f41d2f35aebe
Reviewed-on: https://gerrit.libreoffice.org/61599
Tested-by: Jenkins
Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
üst 425af684
From faeac63865eeb791501d7535f1e7a7c7fc807b04 Mon Sep 17 00:00:00 2001
From: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
Date: Tue, 5 Jun 2018 11:29:15 +0200
Subject: [PATCH 03/14] svx: import PDF images as BGRA
---
pdfium/fpdfsdk/fpdf_editimg.cpp | 20 ++++++++++++++++++++
pdfium/public/fpdfview.h | 3 +++
2 files changed, 23 insertions(+)
diff --git a/pdfium/fpdfsdk/fpdf_editimg.cpp b/pdfium/fpdfsdk/fpdf_editimg.cpp
index fed1581..3f400c7 100644
--- a/pdfium/fpdfsdk/fpdf_editimg.cpp
+++ b/pdfium/fpdfsdk/fpdf_editimg.cpp
@@ -186,6 +186,26 @@ FPDFImageObj_GetBitmap(FPDF_PAGEOBJECT image_object) {
return FPDFBitmapFromCFXDIBitmap(pBitmap.Leak());
}
+FPDF_EXPORT FPDF_BITMAP FPDF_CALLCONV
+FPDFImageObj_GetBitmapBgra(FPDF_PAGEOBJECT image_object) {
+ CPDF_PageObject* pObj = CPDFPageObjectFromFPDFPageObject(image_object);
+ if (!pObj || !pObj->IsImage())
+ return nullptr;
+
+ RetainPtr<CPDF_Image> pImg = pObj->AsImage()->GetImage();
+ if (!pImg)
+ return nullptr;
+
+ RetainPtr<CFX_DIBBase> pSource = pImg->LoadDIBBase();
+ if (!pSource)
+ return nullptr;
+
+ RetainPtr<CFX_DIBitmap> pBitmap;
+ pBitmap = pSource->CloneConvert(FXDIB_Argb);
+
+ return FPDFBitmapFromCFXDIBitmap(pBitmap.Leak());
+}
+
FPDF_EXPORT unsigned long FPDF_CALLCONV
FPDFImageObj_GetImageDataDecoded(FPDF_PAGEOBJECT image_object,
void* buffer,
diff --git a/pdfium/public/fpdfview.h b/pdfium/public/fpdfview.h
index 0ccd140..b451b9c 100644
--- a/pdfium/public/fpdfview.h
+++ b/pdfium/public/fpdfview.h
@@ -905,6 +905,9 @@ FPDF_EXPORT FPDF_BITMAP FPDF_CALLCONV FPDFBitmap_CreateEx(int width,
// function; see the list of such formats above.
FPDF_EXPORT int FPDF_CALLCONV FPDFBitmap_GetFormat(FPDF_BITMAP bitmap);
+FPDF_EXPORT FPDF_BITMAP FPDF_CALLCONV
+FPDFImageObj_GetBitmapBgra(FPDF_PAGEOBJECT image_object);
+
// Function: FPDFBitmap_FillRect
// Fill a rectangle in a bitmap.
// Parameters:
--
2.16.3
...@@ -12,8 +12,6 @@ pdfium_patches += visibility.patch.1 ...@@ -12,8 +12,6 @@ pdfium_patches += visibility.patch.1
pdfium_patches += ubsan.patch pdfium_patches += ubsan.patch
# Fixes build on our baseline. # Fixes build on our baseline.
pdfium_patches += build.patch.1 pdfium_patches += build.patch.1
# Adds missing editing API
pdfium_patches += 0003-svx-import-PDF-images-as-BGRA.patch.2
$(eval $(call gb_UnpackedTarball_UnpackedTarball,pdfium)) $(eval $(call gb_UnpackedTarball_UnpackedTarball,pdfium))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment