Remove no longer needed patches to jpgd.cpp
(cherry picked from commit abe03ff1f0
)
This commit is contained in:
parent
dcb68e0106
commit
75f6d2ef32
|
@ -144,15 +144,13 @@ the GLES version Godot targets.
|
||||||
## jpeg-compressor
|
## jpeg-compressor
|
||||||
|
|
||||||
- Upstream: https://github.com/richgel999/jpeg-compressor
|
- Upstream: https://github.com/richgel999/jpeg-compressor
|
||||||
- Version: 2.00 (1eb17d558b9d3b7442d256642a5745974e9eeb1e, 2020)
|
- Version: 2.00 (aeb7d3b463aa8228b87a28013c15ee50a7e6fcf3, 2020)
|
||||||
- License: Public domain
|
- License: Public domain
|
||||||
|
|
||||||
Files extracted from upstream source:
|
Files extracted from upstream source:
|
||||||
|
|
||||||
- `jpgd*.{c,h}`
|
- `jpgd*.{c,h}`
|
||||||
|
|
||||||
Patches in the `patches` directory should be re-applied after updates.
|
|
||||||
|
|
||||||
|
|
||||||
## libogg
|
## libogg
|
||||||
|
|
||||||
|
|
|
@ -1,44 +0,0 @@
|
||||||
From ae74fa2fcdef8ec44b925a649f66e8cbefce8315 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
|
|
||||||
Date: Thu, 7 May 2020 12:14:09 +0200
|
|
||||||
Subject: [PATCH] Fix detection of SSE2 with Visual Studio
|
|
||||||
|
|
||||||
The previous code assumed that SSE2 is available when building with
|
|
||||||
Visual Studio, but that's not accurate on ARM with UWP.
|
|
||||||
|
|
||||||
SSE2 could also be enabled on x86 if `_M_IX86_FP == 2`, but it requires
|
|
||||||
checking first that it's not actually set to 2 for AVX, AVX2 or AVX512
|
|
||||||
(see https://docs.microsoft.com/en-us/cpp/preprocessor/predefined-macros?view=vs-2019),
|
|
||||||
so I left it out for this quick fix.
|
|
||||||
---
|
|
||||||
jpgd.cpp | 16 +++++++---------
|
|
||||||
1 file changed, 7 insertions(+), 9 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/jpgd.cpp b/jpgd.cpp
|
|
||||||
index 91e66ad..db1f3b4 100644
|
|
||||||
--- a/jpgd.cpp
|
|
||||||
+++ b/jpgd.cpp
|
|
||||||
@@ -37,16 +37,14 @@
|
|
||||||
|
|
||||||
#ifndef JPGD_USE_SSE2
|
|
||||||
|
|
||||||
- #if defined(__GNUC__)
|
|
||||||
-
|
|
||||||
- #if (defined(__x86_64__) || defined(_M_X64))
|
|
||||||
- #if defined(__SSE2__)
|
|
||||||
- #define JPGD_USE_SSE2 (1)
|
|
||||||
- #endif
|
|
||||||
+ #if defined(__GNUC__)
|
|
||||||
+ #if defined(__SSE2__)
|
|
||||||
+ #define JPGD_USE_SSE2 (1)
|
|
||||||
+ #endif
|
|
||||||
+ #elif defined(_MSC_VER)
|
|
||||||
+ #if defined(_M_X64)
|
|
||||||
+ #define JPGD_USE_SSE2 (1)
|
|
||||||
#endif
|
|
||||||
-
|
|
||||||
- #else
|
|
||||||
- #define JPGD_USE_SSE2 (1)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -1,31 +0,0 @@
|
||||||
diff --git a/thirdparty/jpeg-compressor/jpgd.cpp b/thirdparty/jpeg-compressor/jpgd.cpp
|
|
||||||
index a0c494db61..257d0b7574 100644
|
|
||||||
--- a/thirdparty/jpeg-compressor/jpgd.cpp
|
|
||||||
+++ b/thirdparty/jpeg-compressor/jpgd.cpp
|
|
||||||
@@ -2126,7 +2126,7 @@ namespace jpgd {
|
|
||||||
|
|
||||||
int jpeg_decoder::decode_next_mcu_row()
|
|
||||||
{
|
|
||||||
- if (setjmp(m_jmp_state))
|
|
||||||
+ if (::setjmp(m_jmp_state))
|
|
||||||
return JPGD_FAILED;
|
|
||||||
|
|
||||||
const bool chroma_y_filtering = ((m_flags & cFlagBoxChromaFiltering) == 0) && ((m_scan_type == JPGD_YH2V2) || (m_scan_type == JPGD_YH1V2));
|
|
||||||
@@ -3042,7 +3042,7 @@ namespace jpgd {
|
|
||||||
|
|
||||||
jpeg_decoder::jpeg_decoder(jpeg_decoder_stream* pStream, uint32_t flags)
|
|
||||||
{
|
|
||||||
- if (setjmp(m_jmp_state))
|
|
||||||
+ if (::setjmp(m_jmp_state))
|
|
||||||
return;
|
|
||||||
decode_init(pStream, flags);
|
|
||||||
}
|
|
||||||
@@ -3055,7 +3055,7 @@ namespace jpgd {
|
|
||||||
if (m_error_code)
|
|
||||||
return JPGD_FAILED;
|
|
||||||
|
|
||||||
- if (setjmp(m_jmp_state))
|
|
||||||
+ if (::setjmp(m_jmp_state))
|
|
||||||
return JPGD_FAILED;
|
|
||||||
|
|
||||||
decode_start();
|
|
Loading…
Reference in New Issue