diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 6588b284..566fb374 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -693,6 +693,7 @@ Juri Haberland Alfred Zastrow for suggesting to implement separate PausePriority and PauseLifetime parameters for the recordings created when pausing live video + for reporting two warnings when compiling with gcc 3.3.1 Matthias Raus for reporting a problem with starting the editing process if no marks have been set diff --git a/HISTORY b/HISTORY index 8a207787..c577da52 100644 --- a/HISTORY +++ b/HISTORY @@ -2293,3 +2293,5 @@ Video Disk Recorder Revision History Ludwig Nussel). - Fixed scaling SPU bitmaps in Letterbox mode when playing NTSC material. In order to do this, the cDevice was given a new member function GetVideoSystem(). +- Fixed two warnings when compiling with gcc 3.3.1 (thanks to Alfred Zastrow for + reporting this). diff --git a/libdtv/libsi/si_parser.c b/libdtv/libsi/si_parser.c index a922b7e3..e69718db 100644 --- a/libdtv/libsi/si_parser.c +++ b/libdtv/libsi/si_parser.c @@ -1240,7 +1240,7 @@ char *siGetDescriptorTextHandler (u_char *Buffer, int Length, int type) if (*Buffer == 0) break; if ((*Buffer >= ' ' && *Buffer <= '~') || (*Buffer == '\n') || - (*Buffer >= 0xa0 && *Buffer <= 0xff)) *tmp++ = *Buffer; + (*Buffer >= 0xa0)) *tmp++ = *Buffer; if (*Buffer == 0x8A) *tmp++ = '\n'; if ((*Buffer == 0x86 || *Buffer == 0x87) && !(GDT_NAME_DESCRIPTOR & type)) *tmp++ = ' '; Buffer++; diff --git a/osdbase.c b/osdbase.c index 8093b96a..0c0e8981 100644 --- a/osdbase.c +++ b/osdbase.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: osdbase.c 1.8 2003/03/23 15:53:29 kls Exp $ + * $Id: osdbase.c 1.9 2003/08/15 13:47:51 kls Exp $ */ #include "osdbase.h" @@ -215,7 +215,7 @@ void cBitmap::SetBitmap(int x, int y, const cBitmap &Bitmap) Take(Bitmap, &Indexes); for (int ix = 0; ix < Bitmap.width; ix++) { for (int iy = 0; iy < Bitmap.height; iy++) - SetIndex(x + ix, y + iy, Indexes[Bitmap.bitmap[Bitmap.width * iy + ix]]); + SetIndex(x + ix, y + iy, Indexes[int(Bitmap.bitmap[Bitmap.width * iy + ix])]); } } }