[Scummvm-cvs-logs] scummvm master -> 4b3f5149b522aafe884219284a2bef2ff3adb8ec

DrMcCoy drmccoy at drmccoy.de
Sun Jun 30 19:08:07 CEST 2013


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:
4b3f5149b5 VIDEO: Add hypothetical 32bpp support


Commit: 4b3f5149b522aafe884219284a2bef2ff3adb8ec
    https://github.com/scummvm/scummvm/commit/4b3f5149b522aafe884219284a2bef2ff3adb8ec
Author: Sven Hesse (drmccoy at users.sourceforge.net)
Date: 2013-06-30T10:07:04-07:00

Commit Message:
VIDEO: Add hypothetical 32bpp support

Changed paths:
    video/coktel_decoder.cpp



diff --git a/video/coktel_decoder.cpp b/video/coktel_decoder.cpp
index d24a021..4c3b6f8 100644
--- a/video/coktel_decoder.cpp
+++ b/video/coktel_decoder.cpp
@@ -2426,8 +2426,10 @@ void VMDDecoder::blit16(const Graphics::Surface &srcSurf, Common::Rect &rect) {
 			if ((r == 0) && (g == 0) && (b == 0))
 				c = 0;
 
-			if (_surface.format.bytesPerPixel == 2)
+			if      (_surface.format.bytesPerPixel == 2)
 				*((uint16 *)dstRow) = (uint16) c;
+			else if (_surface.format.bytesPerPixel == 4)
+				*((uint32 *)dstRow) = (uint32) c;
 		}
 
 		src += srcSurf .pitch;
@@ -2462,8 +2464,10 @@ void VMDDecoder::blit24(const Graphics::Surface &srcSurf, Common::Rect &rect) {
 			if ((r == 0) && (g == 0) && (b == 0))
 				c = 0;
 
-			if (_surface.format.bytesPerPixel == 2)
+			if      (_surface.format.bytesPerPixel == 2)
 				*((uint16 *)dstRow) = (uint16) c;
+			else if (_surface.format.bytesPerPixel == 4)
+				*((uint32 *)dstRow) = (uint32) c;
 		}
 
 		src += srcSurf .pitch;






More information about the Scummvm-git-logs mailing list