diff --git a/Emgu.CV.Contrib/Aruco/Dictionary.cs b/Emgu.CV.Contrib/Aruco/Dictionary.cs index cd2f15696..48c0b1870 100644 --- a/Emgu.CV.Contrib/Aruco/Dictionary.cs +++ b/Emgu.CV.Contrib/Aruco/Dictionary.cs @@ -33,26 +33,12 @@ namespace Emgu.CV.Aruco } /// - /// Generates a new customizable marker dictionary. + /// Generates a new marker dictionary. /// - /// number of markers in the dictionary - /// number of bits per dimension of each markers - public Dictionary(int nMarkers, int markerSize) + public Dictionary() { //_predefined = false; - _ptr = ArucoInvoke.cveArucoDictionaryCreate1(nMarkers, markerSize, ref _sharedPtr); - } - - /// - /// Generates a new customizable marker dictionary. - /// - /// number of markers in the dictionary - /// number of bits per dimension of each markers - /// Include the markers in this dictionary at the beginning (optional) - public Dictionary(int nMarkers, int markerSize, Dictionary baseDictionary) - { - //_predefined = false; - _ptr = ArucoInvoke.cveArucoDictionaryCreate2(nMarkers, markerSize, baseDictionary._sharedPtr, ref _sharedPtr); + _ptr = ArucoInvoke.cveArucoDictionaryCreate(ref _sharedPtr); } /// @@ -182,10 +168,7 @@ namespace Emgu.CV.Aruco internal static extern IntPtr cveArucoGetPredefinedDictionary(Dictionary.PredefinedDictionaryName name, ref IntPtr sharedPtr); [DllImport(CvInvoke.ExternLibrary, CallingConvention = CvInvoke.CvCallingConvention)] - internal static extern IntPtr cveArucoDictionaryCreate1(int nMarkers, int markerSize, ref IntPtr sharedPtr); - - [DllImport(CvInvoke.ExternLibrary, CallingConvention = CvInvoke.CvCallingConvention)] - internal static extern IntPtr cveArucoDictionaryCreate2(int nMarkers, int markerSize, IntPtr baseDictionary, ref IntPtr sharedPtr); + internal static extern IntPtr cveArucoDictionaryCreate(ref IntPtr sharedPtr); [DllImport(CvInvoke.ExternLibrary, CallingConvention = CvInvoke.CvCallingConvention)] internal static extern void cveArucoDictionaryRelease(ref IntPtr dict, ref IntPtr sharedPtr); diff --git a/Emgu.CV.Extern/aruco/aruco_c.cpp b/Emgu.CV.Extern/aruco/aruco_c.cpp index 092881876..9e1deebfe 100644 --- a/Emgu.CV.Extern/aruco/aruco_c.cpp +++ b/Emgu.CV.Extern/aruco/aruco_c.cpp @@ -29,6 +29,7 @@ cv::aruco::Dictionary* cveArucoDictionaryCreate(cv::Ptr** throw_no_aruco(); #endif } + cv::aruco::Dictionary* cveArucoExtendDictionary( int nMarkers, int markerSize, diff --git a/Emgu.CV.Extern/aruco/aruco_c.h b/Emgu.CV.Extern/aruco/aruco_c.h index 08629b967..7dabd47db 100644 --- a/Emgu.CV.Extern/aruco/aruco_c.h +++ b/Emgu.CV.Extern/aruco/aruco_c.h @@ -61,7 +61,6 @@ CVAPI(cv::aruco::Dictionary*) cveArucoExtendDictionary( cv::Ptr* baseDictionary, int randomSeed, cv::Ptr** sharedPtr); -//CVAPI(cv::aruco::Dictionary*) cveArucoDictionaryCreate2(int nMarkers, int markerSize, cv::Ptr* baseDictionary, cv::Ptr** sharedPtr); CVAPI(void) cveArucoDictionaryRelease(cv::aruco::Dictionary** dict, cv::Ptr** sharedPtr); //CVAPI(void) cveArucoDrawMarker(cv::aruco::Dictionary* dictionary, int id, int sidePixels, cv::_OutputArray* img, int borderBits);