generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix for bug Bug #3215. Added HAVE_QTKIT as a separate mode from HAVE_QUICKTIME

Browse Source
This commit is contained in:
kamjagin 2013-08-14 13:33:47 +02:00
parent 93f05fed35
commit 7ff07e94a3
5 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -745,8 +745,8 @@ if(DEFINED WITH_GIGEAPI)
endif(DEFINED WITH_GIGEAPI) endif(DEFINED WITH_GIGEAPI)
if(DEFINED WITH_QUICKTIME) if(DEFINED WITH_QUICKTIME)
status(" QuickTime:" WITH_QUICKTIME THEN YES ELSE NO) status(" QuickTime:" HAVE_QUICKTIME THEN YES ELSE NO)
status(" QTKit:" WITH_QUICKTIME THEN NO ELSE YES) status(" QTKit:" HAVE_QTKIT THEN YES ELSE NO)
endif(DEFINED WITH_QUICKTIME) endif(DEFINED WITH_QUICKTIME)
if(DEFINED WITH_UNICAP) if(DEFINED WITH_UNICAP)

2
cmake/OpenCVFindLibsVideo.cmake
View File

@ -244,4 +244,6 @@ endif()
# --- QuickTime --- # --- QuickTime ---
if(WITH_QUICKTIME) if(WITH_QUICKTIME)
set(HAVE_QUICKTIME YES) set(HAVE_QUICKTIME YES)
elseif(APPLE)
set(HAVE_QTKIT YES)
endif() endif()

3
cmake/templates/cvconfig.h.cmake
View File

@ -133,6 +133,9 @@
/* QuickTime video libraries */ /* QuickTime video libraries */
#cmakedefine HAVE_QUICKTIME #cmakedefine HAVE_QUICKTIME
/* QTKit video libraries */
#cmakedefine HAVE_QTKIT
/* Intel Threading Building Blocks */ /* Intel Threading Building Blocks */
#cmakedefine HAVE_TBB #cmakedefine HAVE_TBB

2
modules/highgui/CMakeLists.txt
View File

@ -213,7 +213,7 @@ endif()
if(HAVE_QUICKTIME) if(HAVE_QUICKTIME)
list(APPEND highgui_srcs src/cap_qt.cpp) list(APPEND highgui_srcs src/cap_qt.cpp)
list(APPEND HIGHGUI_LIBRARIES "-framework Carbon" "-framework QuickTime" "-framework CoreFoundation" "-framework QuartzCore") list(APPEND HIGHGUI_LIBRARIES "-framework Carbon" "-framework QuickTime" "-framework CoreFoundation" "-framework QuartzCore")
elseif(APPLE) elseif(HAVE_QTKIT)
list(APPEND highgui_srcs src/cap_qtkit.mm) list(APPEND highgui_srcs src/cap_qtkit.mm)
list(APPEND HIGHGUI_LIBRARIES "-framework QTKit" "-framework QuartzCore" "-framework AppKit") list(APPEND HIGHGUI_LIBRARIES "-framework QTKit" "-framework QuartzCore" "-framework AppKit")
endif() endif()

9
modules/highgui/src/cap.cpp
View File

@ -135,7 +135,7 @@ CV_IMPL CvCapture * cvCreateCameraCapture (int index)
#ifdef HAVE_MIL #ifdef HAVE_MIL
CV_CAP_MIL, CV_CAP_MIL,
#endif #endif
#ifdef HAVE_QUICKTIME if defined(HAVE_QUICKTIME) || defined(HAVE_QTKIT)
CV_CAP_QT, CV_CAP_QT,
#endif #endif
#ifdef HAVE_UNICAP #ifdef HAVE_UNICAP
@ -185,6 +185,7 @@ CV_IMPL CvCapture * cvCreateCameraCapture (int index)
defined(HAVE_CMU1394) || \ defined(HAVE_CMU1394) || \
defined(HAVE_MIL) || \ defined(HAVE_MIL) || \
defined(HAVE_QUICKTIME) || \ defined(HAVE_QUICKTIME) || \
defined(HAVE_QTKIT) || \
defined(HAVE_UNICAP) || \ defined(HAVE_UNICAP) || \
defined(HAVE_PVAPI) || \ defined(HAVE_PVAPI) || \
defined(HAVE_OPENNI) || \ defined(HAVE_OPENNI) || \
@ -277,7 +278,7 @@ CV_IMPL CvCapture * cvCreateCameraCapture (int index)
break; break;
#endif #endif
#ifdef HAVE_QUICKTIME #if defined(HAVE_QUICKTIME) || defined(HAVE_QTKIT)
case CV_CAP_QT: case CV_CAP_QT:
capture = cvCreateCameraCapture_QT (index); capture = cvCreateCameraCapture_QT (index);
if (capture) if (capture)
@ -378,7 +379,7 @@ CV_IMPL CvCapture * cvCreateFileCapture (const char * filename)
result = cvCreateCapture_GStreamer (CV_CAP_GSTREAMER_FILE, filename); result = cvCreateCapture_GStreamer (CV_CAP_GSTREAMER_FILE, filename);
#endif #endif
#ifdef HAVE_QUICKTIME #if defined(HAVE_QUICKTIME) || defined(HAVE_QTKIT)
if (! result) if (! result)
result = cvCreateFileCapture_QT (filename); result = cvCreateFileCapture_QT (filename);
#endif #endif
@ -436,7 +437,7 @@ CV_IMPL CvVideoWriter* cvCreateVideoWriter( const char* filename, int fourcc,
result = cvCreateVideoWriter_AVFoundation(filename, fourcc, fps, frameSize, is_color); result = cvCreateVideoWriter_AVFoundation(filename, fourcc, fps, frameSize, is_color);
#endif #endif
#ifdef HAVE_QUICKTIME #if defined(HAVE_QUICKTIME) || defined(HAVE_QTKIT)
if(!result) if(!result)
result = cvCreateVideoWriter_QT(filename, fourcc, fps, frameSize, is_color); result = cvCreateVideoWriter_QT(filename, fourcc, fps, frameSize, is_color);
#endif #endif