rename

Author: shimat

src/OpenCvSharp/Modules/aruco/Enum/PredefinedDictionaryName.cs

@@ -33,7 +33,7 @@ public enum PredefinedDictionaryType
 /// <summary>
 /// Obsolete: Use PredefinedDictionaryType instead. This enum is kept for backward compatibility.
 /// </summary>
-[Obsolete("Use PredefinedDictionaryType instead", false)]
+[Obsolete("Use PredefinedDictionaryType instead", true)]
 public enum PredefinedDictionaryName
 {
 #pragma warning disable 1591

src/OpenCvSharp/Modules/calib3d/Enum/SolvePnPFlags.cs

@@ -38,7 +38,7 @@ public enum SolvePnPMethod
 /// <summary>
 /// Obsolete: Use SolvePnPMethod instead. This enum is kept for backward compatibility.
 /// </summary>
-[Obsolete("Use SolvePnPMethod instead", false)]
+[Obsolete("Use SolvePnPMethod instead", true)]
 public enum SolvePnPFlags
 {
     /// <summary>

src/OpenCvSharp/Modules/photo/InpaintMethod.cs

@@ -20,7 +20,7 @@ public enum InpaintTypes
 /// <summary>
 /// Obsolete: Use InpaintTypes instead. This enum is kept for backward compatibility.
 /// </summary>
-[Obsolete("Use InpaintTypes instead", false)]
+[Obsolete("Use InpaintTypes instead", true)]
 public enum InpaintMethod
 {
     /// <summary>

src/OpenCvSharp/Modules/photo/SeamlessCloneMethods.cs

@@ -31,7 +31,7 @@ public enum SeamlessCloneFlags
 /// <summary>
 /// Obsolete: Use SeamlessCloneFlags instead. This enum is kept for backward compatibility.
 /// </summary>
-[Obsolete("Use SeamlessCloneFlags instead", false)]
+[Obsolete("Use SeamlessCloneFlags instead", true)]
 public enum SeamlessCloneMethods
 {
     /// <summary>

test/OpenCvSharp.Tests/aruco/ArucoTest.cs

@@ -49,7 +49,7 @@ public void CreateDetectorParameters()
     public void GetPredefinedDictionary()
     {
 #pragma warning disable CS8605
-        foreach (PredefinedDictionaryName val in Enum.GetValues(typeof(PredefinedDictionaryName)))
+        foreach (PredefinedDictionaryType val in Enum.GetValues(typeof(PredefinedDictionaryType)))
 #pragma warning restore CS8605
         {
             var dict = CvAruco.GetPredefinedDictionary(val);
@@ -61,7 +61,7 @@ public void GetPredefinedDictionary()
     public void ReadDictionaryFromFile()
     {
         var dictionaryFile = Path.Combine("_data", "aruco", "Dict6X6_1000.yaml");
-        var toCompareWith = CvAruco.GetPredefinedDictionary(PredefinedDictionaryName.Dict6X6_1000);
+        var toCompareWith = CvAruco.GetPredefinedDictionary(PredefinedDictionaryType.Dict6X6_1000);
         var dict = CvAruco.ReadDictionary(dictionaryFile);
 
         Assert.Equal(toCompareWith.BytesList.Rows, dict.BytesList.Rows);
@@ -83,7 +83,7 @@ public void ReadDictionaryFromFile()
     public void DetectMarkers()
     {
         using var image = LoadImage("markers_6x6_250.png", ImreadModes.Grayscale);
-        using var dict = CvAruco.GetPredefinedDictionary(PredefinedDictionaryName.Dict6X6_250);
+        using var dict = CvAruco.GetPredefinedDictionary(PredefinedDictionaryType.Dict6X6_250);
 
         var param = new DetectorParameters();
         CvAruco.DetectMarkers(image, dict, out _, out _, param, out _);
@@ -92,7 +92,7 @@ public void DetectMarkers()
     [Fact]
     public void DictionaryProperties()
     {
-        var dict = CvAruco.GetPredefinedDictionary(PredefinedDictionaryName.Dict6X6_250);
+        var dict = CvAruco.GetPredefinedDictionary(PredefinedDictionaryType.Dict6X6_250);
         Assert.Equal(250, dict.BytesList.Rows);
         Assert.Equal(5, dict.BytesList.Cols); // (6*6 + 7)/8
         Assert.Equal(6, dict.MarkerSize);
@@ -109,7 +109,7 @@ public void DrawDetectedMarker()
     {
         using var image = LoadImage("markers_6x6_250.png", ImreadModes.Grayscale);
         using var outputImage = image.CvtColor(ColorConversionCodes.GRAY2RGB);
-        using var dict = CvAruco.GetPredefinedDictionary(PredefinedDictionaryName.Dict6X6_250);
+        using var dict = CvAruco.GetPredefinedDictionary(PredefinedDictionaryType.Dict6X6_250);
         var param = new DetectorParameters();
         CvAruco.DetectMarkers(image, dict, out var corners, out var ids, param, out var rejectedImgPoints);
 
@@ -129,7 +129,7 @@ public void DrawDetectedMarker()
     public void EstimatePoseSingleMarkers()
     {
         using var image = LoadImage("markers_6x6_250.png", ImreadModes.Grayscale);
-        using var dict = CvAruco.GetPredefinedDictionary(PredefinedDictionaryName.Dict6X6_250);
+        using var dict = CvAruco.GetPredefinedDictionary(PredefinedDictionaryType.Dict6X6_250);
         var param = new DetectorParameters();
         CvAruco.DetectMarkers(image, dict, out var corners, out _, param, out _);
 

test/OpenCvSharp.Tests/photo/PhotoTest.cs

@@ -14,7 +14,7 @@ public void Inpaint()
 
         mask.Rectangle(new Rect(65, 15, 130, 30), Scalar.All(255), -1);
 
-        Cv2.Inpaint(src, mask, dst, 2, InpaintMethod.Telea);
+        Cv2.Inpaint(src, mask, dst, 2, InpaintTypes.Telea);
 
         if (Debugger.IsAttached)
             Window.ShowImages(src, mask, dst);

test/OpenCvSharp.Tests/system/ExceptionTest.cs

@@ -89,7 +89,7 @@ public void MedianBlur()
     public void ArucoDetectMarkers()
     {
         using var image = new Mat();
-        using var dict = OpenCvSharp.Aruco.CvAruco.GetPredefinedDictionary(OpenCvSharp.Aruco.PredefinedDictionaryName.Dict6X6_250);
+        using var dict = OpenCvSharp.Aruco.CvAruco.GetPredefinedDictionary(OpenCvSharp.Aruco.PredefinedDictionaryType.Dict6X6_250);
 
         var param = new OpenCvSharp.Aruco.DetectorParameters();
 

test/OpenCvSharp.Tests/xphoto/XPhotoTest.cs

@@ -78,7 +78,7 @@ public void Inpaint()
         using var src = LoadImage("building.jpg");
         using var mask = LoadImage("building_mask.bmp", ImreadModes.Grayscale);
         using var dst = new Mat(src.Size(), src.Type());
-        CvXPhoto.Inpaint(src, mask, dst, InpaintTypes.SHIFTMAP);
+        CvXPhoto.Inpaint(src, mask, dst, OpenCvSharp.XPhoto.InpaintTypes.SHIFTMAP);
         ShowImagesWhenDebugMode(src);
         ShowImagesWhenDebugMode(dst);
     }