Merge pull request #3291 from asmorkalov:android_superres_video_check

pull/3297/head
Andrey Pavlenko 11 years ago
commit aa6b5ac124
  1. 13
      modules/superres/test/test_precomp.hpp
  2. 4
      modules/superres/test/test_superres.cpp

@ -60,4 +60,17 @@
#include "opencv2/superres/superres.hpp" #include "opencv2/superres/superres.hpp"
#include "input_array_utility.hpp" #include "input_array_utility.hpp"
#if defined(HAVE_XINE) || \
defined(HAVE_GSTREAMER) || \
defined(HAVE_QUICKTIME) || \
defined(HAVE_QTKIT) || \
defined(HAVE_AVFOUNDATION) || \
defined(HAVE_FFMPEG) || \
defined(HAVE_MSMF) || \
defined(HAVE_VFW)
# define BUILD_WITH_VIDEO_INPUT_SUPPORT 1
#else
# define BUILD_WITH_VIDEO_INPUT_SUPPORT 0
#endif
#endif #endif

@ -42,6 +42,8 @@
#include "test_precomp.hpp" #include "test_precomp.hpp"
#if BUILD_WITH_VIDEO_INPUT_SUPPORT
class AllignedFrameSource : public cv::superres::FrameSource class AllignedFrameSource : public cv::superres::FrameSource
{ {
public: public:
@ -291,3 +293,5 @@ TEST_F(SuperResolution, BTVL1_OCL)
RunTest(cv::superres::createSuperResolution_BTVL1_OCL()); RunTest(cv::superres::createSuperResolution_BTVL1_OCL());
} }
#endif #endif
#endif // BUILD_WITH_VIDEO_INPUT_SUPPORT

Loading…
Cancel
Save