From b2c3268df1ee1856cfdced82db5039acd6755d2e Mon Sep 17 00:00:00 2001
From: Ben Avison <bavison@gitlab.riscosopen.org>
Date: Wed, 9 Dec 1998 12:56:50 +0000
Subject: [PATCH] Bugfix: if a >=256-colour sprite icon is plotted, and then a
shaded and/or selected text-plus-sprite icon is plotted, where the sprite in
the latter icon is unspecified (no validation string, or no 'S' command),
then a SpriteOp call from within ColourTrans data aborts. This caused aborts
when certain rectangles of the ImageFS options window were redrawn.
Version 4.13. Not tagged
---
VersionASM | 2 +-
VersionNum | 4 ++--
s/Wimp04 | 1 +
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/VersionASM b/VersionASM
index b1546d7..488d83e 100644
--- a/VersionASM
+++ b/VersionASM
@@ -8,5 +8,5 @@
Module_MajorVersion SETS "4.13"
Module_Version SETA 413
Module_MinorVersion SETS ""
-Module_Date SETS "27 Nov 1998"
+Module_Date SETS "09 Dec 1998"
END
diff --git a/VersionNum b/VersionNum
index 3d27861..0ea1fc8 100644
--- a/VersionNum
+++ b/VersionNum
@@ -5,10 +5,10 @@
*/
#define Module_MajorVersion_CMHG 4.13
#define Module_MinorVersion_CMHG
-#define Module_Date_CMHG 27 Nov 1998
+#define Module_Date_CMHG 09 Dec 1998
#define Module_MajorVersion "4.13"
#define Module_Version 413
#define Module_MinorVersion ""
-#define Module_Date "27 Nov 1998"
+#define Module_Date "09 Dec 1998"
diff --git a/s/Wimp04 b/s/Wimp04
index 67edd55..227c912 100644
--- a/s/Wimp04
+++ b/s/Wimp04
@@ -3809,6 +3809,7 @@ calcinverse ROUT
LDR R1, sprite_log2bpp ; if <256-colour sprite without palette, we pass palette from Wimp workspace, so no problem
CMP R1, #3 ; if <256-colour sprite with palette, cachespritedata has already updated pixtable_params
BLGE cachespriteaddress ; R2 -> this sprite, ie *not* the first sprite in this run of matching-mode sprites!
+ EXIT VS ; bail out now if sprite not found!
CMP R1, #3
Push "R2", GE
ADR R0, pixtable_params
--
GitLab