[libcvd-members] libcvd cvd/internal/scalar_convert.h cvd/intern...

[Edward Rosten]

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Changes by:     Edward Rosten <edrosten>        08/05/12 17:52:05

Modified files:
        cvd/internal   : scalar_convert.h 
        cvd/internal/io: tiff.h 
        cvd_src/Linux  : v4l1buffer.cc 
        cvd_src/fast   : fast_10_score.cxx fast_11_score.cxx 
                         fast_12_score.cxx fast_7_score.cxx 
                         fast_8_score.cxx fast_9_score.cxx 
        progs          : calibrate.cxx 

Log message:
        More fixes and warning removals for gcc 4.3.0

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd/internal/scalar_convert.h?cvsroot=libcvd&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd/internal/io/tiff.h?cvsroot=libcvd&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/Linux/v4l1buffer.cc?cvsroot=libcvd&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/fast/fast_10_score.cxx?cvsroot=libcvd&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/fast/fast_11_score.cxx?cvsroot=libcvd&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/fast/fast_12_score.cxx?cvsroot=libcvd&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/fast/fast_7_score.cxx?cvsroot=libcvd&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/fast/fast_8_score.cxx?cvsroot=libcvd&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/fast/fast_9_score.cxx?cvsroot=libcvd&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/libcvd/progs/calibrate.cxx?cvsroot=libcvd&r1=1.3&r2=1.4

Patches:
Index: cvd/internal/scalar_convert.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd/internal/scalar_convert.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- cvd/internal/scalar_convert.h       12 Jul 2006 21:40:02 -0000      1.11
+++ cvd/internal/scalar_convert.h       12 May 2008 17:52:01 -0000      1.12
@@ -109,8 +109,8 @@
                    table[i] = (i-255)/255.0;    
                  return true;
                }
-               static bool init_float_for_byte = 
buildLookupTable(float_for_byte);
-               static bool init_double_for_byte = 
buildLookupTable(double_for_byte);
+               const static bool init_float_for_byte = 
buildLookupTable(float_for_byte);
+               const static bool init_double_for_byte = 
buildLookupTable(double_for_byte);
                inline float byte_to_float(int b) { return 
float_for_byte[b+255]; }
                inline double byte_to_double(int b) { return 
double_for_byte[b+255]; }
                

Index: cvd/internal/io/tiff.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd/internal/io/tiff.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- cvd/internal/io/tiff.h      28 Nov 2005 19:05:12 -0000      1.2
+++ cvd/internal/io/tiff.h      12 May 2008 17:52:01 -0000      1.3
@@ -22,6 +22,7 @@
 #define PNM_TIFF
 
 #include <iostream>
+#include <vector>
 #include <string>
 #include <stdarg.h>
 #include <cvd/image.h>
@@ -76,29 +77,29 @@
 
        template <class T, class S> struct TIFFReader<T,S,1> {
          static void read(BasicImage<T>& im, tiff_in& tiff) {
-           std::auto_ptr<S> rowbuf(new S[tiff.x_size()]);
+               std::vector<S> rowbuf(tiff.x_size());
            for (int r=0; r<tiff.y_size(); r++) {
-             tiff.get_raw_pixel_lines(rowbuf.get(), 1);
-             Pixel::ConvertPixels<S,T>::convert(rowbuf.get(), im[r], 
tiff.x_size());
+             tiff.get_raw_pixel_lines(&rowbuf[0], 1);
+             Pixel::ConvertPixels<S,T>::convert(&rowbuf[0], im[r], 
tiff.x_size());
            }       
          }
        };
        template <class T, class S> struct TIFFReader<T,S,3> {
          static void read(BasicImage<T>& im, tiff_in& tiff) {
-           std::auto_ptr<Rgb<S> > rowbuf(new Rgb<S>[tiff.x_size()]);
+               std::vector<Rgb<S> > rowbuf(tiff.x_size());
            for (int r=0; r<tiff.y_size(); r++) {
-             tiff.get_raw_pixel_lines((S*)rowbuf.get(), 1);
-             Pixel::ConvertPixels<Rgb<S>,T>::convert(rowbuf.get(), im[r], 
tiff.x_size());
+             tiff.get_raw_pixel_lines((S*)&rowbuf[0], 1);
+             Pixel::ConvertPixels<Rgb<S>,T>::convert(&rowbuf[0], im[r], 
tiff.x_size());
            }       
          }
        };
 
        template <class T, class S> struct TIFFReader<T,S,4> {
          static void read(BasicImage<T>& im, tiff_in& tiff) {
-           std::auto_ptr<Rgba<S> > rowbuf(new Rgba<S>[tiff.x_size()]);
+               std::vector<Rgba<S> > rowbuf(tiff.x_size());
            for (int r=0; r<tiff.y_size(); r++) {
-             tiff.get_raw_pixel_lines((S*)rowbuf.get(), 1);
-             Pixel::ConvertPixels<Rgba<S>,T>::convert(rowbuf.get(), im[r], 
tiff.x_size());
+             tiff.get_raw_pixel_lines((S*)&rowbuf[0], 1);
+             Pixel::ConvertPixels<Rgba<S>,T>::convert(&rowbuf[0], im[r], 
tiff.x_size());
            }       
          }
        };

