[Scummvm-cvs-logs] scummvm master -> d4756a961ceb31e884f3519ce0d43d40510426b5

clone2727 clone2727 at gmail.com
Fri Apr 18 03:06:46 CEST 2014


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:
32e85a957d VIDEO: Use || instead of the currently incorrect &&
d4756a961c Merge pull request #460 from klusark/logically_dead


Commit: 32e85a957de8142266c20271fd76aca0fa2c023c
    https://github.com/scummvm/scummvm/commit/32e85a957de8142266c20271fd76aca0fa2c023c
Author: Joel Teichroeb (joel at teichroeb.net)
Date: 2014-04-11T19:53:03-07:00

Commit Message:
VIDEO: Use || instead of the currently incorrect &&

The code currenly has 4 logically dead lines. Instead of requiring
both newWidth and newHeight to be non zero, just make sure one of
them is non zero and set the other one to the current size.

Changed paths:
    video/flic_decoder.cpp



diff --git a/video/flic_decoder.cpp b/video/flic_decoder.cpp
index 5d27aa0..994f47c 100644
--- a/video/flic_decoder.cpp
+++ b/video/flic_decoder.cpp
@@ -176,7 +176,7 @@ const Graphics::Surface *FlicDecoder::FlicVideoTrack::decodeNextFrame() {
 			uint16 newWidth = _fileStream->readUint16LE();
 			uint16 newHeight = _fileStream->readUint16LE();
 
-			if ((newWidth != 0) && (newHeight != 0)) {
+			if ((newWidth != 0) || (newHeight != 0)) {
 				if (newWidth == 0)
 					newWidth = _surface->w;
 				if (newHeight == 0)


Commit: d4756a961ceb31e884f3519ce0d43d40510426b5
    https://github.com/scummvm/scummvm/commit/d4756a961ceb31e884f3519ce0d43d40510426b5
Author: clone2727 (clone2727 at gmail.com)
Date: 2014-04-17T21:06:20-04:00

Commit Message:
Merge pull request #460 from klusark/logically_dead

VIDEO: Use || instead of the currently incorrect &&

Changed paths:
    video/flic_decoder.cpp









More information about the Scummvm-git-logs mailing list