Fixed two warnings when compiling with gcc 3.3.1

This commit is contained in:
Klaus Schmidinger 2003-08-15 13:50:08 +02:00
parent 26ffdd1c83
commit 7a3c2df2f4
4 changed files with 6 additions and 3 deletions

View File

@ -693,6 +693,7 @@ Juri Haberland <juri@koschikode.com>
Alfred Zastrow <vdr@zastrow4u.de> Alfred Zastrow <vdr@zastrow4u.de>
for suggesting to implement separate PausePriority and PauseLifetime parameters for for suggesting to implement separate PausePriority and PauseLifetime parameters for
the recordings created when pausing live video the recordings created when pausing live video
for reporting two warnings when compiling with gcc 3.3.1
Matthias Raus <matthias-raus@web.de> Matthias Raus <matthias-raus@web.de>
for reporting a problem with starting the editing process if no marks have been set for reporting a problem with starting the editing process if no marks have been set

View File

@ -2293,3 +2293,5 @@ Video Disk Recorder Revision History
Ludwig Nussel). Ludwig Nussel).
- Fixed scaling SPU bitmaps in Letterbox mode when playing NTSC material. - 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(). 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).

View File

@ -1240,7 +1240,7 @@ char *siGetDescriptorTextHandler (u_char *Buffer, int Length, int type)
if (*Buffer == 0) break; if (*Buffer == 0) break;
if ((*Buffer >= ' ' && *Buffer <= '~') || (*Buffer == '\n') || if ((*Buffer >= ' ' && *Buffer <= '~') || (*Buffer == '\n') ||
(*Buffer >= 0xa0 && *Buffer <= 0xff)) *tmp++ = *Buffer; (*Buffer >= 0xa0)) *tmp++ = *Buffer;
if (*Buffer == 0x8A) *tmp++ = '\n'; if (*Buffer == 0x8A) *tmp++ = '\n';
if ((*Buffer == 0x86 || *Buffer == 0x87) && !(GDT_NAME_DESCRIPTOR & type)) *tmp++ = ' '; if ((*Buffer == 0x86 || *Buffer == 0x87) && !(GDT_NAME_DESCRIPTOR & type)) *tmp++ = ' ';
Buffer++; Buffer++;

View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * 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" #include "osdbase.h"
@ -215,7 +215,7 @@ void cBitmap::SetBitmap(int x, int y, const cBitmap &Bitmap)
Take(Bitmap, &Indexes); Take(Bitmap, &Indexes);
for (int ix = 0; ix < Bitmap.width; ix++) { for (int ix = 0; ix < Bitmap.width; ix++) {
for (int iy = 0; iy < Bitmap.height; iy++) 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])]);
} }
} }
} }