diff options
| author | Matteo Bernardini <ponce@slackbuilds.org> | 2025-03-08 18:21:51 +0100 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2025-03-15 09:19:24 +0700 |
| commit | 4f7036b95f1c7fec6a83258523bb3369124f3bdd (patch) | |
| tree | 2ef7710edab8b9960d0671035010fe7e0c10c0cb | |
| parent | 9c7fc9e8cffa4c4ee0a93147f9ce8e0f317132cf (diff) | |
libraries/FreeImage: Fix line endings of the patches.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | libraries/FreeImage/cross_platform_byteswap_fix.patch | 36 | ||||
| -rw-r--r-- | libraries/FreeImage/gcc-version-fix-includes.patch | 16 |
2 files changed, 26 insertions, 26 deletions
diff --git a/libraries/FreeImage/cross_platform_byteswap_fix.patch b/libraries/FreeImage/cross_platform_byteswap_fix.patch index c884882fbe..9ae51e7217 100644 --- a/libraries/FreeImage/cross_platform_byteswap_fix.patch +++ b/libraries/FreeImage/cross_platform_byteswap_fix.patch @@ -2,21 +2,21 @@ diff -up FreeImage/Source/LibJXR/image/decode/segdec.c.orig FreeImage/Source/Lib --- FreeImage/Source/LibJXR/image/decode/segdec.c.orig 2024-08-18 02:32:53.595421505 -0500 +++ FreeImage/Source/LibJXR/image/decode/segdec.c 2024-08-18 02:33:41.184788298 -0500 @@ -29,6 +29,18 @@ - #include "strcodec.h" - #include "decode.h" - -+// Conditional definition of _byteswap_ulong for cross-platform compatibility -+#ifdef _MSC_VER -+ #include <intrin.h> // Use the Microsoft-specific function on MSVC -+#else -+ #include <stdint.h> // Standard header for fixed-width integers -+ -+ // Define the Microsoft-specific function for non-MSVC compilers -+ static inline uint32_t _byteswap_ulong(uint32_t x) { -+ return __builtin_bswap32(x); // GCC/Clang built-in function for Linux -+ } -+#endif -+ - #ifdef MEM_TRACE - #define TRACE_MALLOC 1 - #define TRACE_NEW 0 + #include "strcodec.h"
+ #include "decode.h"
+
++// Conditional definition of _byteswap_ulong for cross-platform compatibility
++#ifdef _MSC_VER
++ #include <intrin.h> // Use the Microsoft-specific function on MSVC
++#else
++ #include <stdint.h> // Standard header for fixed-width integers
++
++ // Define the Microsoft-specific function for non-MSVC compilers
++ static inline uint32_t _byteswap_ulong(uint32_t x) {
++ return __builtin_bswap32(x); // GCC/Clang built-in function for Linux
++ }
++#endif
++
+ #ifdef MEM_TRACE
+ #define TRACE_MALLOC 1
+ #define TRACE_NEW 0
diff --git a/libraries/FreeImage/gcc-version-fix-includes.patch b/libraries/FreeImage/gcc-version-fix-includes.patch index 1b04e880c1..1f0d8bfee1 100644 --- a/libraries/FreeImage/gcc-version-fix-includes.patch +++ b/libraries/FreeImage/gcc-version-fix-includes.patch @@ -36,11 +36,11 @@ diff -up FreeImage/Source/LibJXR/jxrgluelib/JXRGlueJxr.c.orig FreeImage/Source/L --- FreeImage/Source/LibJXR/jxrgluelib/JXRGlueJxr.c.orig 2024-08-18 15:32:17.325371341 -0500 +++ FreeImage/Source/LibJXR/jxrgluelib/JXRGlueJxr.c 2024-08-18 15:32:44.343575960 -0500 @@ -28,7 +28,7 @@ - //*@@@---@@@@****************************************************************** - #include <limits.h> - #include <JXRGlue.h> -- -+#include <wchar.h> - - static const char szHDPhotoFormat[] = "<dc:format>image/vnd.ms-photo</dc:format>"; - const U32 IFDEntryTypeSizes[] = { 0, 1, 1, 2, 4, 8, 1, 1, 2, 4, 8, 4, 8 }; + //*@@@---@@@@******************************************************************
+ #include <limits.h>
+ #include <JXRGlue.h>
+-
++#include <wchar.h>
+
+ static const char szHDPhotoFormat[] = "<dc:format>image/vnd.ms-photo</dc:format>";
+ const U32 IFDEntryTypeSizes[] = { 0, 1, 1, 2, 4, 8, 1, 1, 2, 4, 8, 4, 8 };
|