summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2009-05-23 10:12:04 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2009-05-23 10:12:04 +0200
commit6cdfb489aea9b4e8ea7f3287c76227a573b75161 (patch)
tree937ecbce053b95deb5c9738f8795c02b1c338974
parent02921f8851e5e864beafcaf085fec1017a93bde2 (diff)
downloadvdr-6cdfb489aea9b4e8ea7f3287c76227a573b75161.tar.gz
vdr-6cdfb489aea9b4e8ea7f3287c76227a573b75161.tar.bz2
Added a note about cFont::GetFont() not being thread-safe
-rw-r--r--HISTORY3
-rw-r--r--font.h10
2 files changed, 8 insertions, 5 deletions
diff --git a/HISTORY b/HISTORY
index 2ef05959..f7775a8f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6075,7 +6075,7 @@ Video Disk Recorder Revision History
- cFrameDetector::Analyze() now syncs on the TS packet sync bytes (thanks to
Oliver Endriss for reporting broken index generation after a buffer overflow).
-2009-05-21: Version 1.7.8
+2009-05-23: Version 1.7.8
- Fixed a typo in aspect ratio 2.21:1 (reported by Reinhard Nissl).
- The name of the function cDevice::GetVideoSize() wasn't very well chosen
@@ -6108,3 +6108,4 @@ Video Disk Recorder Revision History
- The new setup option "Recording/Pause key handling" can be used to define
what happens if the Pause key on the remote control is pressed during
live tv (thanks to Timo Eskola).
+- Added a note about cFont::GetFont() not being thread-safe.
diff --git a/font.h b/font.h
index 5b9ec642..eadf88c1 100644
--- a/font.h
+++ b/font.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: font.h 2.1 2009/05/03 11:00:19 kls Exp $
+ * $Id: font.h 2.2 2009/05/23 10:10:40 kls Exp $
*/
#ifndef __FONT_H
@@ -55,9 +55,11 @@ public:
static const cFont *GetFont(eDvbFont Font);
///< Gets the given Font, which was previously set by a call to SetFont().
///< If no SetFont() call has been made, the font as defined in the setup is returned.
- ///< The caller must not use the returned font outside the scope in which
- ///< it was retrieved by the call to GetFont(), because a call to SetFont()
- ///< may delete an existing font.
+ ///< GetFont() is not thread-safe, and shall only be called from the main
+ ///< thread! A font returned by GetFont() must only be used locally inside the
+ ///< function it was retrieved from, and no long term pointer to it shall be kept,
+ ///< because the cFont object may become invalid at any time after the
+ ///< function that called GetFont() has returned.
static cFont *CreateFont(const char *Name, int CharHeight, int CharWidth = 0);
///< Creates a new font object with the given Name and makes its characters
///< CharHeight pixels high. If CharWidth is given, it overwrites the font's