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

quiet most of the OSX build warnings

Browse Source
This commit is contained in:
Andrey Kamaev
2012-07-05 12:56:31 +00:00
parent b712bbe9a5
commit e900952b87
30 changed files with 39 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/core/include/opencv2/core/eigen.hpp
View File

@@ -73,7 +73,7 @@ void eigen2cv( const Eigen::Matrix<_Tp, _rows, _cols, _options, _maxRows, _maxCo
_src.copyTo(dst);
}
}
template<typename _Tp, int _rows, int _cols, int _options, int _maxRows, int _maxCols>
void cv2eigen( const Mat& src,
Eigen::Matrix<_Tp, _rows, _cols, _options, _maxRows, _maxCols>& dst )
@@ -132,14 +132,14 @@ void cv2eigen( const Mat& src,
}
}
template<typename _Tp>
void cv2eigen( const Mat& src,
Eigen::Matrix<_Tp, Eigen::Dynamic, 1>& dst )
{
CV_Assert(src.cols == 1);
dst.resize(src.rows);
if( !(dst.Flags & Eigen::RowMajorBit) )
{
Mat _dst(src.cols, src.rows, DataType<_Tp>::type,
@@ -183,8 +183,8 @@ void cv2eigen( const Mat& src,
src.convertTo(_dst, _dst.type());
CV_DbgAssert(_dst.data == (uchar*)dst.data());
}
}
}
}
#endif

3
modules/core/include/opencv2/core/internal.hpp
View File

@@ -156,6 +156,9 @@ CV_INLINE IppiSize ippiSize(int width, int height)
#endif
#ifdef HAVE_EIGEN
# if defined __GNUC__ && defined __APPLE__
# pragma GCC diagnostic ignored "-Wshadow"
# endif
# include <Eigen/Core>
# include "opencv2/core/eigen.hpp"
#endif