aboutsummaryrefslogtreecommitdiff
path: root/image/jpeg.cpp
diff options
context:
space:
mode:
authorBastien Bouclet2019-04-21 14:17:34 +0200
committerBastien Bouclet2019-04-28 07:59:14 +0200
commit8ffa7379014916eff11005ae324ec24c68abd4bf (patch)
tree93a5d49ac6007a237182cd84bc27edb6655b489f /image/jpeg.cpp
parent9f98cddf8dc015e0cdc6b57e303b693bba3cc1fc (diff)
downloadscummvm-rg350-8ffa7379014916eff11005ae324ec24c68abd4bf.tar.gz
scummvm-rg350-8ffa7379014916eff11005ae324ec24c68abd4bf.tar.bz2
scummvm-rg350-8ffa7379014916eff11005ae324ec24c68abd4bf.zip
IMAGE: Remove decoding JPEG directly to RGB565
It's not supported by ancient versions of libjpeg-turbo, and there is no way to detect if support is available without doing a compilation test...
Diffstat (limited to 'image/jpeg.cpp')
-rw-r--r--image/jpeg.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/image/jpeg.cpp b/image/jpeg.cpp
index 5cc348fdfe..2a528d53d7 100644
--- a/image/jpeg.cpp
+++ b/image/jpeg.cpp
@@ -197,15 +197,17 @@ J_COLOR_SPACE fromScummvmPixelFormat(const Graphics::PixelFormat &format) {
{ Graphics::PixelFormat(4, 8, 8, 8, 0, 16, 8, 0, 24), JCS_EXT_XRGB, JCS_EXT_BGRX },
{ Graphics::PixelFormat(4, 8, 8, 8, 0, 8, 16, 24, 0), JCS_EXT_BGRX, JCS_EXT_XRGB },
{ 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
+#if defined(JCS_EXTENSIONS) and defined(JCS_ALPHA_EXTENSIONS)
+ ,
#endif
#ifdef JCS_ALPHA_EXTENSIONS
{ Graphics::PixelFormat(4, 8, 8, 8, 8, 24, 16, 8, 0), JCS_EXT_RGBA, JCS_EXT_ABGR },
{ Graphics::PixelFormat(4, 8, 8, 8, 8, 0, 8, 16, 24), JCS_EXT_ABGR, JCS_EXT_RGBA },
{ Graphics::PixelFormat(4, 8, 8, 8, 8, 16, 8, 0, 24), JCS_EXT_ARGB, JCS_EXT_BGRA },
- { Graphics::PixelFormat(4, 8, 8, 8, 8, 8, 16, 24, 0), JCS_EXT_BGRA, JCS_EXT_ARGB },
+ { Graphics::PixelFormat(4, 8, 8, 8, 8, 8, 16, 24, 0), JCS_EXT_BGRA, JCS_EXT_ARGB }
#endif
- { Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0), JCS_RGB565, JCS_RGB565 }
};
for (uint i = 0; i < ARRAYSIZE(mappings); i++) {