Commit 21614008 authored by Jeffrey Lee's avatar Jeffrey Lee
Browse files

Fix issues rendering Cyberbit font

Detail:
  s/Fonts01 - Increase scratchsize from 8K to 12K. 8K was slightly too small for Cyberbit char 0x98f8.
  s/Fonts04 - Fix CachePixels to correctly return any errors generated by CacheChunk
Admin:
  Tested on rev A2 BB-xM.
  Cyberbit char 0x98f8 now renders properly instead of returning a duff error pointer.


Version 3.68. Tagged as 'Manager-3_68'
parent a8f3d0b8
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "3.67"
Module_Version SETA 367
Module_MajorVersion SETS "3.68"
Module_Version SETA 368
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 "Manager"
Module_ComponentPath SETS "castle/RiscOS/Sources/Video/Render/Fonts/Manager"
Module_FullVersion SETS "3.67"
Module_HelpVersion SETS "3.67 (24 Jul 2011)"
Module_FullVersion SETS "3.68"
Module_HelpVersion SETS "3.68 (24 Sep 2011)"
END
/* (3.67)
/* (3.68)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 3.67
#define Module_MajorVersion_CMHG 3.68
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 24 Jul 2011
#define Module_Date_CMHG 24 Sep 2011
#define Module_MajorVersion "3.67"
#define Module_Version 367
#define Module_MajorVersion "3.68"
#define Module_Version 368
#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 "Manager"
#define Module_ComponentPath "castle/RiscOS/Sources/Video/Render/Fonts/Manager"
#define Module_FullVersion "3.67"
#define Module_HelpVersion "3.67 (24 Jul 2011)"
#define Module_LibraryVersionInfo "3:67"
#define Module_FullVersion "3.68"
#define Module_HelpVersion "3.68 (24 Sep 2011)"
#define Module_LibraryVersionInfo "3:68"
......@@ -1699,7 +1699,7 @@ oldpaintmatrix # 4 ; used to minimise calls to GetTransform
paintendaddress # 4 ; used for paintchars (set to &FFFFFFFF if no end)
scratchblock # 4 ; pointer to block used for Draw module stuff
scratchsize * 4096 *2 ; size of block
scratchsize * 4096 *3 ; size of block
relocSP # 4
......
......@@ -1232,6 +1232,8 @@ CachePixels Entry "R0-R4,cacheptr"
LDRB R4,[R6,R7] ; get flags from font header if no transform
01 BL CacheChunk
STRVS R0,[R13]
CheckCache "cachepixels untransformed exit"
EXIT
......@@ -1250,6 +1252,7 @@ CachePixels Entry "R0-R4,cacheptr"
STR R14,[R1,#std_size]
BL CacheChunk ; returns R6 -> chunk containing char (chunk younger than char)
STRVS R0,[R13]
LDR R1,transformptr ; relocated if nec.
LDR R14,[R1,#std_size]
......
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