thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

IMAGE: Fix MSVC warnings

Browse source 
Fixes warning C4067: unexpected tokens following preprocessor directive
due to non-standard "and" "or" operators
This commit is contained in:
SupSuper 2019-05-09 02:32:58 +01:00 • committed by Paul Gilbert
parent 03c43f0588
commit 2365b678b3
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
image/jpeg.cpp
View file

@ -184,7 +184,7 @@ void outputMessage(j_common_ptr cinfo) {
} }
J_COLOR_SPACE fromScummvmPixelFormat(const Graphics::PixelFormat &format) { J_COLOR_SPACE fromScummvmPixelFormat(const Graphics::PixelFormat &format) {
#if defined(JCS_EXTENSIONS) or defined(JCS_ALPHA_EXTENSIONS) #if defined(JCS_EXTENSIONS) || defined(JCS_ALPHA_EXTENSIONS)
struct PixelFormatMapping { struct PixelFormatMapping {
Graphics::PixelFormat pixelFormat; Graphics::PixelFormat pixelFormat;
J_COLOR_SPACE bigEndianColorSpace; J_COLOR_SPACE bigEndianColorSpace;
@ -200,7 +200,7 @@ J_COLOR_SPACE fromScummvmPixelFormat(const Graphics::PixelFormat &format) {
{ Graphics::PixelFormat(3, 8, 8, 8, 0, 16, 8, 0, 0), JCS_EXT_RGB, JCS_EXT_BGR }, { Graphics::PixelFormat(3, 8, 8, 8, 0, 16, 8, 0, 0), JCS_EXT_RGB, JCS_EXT_BGR },
{ Graphics::PixelFormat(3, 8, 8, 8, 0, 0, 8, 16, 0), JCS_EXT_BGR, JCS_EXT_RGB } { Graphics::PixelFormat(3, 8, 8, 8, 0, 0, 8, 16, 0), JCS_EXT_BGR, JCS_EXT_RGB }
#endif #endif
#if defined(JCS_EXTENSIONS) and defined(JCS_ALPHA_EXTENSIONS) #if defined(JCS_EXTENSIONS) && defined(JCS_ALPHA_EXTENSIONS)
, ,
#endif #endif
#ifdef JCS_ALPHA_EXTENSIONS #ifdef JCS_ALPHA_EXTENSIONS