Ticket #26246: patch-cvcap_qt.mm.diff

src/highgui/cvcap_qt.mm

@@ -99 +99 @@
         CvCaptureCAM(int cameraNum = -1) ;
         ~CvCaptureCAM(); 
         virtual bool grabFrame(); 
-        virtual IplImage* retrieveFrame();
+        virtual IplImage* retrieveFrame(int);
         virtual IplImage* queryFrame(); 
         virtual double getProperty(int property_id); 
         virtual bool setProperty(int property_id, double value); 
@@ -142 +142 @@
         CvCaptureFile(const char* filename) ;
         ~CvCaptureFile(); 
         virtual bool grabFrame(); 
-        virtual IplImage* retrieveFrame();
+        virtual IplImage* retrieveFrame(int);
         virtual IplImage* queryFrame(); 
         virtual double getProperty(int property_id); 
         virtual bool setProperty(int property_id, double value); 
@@ -291 +291 @@
         return total <= timeOut;        
 }
 
-IplImage* CvCaptureCAM::retrieveFrame() {
+IplImage* CvCaptureCAM::retrieveFrame(int) {
         return [capture getOutput]; 
 }
 
@@ -304 +304 @@
                 startCaptureDevice(camNum); 
                  */
         }
-        return retrieveFrame(); 
+        return retrieveFrame(0); 
 }       
 
 void CvCaptureCAM::stopCaptureDevice() {
@@ -779 +779 @@
 }
 
 
-IplImage* CvCaptureFile::retrieveFrame() {
+IplImage* CvCaptureFile::retrieveFrame(int) {
         return retrieveFramePixelBuffer(); 
 }
 
 IplImage* CvCaptureFile::queryFrame() {
         grabFrame(); 
-        return retrieveFrame(); 
+        return retrieveFrame(0); 
 }       
 
 double CvCaptureFile::getFPS() {