[Libreoffice-commits] core.git: 3 commits - cui/source external/lcms2

[Noel Grandin]

 cui/source/customize/cfg.cxx            |    1 +
 external/lcms2/ExternalProject_lcms2.mk |    1 +
 external/lcms2/UnpackedTarball_lcms2.mk |    1 +
 external/lcms2/ubsan.patch.0            |   11 +++++++++++
 4 files changed, 14 insertions(+)

New commits:
commit 00ddedcb477ed09b5649e816b629234d5689b861
Author: Noel Grandin <noel at peralex.com>
Date:   Mon Nov 10 12:16:41 2014 +0200

    fdo#76658 fix bad conversion of old-style UNO service..
    
    in my commit 0394cb37a2d378511f265004b285fd93df37e5ca
    "fdo#46808, Convert ui::ImageManager to new style"
    
    Change-Id: I77d3189723403221e7388969b1eb892a244b90af
    Signed-off-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 5b09be9..b00dcd0 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -4813,6 +4813,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( vcl::Window *pWindow,
     aProp[ 1 ] <<= aPropValue;
 
     m_xImportedImageManager = css::ui::ImageManager::create( xComponentContext );
+    m_xImportedImageManager->initialize(aProp);
 
     ImageInfo mImageInfo;
     uno::Sequence< OUString > names;
commit af0605ce4511b1248810ced538d9f9f62e74d7d7
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Nov 11 10:26:12 2014 +0100

    Avoid -fsanitize=signed-integer-overflow
    
    Change-Id: I1a8ae99401e488e2ece47be4119843945154ef98

diff --git a/external/lcms2/UnpackedTarball_lcms2.mk b/external/lcms2/UnpackedTarball_lcms2.mk
index fdf2ab3..6490110 100644
--- a/external/lcms2/UnpackedTarball_lcms2.mk
+++ b/external/lcms2/UnpackedTarball_lcms2.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,lcms2,\
 	external/lcms2/lcms2-msvc-disable-sse2.patch.1 \
 	external/lcms2/lcms2-vc2013-project.patch \
 	external/lcms2/lcms2-config-guess.patch.0 \
+	external/lcms2/ubsan.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/lcms2/ubsan.patch.0 b/external/lcms2/ubsan.patch.0
new file mode 100644
index 0000000..2eafcad
--- /dev/null
+++ b/external/lcms2/ubsan.patch.0
@@ -0,0 +1,11 @@
+--- src/lcms2_internal.h
++++ src/lcms2_internal.h
+@@ -93,7 +93,7 @@
+ 
+ // A fast way to convert from/to 16 <-> 8 bits
+ #define FROM_8_TO_16(rgb) (cmsUInt16Number) ((((cmsUInt16Number) (rgb)) << 8)|(rgb))
+-#define FROM_16_TO_8(rgb) (cmsUInt8Number) ((((rgb) * 65281 + 8388608) >> 24) & 0xFF)
++#define FROM_16_TO_8(rgb) (cmsUInt8Number) ((((unsigned)(rgb) * 65281 + 8388608) >> 24) & 0xFF)
+ 
+ // Code analysis is broken on asserts
+ #ifdef _MSC_VER
commit 205044e89722e9b3a9c700ee3ae6f2335f57ef7b
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Nov 11 10:25:19 2014 +0100

    Pass down some CFLAGS
    
    Change-Id: I2c69d9ad61137adb82213ad2a4c40e7403a395a5

diff --git a/external/lcms2/ExternalProject_lcms2.mk b/external/lcms2/ExternalProject_lcms2.mk
index 8bfb514..56982ee 100644
--- a/external/lcms2/ExternalProject_lcms2.mk
+++ b/external/lcms2/ExternalProject_lcms2.mk
@@ -28,6 +28,7 @@ $(call gb_ExternalProject_get_state_target,lcms2,build):
 		./configure --without-jpeg --without-tiff --with-pic \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 			CPPFLAGS=" $(SOLARINC)" \
+			CFLAGS='$(if $(debug),$(gb_DEBUG_CFLAGS),$(gb_COMPILEROPTFLAGS))' \
 			$(if $(filter-out WNTGCC,$(OS)$(COM)),,CPPFLAGS=" -DCMS_DLL_BUILD") \
 			$(if $(filter IOS ANDROID,$(OS)), --disable-shared --enable-static, --enable-shared --disable-static) \
 			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \