frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed a compiler warning in font.c

Browse Source
This commit is contained in:
Klaus Schmidinger 2015-04-19 11:14:27 +02:00
parent c17328da87
commit 15927fd097
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@ -8596,7 +8596,7 @@ Video Disk Recorder Revision History
- Bumped all version numbers to 2.2.0. - Bumped all version numbers to 2.2.0.
- Official release. - 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 - 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 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). VDR from using any DVB devices (suggested by Dietmar Spingler).
- The -V and -h options now list the plugins in alphabetical order (suggested by - The -V and -h options now list the plugins in alphabetical order (suggested by
Dietmar Spingler). Dietmar Spingler).
- Fixed a compiler warning in font.c.

4
font.c
View File

@ -6,7 +6,7 @@
* *
* BiDi support by Osama Alrawab <alrawab@hotmail.com> @2008 Tripoli-Libya. * 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" #include "font.h"
@ -140,7 +140,7 @@ cFreetypeFont::cFreetypeFont(const char *Name, int CharHeight, int CharWidth)
if (!error) { if (!error) {
error = FT_Render_Glyph(face->glyph, FT_RENDER_MODE_NORMAL); error = FT_Render_Glyph(face->glyph, FT_RENDER_MODE_NORMAL);
if (!error) { 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; bottom = face->glyph->bitmap.rows-face->glyph->bitmap_top;
} }
else else