[Libreoffice-commits] core.git: external/pdfium

[Libreoffice Gerrit user]

 external/pdfium/0003-svx-import-PDF-images-as-BGRA.patch.2 |   58 -------------
 external/pdfium/UnpackedTarball_pdfium.mk                  |    2 
 2 files changed, 60 deletions(-)

New commits:
commit 87e3539d69626780c6d7531b725dd0d64c69e6d8
Author:     Miklos Vajna <vmiklos at collabora.co.uk>
AuthorDate: Tue Oct 9 22:02:02 2018 +0200
Commit:     Miklos Vajna <vmiklos at collabora.co.uk>
CommitDate: Wed Oct 10 09:00:29 2018 +0200

    pdfium: remove not needed FPDFImageObj_GetBitmapBgra() patch
    
    Last usage was removed in commit
    45c753aff6468b9761e68bc0bf48ab161cd0cba6 (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: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/external/pdfium/0003-svx-import-PDF-images-as-BGRA.patch.2 b/external/pdfium/0003-svx-import-PDF-images-as-BGRA.patch.2
deleted file mode 100644
index 08b272526578..000000000000
--- a/external/pdfium/0003-svx-import-PDF-images-as-BGRA.patch.2
+++ /dev/null
@@ -1,58 +0,0 @@
-From faeac63865eeb791501d7535f1e7a7c7fc807b04 Mon Sep 17 00:00:00 2001
-From: Ashod Nakashian <ashod.nakashian at 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
-
diff --git a/external/pdfium/UnpackedTarball_pdfium.mk b/external/pdfium/UnpackedTarball_pdfium.mk
index d99f1077da98..aaaab0c25ac1 100644
--- a/external/pdfium/UnpackedTarball_pdfium.mk
+++ b/external/pdfium/UnpackedTarball_pdfium.mk
@@ -12,8 +12,6 @@ pdfium_patches += visibility.patch.1
 pdfium_patches += ubsan.patch
 # Fixes build on our baseline.
 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))