Commit 05b310f2 authored by ROOL's avatar ROOL 🤖
Browse files

Fix for camera and scissor tool in 'export' mode

Detail:
  * If the source sprite has an old-style bit mask, solid pixels in the exported sprite's mask may have a different value to the source sprite's. For example 0xFF -> 0xFC.
  * The OS seems to render such intermediate mask values inconsistently.
  Applicable GCOL commands have now replaced with OS_SetColour calls (taken from another fix elsewhere in the code that dates back to Acorn).
Admin:
  See also https://www.riscosopen.org/forum/forums/4/topics/14698
  Submission for the Paint bounty.

Version 2.29. Tagged as 'Paint-2_29'
parent e137ee5d
......@@ -9,12 +9,12 @@
GBLS Module_ApplicationDate
GBLS Module_HelpVersion
GBLS Module_ComponentName
Module_MajorVersion SETS "2.28"
Module_Version SETA 228
Module_MajorVersion SETS "2.29"
Module_Version SETA 229
Module_MinorVersion SETS ""
Module_Date SETS "26 Sep 2019"
Module_ApplicationDate SETS "26-Sep-19"
Module_Date SETS "14 Dec 2019"
Module_ApplicationDate SETS "14-Dec-19"
Module_ComponentName SETS "Paint"
Module_FullVersion SETS "2.28"
Module_HelpVersion SETS "2.28 (26 Sep 2019)"
Module_FullVersion SETS "2.29"
Module_HelpVersion SETS "2.29 (14 Dec 2019)"
END
/* (2.28)
/* (2.29)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 2.28
#define Module_MajorVersion_CMHG 2.29
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 26 Sep 2019
#define Module_Date_CMHG 14 Dec 2019
#define Module_MajorVersion "2.28"
#define Module_Version 228
#define Module_MajorVersion "2.29"
#define Module_Version 229
#define Module_MinorVersion ""
#define Module_Date "26 Sep 2019"
#define Module_Date "14 Dec 2019"
#define Module_ApplicationDate "26-Sep-19"
#define Module_ApplicationDate "14-Dec-19"
#define Module_ComponentName "Paint"
#define Module_FullVersion "2.28"
#define Module_HelpVersion "2.28 (26 Sep 2019)"
#define Module_LibraryVersionInfo "2:28"
#define Module_FullVersion "2.29"
#define Module_HelpVersion "2.29 (14 Dec 2019)"
#define Module_LibraryVersionInfo "2:29"
......@@ -1683,11 +1683,9 @@ static void scissorpaint_null (main_window *window, wimp_mousestr *mpos)
ssid.s.addr = psprite_address (sprite);
sprwindow_swap_output_to_mask (&tempsprite, 0);
bbc_gcol (0, 0);
bbc_gcol (3, 0); /* set empty gcol */
bbc_clg (); /* clear it all out */
bbc_gcol (0, 255);
bbc_gcol (3, 3); /* set solid gcol */
os_swi2 (OS_SetColour, 1 << 4, 0); /* set empty gcol */
bbc_clg (); /* clear it all out */
os_swi2 (OS_SetColour, 1 << 4, -1); /* set solid gcol */
error = sprite_put_mask_given (sprite->file->spritearea,
&ssid, -tools_pixel_to_point_x(&window->data->sprite, sprite->toolspace [1]),
-tools_pixel_to_point_y(&window->data->sprite, sprite->toolspace [2]));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment