From 4347e05fcfdd82dc155678b838065f6c671e75ed Mon Sep 17 00:00:00 2001
From: Robert Sprowson <rsprowson@gitlab.riscosopen.org>
Date: Sat, 25 Sep 2010 15:20:40 +0000
Subject: [PATCH] Reinstate mungeGCOL8to32.

Had erroneously been switched out in version 1.27 clean up, when it is needed. Comment added to denote it's a fall through of the table above it.

Version 1.29. Tagged as 'SprExtend-1_29'
---
 Sources/SprOp |  5 ++---
 VersionASM    |  8 ++++----
 VersionNum    | 14 +++++++-------
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/Sources/SprOp b/Sources/SprOp
index 7293736..f79a589 100644
--- a/Sources/SprOp
+++ b/Sources/SprOp
@@ -1957,8 +1957,8 @@ converttrans_new
         STR     R0,[R2,R8,LSL #2]       ; and store the converted value
         B       converttrans_new        ; outbpp = 3 (and inbpp < 4 log2bpp)
         B       mungeGCOL8to16          ; outbpp = 4
-      [ {FALSE}
-        B       mungeGCOL8to32          ; outbpp = 5
+        ; Fall  mungeGCOL8to32          ; outbpp = 5
+        ; thru
 
 mungeGCOL8to32
         Push    "R2,LR"
@@ -1975,7 +1975,6 @@ mungeGCOL8to32
         ORR     R0,R0,R0,LSR #4         ; R0 =          bbttbbtt ggttggtt rrttrrtt
 
         Pull    "R2,PC"
-      ]
 
 mungeGCOL8to16
       [ vidc20
diff --git a/VersionASM b/VersionASM
index b2285f5..2e04c38 100644
--- a/VersionASM
+++ b/VersionASM
@@ -11,13 +11,13 @@
                         GBLS    Module_HelpVersion
                         GBLS    Module_ComponentName
                         GBLS    Module_ComponentPath
-Module_MajorVersion     SETS    "1.28"
-Module_Version          SETA    128
+Module_MajorVersion     SETS    "1.29"
+Module_Version          SETA    129
 Module_MinorVersion     SETS    ""
 Module_Date             SETS    "25 Sep 2010"
 Module_ApplicationDate  SETS    "25-Sep-10"
 Module_ComponentName    SETS    "SprExtend"
 Module_ComponentPath    SETS    "mixed/RiscOS/Sources/Video/Render/SprExtend"
-Module_FullVersion      SETS    "1.28"
-Module_HelpVersion      SETS    "1.28 (25 Sep 2010)"
+Module_FullVersion      SETS    "1.29"
+Module_HelpVersion      SETS    "1.29 (25 Sep 2010)"
                         END
diff --git a/VersionNum b/VersionNum
index 734044b..f96d849 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,15 +1,15 @@
-/* (1.28)
+/* (1.29)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.1.
  *
  */
-#define Module_MajorVersion_CMHG        1.28
+#define Module_MajorVersion_CMHG        1.29
 #define Module_MinorVersion_CMHG        
 #define Module_Date_CMHG                25 Sep 2010
 
-#define Module_MajorVersion             "1.28"
-#define Module_Version                  128
+#define Module_MajorVersion             "1.29"
+#define Module_Version                  129
 #define Module_MinorVersion             ""
 #define Module_Date                     "25 Sep 2010"
 
@@ -18,6 +18,6 @@
 #define Module_ComponentName            "SprExtend"
 #define Module_ComponentPath            "mixed/RiscOS/Sources/Video/Render/SprExtend"
 
-#define Module_FullVersion              "1.28"
-#define Module_HelpVersion              "1.28 (25 Sep 2010)"
-#define Module_LibraryVersionInfo       "1:28"
+#define Module_FullVersion              "1.29"
+#define Module_HelpVersion              "1.29 (25 Sep 2010)"
+#define Module_LibraryVersionInfo       "1:29"
-- 
GitLab