[Scummvm-git-logs] scummvm master -> 9ecce37b811a45f333b5418eea857fcbbaae2580

whoozle vladimir.menshakov at gmail.com
Wed Sep 2 05:44:15 UTC 2020


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:
9ecce37b81 VIDEO: Pad consts with spaces, not tabs, formatting fixup


Commit: 9ecce37b811a45f333b5418eea857fcbbaae2580
    https://github.com/scummvm/scummvm/commit/9ecce37b811a45f333b5418eea857fcbbaae2580
Author: Vladimir Menshakov (vladimir.menshakov at gmail.com)
Date: 2020-09-02T06:43:44+01:00

Commit Message:
VIDEO: Pad consts with spaces, not tabs, formatting fixup

Changed paths:
    video/flic_decoder.cpp


diff --git a/video/flic_decoder.cpp b/video/flic_decoder.cpp
index 3d1bc0d83b..72a8aa0c3d 100644
--- a/video/flic_decoder.cpp
+++ b/video/flic_decoder.cpp
@@ -156,14 +156,14 @@ Graphics::PixelFormat FlicDecoder::FlicVideoTrack::getPixelFormat() const {
 	return _surface->format;
 }
 
-#define FLI_SETPAL				4
-#define FLI_SS2					7
-#define FLI_BRUN				15
-#define FLI_COPY				16
-#define PSTAMP					18
-#define FRAME_TYPE				0xF1FA
-#define FLC_FILE_HEADER			0xAF12
-#define FLC_FILE_HEADER_SIZE	0x80
+#define FLI_SETPAL            4
+#define FLI_SS2               7
+#define FLI_BRUN              15
+#define FLI_COPY              16
+#define PSTAMP                18
+#define FRAME_TYPE            0xF1FA
+#define FLC_FILE_HEADER       0xAF12
+#define FLC_FILE_HEADER_SIZE  0x80
 
 const Graphics::Surface *FlicDecoder::FlicVideoTrack::decodeNextFrame() {
 	// Read chunk
@@ -175,7 +175,8 @@ const Graphics::Surface *FlicDecoder::FlicVideoTrack::decodeNextFrame() {
 		handleFrame();
 		break;
 	case FLC_FILE_HEADER:
-		_fileStream->skip(FLC_FILE_HEADER_SIZE - 6); //skip 0x80 file header subtracting 6 bytes of header
+		// Skip 0x80 bytes of file header subtracting 6 bytes of header
+		_fileStream->skip(FLC_FILE_HEADER_SIZE - 6);
 		break;
 	default:
 		error("FlicDecoder::decodeFrame(): unknown main chunk type (type = 0x%02X)", frameType);




More information about the Scummvm-git-logs mailing list