Changeset 32750 for lang/cpluspluscli

Timestamp:

04/23/09 15:16:19 (4 years ago)

Author:

schima

Message:

disused 2-dimension PointerAccessor?

Location:

lang/cpluspluscli/OpenCvSharp2/trunk

Files:

• OpenCvSharp.MachineLearning/CvSVM.h (modified) (1 diff)
• OpenCvSharp.Test/Samples/EM.cs (modified) (2 diffs)
• OpenCvSharp.Test/Samples/Kalman.cs (modified) (1 diff)
• OpenCvSharp/OpenCvSharp.csproj (modified) (3 diffs)
• OpenCvSharp/Src/Class/CvHaarClassifier.cs (modified) (4 diffs)
• OpenCvSharp/Src/CvArr/CvMat.cs (modified) (8 diffs)
• OpenCvSharp/Src/CvArr/CvMatND.cs (modified) (22 diffs)
• OpenCvSharp/Src/CvArr/IplImage.cs (modified) (1 diff)
• OpenCvSharp/Src/Tool/PointerAccessor/1 (deleted)
• OpenCvSharp/Src/Tool/PointerAccessor/2 (deleted)
• OpenCvSharp/Src/Tool/PointerAccessor/IPointerAccessor.cs (added)
• OpenCvSharp/Src/Tool/PointerAccessor/IPointerAccessor1.cs (deleted)
• OpenCvSharp/Src/Tool/PointerAccessor/IPointerAccessor2.cs (deleted)
• OpenCvSharp/Src/Tool/PointerAccessor/PointerAccessor.Byte.cs (added)
• OpenCvSharp/Src/Tool/PointerAccessor/PointerAccessor.Double.cs (added)
• OpenCvSharp/Src/Tool/PointerAccessor/PointerAccessor.Int16.cs (added)
• OpenCvSharp/Src/Tool/PointerAccessor/PointerAccessor.Int32.cs (added)
• OpenCvSharp/Src/Tool/PointerAccessor/PointerAccessor.Single.cs (added)

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp.MachineLearning/CvSVM.h

@@ -139 +139 @@
         /// <param name="i"></param>
         /// <returns></returns>
-                PointerAccessor::Float1^ GetSupportVector(Int32 i)
-        {
-                        return gcnew PointerAccessor::Float1(const_cast<float*>(_ptr->get_support_vector(i)));
+                PointerAccessor::Single^ GetSupportVector(Int32 i)
+        {
+                        return gcnew PointerAccessor::Single(const_cast<float*>(_ptr->get_support_vector(i)));
         }
         /// <summary>

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp.Test/Samples/EM.cs

@@ -68 +68 @@
                     {
                         CvPoint pt = new CvPoint(j, i);
-                        sample.DataArrayFloat[0] = (float)j;
-                        sample.DataArrayFloat[1] = (float)i;
+                        sample.DataArraySingle[0] = (float)j;
+                        sample.DataArraySingle[1] = (float)i;
                         int response = Cv.Round(em.Predict(sample, null));
                         CvColor c = COLORS[response % COLORS.Length];
@@ -83 +83 @@
                 CvPoint pt = new CvPoint()
                 {
-                    X = Cv.Round(samples.DataArrayFloat[i * 2]),
-                    Y = Cv.Round(samples.DataArrayFloat[i * 2 + 1])
+                    X = Cv.Round(samples.DataArraySingle[i * 2]),
+                    Y = Cv.Round(samples.DataArraySingle[i * 2 + 1])
                 };
-                img.Circle(pt, 1, COLORS[labels.DataArrayInt[i] % COLORS.Length], Cv.FILLED);
+                img.Circle(pt, 1, COLORS[labels.DataArrayInt32[i] % COLORS.Length], Cv.FILLED);
             }
 

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp.Test/Samples/Kalman.cs

@@ -64 +64 @@
                         Cv.MatMulAdd(kalman.MeasurementMatrix, state, measurement, measurement);
 
-                        float measurement_angle = measurement.DataArrayFloat[0];
+                        float measurement_angle = measurement.DataArraySingle[0];
                         CvPoint measurement_pt = CalcPoint(img, measurement_angle);
 

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/OpenCvSharp.csproj

@@ -4 +4 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
+    <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4C2356B8-1A1E-4F92-A51C-A49CA116867F}</ProjectGuid>
@@ -290 +290 @@
     <Compile Include="Src\Struct\CvLineSegmentPoint.cs" />
     <Compile Include="Src\Tool\Pointer.cs" />
-    <Compile Include="Src\Tool\PointerAccessor\IPointerAccessor2.cs" />
     <Compile Include="Src\Tool\TimeMeasurer.cs" />
     <Compile Include="Src\Tool\StructurePointer.cs" />
