Skip to content

Commit 2d3415f

Browse files
committed
Fixed Scalar -> CvColor cast bug
1 parent b15906e commit 2d3415f

File tree

1 file changed

+2
-37
lines changed

1 file changed

+2
-37
lines changed

src/OpenCvSharp/Src/HighGUI/CvWindow.cs

Lines changed: 2 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -701,8 +701,8 @@ public static void ShowImages(IEnumerable<CvArr> images, IEnumerable<string> nam
701701
if (names == null)
702702
throw new ArgumentNullException("names");
703703

704-
CvArr[] imagesArray = ToArray(images);
705-
string[] namesArray = ToArray(names);
704+
CvArr[] imagesArray = Util.ToArray(images);
705+
string[] namesArray = Util.ToArray(names);
706706

707707
if (imagesArray.Length == 0)
708708
return;
@@ -722,41 +722,6 @@ public static void ShowImages(IEnumerable<CvArr> images, IEnumerable<string> nam
722722
w.Close();
723723
}
724724
}
725-
/// <summary>
726-
///
727-
/// </summary>
728-
/// <param name="imagesAndNames"></param>
729-
public static void ShowImages(params object[] imagesAndNames)
730-
{
731-
if (imagesAndNames == null)
732-
return;
733-
if (imagesAndNames.Length % 2 != 0)
734-
throw new ArgumentException();
735-
736-
var namesArray = new string[imagesAndNames.Length / 2];
737-
var imagesArray = new CvArr[imagesAndNames.Length / 2];
738-
739-
for (int i = 0; i < imagesAndNames.Length; i+=2)
740-
{
741-
string name = imagesAndNames[i + 0] as string;
742-
if (name == null)
743-
throw new OpenCvSharpException("Invalid name argument");
744-
namesArray[i/2] = name;
745-
746-
CvArr arr = imagesAndNames[i + 1] as CvArr;
747-
if(arr == null)
748-
throw new OpenCvSharpException("Invalid CvArr argument");
749-
imagesArray[i/2] = arr;
750-
}
751-
ShowImages(imagesArray, namesArray);
752-
}
753-
private static T[] ToArray<T>(IEnumerable<T> enumerable)
754-
{
755-
T[] arr = enumerable as T[];
756-
if (arr != null)
757-
return arr;
758-
return new List<T>(enumerable).ToArray();
759-
}
760725
#endregion
761726
#region GetWindowByName
762727
#if LANG_JP

0 commit comments

Comments
 (0)