mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

external/lcms2: fix lcms2-2.4-windows.patch

Browse Source 
fix typos and macros in code.

Change-Id: I0886f3d95d87be70be1e7e6a220617f728fe6653
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161056
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001722@ymail.ne.jp>
This commit is contained in:
Taichi Haradaguchi
2023-12-14 22:01:40 +09:00
parent 0cd74b5be2
commit 324a12413f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
external/lcms2/lcms2-2.4-windows.patch vendored
View File

@@ -1,4 +1,4 @@
This patch is neccesary for Windows (32-bit) build. This patch is necessary for Windows (32-bit) build.
(In Jenkins' build message) (In Jenkins' build message)
> icc_transform.o : error LNK2019: unresolved external symbol _cmsGetColorSpace referenced in function "public: static class std::unique_ptr<class fxcodec::IccTransform,struct std::default_delete<class fxcodec::IccTransform> > __cdecl fxcodec::IccTransform::CreateTransformSRGB(class pdfium::span<unsigned char const >)" (?CreateTransformSRGB@IccTransform@fxcodec@@SA?AV?$unique_ptr@VIccTransform@fxcodec@@U?$default_delete@VIccTransform@fxcodec@@@std@@@std@@V?$span@$$CBE@pdfium@@@Z) > icc_transform.o : error LNK2019: unresolved external symbol _cmsGetColorSpace referenced in function "public: static class std::unique_ptr<class fxcodec::IccTransform,struct std::default_delete<class fxcodec::IccTransform> > __cdecl fxcodec::IccTransform::CreateTransformSRGB(class pdfium::span<unsigned char const >)" (?CreateTransformSRGB@IccTransform@fxcodec@@SA?AV?$unique_ptr@VIccTransform@fxcodec@@U?$default_delete@VIccTransform@fxcodec@@@std@@@std@@V?$span@$$CBE@pdfium@@@Z)
@@ -21,7 +21,7 @@ This patch is neccesary for Windows (32-bit) build.
+// LibreOffice always builds this as DLL and with the stdcall calling +// LibreOffice always builds this as DLL and with the stdcall calling
+// convention, so make this usable from outside without having to +// convention, so make this usable from outside without having to
+// specify CMS_DLL manually whenever the library is used. +// specify CMS_DLL manually whenever the library is used.
+#if !defined(CMS_DLL_BUILD) && !defined(CMS_DLL) && !defined(_WIN64) +#if !defined(CMS_DLL_BUILD) && !defined(CMS_DLL) && defined(_MSC_VER) && defined(_M_IX86)
+#define CMS_DLL +#define CMS_DLL
+#endif +#endif
+ +