commit 88da206036edff6d30488e658076545afa8d88b5
author Brian Silverman <brians> Wed Aug 28 16:22:31 2013 -0700
committer Brian Silverman <brians> Wed Aug 28 16:22:31 2013 -0700
tree 7a92264cceeabfcc56519d498000819f70b7bf14
parent 8b34e27e395435bbadec744d17e9a5da0220f082

updated code so it would compile with a newer GCC (and less opencv...)

vision/BinaryServer.cpp

diff --git a/vision/BinaryServer.cpp b/vision/BinaryServer.cpp
index c3c0b5e..29deee9 100644
--- a/vision/BinaryServer.cpp
+++ b/vision/BinaryServer.cpp
@@ -14,7 +14,6 @@
 #include "aos/externals/libjpeg/include/jpeglib.h"
 #include "aos/atom_code/camera/Buffers.h"
 #include "aos/common/time.h"
-#include "opencv2/opencv.hpp"
 
 namespace frc971 {
 namespace vision {

vision/JPEGRoutines.cpp

diff --git a/vision/JPEGRoutines.cpp b/vision/JPEGRoutines.cpp
index acddd89..e3dc254 100644
--- a/vision/JPEGRoutines.cpp
+++ b/vision/JPEGRoutines.cpp
@@ -8,7 +8,6 @@
 #include <string.h>
 
 #include "aos/common/time.h"
-#include "opencv2/opencv.hpp"
 
 #include "vision/OpenCVWorkTask.h"
 
@@ -131,8 +130,7 @@
   struct jpeg_error_mgr jerr;
 
   static aos::time::Time timestamp_old = aos::time::Time::Now();
-  aos::time::Time timestamp_start = aos::time::Time::Now();
-
+  //aos::time::Time timestamp_start = aos::time::Time::Now();
   
   cinfo.err = jpeg_std_error( &jerr );
   cinfo.out_color_space = JCS_RGB;

vision/OpenCVWorkTask.cpp

diff --git a/vision/OpenCVWorkTask.cpp b/vision/OpenCVWorkTask.cpp
index df4d450..9d68065 100644
--- a/vision/OpenCVWorkTask.cpp
+++ b/vision/OpenCVWorkTask.cpp
@@ -8,7 +8,6 @@
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
-#include "opencv2/opencv.hpp"
 
 #include "aos/common/time.h"
 #include "aos/atom_code/camera/Buffers.h"
@@ -82,7 +81,9 @@
     // parker you prolly want const_cast<type>(var);
     LOG(INFO, "Got new image\n");
     unsigned char *buffer = (unsigned char *)notify->GetBuffer();
-    frc971::vision::process_jpeg(buffer, (unsigned char *)image, data_size);
+    frc971::vision::process_jpeg(buffer,
+                                 (unsigned char *)const_cast<void *>(image),
+                                 data_size);
 
     // build the headers on top of the buffer
     cvSetData(processor.src_header_image,