Merge remote-tracking branch 'remotes/origin/master' into CPlusPlus-Improvement-stitching

shimat · shimat · commit bf126bd1381a · 2014-07-23T16:19:59.000+09:00
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ If you have Visual Studio 2012 or later, it is recommended to use [NuGet](http:/
 If you do not use NuGet, get DLL files from the [release page](https://github.com/shimat/opencvsharp/releases).
 
 ## Requirements
-* [OpenCV 2.4.8](http://opencv.org/)
+* [OpenCV 2.4.9](http://opencv.org/)
 * [Visual C++ 2012 Redistributable Package](http://www.microsoft.com/en-US/download/details.aspx?id=30679)
 * [.NET Framework 2.0](http://www.microsoft.com/ja-jp/download/details.aspx?id=1639) or later / [Mono](http://www.mono-project.com/Main_Page)
 
diff --git a/src/OpenCvSharp.CPlusPlus/modules/highgui/VideoCapture.cs b/src/OpenCvSharp.CPlusPlus/modules/highgui/VideoCapture.cs
@@ -52,10 +52,10 @@ public VideoCapture()
             }
             catch (AccessViolationException e)
             {
-                throw new OpenCvSharpException("Failed to create CvCapture", e);
+                throw new OpenCvSharpException("Failed to create VideoCapture", e);
             }
             if (ptr == IntPtr.Zero)
-                throw new OpenCvSharpException("Failed to create CvCapture");
+                throw new OpenCvSharpException("Failed to create VideoCapture");
             
             captureType = CaptureType.NotSpecified;
         }
@@ -84,11 +84,11 @@ public VideoCapture(int index)
             }
             catch (AccessViolationException e)
             {
-                throw new OpenCvSharpException("Failed to create CvCapture", e);
+                throw new OpenCvSharpException("Failed to create VideoCapture", e);
             }
             if (ptr == IntPtr.Zero)
             {
-                throw new OpenCvSharpException("Failed to create CvCapture");
+                throw new OpenCvSharpException("Failed to create VideoCapture");
             }
             captureType = CaptureType.Camera;
         }
@@ -221,7 +221,7 @@ public VideoCapture(string fileName)
             ptr = NativeMethods.highgui_VideoCapture_new_fromFile(fileName);
 
             if (ptr == IntPtr.Zero)
-                throw new OpenCvSharpException("Failed to create CvCapture");
+                throw new OpenCvSharpException("Failed to create VideoCapture");
             
             captureType = CaptureType.File;
         }

Original file line number	Diff line number	Diff line change
`@@ -52,10 +52,10 @@ public VideoCapture()`
`52`	`52`	`}`
`53`	`53`	`catch (AccessViolationException e)`
`54`	`54`	`{`
`55`		`- throw new OpenCvSharpException("Failed to create CvCapture", e);`
	`55`	`+ throw new OpenCvSharpException("Failed to create VideoCapture", e);`
`56`	`56`	`}`
`57`	`57`	`if (ptr == IntPtr.Zero)`
`58`		`- throw new OpenCvSharpException("Failed to create CvCapture");`
	`58`	`+ throw new OpenCvSharpException("Failed to create VideoCapture");`
`59`	`59`
`60`	`60`	`captureType = CaptureType.NotSpecified;`
`61`	`61`	`}`
`@@ -84,11 +84,11 @@ public VideoCapture(int index)`
`84`	`84`	`}`
`85`	`85`	`catch (AccessViolationException e)`
`86`	`86`	`{`
`87`		`- throw new OpenCvSharpException("Failed to create CvCapture", e);`
	`87`	`+ throw new OpenCvSharpException("Failed to create VideoCapture", e);`
`88`	`88`	`}`
`89`	`89`	`if (ptr == IntPtr.Zero)`
`90`	`90`	`{`
`91`		`- throw new OpenCvSharpException("Failed to create CvCapture");`
	`91`	`+ throw new OpenCvSharpException("Failed to create VideoCapture");`
`92`	`92`	`}`
`93`	`93`	`captureType = CaptureType.Camera;`
`94`	`94`	`}`
`@@ -221,7 +221,7 @@ public VideoCapture(string fileName)`
`221`	`221`	`ptr = NativeMethods.highgui_VideoCapture_new_fromFile(fileName);`
`222`	`222`
`223`	`223`	`if (ptr == IntPtr.Zero)`
`224`		`- throw new OpenCvSharpException("Failed to create CvCapture");`
	`224`	`+ throw new OpenCvSharpException("Failed to create VideoCapture");`
`225`	`225`
`226`	`226`	`captureType = CaptureType.File;`
`227`	`227`	`}`