diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2004-10-23 14:24:17 +0200 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2004-10-23 14:24:17 +0200 |
| commit | 5105187701a407e99a05e3e87bbf93aa28edfa40 (patch) | |
| tree | 8db0972e3baf03fb8fc12ef0cba340a65c0c4271 | |
| parent | 8ce024709102ac8293af1b7745a244e473df166e (diff) | |
| download | vdr-5105187701a407e99a05e3e87bbf93aa28edfa40.tar.gz vdr-5105187701a407e99a05e3e87bbf93aa28edfa40.tar.bz2 | |
Some minor code cleanups
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | HISTORY | 1 | ||||
| -rw-r--r-- | genfontfile.c | 2 | ||||
| -rw-r--r-- | libsi/util.h | 4 |
4 files changed, 5 insertions, 3 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index a5e36c6b..9f4c201e 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1026,6 +1026,7 @@ Drazen Dupor <drazen.dupor@dupor.com> Prakash K. Cheemplavam <PrakashKC@gmx.de> for fixing some issues with gcc 3.4 + for some minor code cleanups Miko Wohlgemuth <weak@chello.at> for reporting a problem with the OSD alignment in the SPU decoder @@ -3056,3 +3056,4 @@ Video Disk Recorder Revision History to clear the transfer buffer to avoid overflows (thanks to Reinhard Nissl). - Updated Romanian language texts and the iso8859-2 fonts (thanks to Lucian Muresan). - Now actually using the iso8859-15 fonts (thanks to Lucian Muresan). +- Some minor code cleanups (thanks to Prakash K. Cheemplavam). diff --git a/genfontfile.c b/genfontfile.c index 41d87b79..bc171cf2 100644 --- a/genfontfile.c +++ b/genfontfile.c @@ -179,7 +179,7 @@ SuckGlyphsFromServer(Display * dpy, Font font) charHeight = charinfo->ascent + charinfo->descent; spanLength = (charWidth + 7) / 8; } - bitmapData = calloc(height * spanLength, sizeof(char)); + bitmapData = (unsigned char *)calloc(height * spanLength, sizeof(char)); if (!bitmapData) goto FreeFontAndReturn; DEBUG_GLYPH4("index %d, glyph %d (%d by %d)\n", diff --git a/libsi/util.h b/libsi/util.h index db2a0a17..da188ad4 100644 --- a/libsi/util.h +++ b/libsi/util.h @@ -6,7 +6,7 @@ * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * - * $Id: util.h 1.4 2004/10/16 09:59:48 kls Exp $ + * $Id: util.h 1.5 2004/10/23 14:22:40 kls Exp $ * * ***************************************************************************/ @@ -140,7 +140,7 @@ namespace DVBTime { time_t getTime(unsigned char date_hi, unsigned char date_lo, unsigned char timehr, unsigned char timemi, unsigned char timese); time_t getDuration(unsigned char timehr, unsigned char timemi, unsigned char timese); inline unsigned char bcdToDec(unsigned char b) { return ((b >> 4) & 0x0F) * 10 + (b & 0x0F); } -}; +} //taken and adapted from libdtv, (c) Rolf Hakenes class CRC32 { |