artoolkitplus/gcc45.patch

   1 diff -Nur ./include/ARToolKitPlus/TrackerImpl.h ../src_fixed/include/ARToolKitPlus/TrackerImpl.h
   2 --- ./include/ARToolKitPlus/TrackerImpl.h       2006-07-25 16:05:46.000000000 -0300
   3 +++ ../src_fixed/include/ARToolKitPlus/TrackerImpl.h    2011-03-08 16:28:56.616667902 -0300
   4 @@ -198,7 +198,7 @@
   5          * in an ARToolKit camera calibration file.
   6          * Returns true if loading of the camera file succeeded.
   7          */
   8 -       static bool calcCameraMatrix(const char* nCamParamFile, int nWidth, int nHeight,
   9 +       /*static*/ bool calcCameraMatrix(const char* nCamParamFile, int nWidth, int nHeight,
  10                                                                  ARFloat nNear, ARFloat nFar, ARFloat *nMatrix);
  11
  12
  13 diff -Nur ./src/core/arDetectMarker.cxx ../src_fixed/src/core/arDetectMarker.cxx
  14 --- ./src/core/arDetectMarker.cxx       2006-04-19 23:28:10.000000000 -0300
  15 +++ ../src_fixed/src/core/arDetectMarker.cxx    2011-03-08 16:31:41.656667685 -0300
  16 @@ -144,7 +144,10 @@
  17
  18      for( i = j = 0; i < prev_num; i++ ) {
  19          prev_info[i].count++;
  20 -        if( prev_info[i].count < 4 ) {
  21 +        // Without this aaa the code won't compile when using this class of an installed
  22 +        // ARTKP. I have no idea of what is the reason.
  23 +        int aaa = prev_info[i].count;
  24 +        if( aaa < 4 ) {
  25              prev_info[j] = prev_info[i];
  26              j++;
  27          }
  28 diff -Nur ./src/librpp/rpp.cpp ../src_fixed/src/librpp/rpp.cpp
  29 --- ./src/librpp/rpp.cpp        2006-04-19 23:28:10.000000000 -0300
  30 +++ ../src_fixed/src/librpp/rpp.cpp     2011-03-08 16:28:56.620001120 -0300
  31 @@ -50,6 +50,7 @@
  32  #include "rpp.h"
  33  #include "rpp_const.h"
  34  #include "rpp_vecmat.h"
  35 +#include <cstring>
  36
  37  namespace rpp {
  38
  39 diff -Nur ./src/librpp/rpp_vecmat.cpp ../src_fixed/src/librpp/rpp_vecmat.cpp
  40 --- ./src/librpp/rpp_vecmat.cpp 2006-04-19 23:28:10.000000000 -0300
  41 +++ ../src_fixed/src/librpp/rpp_vecmat.cpp      2011-03-08 16:28:56.620001120 -0300
  42 @@ -44,6 +44,8 @@
  43  #include "rpp_vecmat.h"
  44  #include "math.h"
  45  #include "assert.h"
  46 +#include <cstdlib>
  47 +#include <cstdio>
  48
  49
  50  namespace rpp {
  51 diff -Nur ./tools/IdPatGen/src/PN/Image.cpp ../src_fixed/tools/IdPatGen/src/PN/Image.cpp
  52 --- ./tools/IdPatGen/src/PN/Image.cpp   2006-04-19 23:28:10.000000000 -0300
  53 +++ ../src_fixed/tools/IdPatGen/src/PN/Image.cpp        2011-03-08 16:28:56.620001120 -0300
  54 @@ -35,7 +35,7 @@
  55
  56  #include <cstdio>
  57  #include <cstdlib>
  58 -#include <string>
  59 +#include <cstring>
  60
  61  #if defined(TARGET_HOST_WIN32) || defined(TARGET_HOST_WINCE)
  62  #include <windows.h>
  63 diff -Nur ./tools/IdPatGen/src/PN/ImageTool.cpp ../src_fixed/tools/IdPatGen/src/PN/ImageTool.cpp
  64 --- ./tools/IdPatGen/src/PN/ImageTool.cpp       2006-04-19 23:28:10.000000000 -0300
  65 +++ ../src_fixed/tools/IdPatGen/src/PN/ImageTool.cpp    2011-03-08 16:28:56.620001120 -0300
  66 @@ -33,7 +33,7 @@
  67  #include "ImageTool.h"
  68
  69  #include <cstdio>
  70 -#include <string>
  71 +#include <cstring>
  72
  73  #if defined(TARGET_HOST_WIN32) || defined(TARGET_HOST_WINCE)
  74  #include <windows.h>