Added a note to the description of cFont::Size(), regarding possible differences between it and cFont::Height()

3 files changed, 7 insertions, 2 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index ad1c3362..e1a3192d 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -3323,6 +3323,8 @@ Thomas Reufer <thomas@reufer.ch>
  ViewPort and DrawPort
  for suggesting to reduce the priority of the "video directory scanner" thread
  for making the 'newplugin' script create the 'po' subdirectory for translations
+ for suggesting to add a note to the description of cFont::Size(), regarding possible
+ differences between it and cFont::Height()
 
 Eike Sauer <EikeSauer@t-online.de>
  for reporting a problem with channels that need more than 5 TS packets for detecting
diff --git a/HISTORY b/HISTORY
index 290d5b44..f869d2b4 100644
--- a/HISTORY
+++ b/HISTORY
@@ -8851,3 +8851,5 @@ Video Disk Recorder Revision History
   The cRecordingsHandler now performs its actual operations in a separate thread,
   thus avoiding locking problems and reducing the time between subsequent
   operations.
+- Added a note to the description of cFont::Size(), regarding possible differences
+  between it and cFont::Height() (suggested to Thomas Reufer).
diff --git a/font.h b/font.h
index cd62b4a9..5e4b4da9 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 3.1 2014/01/07 12:11:55 kls Exp $
+ * $Id: font.h 4.1 2016/12/13 14:58:53 kls Exp $
  */
 
 #ifndef __FONT_H
@@ -43,7 +43,8 @@ public:
           ///< Returns the font name.
   virtual int Size(void) const { return Height(); }
           ///< Returns the original size as requested when the font was created.
-          ///< This may be different than the actual height.
+          ///< This may be smaller than the actual height, for instance if the
+          ///< font contains descenders.
   virtual int Width(uint c) const = 0;
           ///< Returns the width of the given character in pixel.
   virtual int Width(const char *s) const = 0;