opengazer/opengazer.patch

   1 diff -aur opengazer-0.1.2/FaceDetector.h opengazer-0.1.2-mod/FaceDetector.h
   2 --- opengazer-0.1.2/FaceDetector.h      2007-08-27 12:25:09.000000000 -0400
   3 +++ opengazer-0.1.2-mod/FaceDetector.h  2009-08-29 02:13:57.000000000 -0400
   4 @@ -7,7 +7,7 @@
   5
   6  public:
   7      static FaceDetector facedetector;
   8 -    FaceDetector(char *cascadename="haarcascade_frontalface_alt.xml");
   9 +    FaceDetector(char *cascadename="/usr/share/opengazer/haarcascade_frontalface_alt.xml");
  10      ~FaceDetector();
  11      vector<CvRect> detect(const IplImage *img);
  12  };
  13 diff -aur opengazer-0.1.2/GazeTracker.cpp opengazer-0.1.2-mod/GazeTracker.cpp
  14 --- opengazer-0.1.2/GazeTracker.cpp     2007-08-27 12:25:10.000000000 -0400
  15 +++ opengazer-0.1.2-mod/GazeTracker.cpp 2009-08-29 02:13:57.000000000 -0400
  16 @@ -118,7 +118,7 @@
  17
  18  void GazeTracker::save(void) {
  19      CvFileStorage *out =
  20 -       cvOpenFileStorage("calibration.xml", NULL, CV_STORAGE_WRITE);
  21 +       cvOpenFileStorage("~/.opengazer/calibration.xml", NULL, CV_STORAGE_WRITE);
  22      save(out, "GazeTracker");
  23      cvReleaseFileStorage(&out);
  24  }
  25 @@ -132,7 +132,7 @@
  26
  27  void GazeTracker::load(void) {
  28      CvFileStorage *in =
  29 -       cvOpenFileStorage("calibration.xml", NULL, CV_STORAGE_READ);
  30 +       cvOpenFileStorage("~/.opengazer/calibration.xml", NULL, CV_STORAGE_READ);
  31      CvFileNode *root = cvGetRootFileNode(in);
  32      load(in, cvGetFileNodeByName(in, root, "GazeTracker"));
  33      cvReleaseFileStorage(&in);
  34 diff -aur opengazer-0.1.2/MainGazeTracker.cpp opengazer-0.1.2-mod/MainGazeTracker.cpp
  35 --- opengazer-0.1.2/MainGazeTracker.cpp 2007-08-27 12:25:10.000000000 -0400
  36 +++ opengazer-0.1.2-mod/MainGazeTracker.cpp     2009-08-29 02:20:28.000000000 -0400
  37 @@ -85,9 +85,14 @@
  38  }
  39
  40  void MainGazeTracker::savepoints() {
  41 +    string trackerfile, pointsfile;
  42 +    trackerfile = getenv("HOME");
  43 +    pointsfile= trackerfile;
  44 +    trackerfile += "/.opengazer/tracker";
  45 +    pointsfile += "/.opengazer/points.txt";
  46      try {
  47 -       tracking->tracker.save("tracker", "points.txt", videoinput->frame);
  48 -       autoreload = true;
  49 +        tracking->tracker.save(trackerfile.c_str(), pointsfile.c_str(), videoinput->frame);
  50 +        autoreload = true;
  51      }
  52      catch (ios_base::failure &e) {
  53         cout << e.what() << endl;
  54 @@ -95,8 +100,13 @@
  55  }
  56
  57  void MainGazeTracker::loadpoints() {
  58 +    string trackerfile, pointsfile;
  59 +    trackerfile = getenv("HOME");
  60 +    pointsfile= trackerfile;
  61 +    trackerfile += "/.opengazer/tracker";
  62 +    pointsfile += "/.opengazer/points.txt";
  63      try {
  64 -       tracking->tracker.load("tracker", "points.txt", videoinput->frame);
  65 +        tracking->tracker.load(trackerfile.c_str(), pointsfile.c_str(), videoinput->frame);
  66         autoreload = true;
  67      }
  68      catch (ios_base::failure &e) {
  69 @@ -168,7 +178,7 @@
  70      shared_ptr<WindowPointer>
  71         pointer(new WindowPointer(WindowPointer::PointerSpec(30,30,1,0,0)));
  72
  73 -    ifstream calfile("calpoints.txt");
  74 +    ifstream calfile("/usr/share/opengazer/calpoints.txt");
  75
  76      shared_ptr<Calibrator>
  77         calibrator(new Calibrator(framecount, tracking,
  78 diff -aur opengazer-0.1.2/Makefile opengazer-0.1.2-mod/Makefile
  79 --- opengazer-0.1.2/Makefile    2007-08-27 12:25:09.000000000 -0400
  80 +++ opengazer-0.1.2-mod/Makefile        2009-08-29 02:13:57.000000000 -0400
  81 @@ -1,9 +1,9 @@
  82  # required libraries: vxl, opencv, boost, gtkmm
  83
  84 -VXLDIR = /opt
  85 +VXLDIR = /usr
  86  VERSION = opengazer-0.1.2
  87  CPPFLAGS = -Wall -g -O3
  88 -LINKER = -L$(VXLDIR)/lib -L/usr/local/lib -lm -ldl -lvnl -lmvl -lvnl_algo -lvgl -lgthread-2.0
  89 +LINKER = -L$(VXLDIR)/lib -L/usr/local/lib -lm -ldl -lmvl -lvnl_algo -lvnl -lv3p_netlib -lnetlib -lvcl -lvgl -lgthread-2.0
  90
  91  # change the following line if your vxl library is installed elsewhere
  92  INCLUDES = $(foreach prefix,/usr/local/include $(VXLDIR)/include $(VXLDIR)/include/vxl, \
  93 @@ -24,7 +24,7 @@
  94         g++ -c $(CPPFLAGS) -o $@ `pkg-config cairomm-1.0 opencv gtkmm-2.4 --cflags` $(INCLUDES) $<
  95
  96  opengazer:     $(objects)
  97 -       g++ $(CPPFLAGS) -o $@ `pkg-config cairomm-1.0 opencv gtkmm-2.4 --libs`  $(LINKER) $^
  98 +       g++ $(CPPFLAGS) -o $@ `pkg-config cairomm-1.0 opencv gtkmm-2.4 --libs`  $^ $(LINKER)
  99
 100  include $(patsubst %.cpp,%.o.depends,$(sources))
 101
 102 diff -aur opengazer-0.1.2/PointTracker.h opengazer-0.1.2-mod/PointTracker.h
 103 --- opengazer-0.1.2/PointTracker.h      2007-08-27 12:25:10.000000000 -0400
 104 +++ opengazer-0.1.2-mod/PointTracker.h  2009-08-29 02:13:57.000000000 -0400
 105 @@ -8,7 +8,7 @@
 106  using namespace std;
 107  typedef vgl_vector_2d<double> HomPoint;
 108
 109 -class TrackingException: public exception {};
 110 +class TrackingException: public std::exception {};
 111
 112  class PointTracker {
 113  public: