mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 03:30:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved string handling. Swapped transpose interface for slow but correct implementation. Will come back to optimized implementation later. imshow now works correctly

Browse Source
This commit is contained in:
hbristow 2013-07-12 15:48:03 +10:00
parent 346f7d0f3e
commit 603d949354
2 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
modules/matlab/include/mxarray.hpp
View File

@ -411,20 +411,19 @@ public:
const Scalar* imag() const { return static_cast<const Scalar *>(mxGetData(ptr_)); } const Scalar* imag() const { return static_cast<const Scalar *>(mxGetData(ptr_)); }
template <typename Scalar> template <typename Scalar>
Scalar scalar() const { return static_cast<Scalar *>(mxGetData(ptr_))[0]; } Scalar scalar() const { return static_cast<double *>(mxGetData(ptr_))[0]; }
std::string toString() const { std::string toString() const {
conditionalError(isString(), "Attempted to convert non-string type to string"); conditionalError(isString(), "Attempted to convert non-string type to string");
std::string str; std::string str(size()+1, '\0');
str.reserve(size()+1);
mxGetString(ptr_, const_cast<char *>(str.data()), str.size()); mxGetString(ptr_, const_cast<char *>(str.data()), str.size());
mexPrintf(str.c_str()); mexPrintf("string: %s\n", str.c_str());
return str; return str;
} }
size_t size() const { return mxGetNumberOfElements(ptr_); } size_t size() const { return mxGetNumberOfElements(ptr_); }
size_t rows() const { return mxGetM(ptr_); } size_t rows() const { return mxGetDimensions(ptr_)[0]; }
size_t cols() const { return mxGetN(ptr_); } size_t cols() const { return mxGetDimensions(ptr_)[1]; }
size_t channels() const { return (mxGetNumberOfDimensions(ptr_) > 2) ? mxGetDimensions(ptr_)[2] : 1; } size_t channels() const { return (mxGetNumberOfDimensions(ptr_) > 2) ? mxGetDimensions(ptr_)[2] : 1; }
bool isComplex() const { return mxIsComplex(ptr_); } bool isComplex() const { return mxIsComplex(ptr_); }
bool isNumeric() const { return mxIsNumeric(ptr_); } bool isNumeric() const { return mxIsNumeric(ptr_); }
@ -475,7 +474,7 @@ template <>
cv::Mat MxArray::toMat<Matlab::InheritType>() const { cv::Mat MxArray::toMat<Matlab::InheritType>() const {
switch (ID()) { switch (ID()) {
case mxINT8_CLASS: return toMat<int8_t>(); case mxINT8_CLASS: return toMat<int8_t>();
case mxUINT8_CLASS: return toMat<uint8_t>();; case mxUINT8_CLASS: return toMat<uint8_t>();
case mxINT16_CLASS: return toMat<int16_t>(); case mxINT16_CLASS: return toMat<int16_t>();
case mxUINT16_CLASS: return toMat<uint16_t>(); case mxUINT16_CLASS: return toMat<uint16_t>();
case mxINT32_CLASS: return toMat<int32_t>(); case mxINT32_CLASS: return toMat<int32_t>();
@ -503,9 +502,18 @@ void deepCopyAndTranspose(const cv::Mat& in, MxArray& out) {
conditionalError(static_cast<size_t>(in.rows) == out.rows(), "Matrices must have the same number of rows"); conditionalError(static_cast<size_t>(in.rows) == out.rows(), "Matrices must have the same number of rows");
conditionalError(static_cast<size_t>(in.cols) == out.cols(), "Matrices must have the same number of cols"); conditionalError(static_cast<size_t>(in.cols) == out.cols(), "Matrices must have the same number of cols");
conditionalError(static_cast<size_t>(in.channels()) == out.channels(), "Matrices must have the same number of channels"); conditionalError(static_cast<size_t>(in.channels()) == out.channels(), "Matrices must have the same number of channels");
const InputScalar* inp = in.ptr<InputScalar>(0); std::vector<cv::Mat> channels;
OutputScalar* outp = out.real<OutputScalar>(); cv::split(in, channels);
gemt('R', out.rows(), out.cols(), inp, in.step1(), outp, out.rows()); for (size_t c = 0; c < out.channels(); ++c) {
cv::transpose(channels[c], channels[c]);
cv::Mat outmat(out.cols(), out.rows(), cv::DataType<OutputScalar>::type,
static_cast<void *>(out.real<OutputScalar>() + out.cols()*out.rows()*c));
channels[c].convertTo(outmat, cv::DataType<OutputScalar>::type);
}
//const InputScalar* inp = in.ptr<InputScalar>(0);
//OutputScalar* outp = out.real<OutputScalar>();
//gemt('R', out.rows(), out.cols(), inp, in.step1(), outp, out.rows());
} }
template <typename InputScalar, typename OutputScalar> template <typename InputScalar, typename OutputScalar>
@ -513,9 +521,20 @@ void deepCopyAndTranspose(const MxArray& in, cv::Mat& out) {
conditionalError(in.rows() == static_cast<size_t>(out.rows), "Matrices must have the same number of rows"); conditionalError(in.rows() == static_cast<size_t>(out.rows), "Matrices must have the same number of rows");
conditionalError(in.cols() == static_cast<size_t>(out.cols), "Matrices must have the same number of cols"); conditionalError(in.cols() == static_cast<size_t>(out.cols), "Matrices must have the same number of cols");
conditionalError(in.channels() == static_cast<size_t>(out.channels()), "Matrices must have the same number of channels"); conditionalError(in.channels() == static_cast<size_t>(out.channels()), "Matrices must have the same number of channels");
const InputScalar* inp = in.real<InputScalar>(); std::vector<cv::Mat> channels;
OutputScalar* outp = out.ptr<OutputScalar>(0); for (size_t c = 0; c < in.channels(); ++c) {
gemt('C', in.rows(), in.cols(), inp, in.rows(), outp, out.step1()); cv::Mat outmat;
cv::Mat inmat(in.cols(), in.rows(), cv::DataType<InputScalar>::type,
static_cast<void *>(const_cast<InputScalar *>(in.real<InputScalar>() + in.cols()*in.rows()*c)));
inmat.convertTo(outmat, cv::DataType<OutputScalar>::type);
cv::transpose(outmat, outmat);
channels.push_back(outmat);
}
cv::merge(channels, out);
//const InputScalar* inp = in.real<InputScalar>();
//OutputScalar* outp = out.ptr<OutputScalar>(0);
//gemt('C', in.rows(), in.cols(), inp, in.rows(), outp, out.step1());
} }

1
modules/matlab/include/transpose.hpp
View File

@ -35,6 +35,7 @@ void transpose4x4(const InputScalar* src, size_t lda, OutputScalar* dst, size_t
*/ */
template <typename InputScalar, typename OutputScalar> template <typename InputScalar, typename OutputScalar>
void gemt(const char major, const size_t M, const size_t N, const InputScalar* a, size_t lda, OutputScalar* b, size_t ldb) { void gemt(const char major, const size_t M, const size_t N, const InputScalar* a, size_t lda, OutputScalar* b, size_t ldb) {
// 1x1 transpose is just copy // 1x1 transpose is just copy
if (M == 1 && N == 1) { *b = *a; return; } if (M == 1 && N == 1) { *b = *a; return; }