Commit f02348a9 authored by Daniel Armbruster's avatar Daniel Armbruster Committed by thomas.forbriger
Browse files

correction

This is a legacy commit from before 2015-03-01.
It may be incomplete as well as inconsistent.
See COPYING.legacy and README.history for details.

SVN Path:     http://gpitrsvn.gpi.uni-karlsruhe.de/repos/TFSoftware/trunk
SVN Revision: 3933
SVN UUID:     67feda4a-a26e-11df-9d6e-31afc202ad0c
parent e5e68b68
...@@ -193,10 +193,11 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[]) ...@@ -193,10 +193,11 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
/* /*
* Important note: * Important note:
* If only one argument is given to any2matlab.mexa64 the given filename must contain at least one * If only one argument is given to any2matlab.mexa64 the given filename must
* dot. After the the dot there must be one of the following endings. * contain at least one dot. After the the dot there must be one of the
* following endings.
*/ */
if (infile.rfind(".") != string::npos) { if (nrhs == 1 && infile.rfind(".") != string::npos) {
filetype = infile.substr(infile.rfind(".") + 1); filetype = infile.substr(infile.rfind(".") + 1);
} }
else else
...@@ -207,7 +208,6 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[]) ...@@ -207,7 +208,6 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
if (nrhs == 2) { if (nrhs == 2) {
infile = std::string(mxArrayToString(prhs[0])); infile = std::string(mxArrayToString(prhs[0]));
filetype = std::string(mxArrayToString(prhs[1])); filetype = std::string(mxArrayToString(prhs[1]));
infile += "."+filetype;
} }
// set format to default value: double // set format to default value: double
...@@ -217,7 +217,6 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[]) ...@@ -217,7 +217,6 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
if (nrhs == 3) { if (nrhs == 3) {
infile = std::string(mxArrayToString(prhs[0])); infile = std::string(mxArrayToString(prhs[0]));
filetype = std::string(mxArrayToString(prhs[1])); filetype = std::string(mxArrayToString(prhs[1]));
infile += "."+filetype;
std::string arg2(mxArrayToString(prhs[2])); std::string arg2(mxArrayToString(prhs[2]));
// check: third argument // check: third argument
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment