summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2015-04-19 11:14:27 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2015-04-19 11:14:27 +0200
commit15927fd097abf5668439463202c51def45560d88 (patch)
tree9fffafb4d081f211d49ecdb8c7cd56af23ed1aa3
parentc17328da8764e21af0e466701d5622345f7c38c0 (diff)
downloadvdr-15927fd097abf5668439463202c51def45560d88.tar.gz
vdr-15927fd097abf5668439463202c51def45560d88.tar.bz2
Fixed a compiler warning in font.c
-rw-r--r--HISTORY3
-rw-r--r--font.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/HISTORY b/HISTORY
index 467c531d..afb69a67 100644
--- a/HISTORY
+++ b/HISTORY
@@ -8596,7 +8596,7 @@ Video Disk Recorder Revision History
- Bumped all version numbers to 2.2.0.
- Official release.
-2015-04-18: Version 2.3.1
+2015-04-19: Version 2.3.1
- The new function cOsd::MaxPixmapSize() can be called to determine the maximum size
a cPixmap may have on the current OSD. The 'osddemo' example has been modified
@@ -8635,3 +8635,4 @@ Video Disk Recorder Revision History
VDR from using any DVB devices (suggested by Dietmar Spingler).
- The -V and -h options now list the plugins in alphabetical order (suggested by
Dietmar Spingler).
+- Fixed a compiler warning in font.c.
diff --git a/font.c b/font.c
index cd2c494b..29256e05 100644
--- a/font.c
+++ b/font.c
@@ -6,7 +6,7 @@
*
* BiDi support by Osama Alrawab <alrawab@hotmail.com> @2008 Tripoli-Libya.
*
- * $Id: font.c 3.2 2014/01/07 12:19:45 kls Exp $
+ * $Id: font.c 4.1 2015/04/19 11:13:45 kls Exp $
*/
#include "font.h"
@@ -140,7 +140,7 @@ cFreetypeFont::cFreetypeFont(const char *Name, int CharHeight, int CharWidth)
if (!error) {
error = FT_Render_Glyph(face->glyph, FT_RENDER_MODE_NORMAL);
if (!error) {
- if (face->glyph->bitmap.rows-face->glyph->bitmap_top > bottom)
+ if (int(face->glyph->bitmap.rows-face->glyph->bitmap_top) > bottom)
bottom = face->glyph->bitmap.rows-face->glyph->bitmap_top;
}
else