Renamed symbols so module can build with OSLib 6.90.

Version 0.50. Tagged as 'Picker-0_50'

Support011/doc/c/ex0

@@ -39,7 +39,7 @@ _kernel_oserror *x (int page, char *t)
 
    while (more)
    {  swi_regs.r [0] = os_COLOUR_BLACK;
-      swi_regs.r [3] = colourtrans_SET_FG;
+      swi_regs.r [3] = colourtrans_SET_FG_GCOL;
       swi_regs.r [4] = os_ACTION_OVERWRITE;
 
       if ((oserror = _kernel_swi (ColourTrans_SetGCOL, &swi_regs, &swi_regs))

Support011/doc/c/ex1

@@ -31,7 +31,7 @@ os_error *x (int page, char *t)
 
    while (more)
    {  if ((error = xcolourtrans_set_gcol (os_COLOUR_BLACK,
-            colourtrans_SET_FG, os_ACTION_OVERWRITE, NULL, NULL))
+            colourtrans_SET_FG_GCOL, os_ACTION_OVERWRITE, NULL, NULL))
             != NULL)
          goto finish;
 

Support011/doc/c/ex2

@@ -26,7 +26,7 @@ void x (int page, char *t)
 
    for (pdriver_draw_page (1, &req, page, NULL, &more, NULL);
          more; pdriver_get_rectangle (&req, &more, NULL))
-   {  colourtrans_set_gcol (os_COLOUR_BLACK, colourtrans_SET_FG,
+   {  colourtrans_set_gcol (os_COLOUR_BLACK, colourtrans_SET_FG_GCOL,
             os_ACTION_OVERWRITE, NULL, NULL);
 
       font_paint (0, t, NONE, 0, 0, NULL, NULL, 0);

Support011/doc/x

@@ -181,7 +181,7 @@ return codes, a printing loop might look like this:
 
       while (more)
       {  if ((error = xcolourtrans_set_gcol (os_COLOUR_BLACK,
-               colourtrans_SET_FG, os_ACTION_OVERWRITE, NULL, NULL))
+               colourtrans_SET_FG_GCOL, os_ACTION_OVERWRITE, NULL, NULL))
                != NULL)
             goto finish;
 
@@ -200,7 +200,7 @@ whereas if you can call x-clear SWI's, you can write instead:
 
       for (more = pdriver_draw_page (1, &req, page, NULL, NULL);
             more; more = pdriver_get_rectangle (&req, NULL))
-      {  colourtrans_set_gcol (os_COLOUR_BLACK, colourtrans_SET_FG,
+      {  colourtrans_set_gcol (os_COLOUR_BLACK, colourtrans_SET_FG_GCOL,
                os_ACTION_OVERWRITE, NULL, NULL);
 
          font_paint (0, t, NONE, 0, 0, NULL, NULL, 0);

VersionNum

-/* (0.49)
+/* (0.50)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
- * Last processed by srccommit version: 1.68.
+ * Last processed by srccommit version: 1.1.
  *
  */
-#define Module_MajorVersion_CMHG        0.49
+#define Module_MajorVersion_CMHG        0.50
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                25 Oct 2002
+#define Module_Date_CMHG                17 Oct 2008
 
-#define Module_MajorVersion             "0.49"
-#define Module_Version                  49
+#define Module_MajorVersion             "0.50"
+#define Module_Version                  50
 #define Module_MinorVersion             ""
-#define Module_Date                     "25 Oct 2002"
+#define Module_Date                     "17 Oct 2008"
 
-#define Module_ApplicationDate          "25-Oct-02"
+#define Module_ApplicationDate          "17-Oct-08"
 
 #define Module_ComponentName            "Picker"
 #define Module_ComponentPath            "RiscOS/Sources/Video/UserI/Picker"
 
-#define Module_FullVersion              "0.49"
-#define Module_HelpVersion              "0.49 (25 Oct 2002)"
-#define Module_LibraryVersionInfo       "0:49"
+#define Module_FullVersion              "0.50"
+#define Module_HelpVersion              "0.50 (17 Oct 2008)"
+#define Module_LibraryVersionInfo       "0:50"

c/cmyk

@@ -932,8 +932,8 @@ static os_error *Set_Colour (colourpicker_colour *colour)
    tracef ("Set_Colour (%d, %d, %d)\n" _
          cmyk->cyan _ cmyk->magenta _ cmyk->yellow _ cmyk->key);
 
-   if ((error = xcolourtrans_set_gcol (Colour (cmyk), colourtrans_SET_FG |
-         colourtrans_USE_ECFS, os_ACTION_OVERWRITE, NULL, NULL)) != NULL)
+   if ((error = xcolourtrans_set_gcol (Colour (cmyk), colourtrans_SET_FG_GCOL |
+         colourtrans_USE_ECFS_GCOL, os_ACTION_OVERWRITE, NULL, NULL)) != NULL)
       goto finish;
 
 finish:

c/hsv

@@ -118,8 +118,8 @@ static os_error *Use_Rectangles (wimp_draw *draw, int *h, int *s, int *v,
                   os_BSHIFT;
 
          if
-         (  (error = xcolourtrans_set_gcol (c, colourtrans_SET_FG |
-                  colourtrans_USE_ECFS, os_ACTION_OVERWRITE, NULL, NULL)) !=
+         (  (error = xcolourtrans_set_gcol (c, colourtrans_SET_FG_GCOL |
+                  colourtrans_USE_ECFS_GCOL, os_ACTION_OVERWRITE, NULL, NULL)) !=
                   NULL ||
 
             (  error = xos_plot
@@ -1857,8 +1857,8 @@ static os_error *Set_Colour (colourpicker_colour *colour)
    tracef ("Set_Colour (%d, %d, %d)\n" _
          hsv->hue _ hsv->saturation _ hsv->value);
 
-   if ((error = xcolourtrans_set_gcol (Colour (hsv), colourtrans_SET_FG |
-         colourtrans_USE_ECFS, os_ACTION_OVERWRITE, NULL, NULL)) != NULL)
+   if ((error = xcolourtrans_set_gcol (Colour (hsv), colourtrans_SET_FG_GCOL |
+         colourtrans_USE_ECFS_GCOL, os_ACTION_OVERWRITE, NULL, NULL)) != NULL)
       goto finish;
 
 finish:

c/rgb

@@ -106,7 +106,7 @@ static os_error *Use_Rectangles (wimp_draw *draw, os_colour *c,
 
          if
          (  (error = xcolourtrans_set_gcol (*c,
-                  colourtrans_SET_FG | colourtrans_USE_ECFS,
+                  colourtrans_SET_FG_GCOL | colourtrans_USE_ECFS_GCOL,
                   os_ACTION_OVERWRITE, NULL, NULL)) != NULL ||
 
             (  error = xos_plot
@@ -1768,8 +1768,8 @@ static os_error *Set_Colour (colourpicker_colour *colour)
 
    tracef ("Set_Colour (%d, %d, %d)\n" _ rgb->red _ rgb->green _ rgb->blue);
 
-   if ((error = xcolourtrans_set_gcol (Colour (rgb), colourtrans_SET_FG |
-         colourtrans_USE_ECFS, os_ACTION_OVERWRITE, NULL, NULL)) != NULL)
+   if ((error = xcolourtrans_set_gcol (Colour (rgb), colourtrans_SET_FG_GCOL |
+         colourtrans_USE_ECFS_GCOL, os_ACTION_OVERWRITE, NULL, NULL)) != NULL)
       goto finish;
 
    tracef ("set colour to 0x%X\n" _ Colour (rgb));