Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
1e5a93a4
Commit
1e5a93a4
authored
Apr 21, 2020
by
Pedro J. Estébanez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compilation of jpgd.cpp on MSVC 2017
parent
cb1ae08c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
36 additions
and
3 deletions
+36
-3
README.md
thirdparty/README.md
+2
-0
jpgd.cpp
thirdparty/jpeg-compressor/jpgd.cpp
+3
-3
fix-msvc2017-build.patch
thirdparty/jpeg-compressor/patches/fix-msvc2017-build.patch
+31
-0
No files found.
thirdparty/README.md
View file @
1e5a93a4
...
...
@@ -189,6 +189,8 @@ Files extracted from upstream source:
-
`jpgd*.{c,h}`
Patches in the
`patches`
directory should be re-applied after updates.
## libogg
...
...
thirdparty/jpeg-compressor/jpgd.cpp
View file @
1e5a93a4
...
...
@@ -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
();
...
...
thirdparty/jpeg-compressor/patches/fix-msvc2017-build.patch
0 → 100644
View file @
1e5a93a4
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();
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment