Commit 36c4fb56 authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Let through post 3.50 sprite types in PDriverDP

Pass the sprite type to OS_ReadModeVariable rather than trying to infer the Log2BPP from the sprite type directly.
Tested printing a Draw file with all true colour combinations of test sprites, via the PCL dumper, to a Kyocera 2551ci colour laser printer.

Version 4.64. Tagged as 'PDModules-4_64'
parent 33efbaaa
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "4.63"
Module_Version SETA 463
Module_MajorVersion SETS "4.64"
Module_Version SETA 464
Module_MinorVersion SETS ""
Module_Date SETS "03 Jul 2018"
Module_ApplicationDate SETS "03-Jul-18"
Module_Date SETS "18 Jul 2018"
Module_ApplicationDate SETS "18-Jul-18"
Module_ComponentName SETS "PDModules"
Module_ComponentPath SETS "castle/RiscOS/Sources/Printing/Modules/PDModules"
Module_FullVersion SETS "4.63"
Module_HelpVersion SETS "4.63 (03 Jul 2018)"
Module_FullVersion SETS "4.64"
Module_HelpVersion SETS "4.64 (18 Jul 2018)"
END
/* (4.63)
/* (4.64)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 4.63
#define Module_MajorVersion_CMHG 4.64
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 03 Jul 2018
#define Module_Date_CMHG 18 Jul 2018
#define Module_MajorVersion "4.63"
#define Module_Version 463
#define Module_MajorVersion "4.64"
#define Module_Version 464
#define Module_MinorVersion ""
#define Module_Date "03 Jul 2018"
#define Module_Date "18 Jul 2018"
#define Module_ApplicationDate "03-Jul-18"
#define Module_ApplicationDate "18-Jul-18"
#define Module_ComponentName "PDModules"
#define Module_ComponentPath "castle/RiscOS/Sources/Printing/Modules/PDModules"
#define Module_FullVersion "4.63"
#define Module_HelpVersion "4.63 (03 Jul 2018)"
#define Module_LibraryVersionInfo "4:63"
#define Module_FullVersion "4.64"
#define Module_HelpVersion "4.64 (18 Jul 2018)"
#define Module_LibraryVersionInfo "4:64"
......@@ -123,10 +123,10 @@ colour_rgbtopixvalwide ROUT
; can't generate magic numbers - need proper GCOL
Push "R2,R3"
CMP LR, #4
MOVEQ R1, #5:SHL:27 ; sprite type = 16 bpp
MOVEQ R1, #SpriteType_New16bpp:SHL:27
MOVEQ R3, #2
CMP LR, #5
MOVEQ R1, #6:SHL:27 ; sprite type = 32 bpp
MOVEQ R1, #SpriteType_New32bpp:SHL:27
MOVEQ R3, #4
ORR R1, R1, #90:SHL:14 ; 90 dpi y
ORR R1, R1, #90:SHL:1 ; 90 dpi x
......
......@@ -85,9 +85,12 @@ sprite_put_altentry
STR R4,job_spritescale +12 ; R3,R4 contain the width, height of sprite (pixels)
[ Medusa
MOV LR, R6, LSR #27 ; XOS_SpriteOp return sprite type in top bits of R6
TEQ LR, #SpriteType_New16bpp
TEQNE LR, #SpriteType_New32bpp
MOV R0,R6
MOV R1,#VduExt_Log2BPP
SWI XOS_ReadModeVariable
MOV LR,R2
TEQ LR,#4
TEQNE LR,#5
BNE %FT02 ; only fake colourtrans tables for 16bpp and 32bpp
[ Libra1
......@@ -370,7 +373,7 @@ colourtrans32K_monodefined
; the four-word anchor block 'colourtrans32K'
;
; Returns the address of the anchor block in R7
; rotuine to allocate colour table via select_table
; routine to allocate colour table via select_table
sprite_make256c32Ktable
EntryS "R0-R5"
......
......@@ -145,9 +145,12 @@ sprite_transhasvalidareapointer
ORR R0,R0, #SpriteReason_ReadSpriteSize
SWI XOS_SpriteOp
MOV LR, R6, LSR #27
TEQ LR, #SpriteType_New16bpp
TEQNE LR, #SpriteType_New32bpp
MOV R0,R6
MOV R1,#VduExt_Log2BPP
SWI XOS_ReadModeVariable
MOV LR,R2
TEQ LR,#4
TEQNE LR,#5
BNE %FT02 ; only fake colourtrans tables for 16bpp and 32bpp
[ Libra1
......
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