aboutsummaryrefslogtreecommitdiff
path: root/image/jpeg.cpp
diff options
context:
space:
mode:
authorSupSuper2019-05-09 02:32:58 +0100
committerPaul Gilbert2019-05-09 18:13:10 +1000
commit2365b678b30470d9cf5580126335cee700ac1c4f (patch)
treea9b76b8b3c3362b8a2fbb2f6646e32b6e398096e /image/jpeg.cpp
parent03c43f05883b82487401f82a50cce951a4aee30c (diff)
downloadscummvm-rg350-2365b678b30470d9cf5580126335cee700ac1c4f.tar.gz
scummvm-rg350-2365b678b30470d9cf5580126335cee700ac1c4f.tar.bz2
scummvm-rg350-2365b678b30470d9cf5580126335cee700ac1c4f.zip
IMAGE: Fix MSVC warnings
Fixes warning C4067: unexpected tokens following preprocessor directive due to non-standard "and" "or" operators
Diffstat (limited to 'image/jpeg.cpp')
-rw-r--r--image/jpeg.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/image/jpeg.cpp b/image/jpeg.cpp
index 4605d178e1..2975cb1342 100644
--- a/image/jpeg.cpp
+++ b/image/jpeg.cpp
@@ -184,7 +184,7 @@ void outputMessage(j_common_ptr cinfo) {
}
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 {
Graphics::PixelFormat pixelFormat;
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, 0, 8, 16, 0), JCS_EXT_BGR, JCS_EXT_RGB }
#endif
-#if defined(JCS_EXTENSIONS) and defined(JCS_ALPHA_EXTENSIONS)
+#if defined(JCS_EXTENSIONS) && defined(JCS_ALPHA_EXTENSIONS)
,
#endif
#ifdef JCS_ALPHA_EXTENSIONS