@@ -310 +309 @@
     <Compile Include="Src\Struct\CvScalar.cs" />
     <Compile Include="Src\Struct\CvSize.cs" />
-    <Compile Include="Src\Tool\PointerAccessor\2\Byte2.cs" />
-    <Compile Include="Src\Tool\PointerAccessor\IPointerAccessor1.cs" />
+    <Compile Include="Src\Tool\PointerAccessor\IPointerAccessor.cs" />
     <Compile Include="Src\Tool\ScopedGCHandle.cs" />
     <Compile Include="Src\Tool\Win32API.cs" />
     <Compile Include="Src\Tool\WriteableBitmapConverter.cs" />
-    <Compile Include="Src\Tool\PointerAccessor\1\Byte1.cs" />
-    <Compile Include="Src\Tool\PointerAccessor\1\Short1.cs" />
-    <Compile Include="Src\Tool\PointerAccessor\1\Int1.cs" />
-    <Compile Include="Src\Tool\PointerAccessor\1\Single1.cs" />
-    <Compile Include="Src\Tool\PointerAccessor\1\Double1.cs" />
+    <Compile Include="Src\Tool\PointerAccessor\PointerAccessor.Byte.cs" />
+    <Compile Include="Src\Tool\PointerAccessor\PointerAccessor.Int16.cs" />
+    <Compile Include="Src\Tool\PointerAccessor\PointerAccessor.Int32.cs" />
+    <Compile Include="Src\Tool\PointerAccessor\PointerAccessor.Single.cs" />
+    <Compile Include="Src\Tool\PointerAccessor\PointerAccessor.Double.cs" />
   </ItemGroup>
   <ItemGroup>

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/Src/Class/CvHaarClassifier.cs

@@ -116 +116 @@
         /// </summary>
 #endif
-        public PointerAccessor.Float1 Threshold
+        public PointerAccessor.Single Threshold
         {
-            get { unsafe { return new PointerAccessor.Float1(_data.threshold); } }
+            get { unsafe { return new PointerAccessor.Single(_data.threshold); } }
         }
 
@@ -130 +130 @@
         /// </summary>
 #endif
-        public PointerAccessor.Int1 Left
+        public PointerAccessor.Int32 Left
         {
-            get { unsafe { return new PointerAccessor.Int1(_data.left); } }
+            get { unsafe { return new PointerAccessor.Int32(_data.left); } }
         }
 
@@ -144 +144 @@
         /// </summary>
 #endif
-        public PointerAccessor.Int1 Right
+        public PointerAccessor.Int32 Right
         {
-            get { unsafe { return new PointerAccessor.Int1(_data.right); } }
+            get { unsafe { return new PointerAccessor.Int32(_data.right); } }
         }
 
@@ -158 +158 @@
         /// </summary>
 #endif
-        public PointerAccessor.Float1 Alpha
+        public PointerAccessor.Single Alpha
         {
-            get { unsafe { return new PointerAccessor.Float1(_data.alpha); } }
+            get { unsafe { return new PointerAccessor.Single(_data.alpha); } }
         }
         #endregion

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/Src/CvArr/CvMat.cs

@@ -33 +33 @@
         /// 
         /// </summary>
-        private PointerAccessor.Byte1 dataArrayByte;
+        private PointerAccessor.Byte dataArrayByte;
         /// <summary>
         /// 
         /// </summary>
-        private PointerAccessor.Short1 dataArrayShort;
+        private PointerAccessor.Int16 dataArrayInt16;
         /// <summary>
         /// 
         /// </summary>
-        private PointerAccessor.Int1 dataArrayInt;
+        private PointerAccessor.Int32 dataArrayInt32;
         /// <summary>
         /// 
         /// </summary>
-        private PointerAccessor.Float1 dataArrayFloat;
+        private PointerAccessor.Single dataArraySingle;
         /// <summary>
         /// 
         /// </summary>
-        private PointerAccessor.Double1 dataArrayDouble;
+        private PointerAccessor.Double dataArrayDouble;
         #endregion
 
@@ -630 +630 @@
         /// </summary>
 #endif
-        public PointerAccessor.Byte1 DataArrayByte
+        public PointerAccessor.Byte DataArrayByte
         {
             get
@@ -638 +638 @@
                     unsafe
                     {
-                        dataArrayByte = new PointerAccessor.Byte1(_data.data_ptr);
+                        dataArrayByte = new PointerAccessor.Byte(_data.data_ptr);
                     }
                 }
@@ -653 +653 @@
         /// </summary>
 #endif
