[Scummvm-git-logs] scummvm master -> 6edd4656fb9557c0077e2c42076d8152555b1597

orgads noreply at scummvm.org
Sun Mar 6 16:35:41 UTC 2022


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:
6edd4656fb VIDEO: Fix compiler warnings on Windows


Commit: 6edd4656fb9557c0077e2c42076d8152555b1597
    https://github.com/scummvm/scummvm/commit/6edd4656fb9557c0077e2c42076d8152555b1597
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2022-03-06T18:34:52+02:00

Commit Message:
VIDEO: Fix compiler warnings on Windows

Changed paths:
    video/paco_decoder.cpp


diff --git a/video/paco_decoder.cpp b/video/paco_decoder.cpp
index 99e5b5a275c..c9e7cadaf70 100644
--- a/video/paco_decoder.cpp
+++ b/video/paco_decoder.cpp
@@ -196,7 +196,7 @@ Graphics::PixelFormat PacoDecoder::PacoVideoTrack::getPixelFormat() const {
 void PacoDecoder::readNextPacket() {
 	uint32 nextFrame = _fileStream->pos() + _frameSizes[_curFrame];
 
-	debug(2, " frame %3d size %d @ %lX", _curFrame, _frameSizes[_curFrame], _fileStream->pos());
+	debug(2, " frame %3d size %d @ %lX", _curFrame, _frameSizes[_curFrame], long(_fileStream->pos()));
 
 	_curFrame++;
 
@@ -205,7 +205,7 @@ void PacoDecoder::readNextPacket() {
 		int frameType = _fileStream->readByte();
 		int v = _fileStream->readByte();
 		uint32 chunkSize =  (v << 16 ) | _fileStream->readUint16BE();
-		debug(2, "  slot type %d size %d @ %lX", frameType, chunkSize, _fileStream->pos() - 4);
+		debug(2, "  slot type %d size %d @ %lX", frameType, chunkSize, long(_fileStream->pos() - 4));
 
 		switch (frameType) {
 		case AUDIO:
@@ -299,7 +299,7 @@ void PacoDecoder::PacoVideoTrack::handleFrame(Common::SeekableReadStream *fileSt
 
 	uint8 *fdata = new uint8[1048576];              // 0x100000 copied from original pacodec
 	fileStream->read(fdata, chunkSize - 10);       // remove header length
-	debug(5, "pos: %ld", fileStream->pos());
+	debug(5, "pos: %ld", long(fileStream->pos()));
 	int16 xpos = x, ypos = y, ypos2 = y;
 	byte *dst = (byte *)_surface->getPixels() + x + y * w;
 




More information about the Scummvm-git-logs mailing list