0001-Add-the-ability-to-request-the-raw-file-descriptor-a.patch

Josh Pieper, 2012-10-22 09:38 pm

Download (2.2 kB)

 
b/modules/highgui/include/opencv2/highgui/highgui_c.h
380 380
    CV_CAP_PROP_ROLL          =35,
381 381
    CV_CAP_PROP_IRIS          =36,
382 382
    CV_CAP_PROP_SETTINGS      =37,
383
    CV_CAP_PROP_DEVICE_HANDLE =38,
383 384

  
384 385
    CV_CAP_PROP_AUTOGRAB      =1024, // property for highgui class CvCapture_Android only
385 386
    CV_CAP_PROP_SUPPORTED_PREVIEW_SIZES_STRING=1025, // readonly, tricky property, returns cpnst char* indeed
b/modules/highgui/src/cap_dc1394_v2.cpp
671 671
        break;
672 672
    case CV_CAP_PROP_ISO_SPEED:
673 673
        return (double) isoSpeed;
674
    case CV_CAP_PROP_DEVICE_HANDLE:
675
        return (double) dc1394_capture_get_fileno(dcCam);
674 676
    default:
675 677
        if (propId<CV_CAP_PROP_MAX_DC1394 && dc1394properties[propId]!=-1
676 678
            && dcCam)
b/modules/highgui/src/cap_libv4l.cpp
1350 1350
      sprintf(name, "Exposure");
1351 1351
      capture->control.id = V4L2_CID_EXPOSURE;
1352 1352
      break;
1353
    case CV_CAP_PROP_DEVICE_HANDLE:
1354
      return capture->deviceHandle;
1353 1355
    default:
1354 1356
      sprintf(name, "<unknown property string>");
1355 1357
      capture->control.id = property_id;
1356
-