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

[mduggan]

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:
2ac6579236 IMAGE: Fix use of and keyword


Commit: 2ac6579236204c2f520a6a830f0446940477341b
    https://github.com/scummvm/scummvm/commit/2ac6579236204c2f520a6a830f0446940477341b
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-05-12T22:43:00+09:00

Commit Message:
IMAGE: Fix use of and keyword

Changed paths:
    image/codecs/jyv1.cpp


diff --git a/image/codecs/jyv1.cpp b/image/codecs/jyv1.cpp
index 6c4423d1b5..f459bc4355 100644
--- a/image/codecs/jyv1.cpp
+++ b/image/codecs/jyv1.cpp
@@ -91,7 +91,7 @@ const Graphics::Surface *JYV1Decoder::decodeFrame(Common::SeekableReadStream &st
 		while (!cmdBitStream.eos()) {
 			uint32 idx = cmdBitStream.getBits(4);
 			uint32 blocksize = BASE_LEN[idx];
-			if (idx != 0 and idx != 8) {
+			if (idx != 0 && idx != 8) {
 			   blocksize += cmdBitStream.getBits(FINE_LEN_BITS[idx]);
 			}
 			if (skipping) {