[libcvd-members] libcvd cvd/readaheadvideobuffer.h cvd/timer.h c...

[Gerhard Reitmayr]

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Changes by:     Gerhard Reitmayr <gerhard>      10/11/16 23:45:25

Modified files:
        cvd            : readaheadvideobuffer.h timer.h utility.h 
        cvd_src/Linux  : dvbuffer3_dc1394v2.cc 

Log message:
        small fixes and WIN32 compatibility

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd/readaheadvideobuffer.h?cvsroot=libcvd&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd/timer.h?cvsroot=libcvd&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd/utility.h?cvsroot=libcvd&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/Linux/dvbuffer3_dc1394v2.cc?cvsroot=libcvd&r1=1.13&r2=1.14

Patches:
Index: cvd/readaheadvideobuffer.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd/readaheadvideobuffer.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- cvd/readaheadvideobuffer.h  2 Dec 2008 17:30:40 -0000       1.6
+++ cvd/readaheadvideobuffer.h  16 Nov 2010 23:45:25 -0000      1.7
@@ -34,7 +34,9 @@
 
 namespace CVD {
     #ifndef CVD_HAVE_PTHREAD
+    #ifndef _WIN32
     #warning ReadAheadVideoBuffer will not do any read-ahead because threads 
are not supported in this build
+    #endif
     template <class T> 
     class ReadAheadVideoBuffer : public VideoBuffer<T>
     {

Index: cvd/timer.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd/timer.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- cvd/timer.h 13 Jan 2010 16:18:12 -0000      1.12
+++ cvd/timer.h 16 Nov 2010 23:45:25 -0000      1.13
@@ -61,7 +61,7 @@
 
                /// Convert current time given as double by correcting for the 
start time
                /// @param time current time as double
-               double conv_ntime(const double time) const {
+               double conv_ntime(const double & time) const {
                        return time - startTime * 1.e-6;
                }
 

Index: cvd/utility.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd/utility.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- cvd/utility.h       12 Nov 2010 14:07:31 -0000      1.15
+++ cvd/utility.h       16 Nov 2010 23:45:25 -0000      1.16
@@ -1,7 +1,9 @@
 #ifndef CVD_UTILITY_H
 #define CVD_UTILITY_H
 
+#ifndef _WIN32
 #include <stdint.h>
+#endif
 
 #include <cvd/image.h>
 #include <cvd/internal/is_pod.h>

Index: cvd_src/Linux/dvbuffer3_dc1394v2.cc
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/Linux/dvbuffer3_dc1394v2.cc,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- cvd_src/Linux/dvbuffer3_dc1394v2.cc 20 Apr 2010 16:08:11 -0000      1.13
+++ cvd_src/Linux/dvbuffer3_dc1394v2.cc 16 Nov 2010 23:45:25 -0000      1.14
@@ -22,6 +22,8 @@
 
 #include <cvd/Linux/dvbuffer3.h>
 #include <cvd/byte.h>
+#include <cvd/timer.h>
+
 #include <dc1394/dc1394.h>
 #ifndef __APPLE__
 #include <libraw1394/raw1394.h>
@@ -140,7 +142,7 @@
     struct DV3Frame : public VideoFrame<byte>
     {
       DV3Frame(dc1394video_frame_t *pDC1394Frame)
-       : VideoFrame<byte>(pDC1394Frame->timestamp * 1000000.0,
+       : VideoFrame<byte>(const_cast<const cvd_timer & 
>(timer).conv_ntime(pDC1394Frame->timestamp / 1000000.0),
                           pDC1394Frame->image,
                           ImageRef(pDC1394Frame->size[0], 
pDC1394Frame->size[1]))
       {        mpDC1394Frame = pDC1394Frame; }