Changeset 32273 for lang/cpluspluscli
- Timestamp:
- 04/11/09 19:10:17 (4 years ago)
- Location:
- lang/cpluspluscli/OpenCvSharp2/trunk
- Files:
-
- 3 added
- 2 removed
- 13 modified
-
OpenCvSharp.Extern/OpenCvSharp.Extern.vcproj (modified) (13 diffs)
-
OpenCvSharp.Extern/WCvChain.h (modified) (3 diffs)
-
OpenCvSharp.Extern/WCvChainPtReader.h (modified) (1 diff)
-
OpenCvSharp.Extern/WCvContour.h (modified) (3 diffs)
-
OpenCvSharp.Extern/WCvContourTree.cpp (added)
-
OpenCvSharp.Extern/WCvContourTree.h (added)
-
OpenCvSharp.Extern/WCvPOSITObject.cpp (deleted)
-
OpenCvSharp.Extern/WCvPOSITObject.h (deleted)
-
OpenCvSharp.Extern/WCvSet.h (modified) (3 diffs)
-
OpenCvSharp/Core/Cv_A-C.cs (modified) (4 diffs)
-
OpenCvSharp/Core/Cv_R-Z.cs (modified) (2 diffs)
-
OpenCvSharp/CvArr/CvChain.cs (modified) (3 diffs)
-
OpenCvSharp/CvArr/CvContour.cs (modified) (4 diffs)
-
OpenCvSharp/CvArr/CvContourTree.cs (added)
-
OpenCvSharp/CvArr/CvSeq.cs (modified) (18 diffs)
-
OpenCvSharp/CvArr/CvSeqT.cs (modified) (5 diffs)
-
OpenCvSharp/CvArr/CvSet.cs (modified) (5 diffs)
-
OpenCvSharp/OpenCvSharp.csproj (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp.Extern/OpenCvSharp.Extern.vcproj
r32215 r32273 2 2 <VisualStudioProject 3 3 ProjectType="Visual C++" 4 Version="9 ,00"4 Version="9.00" 5 5 Name="OpenCvSharp.Extern" 6 6 ProjectGUID="{38E4FA6B-0F95-4020-98C4-D8828A20699F}" … … 550 550 > 551 551 <File 552 RelativePath=".\WCvChain.cpp"553 >554 </File>555 <File556 552 RelativePath=".\WCvChainPtReader.cpp" 557 553 > … … 562 558 </File> 563 559 <File 564 RelativePath=".\WCvContour .cpp"560 RelativePath=".\WCvContourTree.cpp" 565 561 > 566 562 </File> … … 586 582 </File> 587 583 <File 588 RelativePath=".\WCvMat.cpp"589 >590 </File>591 <File592 RelativePath=".\WCvMatND.cpp"593 >594 </File>595 <File596 584 RelativePath=".\WCvMemStorage.cpp" 597 585 > 598 586 </File> 599 587 <File 600 RelativePath=".\WCvPOSITObject.cpp"601 >602 </File>603 <File604 588 RelativePath=".\WCvQuadEdge2D.cpp" 605 589 > 606 590 </File> 607 591 <File 608 RelativePath=".\WCvSeq.cpp"609 >610 </File>611 <File612 592 RelativePath=".\WCvSeqBlock.cpp" 613 593 > … … 618 598 </File> 619 599 <File 620 RelativePath=".\WCvSet.cpp"621 >622 </File>623 <File624 600 RelativePath=".\WCvSetElem.cpp" 625 601 > 626 602 </File> 627 603 <File 628 RelativePath=".\WCvSparseMat.cpp"629 >630 </File>631 <File632 604 RelativePath=".\WCvStereoBMState.cpp" 633 605 > … … 651 623 <File 652 624 RelativePath=".\WIplConvKernel.cpp" 653 >654 </File>655 <File656 RelativePath=".\WIplImage.cpp"657 625 > 658 626 </File> … … 675 643 <File 676 644 RelativePath=".\WCvSVM.cpp" 645 > 646 </File> 647 </Filter> 648 <Filter 649 Name="CvArr" 650 > 651 <File 652 RelativePath=".\WCvChain.cpp" 653 > 654 </File> 655 <File 656 RelativePath=".\WCvContour.cpp" 657 > 658 </File> 659 <File 660 RelativePath=".\WCvMat.cpp" 661 > 662 </File> 663 <File 664 RelativePath=".\WCvMatND.cpp" 665 > 666 </File> 667 <File 668 RelativePath=".\WCvSeq.cpp" 669 > 670 </File> 671 <File 672 RelativePath=".\WCvSet.cpp" 673 > 674 </File> 675 <File 676 RelativePath=".\WCvSparseMat.cpp" 677 > 678 </File> 679 <File 680 RelativePath=".\WIplImage.cpp" 677 681 > 678 682 </File> … … 704 708 > 705 709 <File 706 RelativePath=".\WCvChain.h"707 >708 </File>709 <File710 710 RelativePath=".\WCvChainPtReader.h" 711 711 > … … 716 716 </File> 717 717 <File 718 RelativePath=".\WCvContour.h"719 >720 </File>721 <File722 718 RelativePath=".\WCvFileNode.h" 723 719 > … … 740 736 </File> 741 737 <File 742 RelativePath=".\WCvMat.h"743 >744 </File>745 <File746 RelativePath=".\WCvMatND.h"747 >748 </File>749 <File750 738 RelativePath=".\WCvMemStorage.h" 751 739 > 752 740 </File> 753 741 <File 754 RelativePath=".\WCvPOSITObject.h"755 >756 </File>757 <File758 742 RelativePath=".\WCvQuadEdge2D.h" 759 743 > 760 744 </File> 761 745 <File 762 RelativePath=".\WCvSeq.h"763 >764 </File>765 <File766 746 RelativePath=".\WCvSeqBlock.h" 767 747 > … … 772 752 </File> 773 753 <File 774 RelativePath=".\WCvSet.h"775 >776 </File>777 <File778 754 RelativePath=".\WCvSetElem.h" 779 755 > 780 756 </File> 781 757 <File 782 RelativePath=".\WCvSparseMat.h"783 >784 </File>785 <File786 758 RelativePath=".\WCvStereoBMState.h" 787 759 > … … 805 777 <File 806 778 RelativePath=".\WIplConvKernel.h" 807 >808 </File>809 <File810 RelativePath=".\WIplImage.h"811 779 > 812 780 </File> … … 829 797 <File 830 798 RelativePath=".\WCvSVM.h" 799 > 800 </File> 801 </Filter> 802 <Filter 803 Name="CvArr" 804 > 805 <File 806 RelativePath=".\WCvChain.h" 807 > 808 </File> 809 <File 810 RelativePath=".\WCvContour.h" 811 > 812 </File> 813 <File 814 RelativePath=".\WCvContourTree.h" 815 > 816 </File> 817 <File 818 RelativePath=".\WCvMat.h" 819 > 820 </File> 821 <File 822 RelativePath=".\WCvMatND.h" 823 > 824 </File> 825 <File 826 RelativePath=".\WCvSeq.h" 827 > 828 </File> 829 <File 830 RelativePath=".\WCvSet.h" 831 > 832 </File> 833 <File 834 RelativePath=".\WCvSparseMat.h" 835 > 836 </File> 837 <File 838 RelativePath=".\WIplImage.h" 831 839 > 832 840 </File> -
lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp.Extern/WCvChain.h
r31568 r32273 6 6 #pragma once 7 7 8 #include "WCvSeq.h" 8 9 9 10 namespace KwsmLab { … … 14 15 /// 輪郭データ 15 16 /// </summary> 16 public ref class WCvChain 17 public ref class WCvChain : WCvSeq 17 18 { 18 19 private: … … 32 33 /// 初期化 33 34 /// </summary> 34 WCvChain(IntPtr ptr) 35 WCvChain(IntPtr ptr) : WCvSeq(ptr) 35 36 { 36 37 this->_ptr = static_cast<CvChain*>(ptr.ToPointer()); -
lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp.Extern/WCvChainPtReader.h
r32198 r32273 59 59 } 60 60 } 61 property schar* deltas_62 {63 schar* get(void)64 {65 schar* result = &(_ptr->deltas[0][0]);66 return result;67 }68 }69 61 }; 70 62 } -
lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp.Extern/WCvContour.h
r31568 r32273 6 6 #pragma once 7 7 8 #include "WCvSeq.h" 8 9 9 10 namespace KwsmLab { … … 14 15 /// 輪郭データ 15 16 /// </summary> 16 public ref class WCvContour 17 public ref class WCvContour : WCvSeq 17 18 { 18 19 private: … … 32 33 /// 初期化 33 34 /// </summary> 34 WCvContour(IntPtr ptr) 35 WCvContour(IntPtr ptr) : WCvSeq(ptr) 35 36 { 36 37 this->_ptr = static_cast<CvContour*>(ptr.ToPointer()); -
lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp.Extern/WCvSet.h
r31568 r32273 6 6 #pragma once 7 7 8 #include "WCvSeq.h" 8 9 9 10 namespace KwsmLab { … … 14 15 /// 連続したシーケンスブロック 15 16 /// </summary> 16 public ref class WCvSet 17 public ref class WCvSet : WCvSeq 17 18 { 18 19 private: … … 32 33 /// 初期化 33 34 /// </summary> 34 WCvSet(IntPtr ptr) 35 WCvSet(IntPtr ptr) : WCvSeq(ptr) 35 36 { 36 37 this->_ptr = static_cast<CvSet*>(ptr.ToPointer()); -
lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/Core/Cv_A-C.cs
r32272 r32273 647 647 #endregion 648 648 #region ArcLength 649 #if LANG_JP 649 650 /// <summary> 650 651 /// 輪郭の周囲長または曲線の長さを計算する … … 652 653 /// <param name="curve">配列</param> 653 654 /// <returns>輪郭の周囲長または曲線の長さ</returns> 655 #else 656 /// <summary> 657 /// Calculates contour perimeter or curve length 658 /// </summary> 659 /// <param name="curve">Sequence or array of the curve points. </param> 660 /// <returns></returns> 661 #endif 654 662 public static double ArcLength(this CvArr curve) 655 663 { 656 664 return ArcLength(curve, CvSlice.WholeSeq, -1); 657 665 } 666 #if LANG_JP 658 667 /// <summary> 659 668 /// 輪郭の周囲長または曲線の長さを計算する … … 662 671 /// <param name="slice">曲線の始点と終点.デフォルトでは曲線の全ての長さが計算される.</param> 663 672 /// <returns>輪郭の周囲長または曲線の長さ</returns> 673 #else 674 /// <summary> 675 /// Calculates contour perimeter or curve length 676 /// </summary> 677 /// <param name="curve">Sequence or array of the curve points. </param> 678 /// <param name="slice">Starting and ending points of the curve, by default the whole curve length is calculated. </param> 679 /// <returns></returns> 680 #endif 664 681 public static double ArcLength(this CvArr curve, CvSlice slice) 665 682 { 666 683 return ArcLength(curve, slice, -1); 667 684 } 685 #if LANG_JP 668 686 /// <summary> 669 687 /// 輪郭の周囲長または曲線の長さを計算する … … 677 695 /// </param> 678 696 /// <returns>輪郭の周囲長または曲線の長さ</returns> 697 #else 698 /// <summary> 699 /// Calculates contour perimeter or curve length 700 /// </summary> 701 /// <param name="curve">Sequence or array of the curve points. </param> 702 /// <param name="slice">Starting and ending points of the curve, by default the whole curve length is calculated. </param> 703 /// <param name="is_closed">Indicates whether the curve is closed or not. There are 3 cases: 704 /// * is_closed=0 - the curve is assumed to be unclosed. 705 /// * is_closed>0 - the curve is assumed to be closed. 706 /// * is_closed<0 - if curve is sequence, the flag CV_SEQ_FLAG_CLOSED of ((CvSeq*)curve)->flags is checked to determine if the curve is closed or not, otherwise (curve is represented by array (CvMat*) of points) it is assumed to be unclosed. </param> 707 /// <returns></returns> 708 #endif 679 709 public static double ArcLength(this CvArr curve, CvSlice slice, int is_closed) 680 710 { -
lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/Core/Cv_R-Z.cs
r32272 r32273 113 113 Type t = typeof(T); 114 114 if (t == typeof(IplImage)) 115 return (T) System.Convert.ChangeType(new IplImage(result), typeof(IplImage));116 elseif (t == typeof(CvMat))117 return (T) System.Convert.ChangeType(new CvMat(result), typeof(CvMat));118 elseif (t == typeof(CvMatND))119 return (T) System.Convert.ChangeType(new CvMatND(result), typeof(CvMatND));120 elseif (t == typeof(CvSparseMat))121 return (T) System.Convert.ChangeType(new CvSparseMat(result), typeof(CvSparseMat));122 elseif (t == typeof(CvSeq))123 return (T) System.Convert.ChangeType(new CvSeq(result), typeof(CvSeq));124 else125 throw new NotImplementedException();115 return (T)(object)(new IplImage(result)); 116 if (t == typeof(CvMat)) 117 return (T)(object)(new CvMat(result)); 118 if (t == typeof(CvMatND)) 119 return (T)(object)(new CvMatND(result)); 120 if (t == typeof(CvSparseMat)) 121 return (T)(object)(new CvSparseMat(result)); 122 if (t == typeof(CvSeq)) 123 return (T)(object)(new CvSeq(result)); 124 125 throw new NotSupportedException(); 126 126 } 127 127 #endregion … … 147 147 Type t = typeof(T); 148 148 if (t == typeof(IplImage)) 149 return (T) System.Convert.ChangeType(new IplImage(result), typeof(IplImage));150 elseif (t == typeof(CvMat))151 return (T) System.Convert.ChangeType(new CvMat(result), typeof(CvMat));152 elseif (t == typeof(CvMatND))153 return (T) System.Convert.ChangeType(new CvMatND(result), typeof(CvMatND));154 elseif (t == typeof(CvSparseMat))155 return (T) System.Convert.ChangeType(new CvSparseMat(result), typeof(CvSparseMat));156 elseif (t == typeof(CvSeq))157 return (T) System.Convert.ChangeType(new CvSeq(result), typeof(CvSeq));158 else159 throw new NotImplementedException();149 return (T)(object)(new IplImage(result)); 150 if (t == typeof(CvMat)) 151 return (T)(object)(new CvMat(result)); 152 if (t == typeof(CvMatND)) 153 return (T)(object)(new CvMatND(result)); 154 if (t == typeof(CvSparseMat)) 155 return (T)(object)(new CvSparseMat(result)); 156 if (t == typeof(CvSeq)) 157 return (T)(object)(new CvSeq(result)); 158 159 throw new NotImplementedException(); 160 160 } 161 161 #endregion -
lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/CvArr/CvChain.cs
r32142 r32273 6 6 namespace KwsmLab.OpenCvSharp 7 7 { 8 #if LANG_JP 8 9 /// <summary> 9 10 /// 輪郭データ 10 11 /// </summary> 12 #else 13 /// <summary> 14 /// 15 /// </summary> 16 #endif 11 17 public class CvChain : CvSeq<CvPoint> 12 18 { 13 19 /// <summary> 14 /// C++/CLI 側でポインタにアクセスするオブジェクト20 /// C++/CLI access to object's pointer 15 21 /// </summary> 16 new private Extern.WCvChaindata;22 new private readonly Extern.WCvChain _data; 17 23 /// <summary> 18 /// データポインタ24 /// Data pointer 19 25 /// </summary> 20 new private IntPtrptr;26 new private readonly IntPtr _ptr; 21 27 22 28 23 #region 初期化と解放 29 #region Init and Disposal 30 #if LANG_JP 24 31 /// <summary> 25 /// ポインタから初期化32 /// ネイティブのデータポインタから初期化 26 33 /// </summary> 27 34 /// <param name="ptr"></param> 35 #else 36 /// <summary> 37 /// Initializes from native pointer 38 /// </summary> 39 /// <param name="ptr"></param> 40 #endif 28 41 public CvChain(IntPtr ptr) 29 42 : base(ptr) 30 43 { 31 this. ptr = ptr;32 this. data = new Extern.WCvChain(ptr);44 this._ptr = ptr; 45 this._data = new Extern.WCvChain(ptr); 33 46 } 47 #if LANG_JP 34 48 /// <summary> 35 49 /// リソースの解放 36 50 /// </summary> 51 #else 52 /// <summary> 53 /// Releases resource 54 /// </summary> 55 #endif 37 56 public override void Dispose() 38 57 { … … 43 62 44 63 45 #region プロパティ64 #region Properties 46 65 /// <summary> 47 /// sizeof(Cv Mat) を取得する66 /// sizeof(CvChain) 48 67 /// </summary> 49 68 new public const Int32 SizeOf = Extern.WCvChain.SizeOf; 50 69 /// <summary> 51 /// データポインタ(CvContour*)を取得する70 /// Data pointer (CvChain*) 52 71 /// </summary> 53 72 public override IntPtr CvPtr 54 73 { 55 get { return ptr; }74 get { return _ptr; } 56 75 } 57 76 … … 61 80 public CvPoint Origin 62 81 { 63 get { return data.origin; }82 get { return _data.origin; } 64 83 } 65 84 #endregion -
lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/CvArr/CvContour.cs
r32142 r32273 12 12 { 13 13 /// <summary> 14 /// C++/CLI 側でポインタにアクセスするオブジェクト14 /// C++/CLI access to object's pointer 15 15 /// </summary> 16 new private Extern.WCvContourdata;16 new private readonly Extern.WCvContour _data; 17 17 /// <summary> 18 /// データポインタ18 /// Data pointer 19 19 /// </summary> 20 new private IntPtrptr;20 new private readonly IntPtr _ptr; 21 21 22 22 23 #region 初期化と解放 23 #region Init and Disposal 24 #if LANG_JP 24 25 /// <summary> 25 /// ポインタから初期化26 /// ネイティブのデータポインタから初期化 26 27 /// </summary> 27 28 /// <param name="ptr"></param> 29 #else 30 /// <summary> 31 /// Initializes from native pointer 32 /// </summary> 33 /// <param name="ptr"></param> 34 #endif 28 35 public CvContour(IntPtr ptr) 29 36 : base(ptr) 30 37 { 31 this. ptr = ptr;32 this. data = new Extern.WCvContour(ptr);38 this._ptr = ptr; 39 this._data = new Extern.WCvContour(ptr); 33 40 } 41 #if LANG_JP 34 42 /// <summary> 35 43 /// リソースの解放 36 44 /// </summary> 45 #else 46 /// <summary> 47 /// Releases resource 48 /// </summary> 49 #endif 37 50 public override void Dispose() 38 51 { … … 43 56 44 57 45 #region プロパティ58 #region Properties 46 59 /// <summary> 47 /// sizeof(Cv Mat) を取得する60 /// sizeof(CvContour) 48 61 /// </summary> 49 62 new public const Int32 SizeOf = Extern.WCvContour.SizeOf; 50 63 /// <summary> 51 /// データポインタ(CvContour*)を取得する64 /// Data pointer(CvContour*) 52 65 /// </summary> 53 66 public override IntPtr CvPtr 54 67 { 55 get { return ptr; }68 get { return _ptr; } 56 69 } 57 70 … … 61 74 public CvRect Rect 62 75 { 63 get { return data.rect; }76 get { return _data.rect; } 64 77 } 65 78 /// <summary> … … 68 81 public int Color 69 82 { 70 get { return data.color; }83 get { return _data.color; } 71 84 } 72 85 #endregion -
lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/CvArr/CvSeq.cs
r32115 r32273 13 13 { 14 14 /// <summary> 15 /// C++/CLI 側でポインタにアクセスするオブジェクト16 /// </summary> 17 protected Extern.WCvSeq data;18 /// <summary> 19 /// データポインタ20 /// </summary> 21 protected IntPtr ptr;22 23 24 #region 初期化と解放15 /// C++/CLI access to object's pointer 16 /// </summary> 17 protected Extern.WCvSeq _data; 18 /// <summary> 19 /// Data pointer 20 /// </summary> 21 protected IntPtr _ptr; 22 23 24 #region Init and Disposal 25 25 /// <summary> 26 26 /// cvCreateSeqによる初期化. header_size=sizeof(CvSeq) … … 52 52 throw new ArgumentNullException(); 53 53 } 54 this. ptr = CvDll.cvCreateSeq(seq_flags, header_size, elem_size, storage.CvPtr);55 if (this. ptr == IntPtr.Zero)54 this._ptr = CvDll.cvCreateSeq(seq_flags, header_size, elem_size, storage.CvPtr); 55 if (this._ptr == IntPtr.Zero) 56 56 { 57 57 throw new Exception("CvSeqのインスタンスの生成に失敗しました."); 58 58 } 59 this. data = new Extern.WCvSeq(this.ptr);59 this._data = new Extern.WCvSeq(this._ptr); 60 60 } 61 61 /// <summary> … … 65 65 public CvSeq(IntPtr ptr) 66 66 { 67 this. ptr = ptr;68 this. data = new Extern.WCvSeq(ptr);67 this._ptr = ptr; 68 this._data = new Extern.WCvSeq(ptr); 69 69 } 70 70 /// <summary> … … 89 89 public override IntPtr CvPtr 90 90 { 91 get { return ptr; }91 get { return _ptr; } 92 92 } 93 93 … … 96 96 /// </summary> 97 97 public int Flags{ 98 get { return data.flags; }98 get { return _data.flags; } 99 99 } 100 100 /// <summary> … … 102 102 /// </summary> 103 103 public int HeaderSize{ 104 get { return data.header_size; }104 get { return _data.header_size; } 105 105 } 106 106 /// <summary> … … 109 109 public CvSeq HPrev{ 110 110 get { 111 IntPtr ptr = data.h_prev;111 IntPtr ptr = _data.h_prev; 112 112 if(ptr != IntPtr.Zero){ 113 113 return new CvSeq(ptr); … … 122 122 public CvSeq HNext{ 123 123 get { 124 IntPtr ptr = data.h_next;124 IntPtr ptr = _data.h_next; 125 125 if(ptr != IntPtr.Zero){ 126 126 return new CvSeq(ptr); … … 135 135 public CvSeq VPrev{ 136 136 get { 137 IntPtr ptr = data.v_prev;137 IntPtr ptr = _data.v_prev; 138 138 if(ptr != IntPtr.Zero){ 139 139 return new CvSeq(ptr); … … 148 148 public CvSeq VNext{ 149 149 get { 150 IntPtr ptr = data.v_next;150 IntPtr ptr = _data.v_next; 151 151 if(ptr != IntPtr.Zero){ 152 152 return new CvSeq(ptr); … … 160 160 /// </summary> 161 161 public int Total{ 162 get { return data.total; }162 get { return _data.total; } 163 163 } 164 164 /// <summary> … … 166 166 /// </summary> 167 167 public int ElemSize{ 168 get { return data.elem_size; }168 get { return _data.elem_size; } 169 169 } 170 170 /// <summary> … … 172 172 /// </summary> 173 173 public IntPtr BlockMax{ 174 get { return data.block_max; }174 get { return _data.block_max; } 175 175 } 176 176 /// <summary> … … 178 178 /// </summary> 179 179 public IntPtr Ptr{ 180 get { return data.ptr; }180 get { return _data.ptr; } 181 181 } 182 182 /// <summary> … … 184 184 /// </summary> 185 185 public int DeltaElems{ 186 get { return data.delta_elems; }186 get { return _data.delta_elems; } 187 187 } 188 188 /// <summary> … … 191 191 public CvMemStorage Storage{ 192 192 get { 193 IntPtr ptr = data.storage;193 IntPtr ptr = _data.storage; 194 194 if(ptr != IntPtr.Zero){ 195 195 return new CvMemStorage(ptr, false); … … 204 204 public CvSeqBlock FreeBlocks{ 205 205 get { 206 IntPtr ptr = data.free_blocks;206 IntPtr ptr = _data.free_blocks; 207 207 if(ptr != IntPtr.Zero){ 208 208 return new CvSeqBlock(ptr); … … 217 217 public CvSeqBlock First{ 218 218 get { 219 IntPtr ptr = data.first;219 IntPtr ptr = _data.first; 220 220 if(ptr != IntPtr.Zero){ 221 221 return new CvSeqBlock(ptr); -
lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/CvArr/CvSeqT.cs
r32271 r32273 13 13 { 14 14 15 #region 初期化と解放15 #region Init and Disposal 16 16 /// <summary> 17 17 /// cvCreateSeqによる初期化. header_size=sizeof(CvSeq) … … 81 81 new public CvSeq<T> HPrev{ 82 82 get { 83 IntPtr ptr = data.h_prev;83 IntPtr ptr = _data.h_prev; 84 84 if(ptr != IntPtr.Zero){ 85 85 return new CvSeq<T>(ptr); … … 94 94 new public CvSeq<T> HNext{ 95 95 get { 96 IntPtr ptr = data.h_next;96 IntPtr ptr = _data.h_next; 97 97 if(ptr != IntPtr.Zero){ 98 98 return new CvSeq<T>(ptr); … … 107 107 new public CvSeq<T> VPrev{ 108 108 get { 109 IntPtr ptr = data.v_prev;109 IntPtr ptr = _data.v_prev; 110 110 if(ptr != IntPtr.Zero){ 111 111 return new CvSeq<T>(ptr); … … 120 120 new public CvSeq<T> VNext{ 121 121 get { 122 IntPtr ptr = data.v_next;122 IntPtr ptr = _data.v_next; 123 123 if(ptr != IntPtr.Zero){ 124 124 return new CvSeq<T>(ptr); -
lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/CvArr/CvSet.cs
r31460 r32273 12 12 { 13 13 /// <summary> 14 /// C++/CLI 側でポインタにアクセスするオブジェクト14 /// C++/CLI access to object's pointer 15 15 /// </summary> 16 new protected Extern.WCvSet data;16 new protected Extern.WCvSet _data; 17 17 /// <summary> 18 /// データポインタ18 /// Data pointer 19 19 /// </summary> 20 new protected IntPtr ptr;20 new protected IntPtr _ptr; 21 21 22 22 … … 29 29 : base(ptr) 30 30 { 31 this. ptr = ptr;32 this. data = new Extern.WCvSet(ptr);31 this._ptr = ptr; 32 this._data = new Extern.WCvSet(ptr); 33 33 } 34 34 … … 53 53 public override IntPtr CvPtr 54 54 { 55 get { return ptr; }55 get { return _ptr; } 56 56 } 57 57 … … 60 60 /// </summary> 61 61 public CvSetElem FreeElems{ 62 get { return new CvSetElem( data.free_elems); }62 get { return new CvSetElem(_data.free_elems); } 63 63 } 64 64 /// <summary> … … 66 66 /// </summary> 67 67 public int ActiveCount{ 68 get { return data.active_count; }68 get { return _data.active_count; } 69 69 } 70 70 #endregion -
lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/OpenCvSharp.csproj
r32272 r32273 166 166 <Compile Include="Class\CvTreeNodeIteratorT.cs" /> 167 167 <Compile Include="Core\Cv_D-G.cs" /> 168 <Compile Include="CvArr\CvContourTree.cs" /> 168 169 <Compile Include="Delegate\CvDistanceFunction.cs" /> 169 170 <Compile Include="Enum\AngleUnit.cs" />
![(please configure the [header_logo] section in trac.ini)](/share/chrome/site/your_project_logo.png)