[OMPT-svn-commit] OpenMPT r21378 - in branches/OpenMPT-1.31: . soundlib

[<sv...@op...>]

Author: manx
Date: Sat Aug 10 08:41:08 2024
New Revision: 21378
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21378

Log:
Merged revision(s) 21377 from trunk/OpenMPT:
[Ref] Silence GCC -Wconversion warnings.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/soundlib/Load_med.cpp

Modified: branches/OpenMPT-1.31/soundlib/Load_med.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/Load_med.cpp	Sat Aug 10 08:38:59 2024	(r21377)
+++ branches/OpenMPT-1.31/soundlib/Load_med.cpp	Sat Aug 10 08:41:08 2024	(r21378)
@@ -1467,7 +1467,7 @@
 			}
 			Patterns[pat].WriteEffect(EffectWriter(CMD_POSITIONJUMP, mpt::saturate_cast<ModCommand::PARAM>(to)).Row(Patterns[pat].GetNumRows() - 1).RetryPreviousRow());
 			if(pat >= basePattern && (pat - basePattern) >= numPatterns)
-				numPatterns = pat - basePattern + 1;
+				numPatterns = static_cast<PATTERNINDEX>(pat - basePattern + 1);
 		}
 
 		if(numSongs > 1)
@@ -1481,7 +1481,7 @@
 					Patterns[firstPat].WriteEffect(EffectWriter(CMD_PANNING8, mpt::saturate_cast<ModCommand::PARAM>(ChnSettings[chn].nPan)).Channel(chn).RetryNextRow());
 				}
 				if(firstPat >= basePattern && (firstPat - basePattern) >= numPatterns)
-					numPatterns = firstPat - basePattern + 1;
+					numPatterns = static_cast<PATTERNINDEX>(firstPat - basePattern + 1);
 			}
 		}