From ef56e590dd257d6d5ff5d106f9f8d312d711ed6d Mon Sep 17 00:00:00 2001 From: DarkWyrm Date: Sun, 5 Oct 2003 17:40:20 +0000 Subject: [PATCH] Speedup for color lookups Prevent crashes when things other than the server utilize LayerData objects git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4949 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/servers/app/LayerData.h | 3 ++- headers/private/servers/app/RGBColor.h | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/headers/private/servers/app/LayerData.h b/headers/private/servers/app/LayerData.h index 66cd8177c2..505fc77007 100644 --- a/headers/private/servers/app/LayerData.h +++ b/headers/private/servers/app/LayerData.h @@ -37,7 +37,8 @@ public: alphaFncMode = B_ALPHA_OVERLAY; scale = 1.0; fontAliasing = true; - font = *(fontserver->GetSystemPlain()); + if(fontserver) + font = *(fontserver->GetSystemPlain()); clippReg = NULL; diff --git a/headers/private/servers/app/RGBColor.h b/headers/private/servers/app/RGBColor.h index 3a18d58718..896584b578 100644 --- a/headers/private/servers/app/RGBColor.h +++ b/headers/private/servers/app/RGBColor.h @@ -51,8 +51,8 @@ public: void PrintToStream(void) const; - uint8 GetColor8(void) const; - uint16 GetColor16(void) const; + uint8 GetColor8(void); + uint16 GetColor16(void); rgb_color GetColor32(void) const; void SetColor(uint8 r, uint8 g, uint8 b, uint8 a=255); @@ -72,6 +72,7 @@ protected: rgb_color color32; uint16 color16; uint8 color8; + bool update8,update16; }; #endif