Made calibration a bit faster in the absense of a checkboard and trying to fix

a crash with the libv4l capture code
2010-11-01 06:20:36 +00:00
parent 40c05d8418
commit 9ee954a0c6
2 changed files with 24 additions and 17 deletions
--- a/modules/highgui/src/cap_libv4l.cpp
+++ b/modules/highgui/src/cap_libv4l.cpp
@@ -1261,9 +1261,11 @@ static IplImage* icvRetrieveFrameCAM_V4L( CvCaptureCAM_V4L* capture, int) {
  if (capture->is_v4l2_device == 1)
  {

-      memcpy((char *)capture->frame.imageData,
-             (char *)capture->buffers[capture->bufferIndex].start,
-             capture->frame.imageSize);
+	  if(capture->buffers[capture->bufferIndex].start){
+		  memcpy((char *)capture->frame.imageData,
+				 (char *)capture->buffers[capture->bufferIndex].start,
+				 capture->frame.imageSize);
+	  }

  } else
 #endif /* HAVE_CAMV4L2 */