1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
diff -Naur qgifer-0.2.1-source/CMakeLists.txt qgifer-0.2.1-modified/CMakeLists.txt
--- qgifer-0.2.1-source/CMakeLists.txt 2013-06-04 18:33:16.000000000 +0200
+++ qgifer-0.2.1-modified/CMakeLists.txt 2015-12-19 20:58:13.772808845 +0100
@@ -35,7 +35,7 @@
SET(GIF_INCLUDE_DIR "C:\\Program Files\\GnuWin32\\include")
ENDIF(WIN32)
-FIND_PACKAGE( OpenCV REQUIRED core highgui imgproc )
+FIND_PACKAGE( OpenCV REQUIRED core highgui imgproc videoio)
FIND_PACKAGE(Qt4 REQUIRED)
FIND_PACKAGE(GIF REQUIRED)
@@ -148,9 +148,9 @@
QT4_ADD_RESOURCES(RESOURCES_RCC ${RESOURCES})
IF(WIN32)
- SET( OPENCV_LIBS "-lopencv_core244 -lopencv_highgui244 -lopencv_imgproc244" )
+ SET( OPENCV_LIBS "-lopencv_core244 -lopencv_highgui244 -lopencv_imgproc244 -lopencv_videoio244" )
ELSE(WIN32)
- SET( OPENCV_LIBS "-lopencv_core -lopencv_highgui -lopencv_imgproc" )
+ SET( OPENCV_LIBS "-lopencv_core -lopencv_highgui -lopencv_imgproc -lopencv_videoio" )
ENDIF(WIN32)
SET( GIF_LIBS "-lgif" )
@@ -207,7 +207,7 @@
#SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${PACKAGE_NAME}_${QGIFER_VERSION_MAJOR}.${QGIFER_VERSION_MINOR}.${QGIFER_VERSION_PATCH}")
#set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) #za pierwszym razem, pozniej dodano | dla nowszych opencv
-SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.1.3), libc6 (>= 2.3.6-6~), libgcc1 (>= 1:4.1.1), libgif4 (>= 4.1.4), libopencv-core2.3 | libopencv-core2.4, libopencv-highgui2.3 | libopencv-highgui2.4, libopencv-imgproc2.3 | libopencv-imgproc2.4, libqtcore4 (>= 4:4.7.0~beta1), libqtgui4 (>= 4:4.6.1), libstdc++6 (>= 4.1.1)")
+SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.1.3), libc6 (>= 2.3.6-6~), libgcc1 (>= 1:4.1.1), libgif4 (>= 4.1.4), libopencv-core2.3 | libopencv-core2.4 | libopencv-core3.0, libopencv-highgui2.3 | libopencv-highgui2.4 | libopencv-highgui3.0, libopencv-imgproc2.3 | libopencv-imgproc2.4 | libopencv-imgproc3.0, libqtcore4 (>= 4:4.7.0~beta1), libqtgui4 (>= 4:4.6.1), libstdc++6 (>= 4.1.1)")
SET(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
SET(CPACK_DEBIAN_PACKAGE_SECTION "video")
diff -Naur qgifer-0.2.1-source/src/frameplayer.h qgifer-0.2.1-modified/src/frameplayer.h
--- qgifer-0.2.1-source/src/frameplayer.h 2013-06-04 18:14:55.000000000 +0200
+++ qgifer-0.2.1-modified/src/frameplayer.h 2015-12-19 21:01:44.419870869 +0100
@@ -23,6 +23,7 @@
#include <opencv2/core/core.hpp>
#include <opencv2/highgui/highgui.hpp>
#include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/videoio/videoio.hpp>
#include <QWidget>
#include <QImage>
#include <QStatusBar>
|
GitWeb
