Kaydet (Commit) 0ada594b authored tarafından David Tardon's avatar David Tardon

upload lcms2 2.8

Change-Id: I8a3b138c051d3cddf25855a635262311669bdddc
Reviewed-on: https://gerrit.libreoffice.org/33798Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarDavid Tardon <dtardon@redhat.com>
üst e9576502
......@@ -81,8 +81,8 @@ export JPEG_TURBO_TARBALL := libjpeg-turbo-1.4.2.tar.gz
export LANGTAGREG_MD5SUM := 8a037dc60b16bf8c5fe871b33390a4a2
export LANGTAGREG_TARBALL := language-subtag-registry-2016-07-19.tar.bz2
export LANGUAGETOOL_TARBALL := b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
export LCMS2_MD5SUM := f4c08d38ceade4a664ebff7228910a33
export LCMS2_TARBALL := lcms2-2.6.tar.gz
export LCMS2_MD5SUM := 87a5913f1a52464190bb655ad230539c
export LCMS2_TARBALL := lcms2-2.8.tar.gz
export LIBATOMIC_OPS_MD5SUM := c0b86562d5aa40761a87134f83e6adcf
export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip
export LIBEOT_MD5SUM := aa24f5dd2a2992f4a116aa72af817548
......
......@@ -21,7 +21,7 @@ else ifeq ($(COM),MSC)
$(eval $(call gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/lcms2.dll,bin/lcms2.dll))
endif # $(COM)
else # $(OS) != WNT/MACOSX
$(eval $(call gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/liblcms2.so.2,src/.libs/liblcms2.so.2.0.6))
$(eval $(call gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/liblcms2.so.2,src/.libs/liblcms2.so.2.0.8))
endif # $(OS)
endif # $(DISABLE_DYNLOADING)
......
......@@ -13,12 +13,8 @@ $(eval $(call gb_UnpackedTarball_set_tarball,lcms2,$(LCMS2_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,lcms2,3))
$(eval $(call gb_UnpackedTarball_add_patches,lcms2,\
external/lcms2/lcms2.patch \
external/lcms2/lcms2-2.4-windows.patch \
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 \
external/lcms2/0001-Added-an-extra-check-to-MLU-bounds.patch.1 \
))
......
--- misc/lcms2-2.4/Projects/VC2010/lcms2_DLL/lcms2_DLL.vcproj 2012-09-10 18:01:51.000000000 +0200
+++ misc/build/lcms2-2.4/Projects/VC2010/lcms2_DLL/lcms2_DLL.vcproj 2012-10-05 22:35:01.607191700 +0200
@@ -205,6 +205,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\cmshalf.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\cmsintrp.c"
>
</File>
--- misc/lcms2-2.4/Projects/VC2010/lcms2_static/lcms2_static.vcproj 2012-09-10 18:01:51.000000000 +0200
+++ misc/build/lcms2-2.4/Projects/VC2010/lcms2_static/lcms2_static.vcproj 2012-10-05 22:35:28.168963200 +0200
@@ -175,6 +175,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\cmshalf.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\cmsintrp.c"
>
</File>
TODO: Is this still needed?
--- misc/lcms2-2.4/include/lcms2.h 2011-12-15 16:45:47.000000000 +0100
+++ misc/build/lcms2-2.4/include/lcms2.h 2012-03-17 22:53:28.731585981 +0100
@@ -192,6 +192,15 @@ typedef int cmsBool;
# endif
#endif
#endif // CMS_USE_BIG_ENDIAN
+// LibreOffice always builds this as DLL and with the stdcall calling
+// convention, so make this usable from outside without having to
......
This diff is collapsed.
This diff is collapsed.
--- misc/build/lcms2-2.4/config.sub
+++ misc/build/lcms2-2.4/config.sub
@@ -123,7 +123,7 @@
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
@@ -1294,7 +1294,7 @@
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* | -cegcc* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+ | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
--- src/cmsnamed.c
+++ src/cmsnamed.c
@@ -221,7 +221,7 @@
cmsBool CMSEXPORT cmsMLUsetWide(cmsMLU* mlu, const char Language[3], const char Country[3], const wchar_t* WideString)
{
cmsUInt16Number Lang = _cmsAdjustEndianess16(*(cmsUInt16Number*) Language);
- cmsUInt16Number Cntry = _cmsAdjustEndianess16(*(cmsUInt16Number*) Country);
+ cmsUInt16Number Cntry = Country[0] | ((cmsUInt16Number) Country[1]) << 8;
cmsUInt32Number len;
if (mlu == NULL) return FALSE;
--- 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
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