From b81bf2d1c92e2ac820d2116c66f328869eb627cd Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Mon, 31 May 2004 18:00:00 +0200
Subject: =?UTF-8?q?Version=201.3.9=20-=20Completed=20Croatian=20language?=
 =?UTF-8?q?=20texts=20(thanks=20to=20Drazen=20Dupor).=20-=20New=20iso8859-?=
 =?UTF-8?q?2=20font=20to=20fix=20the=20problem=20with=20program=20freezes?=
 =?UTF-8?q?=20(thanks=20to=20Drazen=20Dupor).=20-=20Implemented=20a=20defa?=
 =?UTF-8?q?ult=20cRemote::Initialize()=20that=20waits=2010=20seconds=20for?=
 =?UTF-8?q?=20a=20keypress=20=20=20in=20order=20to=20prevent=20a=20"hangup?=
 =?UTF-8?q?"=20in=20case,=20e.g.,=20the=20LIRC=20driver=20is=20not=20loade?=
 =?UTF-8?q?d=20(thanks=20=20=20to=20Helmut=20Auer).=20-=20Updated=20'chann?=
 =?UTF-8?q?els.conf.terr'=20for=20Hannover=20(thanks=20to=20Peter=20Waecht?=
 =?UTF-8?q?ler).=20-=20cBitmap::DrawBitmap()=20now=20also=20resets=20the?=
 =?UTF-8?q?=20palette=20if=20the=20entire=20bitmap=20area=20is=20=20=20cov?=
 =?UTF-8?q?ered=20(suggested=20by=20Sascha=20Volkenandt).=20-=20Fixed=20se?=
 =?UTF-8?q?tting=20the=20title=20in=20the=20replay=20display=20of=20the=20?=
 =?UTF-8?q?"Classic=20VDR"=20skin=20in=20case=20=20=20a=20shorter=20title?=
 =?UTF-8?q?=20is=20set=20after=20a=20longer=20one=20(thanks=20to=20Stefan?=
 =?UTF-8?q?=20Huelswitt=20for=20=20=20reporting=20this=20one).=20-=20Now?=
 =?UTF-8?q?=20using=20more=20separate=20areas=20in=20the=20"ST:TNG=20Panel?=
 =?UTF-8?q?s"=20skin=20to=20allow=20a=20theme=20to=20=20=20use=20more=20in?=
 =?UTF-8?q?dependent=20clrMenu*=20colors.=20-=20Fixed=20removing=20the=20"?=
 =?UTF-8?q?scanning=20recordings..."=20message=20in=20case=20the=20video?=
 =?UTF-8?q?=20directory=20=20=20is=20empty=20(thanks=20to=20Andreas=20Rege?=
 =?UTF-8?q?l=20for=20reporting=20this=20one).=20-=20Added=20SetMessage()?=
 =?UTF-8?q?=20functions=20to=20the=20Replay=20and=20Channel=20skin=20funct?=
 =?UTF-8?q?ions.=20Plugins=20=20=20that=20implement=20skins=20will=20need?=
 =?UTF-8?q?=20to=20implement=20these=20functions.=20This=20fixes=20a=20mis?=
 =?UTF-8?q?sing=20=20=20"Editing=20process=20finished"=20message=20(thanks?=
 =?UTF-8?q?=20to=20Oliver=20Endriss=20for=20reporting=20this=20=20=20one).?=
 =?UTF-8?q?=20-=20Fixed=20the=20height=20of=20the=20channel=20display=20in?=
 =?UTF-8?q?=20the=20"Classic=20VDR"=20skin.=20-=20Fixed=20handling=20descr?=
 =?UTF-8?q?iptor=20loops=20in=20'libsi',=20which=20had=20sometimes=20cause?=
 =?UTF-8?q?d=20invalid=20=20=20CA=20ids=20to=20be=20added=20to=20the=20cha?=
 =?UTF-8?q?nnel=20definitions=20(thanks=20to=20Wayne=20Keer=20for=20report?=
 =?UTF-8?q?ing=20=20=20this=20one,=20and=20Marcel=20Wiesweg=20for=20fixing?=
 =?UTF-8?q?=20it).=20-=20Fixed=20handling=20colors=20in=20cDvbSpuPalette::?=
 =?UTF-8?q?yuv2rgb()=20(thanks=20to=20Marco=20Schl=C3=BC=C3=9Fler).=20-=20?=
 =?UTF-8?q?Made=20some=20functions=20of=20cFont=20virtual=20to=20allow=20i?=
 =?UTF-8?q?mplementing=20dummy=20fonts=20for=20the=20=20=20'curses'=20skin?=
 =?UTF-8?q?.=20-=20The=20new=20plugin=20'skincurses'=20re-implements=20the?=
 =?UTF-8?q?=20functionality=20that=20was=20previously=20=20=20available=20?=
 =?UTF-8?q?by=20compiling=20VDR=20with=20DEBUG=5FOSD.=20Some=20things=20ma?=
 =?UTF-8?q?y=20not=20yet=20work=20as=20they=20=20=20should,=20but=20it's?=
 =?UTF-8?q?=20a=20starting=20point.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dvbspu.h | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'dvbspu.h')

diff --git a/dvbspu.h b/dvbspu.h
index 4c926df..df717c1 100644
--- a/dvbspu.h
+++ b/dvbspu.h
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.h 1.3 2004/04/30 13:44:41 kls Exp $
+ * $Id: dvbspu.h 1.4 2004/05/31 08:49:20 kls Exp $
  */
 
 #ifndef __DVBSPU_H
@@ -157,7 +157,6 @@ inline uint32_t cDvbSpuPalette::yuv2rgb(uint32_t yuv_color)
     int Y, Cb, Cr;
     int Ey, Epb, Epr;
     int Eg, Eb, Er;
-    uint32_t result;
 
     Y = (yuv_color >> 16) & 0xff;
     Cb = (yuv_color) & 0xff;
@@ -191,9 +190,7 @@ inline uint32_t cDvbSpuPalette::yuv2rgb(uint32_t yuv_color)
     if (Er < 0)
         Er = 0;
 
-    result = (Eb << 16) | (Eg << 8) | Er;
-
-    return result;
+    return Eb | (Eg << 8) | (Er << 16);
 }
 
 inline uint32_t cDvbSpuPalette::getColor(uint8_t idx, uint8_t trans) const
-- 
cgit v1.2.3