[Scummvm-git-logs] scummvm master -> efcd8ab27047c82da67f98c4246427c8f2c19d4c

[bgK]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
efcd8ab270 IMAGE: Fix build when not using libjpeg-turbo


Commit: efcd8ab27047c82da67f98c4246427c8f2c19d4c
    https://github.com/scummvm/scummvm/commit/efcd8ab27047c82da67f98c4246427c8f2c19d4c
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2019-04-28T09:18:07+02:00

Commit Message:
IMAGE: Fix build when not using libjpeg-turbo

Changed paths:
    image/jpeg.cpp


diff --git a/image/jpeg.cpp b/image/jpeg.cpp
index 2a528d5..4605d17 100644
--- a/image/jpeg.cpp
+++ b/image/jpeg.cpp
@@ -184,6 +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)
 	struct PixelFormatMapping {
 		Graphics::PixelFormat pixelFormat;
 		J_COLOR_SPACE bigEndianColorSpace;
@@ -219,6 +220,7 @@ J_COLOR_SPACE fromScummvmPixelFormat(const Graphics::PixelFormat &format) {
 #endif
 		}
 	}
+#endif
 
 	return JCS_UNKNOWN;
 }