The default maximum size of a cPixmap has been raised to the maximum possible value

3 files changed, 8 insertions, 3 deletions

diff --git a/HISTORY b/HISTORY
index 494b3191..ec71f4f1 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9408,3 +9408,4 @@ Video Disk Recorder Revision History
 - Added a workaround for broadcasters who set an event to status "not running" where
   this is inappropriate; implicitly setting events to "not running" is now also logged.
 - Fixed asserting free disk space in case there is no local timer currently recording.
+- The default maximum size of a cPixmap has been raised to the maximum possible value.
diff --git a/osd.c b/osd.c
index 2617c504..8a3ce721 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 4.5 2018/04/06 08:43:15 kls Exp $
+ * $Id: osd.c 4.6 2019/05/24 21:28:35 kls Exp $
  */
 
 #include "osd.h"
@@ -1643,7 +1643,7 @@ int cOsd::osdLeft = 0;
 int cOsd::osdTop = 0;
 int cOsd::osdWidth = 0;
 int cOsd::osdHeight = 0;
-cSize cOsd::maxPixmapSize(2048, 2048);
+cSize cOsd::maxPixmapSize(INT_MAX, INT_MAX);
 cVector<cOsd *> cOsd::Osds;
 cMutex cOsd::mutex;
 
diff --git a/osd.h b/osd.h
index 559819e3..51b1adf9 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.5 2017/11/02 14:59:19 kls Exp $
+ * $Id: osd.h 4.6 2019/05/24 21:28:35 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -833,6 +833,10 @@ public:
        ///< If this is a true color OSD, this function does nothing.
   virtual const cSize &MaxPixmapSize(void) const;
        ///< Returns the maximum possible size of a pixmap this OSD can create.
+       ///< Derived classes can reimplement this function if their implementation
+       ///< of cPixmap can only provide pixmaps up to a certain size.
+       ///< The default implementation returns a cSize object of maximal size
+       ///< (INT_MAX). However, memory restrictions may still apply.
   virtual cPixmap *CreatePixmap(int Layer, const cRect &ViewPort, const cRect &DrawPort = cRect::Null);
        ///< Creates a new true color pixmap on this OSD (see cPixmap for details).
        ///< The caller must not delete the returned object, it will be deleted when