package/vdr/vdr-image/image-getchar.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
   3 #
   4 # T2 SDE: package/.../vdr-image/image-getchar.patch
   5 # Copyright (C) 2007 The T2 SDE Project
   6 #
   7 # More information can be found in the files COPYING and README.
   8 #
   9 # This patch file is dual-licensed. It is available under the license the
  10 # patched project is licensed under, as long as it is an OpenSource license
  11 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12 # of the GNU General Public License as published by the Free Software
  13 # Foundation; either version 2 of the License, or (at your option) any later
  14 # version.
  15 # --- T2-COPYRIGHT-NOTE-END ---
  16
  17 --- image/libimage/pnm.h.orig   2005-02-14 18:01:00.464704296 +0100
  18 +++ image/libimage/pnm.h        2005-02-14 18:01:11.924962072 +0100
  19 @@ -151,7 +151,7 @@
  20    Get next significant character, i.e. jump over comments
  21    @param file - source file
  22    @param - Next significant character*/
  23 -  bool getchar(FILE* f,char& nNext);
  24 +  bool getchar_(FILE* f,char& nNext);
  25
  26    /*****************************************************************************
  27    Get next bit from file
  28 --- image/libimage/pnm.c.orig   2005-02-14 18:01:04.294122136 +0100
  29 +++ image/libimage/pnm.c        2005-02-14 18:01:30.060205096 +0100
  30 @@ -73,7 +73,7 @@
  31  Get next significant character, i.e. jump over comments
  32  @param file - source file
  33  @param - Next significant character*/
  34 -bool cPNM::getchar(FILE* f, char& nNext)
  35 +bool cPNM::getchar_(FILE* f, char& nNext)
  36  {
  37    register int ich;
  38    register char ch;
  39 @@ -112,7 +112,7 @@
  40    register char ch;
  41
  42    do {
  43 -    if(!getchar( f, ch ))
  44 +    if(!getchar_( f, ch ))
  45        return false;
  46    } while ( ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r' );
  47
  48 @@ -156,7 +156,7 @@
  49    register T i;
  50
  51    do {
  52 -    if(!getchar( f,ch ))
  53 +    if(!getchar_( f,ch ))
  54         return false;
  55    } while ( ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r' );
  56
  57 @@ -168,7 +168,7 @@
  58    i = 0;
  59    do {
  60      i = i * 10 + ch - '0';
  61 -    if(!getchar( f,ch ))
  62 +    if(!getchar_( f,ch ))
  63        return false;
  64    } while ( ch >= '0' && ch <= '9' );
  65    nNext = i;