Merged revision(s) 22447 from trunk/OpenMPT:

manxorist · manxorist · commit 8ede2ebced13 · 2024-12-02T10:32:06.000Z
[Ref] IT Compression: Make clang static analyzer happy. ........ git-svn-id: https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.30@22449 56274372-70c3-4bfc-bfc3-4c3a0b034d27
diff --git a/soundlib/ITCompression.cpp b/soundlib/ITCompression.cpp
@@ -154,10 +154,11 @@ void ITCompression::CompressBlock(const typename Properties::sample_t *data, Smp
 	{
 		if(bwt[i] != width)
 		{
+			MPT_ASSERT(width >= 0);
 			if(width <= 6)
 			{
 				// Mode A: 1 to 6 bits
-				MPT_ASSERT(width);
+				MPT_ASSERT(width != 0);
 				WriteBits(width, (1 << (width - 1)));
 				WriteBits(Properties::fetchA, ConvertWidth(width, bwt[i]));
 			} else if(width < Properties::defWidth)

Original file line number	Diff line number	Diff line change
`@@ -154,10 +154,11 @@ void ITCompression::CompressBlock(const typename Properties::sample_t *data, Smp`
`154`	`154`	`{`
`155`	`155`	`if(bwt[i] != width)`
`156`	`156`	`{`
	`157`	`+ MPT_ASSERT(width >= 0);`
`157`	`158`	`if(width <= 6)`
`158`	`159`	`{`
`159`	`160`	`// Mode A: 1 to 6 bits`
`160`		`- MPT_ASSERT(width);`
	`161`	`+ MPT_ASSERT(width != 0);`
`161`	`162`	`WriteBits(width, (1 << (width - 1)));`
`162`	`163`	`WriteBits(Properties::fetchA, ConvertWidth(width, bwt[i]));`
`163`	`164`	`} else if(width < Properties::defWidth)`