[libcvd-members] libcvd/cvd_src Linux/v4lbuffer.cc noarch/conver...

[Georg Klein]

CVSROOT:        /sources/libcvd
Module name:    libcvd
Changes by:     Georg Klein <georgklein>        09/01/11 14:20:40

Modified files:
        cvd_src/Linux  : v4lbuffer.cc 
        cvd_src/noarch : convert_rgb_to_y.cc 

Log message:
        Turn streaming off when closing v4lbuffer, and fix for rgb_to_y non-asm
        version

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/Linux/v4lbuffer.cc?cvsroot=libcvd&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/noarch/convert_rgb_to_y.cc?cvsroot=libcvd&r1=1.1&r2=1.2

Patches:
Index: Linux/v4lbuffer.cc
===================================================================
RCS file: /sources/libcvd/libcvd/cvd_src/Linux/v4lbuffer.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- Linux/v4lbuffer.cc  8 Dec 2008 16:57:39 -0000       1.11
+++ Linux/v4lbuffer.cc  11 Jan 2009 14:20:40 -0000      1.12
@@ -333,6 +333,8 @@
     V4L2Client::~V4L2Client() {
        if (state == 0)
            return;
+       if(0 != ioctl(state->fd, VIDIOC_STREAMOFF, &state->refbuf.type))
+         throw string("streamoff failed");
        for (size_t i=0; i<state->frames.size(); i++) {
            if (0 != munmap(state->frames[i].data, state->frames[i].length))
                throw string("munmap failed");

Index: noarch/convert_rgb_to_y.cc
===================================================================
RCS file: /sources/libcvd/libcvd/cvd_src/noarch/convert_rgb_to_y.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- noarch/convert_rgb_to_y.cc  28 Feb 2008 00:27:23 -0000      1.1
+++ noarch/convert_rgb_to_y.cc  11 Jan 2009 14:20:40 -0000      1.2
@@ -3,7 +3,7 @@
 #include <cvd/utility.h>
 namespace CVD {
 
-       void ConvertImage<Rgb<byte>, byte, Pixel::CIE<Rgb<byte>, byte>, 
1>::convert(const BasicImage<Rgb<byte> >& from, BasicImage<byte>& to) 
+       void ConvertImage<Rgb<byte>, byte, Pixel::CIE<Rgb<byte>, byte>, 
1>::convert(const SubImage<Rgb<byte> >& from, SubImage<byte>& to) 
        {
                const Rgb<byte>* rgb = from.data();
                byte* gray = to.data(), *gend = to.data() + to.totalsize();