diff --git a/Eigen/src/Core/DenseBase.h b/Eigen/src/Core/DenseBase.h index b335754c0..9c3c6432b 100644 --- a/Eigen/src/Core/DenseBase.h +++ b/Eigen/src/Core/DenseBase.h @@ -417,9 +417,15 @@ template class DenseBase typename internal::traits::Scalar minCoeff(Index* row, Index* col) const; typename internal::traits::Scalar maxCoeff(Index* row, Index* col) const; - typename internal::traits::Scalar minCoeff(Index* index) const; typename internal::traits::Scalar maxCoeff(Index* index) const; + + #ifdef EIGEN2_SUPPORT + typename internal::traits::Scalar minCoeff(int* row, int* col) const; + typename internal::traits::Scalar maxCoeff(int* row, int* col) const; + typename internal::traits::Scalar minCoeff(int* index) const; + typename internal::traits::Scalar maxCoeff(int* index) const; + #endif template typename internal::result_of::Scalar)>::type diff --git a/Eigen/src/Core/MatrixBase.h b/Eigen/src/Core/MatrixBase.h index 510e7115d..457450c43 100644 --- a/Eigen/src/Core/MatrixBase.h +++ b/Eigen/src/Core/MatrixBase.h @@ -208,7 +208,7 @@ template class MatrixBase Scalar dot(const MatrixBase& other) const; #endif - #if EIGEN2_SUPPORT_STAGE != STAGE99_NO_EIGEN2_SUPPORT + #ifdef EIGEN2_SUPPORT template #if EIGEN2_SUPPORT_STAGE >= STAGE30_FULL_EIGEN3_API EIGEN_DEPRECATED diff --git a/Eigen/src/Core/Visitor.h b/Eigen/src/Core/Visitor.h index 6b3b3bfb4..556c6fcd7 100644 --- a/Eigen/src/Core/Visitor.h +++ b/Eigen/src/Core/Visitor.h @@ -241,4 +241,51 @@ DenseBase::maxCoeff(Index* index) const return maxVisitor.res; } +#ifdef EIGEN2_SUPPORT + +template +typename internal::traits::Scalar +DenseBase::minCoeff(int* row, int* col) const +{ + Index r, c; + Scalar result = this->minCoeff(&r, &c); + *row = int(r); + *col = int(c); + return result; +} + +template +typename internal::traits::Scalar +DenseBase::minCoeff(int* index) const +{ + Index i; + Scalar result = this->minCoeff(&i); + *index = int(i); + return result; +} + +template +typename internal::traits::Scalar +DenseBase::maxCoeff(int* row, int* col) const +{ + Index r, c; + Scalar result = this->maxCoeff(&r, &c); + *row = int(r); + *col = int(c); + return result; +} + +template +typename internal::traits::Scalar +DenseBase::maxCoeff(int* index) const +{ + Index i; + Scalar result = this->maxCoeff(&i); + *index = int(i); + return result; +} + +#endif // EIGEN2_SUPPORT + + #endif // EIGEN_VISITOR_H