-        public PointerAccessor.Short1 DataArrayShort
+        public PointerAccessor.Int16 DataArrayInt16
         {
             get
             {
-                if (dataArrayShort == null)
+                if (dataArrayInt16 == null)
                 {
                     unsafe
                     {
-                        dataArrayShort = new PointerAccessor.Short1(_data.data_s);
+                        dataArrayInt16 = new PointerAccessor.Int16(_data.data_s);
                     }
                 }
-                return dataArrayShort;
+                return dataArrayInt16;
             }
         }
@@ -676 +676 @@
         /// </summary>
 #endif
-        public PointerAccessor.Int1 DataArrayInt
+        public PointerAccessor.Int32 DataArrayInt32
         {
             get
             {
-                if (dataArrayInt == null)
+                if (dataArrayInt32 == null)
                 {
                     unsafe
                     {
-                        dataArrayInt = new PointerAccessor.Int1(_data.data_i);
+                        dataArrayInt32 = new PointerAccessor.Int32(_data.data_i);
                     }
                 }
-                return dataArrayInt;
+                return dataArrayInt32;
             }
         }
@@ -699 +699 @@
         /// </summary>
 #endif
-        public PointerAccessor.Float1 DataArrayFloat
+        public PointerAccessor.Single DataArraySingle
         {
             get
             {
-                if (dataArrayFloat == null)
+                if (dataArraySingle == null)
                 {
                     unsafe
                     {
-                        dataArrayFloat = new PointerAccessor.Float1(_data.data_fl);
+                        dataArraySingle = new PointerAccessor.Single(_data.data_fl);
                     }
                 }
-                return dataArrayFloat;
+                return dataArraySingle;
             }
         }
@@ -722 +722 @@
         /// </summary>
 #endif
-        public PointerAccessor.Double1 DataArrayDouble
+        public PointerAccessor.Double DataArrayDouble
         {
             get
@@ -730 +730 @@
                     unsafe
                     {
-                        dataArrayDouble = new PointerAccessor.Double1(_data.data_db);
+                        dataArrayDouble = new PointerAccessor.Double(_data.data_db);
                     }
                 }

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/Src/CvArr/CvMatND.cs

@@ -28 +28 @@
         /// C++/CLI wrapper in order to access a native structure
         /// </summary>
-        private Extern.WCvMatND data;
+        private Extern.WCvMatND _data;
         /// <summary>
         /// Data pointer
         /// </summary>
-        private IntPtr ptr;
+        private IntPtr _ptr;
         /// <summary>
         /// 
         /// </summary>
-        private PointerAccessor.Byte1 dataArrayByte;
+        private PointerAccessor.Byte dataArrayByte;
         /// <summary>
         /// 
         /// </summary>
-        private PointerAccessor.Short1 dataArrayShort;
+        private PointerAccessor.Int16 dataArrayInt16;
         /// <summary>
         /// 
         /// </summary>
-        private PointerAccessor.Int1 dataArrayInt;
+        private PointerAccessor.Int32 dataArrayInt32;
         /// <summary>
         /// 
         /// </summary>
-        private PointerAccessor.Float1 dataArrayFloat;
+        private PointerAccessor.Single dataArraySingle;
         /// <summary>
         /// 
         /// </summary>
-        private PointerAccessor.Double1 dataArrayDouble;
+        private PointerAccessor.Double dataArrayDouble;
         #endregion
 
@@ -80 +80 @@
                 throw new ArgumentNullException("sizes");
             }
-            this.ptr = CvDll.cvCreateMatND(dims, sizes, type);
-            if (this.ptr == IntPtr.Zero)
+            this._ptr = CvDll.cvCreateMatND(dims, sizes, type);
+            if (this._ptr == IntPtr.Zero)
             {
                 throw new OpenCvSharpException("Failed to create CvMat");
             }
-            this.data = new Extern.WCvMatND(this.ptr);
+            this._data = new Extern.WCvMatND(this._ptr);
             base.NotifyMemoryPressure(SizeOf);
         }
@@ -137 +137 @@
             : base(isEnabledDispose)
         {
-            this.ptr = ptr;
-            this.data = new Extern.WCvMatND(ptr);
+            this._ptr = ptr;
+            this._data = new Extern.WCvMatND(ptr);
             base.NotifyMemoryPressure(SizeOf);
         }
@@ -154 +154 @@
             : base(isEnabledDispose)
         {
-            this.ptr = base.AllocMemory(SizeOf);
-            this.data = new Extern.WCvMatND(ptr);
+            this._ptr = base.AllocMemory(SizeOf);
+            this._data = new Extern.WCvMatND(this._ptr);
             base.NotifyMemoryPressure(SizeOf);
         }
