From a3d37dfc7104393a859be58181ac2ecfe1d72f75 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Wed, 22 Feb 2012 17:15:31 +0100
Subject: [PATCH] Fixed upscaling cBitmaps with anti-aliasing

---
 CONTRIBUTORS | 1 +
 HISTORY      | 2 ++
 osd.c        | 5 +++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index b132516b..82a09374 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1133,6 +1133,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for improving handling subtitles of BBC channels
  for fixing handling subtitle color palettes on channels where subtitles appear
  "word by word"
+ for reporting a problem with color palettes in subtitles
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
diff --git a/HISTORY b/HISTORY
index a9044cdc..5c9b783b 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6906,3 +6906,5 @@ Video Disk Recorder Revision History
 - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
 - Fixed handling subtitle color palettes on channels where subtitles appear
   "word by word" (thanks to Rolf Ahrenberg).
+- Fixed upscaling cBitmaps with anti-aliasing (thanks to Rolf Ahrenberg for reporting
+  a problem with color palettes in subtitles).
diff --git a/osd.c b/osd.c
index ab24e174..9c6ca8f0 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 2.23 2011/08/15 09:27:39 kls Exp $
+ * $Id: osd.c 2.24 2012/02/22 16:13:04 kls Exp $
  */
 
 #include "osd.h"
@@ -812,11 +812,11 @@ cBitmap *cBitmap::Scaled(double FactorX, double FactorY, bool AntiAlias)
   // Fixed point scaling code based on www.inversereality.org/files/bitmapscaling.pdf
   // by deltener@mindtremors.com
   cBitmap *b = new cBitmap(int(round(Width() * FactorX)), int(round(Height() * FactorY)), Bpp(), X0(), Y0());
-  b->Replace(*this); // copy palette
   int RatioX = (Width() << 16) / b->Width();
   int RatioY = (Height() << 16) / b->Height();
   if (!AntiAlias || FactorX <= 1.0 && FactorY <= 1.0) {
      // Downscaling - no anti-aliasing:
+     b->Replace(*this); // copy palette
      tIndex *DestRow = b->bitmap;
      int SourceY = 0;
      for (int y = 0; y < b->Height(); y++) {
@@ -834,6 +834,7 @@ cBitmap *cBitmap::Scaled(double FactorX, double FactorY, bool AntiAlias)
   else {
      // Upscaling - anti-aliasing:
      b->SetBpp(8);
+     b->Replace(*this); // copy palette (must be done *after* SetBpp()!)
      int SourceY = 0;
      for (int y = 0; y < b->Height() - 1; y++) {
          int SourceX = 0;