Commit 13cf3af4 authored by Robert Sprowson's avatar Robert Sprowson

Failure to plot JPEG would not switch output back.

Always switches back now before reporting the error.

Version 2.09. Tagged as 'Paint-2_09'
parent 58d77a84
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "2.08"
Module_Version SETA 208
Module_MajorVersion SETS "2.09"
Module_Version SETA 209
Module_MinorVersion SETS ""
Module_Date SETS "24 Jul 2011"
Module_ApplicationDate SETS "24-Jul-11"
Module_Date SETS "24 Sep 2011"
Module_ApplicationDate SETS "24-Sep-11"
Module_ComponentName SETS "Paint"
Module_ComponentPath SETS "castle/RiscOS/Sources/Apps/Paint"
Module_FullVersion SETS "2.08"
Module_HelpVersion SETS "2.08 (24 Jul 2011)"
Module_FullVersion SETS "2.09"
Module_HelpVersion SETS "2.09 (24 Sep 2011)"
END
/* (2.08)
/* (2.09)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 2.08
#define Module_MajorVersion_CMHG 2.09
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 24 Jul 2011
#define Module_Date_CMHG 24 Sep 2011
#define Module_MajorVersion "2.08"
#define Module_Version 208
#define Module_MajorVersion "2.09"
#define Module_Version 209
#define Module_MinorVersion ""
#define Module_Date "24 Jul 2011"
#define Module_Date "24 Sep 2011"
#define Module_ApplicationDate "24-Jul-11"
#define Module_ApplicationDate "24-Sep-11"
#define Module_ComponentName "Paint"
#define Module_ComponentPath "castle/RiscOS/Sources/Apps/Paint"
#define Module_FullVersion "2.08"
#define Module_HelpVersion "2.08 (24 Jul 2011)"
#define Module_LibraryVersionInfo "2:8"
#define Module_FullVersion "2.09"
#define Module_HelpVersion "2.09 (24 Sep 2011)"
#define Module_LibraryVersionInfo "2:9"
......@@ -386,16 +386,18 @@ static os_error *main_plot_fromjpeg (sprite_area *area, sprite_header *header, j
{ os_error *error;
int s1, s2, s3;
/* Switch to sprite, plot the JPEG, switch back */
/* Switch to sprite, plot the JPEG */
error = os_swix4r (OS_SpriteOp, 0x23C, area, header, 0,
NULL, &s1, &s2, &s3);
if (error != NULL) return error;
error = jpeg_put_scaled (jid, 0, 0, NULL,
jpeg_PUT_DITHER_ENABLE | jpeg_PUT_ERROR_DIFFUSED_DITHER);
if (error != NULL) return error;
return os_swix4 (OS_SpriteOp, 0x23C, s1, s2, s3);
/* Unconditionally switch back */
os_swix4 (OS_SpriteOp, 0x23C, s1, s2, s3);
return error;
}
static void main_icon_bboxes (main_window *window, main_sprite *sprite, wimp_box *iniconbbox,
......
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