handvu/gcc4.4-compile.patch

   1 diff -rau handvu-beta3/cubicles/CascadeFileParser.yy handvu-beta3-modified/cubicles/CascadeFileParser.yy
   2 --- handvu-beta3/cubicles/CascadeFileParser.yy  2004-10-10 02:04:53.000000000 +0900
   3 +++ handvu-beta3-modified/cubicles/CascadeFileParser.yy 2009-09-11 12:01:56.184488149 +0900
   4 @@ -64,6 +64,7 @@
   5  #include "Classifiers.h"
   6  #include "IntegralFeatures.h"
   7  #include "Exceptions.h"
   8 +#include <string.h>
   9  //#include <stdio.h>
  10
  11  // internal variables:
  12 diff -rau handvu-beta3/cubicles/IntegralFeatures.cpp handvu-beta3-modified/cubicles/IntegralFeatures.cpp
  13 --- handvu-beta3/cubicles/IntegralFeatures.cpp  2005-10-29 02:47:04.000000000 +0900
  14 +++ handvu-beta3-modified/cubicles/IntegralFeatures.cpp 2009-09-11 12:00:14.326997101 +0900
  15 @@ -67,6 +67,8 @@
  16  #include "Exceptions.h"
  17  #include <math.h>
  18  #include <iostream>
  19 +#include <alloca.h>
  20 +#include <limits.h>
  21
  22
  23  #ifdef _DEBUG
  24 diff -rau handvu-beta3/cubicles/IntegralFeaturesSame.cpp handvu-beta3-modified/cubicles/IntegralFeaturesSame.cpp
  25 --- handvu-beta3/cubicles/IntegralFeaturesSame.cpp      2004-11-11 10:58:58.000000000 +0900
  26 +++ handvu-beta3-modified/cubicles/IntegralFeaturesSame.cpp     2009-09-11 12:01:04.386992294 +0900
  27 @@ -69,6 +69,8 @@
  28  #include "IntegralFeatures.h"
  29  #include "Exceptions.h"
  30  #include <iostream>
  31 +#include <alloca.h>
  32 +#include <limits.h>
  33
  34
  35
  36 diff -rau handvu-beta3/cubicles/IntegralImage.cxx handvu-beta3-modified/cubicles/IntegralImage.cxx
  37 --- handvu-beta3/cubicles/IntegralImage.cxx     2005-02-12 11:00:59.000000000 +0900
  38 +++ handvu-beta3-modified/cubicles/IntegralImage.cxx    2009-09-11 12:02:45.403646922 +0900
  39 @@ -66,6 +66,7 @@
  40
  41  #include <math.h>
  42  #include <ostream>
  43 +#include <string.h>
  44
  45  #ifdef USE_MFC
  46  #ifdef _DEBUG
  47 diff -rau handvu-beta3/cubicles/Scanner.h handvu-beta3-modified/cubicles/Scanner.h
  48 --- handvu-beta3/cubicles/Scanner.h     2005-02-12 11:00:59.000000000 +0900
  49 +++ handvu-beta3-modified/cubicles/Scanner.h    2009-09-11 12:04:16.261137336 +0900
  50 @@ -68,6 +68,8 @@
  51  #include <float.h>
  52  #endif
  53
  54 +#include <limits.h>
  55 +
  56  //namespace { // cubicles
  57
  58  #ifndef CScanMatch_DEFINED
  59 diff -rau handvu-beta3/handvu/CubicleWrapper.cpp handvu-beta3-modified/handvu/CubicleWrapper.cpp
  60 --- handvu-beta3/handvu/CubicleWrapper.cpp      2005-10-31 06:16:03.000000000 +0900
  61 +++ handvu-beta3-modified/handvu/CubicleWrapper.cpp     2009-09-11 12:06:01.513628922 +0900
  62 @@ -24,7 +24,7 @@
  63  #include "Common.h"
  64  #include "CubicleWrapper.h"
  65  #include "HandVu.hpp"
  66 -
  67 +#include <limits.h>
  68
  69  //
  70  // Constructor
  71 diff -rau handvu-beta3/handvu/FileHandling.cpp handvu-beta3-modified/handvu/FileHandling.cpp
  72 --- handvu-beta3/handvu/FileHandling.cpp        2005-08-16 09:14:26.000000000 +0900
  73 +++ handvu-beta3-modified/handvu/FileHandling.cpp       2009-09-11 12:07:39.476952886 +0900
  74 @@ -25,6 +25,7 @@
  75  #include "FileHandling.h"
  76  #include "Exceptions.h"
  77  #include <errno.h>
  78 +#include <string.h>
  79
  80  #ifdef USE_MFC
  81  #ifdef _DEBUG
  82 @@ -135,8 +136,8 @@
  83    fname[0] = 0;
  84    ext[0] = 0;
  85
  86 -  char* slashpos = strrchr(path, '/');
  87 -  char* dotpos = strrchr(path, '.');
  88 +  const char* slashpos = strrchr(path, '/');
  89 +  const char* dotpos = strrchr(path, '.');
  90
  91    if (slashpos==NULL) {
  92      if (dotpos==NULL) {
  93 diff -rau handvu-beta3/handvu/HandVu.cpp handvu-beta3-modified/handvu/HandVu.cpp
  94 --- handvu-beta3/handvu/HandVu.cpp      2006-01-04 09:55:29.000000000 +0900
  95 +++ handvu-beta3-modified/handvu/HandVu.cpp     2009-09-11 12:05:30.657798322 +0900
  96 @@ -36,6 +36,7 @@
  97  #include "HandVu.hpp"
  98
  99  #include <fstream>
 100 +#include <limits.h>
 101
 102  #if defined(WIN32) && defined(DEBUG)
 103  //#include <streams.h>
 104 diff -rau handvu-beta3/handvu/Mask.cpp handvu-beta3-modified/handvu/Mask.cpp
 105 --- handvu-beta3/handvu/Mask.cpp        2005-08-16 09:14:26.000000000 +0900
 106 +++ handvu-beta3-modified/handvu/Mask.cpp       2009-09-11 12:07:03.593623099 +0900
 107 @@ -25,6 +25,9 @@
 108  #include "Mask.h"
 109  #include "Exceptions.h"
 110  #include <fstream>
 111 +#include <string.h>
 112 +#include <alloca.h>
 113 +#include <stdlib.h>
 114
 115  Mask::Mask()
 116  : m_width(-1),
 117 diff -rau handvu-beta3/hv_ARtk/LinuxDC1394CameraController.h handvu-beta3-modified/hv_ARtk/LinuxDC1394CameraController.h
 118 --- handvu-beta3/hv_ARtk/LinuxDC1394CameraController.h  2005-11-08 05:54:50.000000000 +0900
 119 +++ handvu-beta3-modified/hv_ARtk/LinuxDC1394CameraController.h 2009-09-11 12:22:10.950198094 +0900
 120 @@ -1,4 +1,4 @@
 121 -#include <dc1394_control.h>
 122 +//#include <dc1394/control.h>
 123  #include "Common.h"
 124  #include "HandVu.h"
 125
 126 diff -rau handvu-beta3/hv_ARtk/Makefile.am handvu-beta3-modified/hv_ARtk/Makefile.am
 127 --- handvu-beta3/hv_ARtk/Makefile.am    2005-11-08 05:51:20.000000000 +0900
 128 +++ handvu-beta3-modified/hv_ARtk/Makefile.am   2009-09-11 12:10:14.726936482 +0900
 129 @@ -21,7 +21,7 @@
 130  # use ARToolkit's video support with firewire digital camera support.
 131  # ARToolkit must be compiled properly to use dc1394 video.
 132  #
 133 -ARDC_LIBS = -lARvideo -lraw1394 -ldc1394_control
 134 +ARDC_LIBS = -lARvideo -lraw1394 -ldc1394
 135
 136
 137  # SDL resources locations
 138 diff -rau handvu-beta3/hv_ARtk/Makefile.in handvu-beta3-modified/hv_ARtk/Makefile.in
 139 --- handvu-beta3/hv_ARtk/Makefile.in    2006-01-09 04:50:07.000000000 +0900
 140 +++ handvu-beta3-modified/hv_ARtk/Makefile.in   2009-09-11 12:24:58.037681212 +0900
 141 @@ -240,7 +240,7 @@
 142  # use ARToolkit's video support with firewire digital camera support.
 143  # ARToolkit must be compiled properly to use dc1394 video.
 144  #
 145 -ARDC_LIBS = -lARvideo -lraw1394 -ldc1394_control
 146 +ARDC_LIBS = -lARvideo -lraw1394 -ldc1394
 147
 148  # SDL resources locations
 149  #
 150 diff -rau handvu-beta3/hv_ARtk/callbacks.cpp handvu-beta3-modified/hv_ARtk/callbacks.cpp
 151 --- handvu-beta3/hv_ARtk/callbacks.cpp  2005-01-11 13:02:11.000000000 +0900
 152 +++ handvu-beta3-modified/hv_ARtk/callbacks.cpp 2009-09-11 12:08:39.960307830 +0900
 153 @@ -12,6 +12,7 @@
 154  #include "callbacks.h"
 155  #include "drawing.h"
 156  #include "hv_ARtk_demo.h"
 157 +#include <limits.h>
 158
 159  using namespace std;
 160
 161 diff -rau handvu-beta3/hv_ARtk/hv_ARtk_demo.cpp handvu-beta3-modified/hv_ARtk/hv_ARtk_demo.cpp
 162 --- handvu-beta3/hv_ARtk/hv_ARtk_demo.cpp       2005-01-11 13:02:11.000000000 +0900
 163 +++ handvu-beta3-modified/hv_ARtk/hv_ARtk_demo.cpp      2009-09-11 12:09:45.533606187 +0900
 164 @@ -5,6 +5,7 @@
 165  #include <float.h>
 166  #include "hv_ARtk_demo.h"
 167  #include <math.h>
 168 +#include <string.h>
 169
 170  bool render_select( int x, int y, int* selected,
 171                     d3* selected_win);
 172 Only in handvu-beta3-modified/: lib