[Scummvm-git-logs] scummvm master -> dd792e9e8716ae05cf7cf9ca18b500e8e2b9c06a

[orgads]

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:
dd792e9e87 JANITORIAL: Fix some MSVC warnings


Commit: dd792e9e8716ae05cf7cf9ca18b500e8e2b9c06a
    https://github.com/scummvm/scummvm/commit/dd792e9e8716ae05cf7cf9ca18b500e8e2b9c06a
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-07-22T07:28:01+03:00

Commit Message:
JANITORIAL: Fix some MSVC warnings

Changed paths:
    common/bitstream.h
    graphics/pixelbuffer.h


diff --git a/common/bitstream.h b/common/bitstream.h
index fff112fe30..2bc472d73f 100644
--- a/common/bitstream.h
+++ b/common/bitstream.h
@@ -144,7 +144,7 @@ public:
 	    _stream(stream), _disposeAfterUse(disposeAfterUse), _bitContainer(0), _bitsLeft(0), _pos(0) {
 
 		if ((valueBits != 8) && (valueBits != 16) && (valueBits != 32))
-			error("BitStreamImpl: Invalid memory layout %d, %d, %d", valueBits, isLE, MSB2LSB);
+			error("BitStreamImpl: Invalid memory layout %d, %d, %d", valueBits, int(isLE), int(MSB2LSB));
 
 		_size = (_stream->size() & ~((uint32) ((valueBits >> 3) - 1))) * 8;
 	}
@@ -154,7 +154,7 @@ public:
 	    _stream(&stream), _disposeAfterUse(DisposeAfterUse::NO), _bitContainer(0), _bitsLeft(0), _pos(0) {
 
 		if ((valueBits != 8) && (valueBits != 16) && (valueBits != 32))
-			error("BitStreamImpl: Invalid memory layout %d, %d, %d", valueBits, isLE, MSB2LSB);
+			error("BitStreamImpl: Invalid memory layout %d, %d, %d", valueBits, int(isLE), int(MSB2LSB));
 
 		_size = (_stream->size() & ~((uint32) ((valueBits >> 3) - 1))) * 8;
 	}
diff --git a/graphics/pixelbuffer.h b/graphics/pixelbuffer.h
index bf562ab9f7..0bc725798f 100644
--- a/graphics/pixelbuffer.h
+++ b/graphics/pixelbuffer.h
@@ -132,7 +132,7 @@ public:
 			((uint32 *) _buffer)[pixel] = value;
 			return;
 		}
-		error("setPixelAt: Unhandled bytesPerPixel %i", _format.bytesPerPixel);
+		error("setPixelAt: Unhandled bytesPerPixel %d", int(_format.bytesPerPixel));
 	}
 	/**
 	 * Set the value of a pixel. The pixel will be converted from a pixel in another PixelBuffer,
@@ -208,7 +208,7 @@ public:
 		case 4:
 			return ((uint32 *) _buffer)[i];
 		}
-		error("getValueAt: Unhandled bytesPerPixel %i", _format.bytesPerPixel);
+		error("getValueAt: Unhandled bytesPerPixel %d", int(_format.bytesPerPixel));
 	}
 	/**
 	 * Return the RGB value of the pixel at the given index.