@@ -172 +172 @@
             if (IsEnabledDispose && !IsDisposed)
             {
-                CvDll.cvReleaseMat(ref ptr);                
+                CvDll.cvReleaseMat(ref _ptr);                
             }
             base.Dispose();
@@ -189 +189 @@
         public override IntPtr CvPtr
         {
-            get { return ptr; }
+            get { return _ptr; }
         }
 
@@ -203 +203 @@
         new public int Dims
         {
-            get { return data.dims; }
+            get { return _data.dims; }
         }
 #if LANG_JP
@@ -216 +216 @@
         public int Type
         {
-            get { return data.type; }
+            get { return _data.type; }
         }
 #if LANG_JP
@@ -232 +232 @@
             {
                 Dimension[] result = new Dimension[CvConst.CV_MAX_DIM_];
-                IntPtr ptr = data.dim;
+                IntPtr ptr = _data.dim;
                 unsafe
                 {
@@ -275 +275 @@
         public IntPtr Data
         {
-            get { return data.data; }
+            get { return _data.data; }
         }
 #if LANG_JP
@@ -288 +288 @@
         public byte* DataByte
         {
-            get { return data.ptr; }
+            get { return _data.ptr; }
         }
 #if LANG_JP
@@ -301 +301 @@
         public short* DataInt16
         {
-            get { return data.s; }
+            get { return _data.s; }
         }
 #if LANG_JP
@@ -314 +314 @@
         public int* DataInt32
         {
-            get { return data.i; }
+            get { return _data.i; }
         }
 #if LANG_JP
@@ -327 +327 @@
         public float* DataSingle
         {
-            get { return data.fl; }
+            get { return _data.fl; }
         }
 #if LANG_JP
@@ -340 +340 @@
         public double* DataDouble
         {
-            get { return data.db; }
+            get { return _data.db; }
         }
 #if LANG_JP
@@ -351 +351 @@
         /// </summary>
 #endif
-        public PointerAccessor.Byte1 DataArrayByte
+        public PointerAccessor.Byte DataArrayByte
         {
             get
@@ -357 +357 @@
                 if (dataArrayByte == null)
                 {
-                    dataArrayByte = new PointerAccessor.Byte1(data.ptr);
+                    dataArrayByte = new PointerAccessor.Byte(_data.ptr);
                 }
                 return dataArrayByte;
@@ -371 +371 @@
         /// </summary>
 #endif
-        public PointerAccessor.Short1 DataArrayShort
+        public PointerAccessor.Int16 DataArrayInt16
         {
             get
             {
-                if (dataArrayShort == null)
-                {
-                    dataArrayShort = new PointerAccessor.Short1(data.s);
-                }
-                return dataArrayShort;
+                if (dataArrayInt16 == null)
+                {
+                    dataArrayInt16 = new PointerAccessor.Int16(_data.s);
+                }
+                return dataArrayInt16;
             }
         }
@@ -391 +391 @@
         /// </summary>
 #endif
-        public PointerAccessor.Int1 DataArrayInt
+        public PointerAccessor.Int32 DataArrayInt32
         {
             get
             {
-                if (dataArrayInt == null)
-                {
-                    dataArrayInt = new PointerAccessor.Int1(data.i);
-                }
-                return dataArrayInt;
+                if (dataArrayInt32 == null)
+                {
+                    dataArrayInt32 = new PointerAccessor.Int32(_data.i);
+                }
+                return dataArrayInt32;
             }
         }
@@ -411 +411 @@
         /// </summary>
 #endif
-        public PointerAccessor.Float1 DataArrayFloat
+        public PointerAccessor.Single DataArraySingle
         {
             get
             {
-                if (dataArrayFloat == null)
-                {
-                    dataArrayFloat = new PointerAccessor.Float1(data.fl);
-                }
-                return dataArrayFloat;
+                if (dataArraySingle == null)
+                {
+                    dataArraySingle = new PointerAccessor.Single(_data.fl);
+                }
+                return dataArraySingle;
             }
         }
@@ -431 +431 @@
         /// </summary>
 #endif
-        public PointerAccessor.Double1 DataArrayDouble
+        public PointerAccessor.Double DataArrayDouble
         {
             get
@@ -437 +437 @@
                 if (dataArrayDouble == null)
                 {
-                    dataArrayDouble = new PointerAccessor.Double1(data.db);
+                    dataArrayDouble = new PointerAccessor.Double(_data.db);
                 }
                 return dataArrayDouble;

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/Src/CvArr/IplImage.cs

@@ -873 +873 @@
         /// ROI が存在しない場合には，矩形 cvRect(0,0,image.Width,image.Height) が返される．
         /// </summary>
-        /// <param name="image">画像ヘッダ</param>
         /// <returns>ROI</returns> 
 #else