diff --git a/src/OpenCvSharp.ReleaseMaker/MainForm.cs b/src/OpenCvSharp.ReleaseMaker/MainForm.cs index 4e7f9e52a..46fa68f5e 100644 --- a/src/OpenCvSharp.ReleaseMaker/MainForm.cs +++ b/src/OpenCvSharp.ReleaseMaker/MainForm.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Drawing; -using System.Text; using System.Windows.Forms; using System.IO; using System.Linq; @@ -15,7 +11,10 @@ namespace OpenCvSharp.ReleaseMaker /// public partial class MainForm : Form { - private const string VSVersion = "2012"; + /// + /// 2012 / 2013 + /// + private const string VSVersion = "2013"; /// /// Constructor @@ -87,7 +86,7 @@ private void button_Make_Click(object sender, EventArgs e) { MakeBinaryPackage(textBox_Src.Text, textBox_Dst.Text, textBox_Version.Text); MakeSamplePackage(textBox_Src.Text, textBox_Dst.Text, textBox_Version.Text); - MessageBox.Show("生成成功"); + MessageBox.Show(@"生成成功"); } /*catch (Exception ex) { @@ -103,7 +102,7 @@ private void button_Make_Click(object sender, EventArgs e) /// /// /// - private static readonly string[] DllFiles = new string[]{ + private static readonly string[] DllFiles = { @"OpenCvSharp\bin\Release\OpenCvSharp.dll", @"OpenCvSharp\bin\Release\OpenCvSharp.dll.config", @"OpenCvSharp.Blob\bin\Release\OpenCvSharp.Blob.dll", @@ -122,7 +121,7 @@ private void button_Make_Click(object sender, EventArgs e) /// /// /// - private static readonly string[] XmlFiles = new string[]{ + private static readonly string[] XmlFiles = { @"OpenCvSharp\bin\{0}\OpenCvSharp.xml", @"OpenCvSharp.Blob\bin\{0}\OpenCvSharp.Blob.xml", @"OpenCvSharp.CPlusPlus\bin\Release\OpenCvSharp.CPlusPlus.xml", @@ -131,11 +130,11 @@ private void button_Make_Click(object sender, EventArgs e) @"OpenCvSharp.UserInterface\bin\{0}\OpenCvSharp.UserInterface.xml", }; - private static readonly string[] Platforms = new string[] { + private static readonly string[] Platforms = { "x86", "x64" }; - private static readonly string[] Languages = new string[] { + private static readonly string[] Languages = { "Release", "Release JP" }; @@ -143,10 +142,9 @@ private void button_Make_Click(object sender, EventArgs e) /// /// バイナリのzipパッケージを作成 /// - /// + /// /// - /// - /// + /// private void MakeBinaryPackage(string dir, string dirDst, string version) { string dirSrc = Path.Combine(dir, "src"); @@ -247,13 +245,13 @@ private void CreateDirectory(string path) } - private static readonly string[] InvalidExt = new string[] { + private static readonly string[] InvalidExt = { ".pdb", ".bak", ".user", ".suo", }; - private static readonly string[] InvalidDir = new string[] { + private static readonly string[] InvalidDir = { ".svn", ".git", "bin", diff --git a/src/OpenCvSharpExtern/core_Mat.h b/src/OpenCvSharpExtern/core_Mat.h index 505c6a0a2..0f58a831e 100644 --- a/src/OpenCvSharpExtern/core_Mat.h +++ b/src/OpenCvSharpExtern/core_Mat.h @@ -514,8 +514,8 @@ CVAPI(void) core_Mat_IplImage_alignment(cv::Mat *self, IplImage **outImage) // alignment낦 IplImage *img = cvCreateImage(cvSize(dummy.width, dummy.height), dummy.depth, dummy.nChannels); int height = img->height; - int sstep = self->step; - int dstep = img->widthStep; + size_t sstep = self->step; + size_t dstep = img->widthStep; for (int i = 0; i < height; ++i) { char *dp = img->imageData + (dstep * i);