fixed some compilation errors after the merge

git-svn-id: http://rtabmap.googlecode.com/svn/trunk/rtabmap@1021 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
matlabbe
2013-12-11 01:16:45 +00:00
parent 8b8511e154
commit 82cddd1ed1
7 changed files with 28 additions and 3010 deletions

View File

@@ -17,18 +17,17 @@
* along with RTAB-Map. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef QTIPL_H
#define QTIPL_H
#include "rtabmap/core/RtabmapExp.h" // DLL export/import defines
#include <QtGui/QImage>
#include <opencv2/core/core.hpp>
namespace rtabmap {
QImage RTABMAP_EXP Ipl2QImage(const IplImage *newImage, int alpha = 255);
}
#ifndef RTABMAPGUIEXP_H
#define RTABMAPGUIEXP_H
#if defined(_WIN32)
#if defined(rtabmap_gui_EXPORTS)
#define RTABMAPGUI_EXP __declspec( dllexport )
#else
#define RTABMAPGUI_EXP __declspec( dllimport )
#endif
#else
#define RTABMAPGUI_EXP
#endif
#endif // RTABMAPGUIEXP_H