Ticket #862: OpenCV-2.2-nov4l1.patch

File OpenCV-2.2-nov4l1.patch, 1.1 KB (added by kwizart, 3 years ago)

Update of the nov4l1 patch

  • OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp

    diff -up OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp.nov4l1 OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp
    old new  
    214214#include <sys/types.h> 
    215215#include <sys/mman.h> 
    216216 
     217#ifdef HAVE_CAMV4L 
    217218#include <linux/videodev.h> 
     219#endif 
    218220 
    219221#include <string.h> 
    220222#include <stdlib.h> 
  • OpenCV-2.2.0/modules/highgui/src/cap.cpp

    diff -up OpenCV-2.2.0/modules/highgui/src/cap.cpp.nov4l1 OpenCV-2.2.0/modules/highgui/src/cap.cpp
    old new  
    171171            if (capture) 
    172172                return capture; 
    173173        #endif 
    174         #if defined (HAVE_CAMV4L) || defined (HAVE_CAMV4L2) 
     174        #if defined (HAVE_CAMV4L) 
    175175            capture = cvCreateCameraCapture_V4L (index); 
    176176            if (capture) 
    177177                return capture;