Extra rlib sprite function for ROM stubs

Detail:
  Export sprite_put_mask_scaled when UROM.
  Also, delete sprite_put_greyscaled() which has been unimplemented in SpriteExtend since RISC OS 3.60.
Admin:
  Required by Paint bounty.

Version 6.05. Not tagged

VersionASM

@@ -12,9 +12,9 @@
 Module_MajorVersion     SETS    "6.05"
 Module_Version          SETA    605
 Module_MinorVersion     SETS    ""
-Module_Date             SETS    "06 May 2020"
-Module_ApplicationDate  SETS    "06-May-20"
+Module_Date             SETS    "09 May 2020"
+Module_ApplicationDate  SETS    "09-May-20"
 Module_ComponentName    SETS    "RISC_OSLib"
 Module_FullVersion      SETS    "6.05"
-Module_HelpVersion      SETS    "6.05 (06 May 2020)"
+Module_HelpVersion      SETS    "6.05 (09 May 2020)"
                         END

VersionNum

@@ -5,17 +5,17 @@
  */
 #define Module_MajorVersion_CMHG        6.05
 #define Module_MinorVersion_CMHG
-#define Module_Date_CMHG                06 May 2020
+#define Module_Date_CMHG                09 May 2020
 
 #define Module_MajorVersion             "6.05"
 #define Module_Version                  605
 #define Module_MinorVersion             ""
-#define Module_Date                     "06 May 2020"
+#define Module_Date                     "09 May 2020"
 
-#define Module_ApplicationDate          "06-May-20"
+#define Module_ApplicationDate          "09-May-20"
 
 #define Module_ComponentName            "RISC_OSLib"
 
 #define Module_FullVersion              "6.05"
-#define Module_HelpVersion              "6.05 (06 May 2020)"
+#define Module_HelpVersion              "6.05 (09 May 2020)"
 #define Module_LibraryVersionInfo       "6:5"

rlib/c/sprite

@@ -510,25 +510,6 @@ os_error * sprite_put_scaled(sprite_area *area, sprite_id *spr,
   return result;
 }
 
-#ifndef UROM
-os_error * sprite_put_greyscaled(sprite_area *area, sprite_id *spr,
-                                 int x, int y,
-                                 sprite_factors *factors,
-                                 sprite_pixtrans *pixtrans)
-{
-  os_regset r;
-  os_error *result;
-  setfromtag(53, area, spr, &r);
-  r.r[3] = x;
-  r.r[4] = y;
-  r.r[5] = 0;                   /* doesn't support mask or gcol action */
-  r.r[6] = (int) factors;
-  r.r[7] = (int) pixtrans;
-  result = sprite__op(&r);
-  return result;
-}
-#endif
-
 #ifndef UROM
 os_error * sprite_put_mask(sprite_area *area, sprite_id *spr)
 {
@@ -552,7 +533,6 @@ os_error * sprite_put_mask_given(sprite_area *area, sprite_id *spr,
   return result;
 }
 
-#ifndef UROM
 os_error * sprite_put_mask_scaled(sprite_area *area, sprite_id *spr,
                                   int x, int y,
                                   sprite_factors *factors)
@@ -566,7 +546,6 @@ os_error * sprite_put_mask_scaled(sprite_area *area, sprite_id *spr,
   result = sprite__op(&r);
   return result;
 }
-#endif
 
 #ifndef UROM
 os_error * sprite_put_char_scaled(char ch,

rlib/h/sprite

@@ -282,16 +282,6 @@ extern os_error * sprite_put_scaled(sprite_area *, sprite_id *, int gcol,
                             sprite_factors *factors,
                             sprite_pixtrans pixtrans[]);
 
-/* ---------------------------- sprite_put_greyscaled ----------------------
- * Plot the specified sprite at (x,y) using the given GCOL action, and
- * greyscaled using the given scale factors.
- *
- */
-extern os_error * sprite_put_greyscaled(sprite_area *, sprite_id *,
-                            int x, int y,
-                            sprite_factors *factors,
-                            sprite_pixtrans pixtrans[]);
-
 /* ----------------------------- sprite_put_mask ---------------------------
  * Plot the specified sprite mask in the background colour.
  *

rlib/s/rl_entries

@@ -304,10 +304,9 @@
 ;        Entry   sprite_put, imported, , , ,
       Entry   sprite_put_given, imported, , , ,
       Entry   sprite_put_scaled, imported, , , ,
-;        Entry   sprite_put_greyscaled, imported, , , ,
 ;        Entry   sprite_put_mask, imported, , , ,
       Entry   sprite_put_mask_given, imported, , , ,
-;        Entry   sprite_put_mask_scaled, imported, , , ,
+      Entry   sprite_put_mask_scaled, imported, , , ,
 ;        Entry   sprite_put_char_scaled, imported, , , ,
       Entry   sprite_create_mask, imported, , , ,
       Entry   sprite_remove_mask, imported, , , ,