Add more promises

solidpixel · solidpixel · commit 2f713ff9d71c · 2022-12-08T22:14:49.000Z
diff --git a/Source/astcenc_ideal_endpoints_and_weights.cpp b/Source/astcenc_ideal_endpoints_and_weights.cpp
@@ -692,6 +692,7 @@ float compute_error_of_weight_set_1plane(
 ) {
 	vfloatacc error_summav = vfloatacc::zero();
 	unsigned int texel_count = di.texel_count;
+	promise(texel_count > 0);
 
 	// Process SIMD-width chunks, safe to over-fetch - the extra space is zero initialized
 	if (di.max_texel_weight_count > 2)
@@ -757,6 +758,7 @@ float compute_error_of_weight_set_2planes(
 ) {
 	vfloatacc error_summav = vfloatacc::zero();
 	unsigned int texel_count = di.texel_count;
+	promise(texel_count > 0);
 
 	// Process SIMD-width chunks, safe to over-fetch - the extra space is zero initialized
 	if (di.max_texel_weight_count > 2)
diff --git a/Source/astcenc_integer_sequence.cpp b/Source/astcenc_integer_sequence.cpp
@@ -639,7 +639,6 @@ void encode_ise(
 	// Write out just bits
 	else
 	{
-		promise(character_count > 0);
 		for (unsigned int i = 0; i < character_count; i++)
 		{
 			write_bits(input_data[i], bits, bit_offset, output_data);
@@ -708,6 +707,7 @@ void decode_ise(
 	if (trits)
 	{
 		unsigned int trit_blocks = (character_count + 4) / 5;
+		promise(trit_blocks > 0);
 		for (unsigned int i = 0; i < trit_blocks; i++)
 		{
 			const uint8_t *tritptr = trits_of_integer[tq_blocks[i]];
@@ -722,6 +722,7 @@ void decode_ise(
 	if (quints)
 	{
 		unsigned int quint_blocks = (character_count + 2) / 3;
+		promise(quint_blocks > 0);
 		for (unsigned int i = 0; i < quint_blocks; i++)
 		{
 			const uint8_t *quintptr = quints_of_integer[tq_blocks[i]];

Original file line number	Diff line number	Diff line change
`@@ -639,7 +639,6 @@ void encode_ise(`
`639`	`639`	`// Write out just bits`
`640`	`640`	`else`
`641`	`641`	`{`
`642`		`- promise(character_count > 0);`
`643`	`642`	`for (unsigned int i = 0; i < character_count; i++)`
`644`	`643`	`{`
`645`	`644`	`write_bits(input_data[i], bits, bit_offset, output_data);`
`@@ -708,6 +707,7 @@ void decode_ise(`
`708`	`707`	`if (trits)`
`709`	`708`	`{`
`710`	`709`	`unsigned int trit_blocks = (character_count + 4) / 5;`
	`710`	`+ promise(trit_blocks > 0);`
`711`	`711`	`for (unsigned int i = 0; i < trit_blocks; i++)`
`712`	`712`	`{`
`713`	`713`	`const uint8_t *tritptr = trits_of_integer[tq_blocks[i]];`
`@@ -722,6 +722,7 @@ void decode_ise(`
`722`	`722`	`if (quints)`
`723`	`723`	`{`
`724`	`724`	`unsigned int quint_blocks = (character_count + 2) / 3;`
	`725`	`+ promise(quint_blocks > 0);`
`725`	`726`	`for (unsigned int i = 0; i < quint_blocks; i++)`
`726`	`727`	`{`
`727`	`728`	`const uint8_t *quintptr = quints_of_integer[tq_blocks[i]];`