[Scummvm-git-logs] scummvm master -> 26b029ceb94ee744715e23155e06036aa9ab653d

[digitall]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
14cb42c6d6 AGOS: Correct Header Guard Define Naming in GMF Midi Parser
26b029ceb9 AGOS: Correct Array Initialization for Correct Size Removing Magic Number


Commit: 14cb42c6d63a62f7abf5873b0fc81b8c34321b10
    https://github.com/scummvm/scummvm/commit/14cb42c6d63a62f7abf5873b0fc81b8c34321b10
Author: D G Turner (digitall at scummvm.org)
Date: 2022-05-09T19:08:34+01:00

Commit Message:
AGOS: Correct Header Guard Define Naming in GMF Midi Parser

Changed paths:
    engines/agos/midiparser_gmf.h


diff --git a/engines/agos/midiparser_gmf.h b/engines/agos/midiparser_gmf.h
index b0a4d20c042..04c0eae3f78 100644
--- a/engines/agos/midiparser_gmf.h
+++ b/engines/agos/midiparser_gmf.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef AGOS_MIDIPARSER_SMF_H
-#define AGOS_MIDIPARSER_SMF_H
+#ifndef AGOS_MIDIPARSER_GMF_H
+#define AGOS_MIDIPARSER_GMF_H
 
 #include "audio/midiparser_smf.h"
 


Commit: 26b029ceb94ee744715e23155e06036aa9ab653d
    https://github.com/scummvm/scummvm/commit/26b029ceb94ee744715e23155e06036aa9ab653d
Author: D G Turner (digitall at scummvm.org)
Date: 2022-05-09T19:09:18+01:00

Commit Message:
AGOS: Correct Array Initialization for Correct Size Removing Magic Number

MAXIMUM_TRACKS is defined as 120 in the MidiParser superclass, but this
was also lacking a sizeof(byte *) multiplication. This should be neater.

Changed paths:
    engines/agos/midiparser_gmf.cpp


diff --git a/engines/agos/midiparser_gmf.cpp b/engines/agos/midiparser_gmf.cpp
index 0877ceb52dd..5d564e4de9e 100644
--- a/engines/agos/midiparser_gmf.cpp
+++ b/engines/agos/midiparser_gmf.cpp
@@ -26,7 +26,7 @@
 namespace AGOS {
 
 MidiParser_GMF::MidiParser_GMF(int8 source, bool useDosTempos) : MidiParser_SMF(source), _useDosTempos(useDosTempos) {
-	memset(_tracksEndPos, 0, 120);
+	memset(_tracksEndPos, 0, sizeof(_tracksEndPos));
 }
 
 void MidiParser_GMF::parseNextEvent(EventInfo &info) {