Destinquish old and new OpenCV

This commit is contained in:
jriegel
2014-08-27 16:42:50 +02:00
parent 58a7be992b
commit 5bdfe81488
4 changed files with 16 additions and 16 deletions

View File

@@ -31,7 +31,7 @@
#include <Gui/BitmapFactory.h>
#include "ImageOrientationDialog.h"
#if HAVE_OPENCV
#if HAVE_OPENCV2
# include "opencv2/opencv.hpp"
#endif
@@ -147,7 +147,7 @@ bool CmdCreateImagePlane::isActive()
}
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
#if HAVE_OPENCV
#if HAVE_OPENCV2
DEF_STD_CMD(CmdImageCapturerTest);
CmdImageCapturerTest::CmdImageCapturerTest()
@@ -193,7 +193,7 @@ void CreateImageCommands(void)
rcCmdMgr.addCommand(new CmdImageOpen());
rcCmdMgr.addCommand(new CmdCreateImagePlane());
#if HAVE_OPENCV
#if HAVE_OPENCV2
rcCmdMgr.addCommand(new CmdImageCapturerTest());
#endif
}