[Scummvm-git-logs] scummvm master -> de33c1fc06b6ad7337b90deec12c179007423c03
dwatteau
noreply at scummvm.org
Sun Aug 11 14:34:23 UTC 2024
This automated email contains information about 8 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
42b2760f43 BACKENDS: Fix -Wformat warning
5d8be78b72 DIRECTOR: Fix -Wformat warning
c1a98b91d6 FREESCAPE: Fix -Wformat warning
da27af0104 IMMORTAL: Fix -Wformat warning
985c9f5eec M4: Fix -Wformat warning
cbe7aec966 WAGE: Fix -Wformat warning
630c764ac8 IMAGE: Fix ALIGN() macro redefinition warning on NDS
de33c1fc06 DGDS: Fix -Wpedantic warning about double ";"
Commit: 42b2760f43e074af7c52477d36584be9c9f9d83f
https://github.com/scummvm/scummvm/commit/42b2760f43e074af7c52477d36584be9c9f9d83f
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2024-08-11T16:33:53+02:00
Commit Message:
BACKENDS: Fix -Wformat warning
Changed paths:
backends/plugins/elf/elf-loader.cpp
diff --git a/backends/plugins/elf/elf-loader.cpp b/backends/plugins/elf/elf-loader.cpp
index c63aab130b8..75469875c67 100644
--- a/backends/plugins/elf/elf-loader.cpp
+++ b/backends/plugins/elf/elf-loader.cpp
@@ -209,7 +209,7 @@ Elf32_Shdr * DLObject::loadSectionHeaders(Elf32_Ehdr *ehdr) {
// Allocate memory for section headers
if (!(shdr = (Elf32_Shdr *)malloc(ehdr->e_shnum * sizeof(*shdr)))) {
- warning("elfloader: Could not allocate %ld bytes for the section headers", ehdr->e_shnum * sizeof(*shdr));
+ warning("elfloader: Could not allocate %zu bytes for the section headers", ehdr->e_shnum * sizeof(*shdr));
return 0;
}
Commit: 5d8be78b72d4424ebf6c19576b578dc8221666da
https://github.com/scummvm/scummvm/commit/5d8be78b72d4424ebf6c19576b578dc8221666da
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2024-08-11T16:33:53+02:00
Commit Message:
DIRECTOR: Fix -Wformat warning
Changed paths:
engines/director/score.cpp
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index dc070c57bcb..1db4230ec65 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -1726,7 +1726,7 @@ bool Score::readOneFrame() {
return false;
uint16 frameSize = _framesStream->readUint16();
- debugC(4, kDebugLoading, "pos: %ld frameSize: %d (0x%x) streamSize: %d", _framesStream->pos() - 2, frameSize, frameSize, _framesStreamSize);
+ debugC(4, kDebugLoading, "pos: %" PRId64 " frameSize: %d (0x%x) streamSize: %d", _framesStream->pos() - 2, frameSize, frameSize, _framesStreamSize);
assert(frameSize < _framesStreamSize);
debugC(3, kDebugLoading, "++++++++++ score load frame %d (frameSize %d) saveOffset", _curFrameNumber, frameSize);
Commit: c1a98b91d66c1159752e90c1042d2498d0eb5eb5
https://github.com/scummvm/scummvm/commit/c1a98b91d66c1159752e90c1042d2498d0eb5eb5
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2024-08-11T16:33:53+02:00
Commit Message:
FREESCAPE: Fix -Wformat warning
Changed paths:
engines/freescape/loaders/8bitBinaryLoader.cpp
diff --git a/engines/freescape/loaders/8bitBinaryLoader.cpp b/engines/freescape/loaders/8bitBinaryLoader.cpp
index e2db32671d5..c401193dd42 100644
--- a/engines/freescape/loaders/8bitBinaryLoader.cpp
+++ b/engines/freescape/loaders/8bitBinaryLoader.cpp
@@ -989,7 +989,7 @@ void FreescapeEngine::loadMessagesVariableSize(Common::SeekableReadStream *file,
_messagesList.push_back(message);
debugC(1, kFreescapeDebugParser, "'%s'", _messagesList[i].c_str());
}
- debugC(1, kFreescapeDebugParser, "End of messages at %lx", file->pos());
+ debugC(1, kFreescapeDebugParser, "End of messages at %" PRIx64, file->pos());
}
void FreescapeEngine::loadGlobalObjects(Common::SeekableReadStream *file, int offset, int size) {
Commit: da27af01042ed32f517fc280ee83d8f0ea3309ba
https://github.com/scummvm/scummvm/commit/da27af01042ed32f517fc280ee83d8f0ea3309ba
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2024-08-11T16:33:53+02:00
Commit Message:
IMMORTAL: Fix -Wformat warning
Changed paths:
engines/immortal/kernal.cpp
diff --git a/engines/immortal/kernal.cpp b/engines/immortal/kernal.cpp
index 985bc6a2a34..c7d9c3d725b 100644
--- a/engines/immortal/kernal.cpp
+++ b/engines/immortal/kernal.cpp
@@ -487,7 +487,7 @@ int ImmortalEngine::loadUniv(char mazeNum) {
debug("Error, couldn't load maze %d.CNM", mazeNum);
return -1;
}
- debug("Size of maze CNM: %ld", mazeCNM->size());
+ debug("Size of maze CNM: %" PRId64, mazeCNM->size());
// The logical CNM contains the contents of mazeN.CNM, with every entry being bitshifted left once
_logicalCNM = (uint16 *)malloc(mazeCNM->size());
@@ -507,7 +507,7 @@ int ImmortalEngine::loadUniv(char mazeNum) {
debug("Error, couldn't load maze %d.UNV", mazeNum);
return -1;
}
- debug("Size of maze UNV: %ld", mazeUNV->size());
+ debug("Size of maze UNV: %" PRId64, mazeUNV->size());
// This is also where the pointer to CNM is defined, because it is 26 bytes after the pointer to Univ. However for our purposes these are separate
@@ -547,7 +547,7 @@ int ImmortalEngine::loadUniv(char mazeNum) {
// We then uncompress all of that data
mazeUNV->seek(lStuff);
_dataBuffer = unCompress((Common::File *)mazeUNV, lData);
- debug("size of uncompressed CNM/CBM data %ld", _dataBuffer->size());
+ debug("size of uncompressed CNM/CBM data %" PRId64, _dataBuffer->size());
// Check every entry in the CNM (while we add them). The highest number is the total number of tiles in the file
_CNM = (uint16 *)malloc(_univ->_num2Cells);
Commit: 985c9f5eecb51e25b4e1b09b2be6ff5e7336fd85
https://github.com/scummvm/scummvm/commit/985c9f5eecb51e25b4e1b09b2be6ff5e7336fd85
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2024-08-11T16:33:53+02:00
Commit Message:
M4: Fix -Wformat warning
Changed paths:
engines/m4/wscript/ws_hal.cpp
diff --git a/engines/m4/wscript/ws_hal.cpp b/engines/m4/wscript/ws_hal.cpp
index 6d888e45d13..4c59d169866 100644
--- a/engines/m4/wscript/ws_hal.cpp
+++ b/engines/m4/wscript/ws_hal.cpp
@@ -71,14 +71,14 @@ void ws_DumpMachine(machine *m, Common::WriteStream *logFile) {
// Loop through the main set of registers, and dump out the contents
for (i = 0; i < IDX_COUNT; i++) {
tempFloat = (float)(myRegs[i] >> 16) + (float)((float)(myRegs[i] & 0xffff) / (float)65536);
- logFile->writeString(Common::String::format("\t%d\t%s:\t\t%.2f\t\t0x%08lx\n", i, myRegLabels[i], tempFloat, myRegs[i]));
+ logFile->writeString(Common::String::format("\t%d\t%s:\t\t%.2f\t\t0x%08" PRIx64 "\n", i, myRegLabels[i], tempFloat, (int64)myRegs[i]));
}
// If the anim8 has extra local regs
if (myAnim8->numLocalVars > 0) {
for (i = IDX_COUNT; i < IDX_COUNT + myAnim8->numLocalVars; i++) {
tempFloat = (float)(myRegs[i] >> 16) + (float)((float)(myRegs[i] & 0xffff) / (float)65536);
- logFile->writeString(Common::String::format("\t%d\tlocal.%d:\t\t%.2f\t\t0x%08lx\n", i, i - IDX_COUNT, tempFloat, myRegs[i]));
+ logFile->writeString(Common::String::format("\t%d\tlocal.%d:\t\t%.2f\t\t0x%08" PRIx64 "\n", i, i - IDX_COUNT, tempFloat, (int64)myRegs[i]));
}
}
logFile->writeString(Common::String::format("\n"));
Commit: cbe7aec966935670cbcf719c31effe873db9aab9
https://github.com/scummvm/scummvm/commit/cbe7aec966935670cbcf719c31effe873db9aab9
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2024-08-11T16:33:53+02:00
Commit Message:
WAGE: Fix -Wformat warning
Changed paths:
engines/wage/world.cpp
diff --git a/engines/wage/world.cpp b/engines/wage/world.cpp
index 7e8ba7f6faf..0dbe0e61c63 100644
--- a/engines/wage/world.cpp
+++ b/engines/wage/world.cpp
@@ -336,7 +336,7 @@ bool World::loadWorld(Common::MacResManager *resMan) {
res->skip(8); // Skip 8 more bytes
- debug(3, "Loading 29 patterns for Enhanced Scepters at %ld", res->pos());
+ debug(3, "Loading 29 patterns for Enhanced Scepters at %" PRId64, res->pos());
for (int i = 0; i < 29; i++) {
byte *pattern = (byte *)malloc(8);
Commit: 630c764ac8fdc5a9fdec431d0a36dfd66a428754
https://github.com/scummvm/scummvm/commit/630c764ac8fdc5a9fdec431d0a36dfd66a428754
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2024-08-11T16:33:53+02:00
Commit Message:
IMAGE: Fix ALIGN() macro redefinition warning on NDS
Changed paths:
image/codecs/svq1.cpp
diff --git a/image/codecs/svq1.cpp b/image/codecs/svq1.cpp
index 5f8d34d539d..f4bd1b803d5 100644
--- a/image/codecs/svq1.cpp
+++ b/image/codecs/svq1.cpp
@@ -94,7 +94,7 @@ SVQ1Decoder::~SVQ1Decoder() {
}
}
-#define ALIGN(x, a) (((x)+(a)-1)&~((a)-1))
+#define SVQ1_ALIGN(x, a) (((x)+(a)-1)&~((a)-1))
const Graphics::Surface *SVQ1Decoder::decodeFrame(Common::SeekableReadStream &stream) {
debug(1, "SVQ1Decoder::decodeImage()");
@@ -185,10 +185,10 @@ const Graphics::Surface *SVQ1Decoder::decodeFrame(Common::SeekableReadStream &st
frameData.skip(8);
}
- uint yWidth = ALIGN(_frameWidth, 16);
- uint yHeight = ALIGN(_frameHeight, 16);
- uint uvWidth = ALIGN(yWidth / 4, 16);
- uint uvHeight = ALIGN(yHeight / 4, 16);
+ uint yWidth = SVQ1_ALIGN(_frameWidth, 16);
+ uint yHeight = SVQ1_ALIGN(_frameHeight, 16);
+ uint uvWidth = SVQ1_ALIGN(yWidth / 4, 16);
+ uint uvHeight = SVQ1_ALIGN(yHeight / 4, 16);
uint uvPitch = uvWidth + 4; // we need at least one extra column and pitch must be divisible by 4
byte *current[3];
Commit: de33c1fc06b6ad7337b90deec12c179007423c03
https://github.com/scummvm/scummvm/commit/de33c1fc06b6ad7337b90deec12c179007423c03
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2024-08-11T16:33:53+02:00
Commit Message:
DGDS: Fix -Wpedantic warning about double ";"
Changed paths:
engines/dgds/scene.cpp
diff --git a/engines/dgds/scene.cpp b/engines/dgds/scene.cpp
index ef712bc022e..dec74f8ba5e 100644
--- a/engines/dgds/scene.cpp
+++ b/engines/dgds/scene.cpp
@@ -930,7 +930,7 @@ bool Scene::checkConditions(const Common::Array<SceneConditions> &conds) const {
}
-bool SDSScene::_dlgWithFlagLo8IsClosing = false;;
+bool SDSScene::_dlgWithFlagLo8IsClosing = false;
DialogFlags SDSScene::_sceneDialogFlags = kDlgFlagNone;
SDSScene::SDSScene() : _num(-1), _dragItem(nullptr), _shouldClearDlg(false), _ignoreMouseUp(false), _field6_0x14(0), _rbuttonDown(false) {
More information about the Scummvm-git-logs
mailing list