Index: cvd_src/Linux/v4l1buffer.cc
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/Linux/v4l1buffer.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- cvd_src/Linux/v4l1buffer.cc 29 Apr 2008 19:57:54 -0000      1.9
+++ cvd_src/Linux/v4l1buffer.cc 12 May 2008 17:52:02 -0000      1.10
@@ -19,6 +19,7 @@
     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #include <sstream>
+#include <algorithm>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <unistd.h>

Index: cvd_src/fast/fast_10_score.cxx
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/fast/fast_10_score.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- cvd_src/fast/fast_10_score.cxx      23 Jul 2007 20:43:29 -0000      1.2
+++ cvd_src/fast/fast_10_score.cxx      12 May 2008 17:52:03 -0000      1.3
@@ -1,4 +1,5 @@
 #include <vector>
+#include <climits>
 #include <cvd/image.h>
 #include <cvd/byte.h>
 

Index: cvd_src/fast/fast_11_score.cxx
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/fast/fast_11_score.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- cvd_src/fast/fast_11_score.cxx      23 Jul 2007 20:43:29 -0000      1.2
+++ cvd_src/fast/fast_11_score.cxx      12 May 2008 17:52:03 -0000      1.3
@@ -1,4 +1,5 @@
 #include <vector>
+#include <climits>
 #include <cvd/image.h>
 #include <cvd/byte.h>
 

Index: cvd_src/fast/fast_12_score.cxx
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/fast/fast_12_score.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- cvd_src/fast/fast_12_score.cxx      23 Jul 2007 20:43:29 -0000      1.2
+++ cvd_src/fast/fast_12_score.cxx      12 May 2008 17:52:03 -0000      1.3
@@ -1,4 +1,5 @@
 #include <vector>
+#include <climits>
 #include <cvd/image.h>
 #include <cvd/byte.h>
 

Index: cvd_src/fast/fast_7_score.cxx
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/fast/fast_7_score.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- cvd_src/fast/fast_7_score.cxx       23 Jul 2007 20:43:30 -0000      1.2
+++ cvd_src/fast/fast_7_score.cxx       12 May 2008 17:52:03 -0000      1.3
@@ -1,4 +1,5 @@
 #include <vector>
+#include <climits>
 #include <cvd/image.h>
 #include <cvd/byte.h>
 

Index: cvd_src/fast/fast_8_score.cxx
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/fast/fast_8_score.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- cvd_src/fast/fast_8_score.cxx       23 Jul 2007 20:43:30 -0000      1.2
+++ cvd_src/fast/fast_8_score.cxx       12 May 2008 17:52:04 -0000      1.3
@@ -1,4 +1,5 @@
 #include <vector>
+#include <climits>
 #include <cvd/image.h>
 #include <cvd/byte.h>
 

Index: cvd_src/fast/fast_9_score.cxx
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/fast/fast_9_score.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- cvd_src/fast/fast_9_score.cxx       23 Jul 2007 20:43:31 -0000      1.2
+++ cvd_src/fast/fast_9_score.cxx       12 May 2008 17:52:04 -0000      1.3
@@ -1,4 +1,5 @@
 #include <vector>
+#include <climits>
 #include <cvd/image.h>
 #include <cvd/byte.h>
 

Index: progs/calibrate.cxx
===================================================================
RCS file: /cvsroot/libcvd/libcvd/progs/calibrate.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- progs/calibrate.cxx 1 Mar 2008 13:38:18 -0000       1.3
+++ progs/calibrate.cxx 12 May 2008 17:52:05 -0000      1.4
@@ -852,6 +852,7 @@
                     {
                       doParams = !doParams;
                       if(stage == 1)
+                                         {
                         if(doParams)
                           titlePrefix = "Calibrate: Tracking Pose and Internal 
Params";
                         else
@@ -859,6 +860,7 @@
                     }
                 }
             }
+            }
 
           VideoFrame<CAMERA_PIXEL>* vframe = videoBuffer->get_frame();
           while(videoBuffer->frame_pending())