freepv/build_fix.diff

   1 diff -rup freepv-0.3.0/src/libfreepv/Action.h freepv-0.3.0.new//src/libfreepv/Action.h
   2 --- freepv-0.3.0/src/libfreepv/Action.h 2009-05-02 01:12:31.000000000 +0200
   3 +++ freepv-0.3.0.new//src/libfreepv/Action.h    2011-08-14 12:06:26.568973837 +0200
   4 @@ -35,7 +35,7 @@ namespace FPV
   5      float m_pitch;
   6      const char* m_scene;
   7    public:
   8 -    SetView(float _fov, float _yaw, float _pitch, const char* _scene = NULL);
   9 +    SetView(float _fov, float _yaw, float _pitch, const char* _scene = 0);
  10      void execute();
  11    };
  12  }
  13 diff -rup freepv-0.3.0/src/libfreepv/JpegReader.cpp freepv-0.3.0.new//src/libfreepv/JpegReader.cpp
  14 --- freepv-0.3.0/src/libfreepv/JpegReader.cpp   2009-05-02 01:12:31.000000000 +0200
  15 +++ freepv-0.3.0.new//src/libfreepv/JpegReader.cpp      2011-08-14 12:07:49.067773971 +0200
  16 @@ -267,7 +267,7 @@ decodeJPEG(unsigned char * buffer, size_
  17      jpeg_create_decompress(&cinfo);
  18
  19      /* Step 2: specify data source (eg, a file) */
  20 -    jpeg_mem_src(&cinfo, buffer, buf_len);
  21 +    ::jpeg_mem_src(&cinfo, buffer, buf_len);
  22
  23      /* Step 3: read file parameters with jpeg_read_header() */
  24
  25 diff -rup freepv-0.3.0/src/libfreepv/OpenGLRenderer.cpp freepv-0.3.0.new//src/libfreepv/OpenGLRenderer.cpp
  26 --- freepv-0.3.0/src/libfreepv/OpenGLRenderer.cpp       2009-05-02 01:12:31.000000000 +0200
  27 +++ freepv-0.3.0.new//src/libfreepv/OpenGLRenderer.cpp  2011-08-14 12:05:48.312863571 +0200
  28 @@ -27,6 +27,7 @@
  29
  30  #include <vector>
  31  #include <math.h>
  32 +#include <stdio.h>
  33
  34  #include "OpenGLRenderer.h"
  35  #include "Scene.h"
  36 diff -rup freepv-0.3.0/src/libfreepv/pngReader.cpp freepv-0.3.0.new//src/libfreepv/pngReader.cpp
  37 --- freepv-0.3.0/src/libfreepv/pngReader.cpp    2009-05-02 01:12:31.000000000 +0200
  38 +++ freepv-0.3.0.new//src/libfreepv/pngReader.cpp       2011-08-14 12:12:32.126990474 +0200
  39 @@ -135,7 +135,7 @@ namespace FPV
  40      //Transfor grayscale images with less
  41      //than 8 bits to 8 bits
  42      if(color_t == PNG_COLOR_TYPE_GRAY && depth<8)
  43 -      png_set_gray_1_2_4_to_8(p_png_struct);
  44 +      png_set_expand_gray_1_2_4_to_8(p_png_struct);
  45
  46      //Add a full alpha channel if there is
  47      //transparency information in the tRNS chunk
  48 @@ -283,7 +283,7 @@ namespace FPV
  49      //Transfor grayscale images with less
  50      //than 8 bits to 8 bits.
  51      if(color_t == PNG_COLOR_TYPE_GRAY && depth<8)
  52 -      png_set_gray_1_2_4_to_8(p_png_struct);
  53 +      png_set_expand_gray_1_2_4_to_8(p_png_struct);
  54
  55      //Add a full alpha channel if there is
  56      //transparency information in the tRNS chunk
  57 diff -rup freepv-0.3.0/src/libfreepv/QTVRDecoder.cpp freepv-0.3.0.new//src/libfreepv/QTVRDecoder.cpp
  58 --- freepv-0.3.0/src/libfreepv/QTVRDecoder.cpp  2009-05-02 01:12:31.000000000 +0200
  59 +++ freepv-0.3.0.new//src/libfreepv/QTVRDecoder.cpp     2011-08-14 12:11:14.194790591 +0200
  60 @@ -42,6 +42,7 @@
  61  #include <errno.h>
  62  #include <vector>
  63  #include <cstring>
  64 +#include <stdio.h>
  65
  66  #include <zlib.h>
  67
  68 diff -rup freepv-0.3.0/src/libfreepv/SPiVparser.cpp freepv-0.3.0.new//src/libfreepv/SPiVparser.cpp
  69 --- freepv-0.3.0/src/libfreepv/SPiVparser.cpp   2009-05-02 01:12:31.000000000 +0200
  70 +++ freepv-0.3.0.new//src/libfreepv/SPiVparser.cpp      2011-08-14 12:10:46.445194183 +0200
  71 @@ -490,7 +490,7 @@ void SPiVparser::parseNodeURL(const char
  72  {
  73      char * aux_url=NULL;
  74      char * url=(char*) _url;
  75 -    if(aux_url = strrchr (_url,'/'))
  76 +    if(aux_url = (char*)strrchr (_url,'/'))
  77      {
  78         url=aux_url;
  79         url++;
  80 diff -rup freepv-0.3.0/src/libfreepv/Utils/signatures.cpp freepv-0.3.0.new//src/libfreepv/Utils/signatures.cpp
  81 --- freepv-0.3.0/src/libfreepv/Utils/signatures.cpp     2009-05-02 01:12:31.000000000 +0200
  82 +++ freepv-0.3.0.new//src/libfreepv/Utils/signatures.cpp        2011-08-14 12:12:55.569982852 +0200
  83 @@ -24,6 +24,7 @@
  84
  85  #include "signatures.h"
  86  #include <iostream>
  87 +#include <stdio.h>
  88
  89  namespace FPV{
  90  namespace Utils{
  91 diff -rup freepv-0.3.0/src/libfreepv/utils.cpp freepv-0.3.0.new//src/libfreepv/utils.cpp
  92 --- freepv-0.3.0/src/libfreepv/utils.cpp        2009-05-02 01:12:31.000000000 +0200
  93 +++ freepv-0.3.0.new//src/libfreepv/utils.cpp   2011-08-14 12:08:08.467491819 +0200
  94 @@ -23,6 +23,7 @@
  95   */
  96
  97  #include <algorithm>
  98 +#include <stdio.h>
  99
 100  #include "utils.h"
 101