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

Thu Oct 12 06:19:24 UTC 2017

download.lst                      |    4 ++--
 external/pdfium/Library_pdfium.mk |   34 +++++++++++++++++++++-------------
 external/pdfium/ubsan.patch       |    8 ++++----
 3 files changed, 27 insertions(+), 19 deletions(-)

New commits:
commit 5352dfbbe22b59983e1b91366908724138b9783a
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Oct 12 00:04:04 2017 +0200

    pdfium: update to 3235
    
    Change-Id: I2603b885567b409d81f1abfacd25c2a6d344311c
    Reviewed-on: https://gerrit.libreoffice.org/43331
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/download.lst b/download.lst
index ef9cf8e55c4b..9a2cdc5de70f 100644
--- a/download.lst
+++ b/download.lst
@@ -188,8 +188,8 @@ export OWNCLOUD_ANDROID_LIB_SHA256SUM := b18b3e3ef7fae6a79b62f2bb43cc47a5346b633
 export OWNCLOUD_ANDROID_LIB_TARBALL := owncloud-android-library-0.9.4-no-binary-deps.tar.gz
 export PAGEMAKER_SHA256SUM := 3b5de037692f8e156777a75e162f6b110fa24c01749e4a66d7eb83f364e52a33
 export PAGEMAKER_TARBALL := libpagemaker-0.0.3.tar.bz2
-export PDFIUM_SHA256SUM := 76b08c5bc9cd41ccdd58aa41491d3f8e1fad517d7cb3e16d285b68ab175dc0fa
-export PDFIUM_TARBALL := pdfium-3196.tar.bz2
+export PDFIUM_SHA256SUM := 7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f
+export PDFIUM_TARBALL := pdfium-3235.tar.bz2
 export PIXMAN_SHA256SUM := 21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3997aa20a88e
 export PIXMAN_TARBALL := e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz
 export LIBPNG_SHA256SUM := 2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6
diff --git a/external/pdfium/Library_pdfium.mk b/external/pdfium/Library_pdfium.mk
index 13457c1a781e..5ae29a937344 100644
--- a/external/pdfium/Library_pdfium.mk
+++ b/external/pdfium/Library_pdfium.mk
@@ -270,6 +270,8 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\
     UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_psfunc \
     UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_sampledfunc \
     UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_stitchfunc \
+    UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_object_avail \
+    UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_page_object_avail \
 ))
 
 # fpdfdoc
@@ -303,7 +305,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\
     UnpackedTarball/pdfium/core/fpdfdoc/cpvt_color \
     UnpackedTarball/pdfium/core/fpdfdoc/cpvt_fontmap \
     UnpackedTarball/pdfium/core/fpdfdoc/cpvt_generateap \
-    UnpackedTarball/pdfium/core/fpdfdoc/cpvt_sectioninfo \
     UnpackedTarball/pdfium/core/fpdfdoc/cpvt_wordinfo \
     UnpackedTarball/pdfium/core/fpdfdoc/csection \
     UnpackedTarball/pdfium/core/fpdfdoc/ctypeset \
@@ -345,23 +346,18 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\
     UnpackedTarball/pdfium/core/fxcodec/jbig2/JBig2_Segment \
     UnpackedTarball/pdfium/core/fxcodec/jbig2/JBig2_SymbolDict \
     UnpackedTarball/pdfium/core/fxcodec/jbig2/JBig2_TrdProc \
-    UnpackedTarball/pdfium/core/fxcodec/lgif/cgifcontext \
-    UnpackedTarball/pdfium/core/fxcodec/lgif/fx_gif \
     UnpackedTarball/pdfium/core/fxcodec/lbmp/fx_bmp \
+    UnpackedTarball/pdfium/core/fxcodec/codec/ccodec_scanlinedecoder \
+    UnpackedTarball/pdfium/core/fxcodec/gif/cfx_gif \
+    UnpackedTarball/pdfium/core/fxcodec/gif/cfx_gifcontext \
+    UnpackedTarball/pdfium/core/fxcodec/gif/cfx_lzwdecompressor \
 ))
 
 # fxcrt
 $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\
     UnpackedTarball/pdfium/core/fxcrt/cfx_blockbuffer \
-    UnpackedTarball/pdfium/core/fxcrt/cfx_bytestring \
-    UnpackedTarball/pdfium/core/fxcrt/cfx_crtfileaccess \
     UnpackedTarball/pdfium/core/fxcrt/cfx_memorystream \
     UnpackedTarball/pdfium/core/fxcrt/cfx_seekablestreamproxy \
-    UnpackedTarball/pdfium/core/fxcrt/cfx_widestring \
-    UnpackedTarball/pdfium/core/fxcrt/fx_basic_buffer \
-    UnpackedTarball/pdfium/core/fxcrt/fx_basic_gcc \
-    UnpackedTarball/pdfium/core/fxcrt/fx_basic_utf \
-    UnpackedTarball/pdfium/core/fxcrt/fx_basic_util \
     UnpackedTarball/pdfium/core/fxcrt/fx_bidi \
     UnpackedTarball/pdfium/core/fxcrt/fx_coordinates \
     UnpackedTarball/pdfium/core/fxcrt/fx_extension \
