From 0bcf5d6da624c1dd9eb3efd3cd7c0917512259ce Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Fri, 13 Mar 2015 15:09:45 +0100 Subject: [PATCH] Added some comment to cPixmap about the relation between OSD, ViewPort and DrawPort --- CONTRIBUTORS | 2 ++ HISTORY | 2 ++ osd.h | 8 +++++--- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 8c2c4990..fe7fa877 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -3314,6 +3314,8 @@ Thomas Reufer for suggesting to change the return value of cOsd::RenderPixmaps() from cPixmapMemory to cPixmap for adding detection of 24fps + for suggesting to add some comment to cPixmap about the relation between OSD, + ViewPort and DrawPort Eike Sauer for reporting a problem with channels that need more than 5 TS packets for detecting diff --git a/HISTORY b/HISTORY index a02066ab..8f75a408 100644 --- a/HISTORY +++ b/HISTORY @@ -8613,3 +8613,5 @@ Video Disk Recorder Revision History - Added a section about Output Devices to the INSTALL file. - Fixed setting the source value of newly created channels, in case the NIT is received from a different, but very close satellite position. +- Added some comment to cPixmap about the relation between OSD, ViewPort and DrawPort + (suggested by Thomas Reufer). diff --git a/osd.h b/osd.h index b94a54ee..3ece16f8 100644 --- a/osd.h +++ b/osd.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: osd.h 4.2 2015/03/13 15:06:48 kls Exp $ + * $Id: osd.h 4.3 2015/03/13 15:07:53 kls Exp $ */ #ifndef __OSD_H @@ -510,8 +510,10 @@ public: ///< In order to allow devices that can handle only a limited number of layers, ///< the Layer parameter must be less than 8 (MAXPIXMAPLAYERS). ///< ViewPort defines the rectangle in which this pixmap will be rendered on - ///< the OSD. If no DrawPort is given, it defaults to the same size as the - ///< ViewPort, with its upper left corner set to (0, 0). + ///< the OSD. The coordinate (0, 0) corresponds to the upper left corner of the + ///< OSD. If no DrawPort is given, it defaults to the same size as the + ///< ViewPort, with its upper left corner set to (0, 0). The DrawPort's origin + ///< is relative to the ViewPort's origin. ///< All drawing operations will be executed relative to the origin of the ///< DrawPort rectangle, and will be clipped to the size of this rectangle. ///< The DrawPort may have a different size than the ViewPort. If it is smaller