Merge pull request #1 from shimat/master

update from original

.gitignore

@@ -110,3 +110,7 @@ Backup*/
 UpgradeLog*.XML
 Help JP
 Help EN
+/src/Release-Static
+/src/OpenCvSharpExtern/Release-Static
+*.db
+/src/OpenCvSharp.Sandbox/dll/x86/OpenCvSharpExtern.dll

README.md

@@ -6,18 +6,21 @@ OpenCVを.NET Frameworkから利用するための、クロスプラットフォ
 ## Installation
 ### NuGet
 If you have Visual Studio 2012 or later, it is recommended to use [NuGet](http://www.nuget.org/). Search *'opencvsharp'* on the NuGet Package Manager.
-* [All-in-one package](https://www.nuget.org/packages/OpenCvSharp-AnyCPU/) - bundles native OpenCV DLLs
-* [Minimum package](https://www.nuget.org/packages/OpenCvSharp-WithoutDll/) 
+
+* [OpenCV3.0 All-in-one package](https://www.nuget.org/packages/OpenCvSharp3-AnyCPU/) - bundles native OpenCV DLLs
+* [OpenCV3.0 Minimum package](https://www.nuget.org/packages/OpenCvSharp3-WithoutDll/) 
+* [OpenCV2.4.10 All-in-one package](https://www.nuget.org/packages/OpenCvSharp-AnyCPU/) - bundles native OpenCV DLLs
+* [OpenCV2.4.10 Minimum package](https://www.nuget.org/packages/OpenCvSharp-WithoutDll/) 
 
 ### Downloads
 If you do not use NuGet, get DLL files from the [release page](https://github.com/shimat/opencvsharp/releases).
 
 ## Requirements
-* [OpenCV 2.4.10](http://opencv.org/)
-* [Visual C++ 2012 Redistributable Package](http://www.microsoft.com/en-US/download/details.aspx?id=30679)
+* [OpenCV 3.0 / 2.4.10](http://opencv.org/)
+* [Visual C++ 2013 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)
 
-OpenCvSharp.CPlusPlus requires OpenCV DLL files built with VC++2012 (msvcr110.dll). The official pre-built DLL files in build/[x86 or x64]/vc11/bin are suitable.
+OpenCvSharp.CPlusPlus requires OpenCV DLL files built with VC++2013 (msvcr120.dll). The official pre-built DLL files in build/[x86 or x64]/vc12/bin are suitable.
 
 ## Features
 * OpenCvSharp is modeled on the native OpenCV C/C++ API style as much as possible.
@@ -38,17 +41,16 @@ OpenCvSharp.CPlusPlus requires OpenCV DLL files built with VC++2012 (msvcr110.dl
 ## Usage
 For more details, see the **[Wiki](https://github.com/shimat/opencvsharp/wiki)** page.
 
-### C++ style
 ```C#
 // Edge detection by Canny algorithm
 using OpenCvSharp;
-using OpenCvSharp.CPlusPlus;
+// using OpenCvSharp.CPlusPlus;  //for OpenCvSharp2
 
 class Program 
 {
     static void Main() 
     {
-        Mat src = new Mat("lenna.png", LoadMode.GrayScale);
+        Mat src = new Mat("lenna.png", ImreadMode.GrayScale);
         Mat dst = new Mat();
 
         Cv2.Canny(src, dst, 50, 200);
@@ -61,31 +63,6 @@ class Program
 }
 ```
 
-### C style
-```C#
-// Edge detection by Canny algorithm
-using OpenCvSharp;
-
-class Program 
-{
-    static void Main() 
-    {
-        IplImage src = Cv.LoadImage("lenna.png", LoadMode.GrayScale);
-        IplImage dst = Cv.CreateImage(new CvSize(src.Width, src.Height), BitDepth.U8, 1);
-        Cv.Canny(src, dst, 50, 200);
-        Cv.NamedWindow("src image");  
-        Cv.ShowImage("src image", src);
-        Cv.NamedWindow("dst image");  
-        Cv.ShowImage("dst image", dst);
-        Cv.WaitKey();
-        Cv.DestroyAllWindows();
-        Cv.ReleaseImage(src);
-        Cv.ReleaseImage(dst);          
-    }
-}
-```
-
-
 ## License
 OpenCvSharp is licensed under the 
 **BSD 3-Clause License**. See [LICENSE.txt](https://github.com/shimat/opencvsharp/blob/master/LICENSE.txt).