Mainly fix matlab bugs

Author: Li-Zhaoxi

README.md

@@ -6,6 +6,7 @@ We proposed a fast ellipse detection method based on arc adjacency matrix. We ha
   <img src="measuretool/aamed.jpg" width="900px" />
 </div>
 
+:blush:**The binaries for Matlab and Python can be downloaded from the latest release.**
 
 
 ## 1 Compile our Codes

matlab/mexAAMED.cpp

@@ -16,7 +16,10 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
     // Get the data;
     double drows = *(double *)mxGetPr(prhs[0]);
     double dcols = *(double *)mxGetPr(prhs[1]);
-    
+    if (drows <=0 || dcols <=0)
+    {
+        mexErrMsgTxt("drows or dcols must be larger than 0!!");
+    }
     AAMED *_aamed = new AAMED(std::round(drows), std::round(dcols));
     int pointer_size = sizeof(_aamed);
 

matlab/mexSetAAMEDParameters.cpp

@@ -26,6 +26,7 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
     double theta_arc = *(double*)mxGetPr(prhs[1]);
     double lambda_arc = *(double*)mxGetPr(prhs[2]);
     double T_val = *(double*)mxGetPr(prhs[3]);
+    
     _aamed->SetParameters(theta_arc, lambda_arc, T_val); 
 
 }

matlab/mexdestoryAAMED.cpp

@@ -6,23 +6,36 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
 {
     if(nrhs!=1)
     {
-        mexErrMsgTxt("There is only 1 input AAMED pointer.");
+        mexErrMsgTxt("There only needs the AAMED pointer.");
     }
     if(nlhs!=0)
     {
         mexErrMsgTxt("No return value.");
     }
 
     // Get the data;
-    unsigned char *_pt = (unsigned char *)mxGetPr(prhs[0]);
     AAMED *_aamed = NULL;
+    if(mxGetNumberOfElements(prhs[0]) != sizeof(_aamed))
+        mexErrMsgTxt("Wrong AAMED Pointer.");
+    
+    unsigned char *_pt = (unsigned char *)mxGetPr(prhs[0]);
+    
     int pointer_size = sizeof(_aamed);
     unsigned char *_pt_aamed = (unsigned char *)&_aamed;
     for(int i = 0; i < pointer_size; i++)
     {
         _pt_aamed[i] = _pt[i];
     }
-    _aamed->release();
-    //delete[] _aamed;
+    if(_aamed == 0)
+        mexWarnMsgTxt("input parm is a null pointer(0)");
+    else
+    {
+        delete _aamed;
+        for(int i = 0; i < pointer_size; i++)
+        {
+            _pt[i] = 0;
+        }
+    }
+    
 
 }

matlab/mexdetectImagebyAAMED.cpp

@@ -25,17 +25,27 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
     unsigned char * _imgmatlab = (unsigned char *)mxGetPr(prhs[1]);
     int irows = mxGetM(prhs[1]);
     int icols = mxGetN(prhs[1]);
+    if(!_aamed->checkInputImage(irows, icols))
+    {
+        mexWarnMsgTxt("The rows(cols) of the image must be large than drows(dcols)");
+        plhs[0] = mxCreateDoubleMatrix(0,5,mxREAL);
+        return;
+    }
+    
     cv::Mat imgG(irows, icols, CV_8UC1);
     unsigned char * _img = (unsigned char*)imgG.data;
+
     for(int i = 0; i < irows; i++)
     {
         for(int j = 0; j < icols; j++)
         {
-            _img[i * icols + j] = _imgmatlab[j * icols + i];
+            _img[i * icols + j] = _imgmatlab[j * irows + i];
         }
     }
+
     _aamed->run_FLED(imgG);
     int elp_num = _aamed->detEllipses.size();
+
     plhs[0] = mxCreateDoubleMatrix(elp_num,5,mxREAL);
     double *_elp = (double *)mxGetPr(plhs[0]);
     for(int i = 0; i < elp_num; i++)

src/FLED.cpp

@@ -82,7 +82,13 @@ void FLED::release()
 	lA.release();
 
 }
-
+bool FLED::checkInputImage(int rows, int cols)
+{
+    if (rows > dROWS || cols > dCOLS)
+        return false;
+    else
+        return true;
+}
 void FLED::run_AAMED_WithoutCanny(Mat Img_G)
 {
 

src/FLED.h

@@ -43,12 +43,16 @@ class FLED
 	FLED(int drows, int dcols);
 	void SetParameters(double theta_fsa, double length_fsa, double T_val);
 	vector<cv::RotatedRect> detEllipses;
-
+	~FLED()
+	{
+		release();
+	}
 
 
 	void SetParameters(double T_dp, double theta_fsa, double length_fsa, double T_val, int grad_num);
 	void initFrame();
 	void release();// release data;
+    bool checkInputImage(int rows, int cols);
 	void run_FLED(Mat Img_G);
 	void run_AAMED_WithoutCanny(Mat Img_G);
 public:// Draw Data and Write Information Functions