@@ -370,8 +366,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\
     UnpackedTarball/pdfium/core/fxcrt/fx_system \
     UnpackedTarball/pdfium/core/fxcrt/fx_ucddata \
     UnpackedTarball/pdfium/core/fxcrt/fx_unicode \
-    UnpackedTarball/pdfium/core/fxcrt/fxcrt_posix \
-    UnpackedTarball/pdfium/core/fxcrt/fxcrt_windows \
     UnpackedTarball/pdfium/core/fxcrt/xml/cxml_attritem \
     UnpackedTarball/pdfium/core/fxcrt/xml/cxml_attrmap \
     UnpackedTarball/pdfium/core/fxcrt/xml/cxml_databufacc \
@@ -401,6 +395,16 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\
     UnpackedTarball/pdfium/core/fxcrt/css/cfx_cssvaluelist \
     UnpackedTarball/pdfium/core/fxcrt/css/cfx_cssvaluelistparser \
     UnpackedTarball/pdfium/core/fxcrt/cfx_datetime \
+    UnpackedTarball/pdfium/core/fxcrt/bytestring \
+    UnpackedTarball/pdfium/core/fxcrt/cfx_binarybuf \
+    UnpackedTarball/pdfium/core/fxcrt/cfx_bitstream \
+    UnpackedTarball/pdfium/core/fxcrt/cfx_fileaccess_posix \
+    UnpackedTarball/pdfium/core/fxcrt/cfx_fileaccess_windows \
+    UnpackedTarball/pdfium/core/fxcrt/cfx_utf8decoder \
+    UnpackedTarball/pdfium/core/fxcrt/cfx_widetextbuf \
+    UnpackedTarball/pdfium/core/fxcrt/fx_random \
+    UnpackedTarball/pdfium/core/fxcrt/fx_string \
+    UnpackedTarball/pdfium/core/fxcrt/widestring \
 ))
 
 # fxge
@@ -515,7 +519,7 @@ $(eval $(call gb_Library_add_generated_cobjects,pdfium,\
     UnpackedTarball/pdfium/third_party/libopenjpeg20/openjpeg \
     UnpackedTarball/pdfium/third_party/libopenjpeg20/opj_clock \
     UnpackedTarball/pdfium/third_party/libopenjpeg20/pi \
-    UnpackedTarball/pdfium/third_party/libopenjpeg20/raw \
+    UnpackedTarball/pdfium/third_party/libopenjpeg20/thread \
     UnpackedTarball/pdfium/third_party/libopenjpeg20/t1 \
     UnpackedTarball/pdfium/third_party/libopenjpeg20/t2 \
     UnpackedTarball/pdfium/third_party/libopenjpeg20/tcd \
@@ -544,6 +548,10 @@ $(eval $(call gb_Library_add_libs,pdfium,\
 ))
 
 $(eval $(call gb_Library_use_external,pdfium,freetype))
+$(eval $(call gb_Library_add_defs,pdfium,\
+    -DDEFINE_PS_TABLES_DATA \
+))
+
 else
 $(eval $(call gb_Library_set_include,pdfium,\
     -I$(WORKDIR)/UnpackedTarball/pdfium/third_party/freetype/include/ \
diff --git a/external/pdfium/ubsan.patch b/external/pdfium/ubsan.patch
index df898dd93687..8e7ac71b7b8d 100644
--- a/external/pdfium/ubsan.patch
+++ b/external/pdfium/ubsan.patch
@@ -1,6 +1,6 @@
 --- core/fxcodec/lbmp/fx_bmp.h
 +++ core/fxcodec/lbmp/fx_bmp.h
-@@ -132,7 +132,7 @@
+@@ -126,7 +126,7 @@ class BMPDecompressor {
  class CBmpContext : public CCodec_BmpModule::Context {
   public:
    CBmpContext(CCodec_BmpModule* pModule, CCodec_BmpModule::Delegate* pDelegate);
@@ -8,10 +8,10 @@
 +  ~CBmpContext() override {}
  
    BMPDecompressor m_Bmp;
-   CFX_UnownedPtr<CCodec_BmpModule> const m_pModule;
+   UnownedPtr<CCodec_BmpModule> const m_pModule;
 --- core/fxge/cfx_facecache.cpp
 +++ core/fxge/cfx_facecache.cpp
-@@ -206,7 +206,8 @@ CFX_GlyphBitmap* CFX_FaceCache::RenderGlyph(const CFX_Font* pFont,
+@@ -223,7 +223,8 @@ std::unique_ptr<CFX_GlyphBitmap> CFX_FaceCache::RenderGlyph(
        }
      }
    } else {
@@ -23,7 +23,7 @@
              FXFT_PIXEL_MODE_MONO) {
 --- third_party/agg23/agg_rasterizer_scanline_aa.h
 +++ third_party/agg23/agg_rasterizer_scanline_aa.h
-@@ -349,14 +349,14 @@
+@@ -349,14 +349,14 @@ public:
                      cover += cur_cell->cover;
                  }
                  if(area) {
