[Scummvm-git-logs] scummvm master -> 2b745ac298c0465c8f9df4ec9992806c1e0a6103

[dreammaster]

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

Summary:
7846d098b2 IMAGE: Support rendering Indeo videos at 15bpp
2b745ac298 Merge pull request #1013 from ccawley2011/15bit-indeo


Commit: 7846d098b25fa90526cb137efd5e68a8b089da25
    https://github.com/scummvm/scummvm/commit/7846d098b25fa90526cb137efd5e68a8b089da25
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2017-09-05T23:40:05+01:00

Commit Message:
IMAGE: Support rendering Indeo videos at 15bpp

Changed paths:
    image/codecs/indeo/indeo.cpp
    image/codecs/indeo3.cpp


diff --git a/image/codecs/indeo/indeo.cpp b/image/codecs/indeo/indeo.cpp
index 3437753..4826137 100644
--- a/image/codecs/indeo/indeo.cpp
+++ b/image/codecs/indeo/indeo.cpp
@@ -466,6 +466,9 @@ IVI45DecContext::IVI45DecContext() : _gb(nullptr), _frameNum(0), _frameType(0),
 
 IndeoDecoderBase::IndeoDecoderBase(uint16 width, uint16 height, uint bitsPerPixel) : Codec() {
 	switch (bitsPerPixel) {
+	case 15:
+		_pixelFormat = Graphics::PixelFormat(2, 5, 5, 5, 0, 0, 5, 10, 0);
+		break;
 	case 16:
 		_pixelFormat = Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0);
 		break;
diff --git a/image/codecs/indeo3.cpp b/image/codecs/indeo3.cpp
index d862d53..7d3a121 100644
--- a/image/codecs/indeo3.cpp
+++ b/image/codecs/indeo3.cpp
@@ -45,6 +45,9 @@ Indeo3Decoder::Indeo3Decoder(uint16 width, uint16 height, uint bitsPerPixel) : _
 	_iv_frame[1].the_buf = 0;
 
 	switch (bitsPerPixel) {
+	case 15:
+		_pixelFormat = Graphics::PixelFormat(2, 5, 5, 5, 0, 0, 5, 10, 0);
+		break;
 	case 16:
 		_pixelFormat = Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0);
 		break;


Commit: 2b745ac298c0465c8f9df4ec9992806c1e0a6103
    https://github.com/scummvm/scummvm/commit/2b745ac298c0465c8f9df4ec9992806c1e0a6103
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-09-12T19:06:53-04:00

Commit Message:
Merge pull request #1013 from ccawley2011/15bit-indeo

IMAGE: Support rendering Indeo videos at 15bpp

Changed paths:
    image/codecs/indeo/indeo.cpp
    image/codecs/indeo3.cpp