summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2012-03-28 10:43:15 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2012-03-28 10:43:15 +0200
commit1f5cf1db58098ebabe87ff861d9cd5b86e7aeafb (patch)
tree24007c85de5cf5b053b48bd77373aa562a9b3e14
parent55b6ab1dc6b449ef5ed8b3835756539145eee52c (diff)
downloadvdr-1f5cf1db58098ebabe87ff861d9cd5b86e7aeafb.tar.gz
vdr-1f5cf1db58098ebabe87ff861d9cd5b86e7aeafb.tar.bz2
Fixed cPixmapMemory::DrawEllipse() for quadrants -1 and -4
-rw-r--r--HISTORY4
-rw-r--r--config.h10
-rw-r--r--osd.c10
3 files changed, 14 insertions, 10 deletions
diff --git a/HISTORY b/HISTORY
index 1a1c8a6a..6986ad89 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7051,3 +7051,7 @@ Video Disk Recorder Revision History
- Reverted some improvements to Make.config.template (thanks to Christian Ruppert).
- Fixed handling IDLEPRIORITY in cDvbDevice::ProvidesChannel() (thanks to Frank
Schmirler).
+
+2012-03-28: Version 1.7.28
+
+- Fixed cPixmapMemory::DrawEllipse() for quadrants -1 and -4.
diff --git a/config.h b/config.h
index 9d653979..7fa569a0 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: config.h 2.45 2012/03/11 10:41:44 kls Exp $
+ * $Id: config.h 2.46 2012/03/28 10:42:32 kls Exp $
*/
#ifndef __CONFIG_H
@@ -22,13 +22,13 @@
// VDR's own version number:
-#define VDRVERSION "1.7.27"
-#define VDRVERSNUM 10727 // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION "1.7.28"
+#define VDRVERSNUM 10728 // Version * 10000 + Major * 100 + Minor
// The plugin API's version number:
-#define APIVERSION "1.7.27"
-#define APIVERSNUM 10727 // Version * 10000 + Major * 100 + Minor
+#define APIVERSION "1.7.28"
+#define APIVERSNUM 10728 // Version * 10000 + Major * 100 + Minor
// When loading plugins, VDR searches them by their APIVERSION, which
// may be smaller than VDRVERSION in case there have been no changes to
diff --git a/osd.c b/osd.c
index 49b7dce1..fc4ffa42 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.27 2012/03/05 10:28:01 kls Exp $
+ * $Id: osd.c 2.28 2012/03/28 10:40:12 kls Exp $
*/
#include "osd.h"
@@ -1382,10 +1382,10 @@ void cPixmapMemory::DrawEllipse(const cRect &Rect, tColor Color, int Quadrants)
case 0:
case 6: DrawRectangle(cRect(cx - x, cy - y, 2 * x + 1, 1), Color); if (Quadrants == 6) break;
case 8: DrawRectangle(cRect(cx - x, cy + y, 2 * x + 1, 1), Color); break;
- case -1: DrawRectangle(cRect(cx + x, cy - y, x2 - x + 1, 1), Color); break;
+ case -1: DrawRectangle(cRect(cx + x, cy - y, rx - x + 1, 1), Color); break;
case -2: DrawRectangle(cRect(x1, cy - y, cx - x - x1 + 1, 1), Color); break;
case -3: DrawRectangle(cRect(x1, cy + y, cx - x - x1 + 1, 1), Color); break;
- case -4: DrawRectangle(cRect(cx + x, cy + y, x2 - x + 1, 1), Color); break;
+ case -4: DrawRectangle(cRect(cx + x, cy + y, rx - x + 1, 1), Color); break;
default: ;
}
y++;
@@ -1417,10 +1417,10 @@ void cPixmapMemory::DrawEllipse(const cRect &Rect, tColor Color, int Quadrants)
case 0:
case 6: DrawRectangle(cRect(cx - x, cy - y, 2 * x + 1, 1), Color); if (Quadrants == 6) break;
case 8: DrawRectangle(cRect(cx - x, cy + y, 2 * x + 1, 1), Color); break;
- case -1: DrawRectangle(cRect(cx + x, cy - y, x2 - x + 1, 1), Color); break;
+ case -1: DrawRectangle(cRect(cx + x, cy - y, rx - x + 1, 1), Color); break;
case -2: DrawRectangle(cRect(x1, cy - y, cx - x - x1 + 1, 1), Color); break;
case -3: DrawRectangle(cRect(x1, cy + y, cx - x - x1 + 1, 1), Color); break;
- case -4: DrawRectangle(cRect(cx + x, cy + y, x2 - x + 1, 1), Color); break;
+ case -4: DrawRectangle(cRect(cx + x, cy + y, rx - x + 1, 1), Color); break;
default: ;
}
x++;