Changeset 33060

Timestamp:

05/05/09 08:33:15 (4 years ago)

Author:

schima

Message:

SeqPartition? sample

Location:

lang/cpluspluscli/OpenCvSharp2/trunk

Files:

• OpenCvSharp.Blob/OpenCvSharp.Blob.vcproj (modified) (1 diff)
• OpenCvSharp.Extern/CvConst.h (modified) (1 diff)
• OpenCvSharp.Extern/OpenCvSharp.Extern.vcproj (modified) (2 diffs)
• OpenCvSharp.Extern/WBase.h (modified) (1 diff)
• OpenCvSharp.Extern/WCvConDensation.h (modified) (1 diff)
• OpenCvSharp.Extern/WCvTypeInfo.cpp (added)
• OpenCvSharp.Extern/WCvTypeInfo.h (added)
• OpenCvSharp.MachineLearning/CvKNearest.h (modified) (1 diff)
• OpenCvSharp.MachineLearning/CvSVM.h (modified) (1 diff)
• OpenCvSharp.Test/OpenCvSharp.Test.csproj (modified) (2 diffs)
• OpenCvSharp.Test/Program.cs (modified) (3 diffs)
• OpenCvSharp.Test/Samples/SeqPartition.cs (added)
• OpenCvSharp/OpenCvSharp.csproj (modified) (4 diffs)
• wrapped functions.csv (modified) (9 diffs)

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp.Blob/OpenCvSharp.Blob.vcproj

@@ -2 +2 @@
 <VisualStudioProject
         ProjectType="Visual C++"
-        Version="9,00"
+        Version="9.00"
         Name="OpenCvSharp.Blob"
         ProjectGUID="{014EC8DF-B435-444E-8603-D73FC857648A}"

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp.Extern/CvConst.h

@@ -288 +288 @@
                                 literal Int32 CV_DIST_WELSCH_ =  CV_DIST_WELSCH;
                                 literal Int32 CV_DIST_HUBER_ =  CV_DIST_HUBER;
+                                // cvError
+                                literal Int32 CV_StsOk_        = CV_StsOk;                      /* everithing is ok                */
+                                literal Int32 CV_StsBackTrace_ = CV_StsBackTrace;       /* pseudo error for back trace     */
+                                literal Int32 CV_StsError_     = CV_StsError;           /* unknown /unspecified error      */
+                                literal Int32 CV_StsInternal_  = CV_StsInternal;        /* internal error (bad state)      */
+                                literal Int32 CV_StsNoMem_     = CV_StsNoMem;           /* insufficient memory             */
+                                literal Int32 CV_StsBadArg_    = CV_StsBadArg;          /* function arg/param is bad       */
+                                literal Int32 CV_StsBadFunc_   = CV_StsBadFunc;         /* unsupported function            */
+                                literal Int32 CV_StsNoConv_    = CV_StsNoConv;          /* iter. didn't converge           */
+                                literal Int32 CV_StsAutoTrace_ = CV_StsAutoTrace;       /* tracing                         */
+
+                                literal Int32 CV_HeaderIsNull_    = CV_HeaderIsNull;    /* image header is NULL            */
+                                literal Int32 CV_BadImageSize_    = CV_BadImageSize;    /* image size is invalid           */
+                                literal Int32 CV_BadOffset_       = CV_BadOffset;               /* offset is invalid               */
+                                literal Int32 CV_BadDataPtr_      = CV_BadDataPtr;              /**/
+                                literal Int32 CV_BadStep_         = CV_BadStep;                 /**/
+                                literal Int32 CV_BadModelOrChSeq_ = CV_BadModelOrChSeq; /**/
+                                literal Int32 CV_BadNumChannels_  = CV_BadNumChannels;  /**/
+                                literal Int32 CV_BadNumChannel1U_ = CV_BadNumChannel1U; /**/
+                                literal Int32 CV_BadDepth_        = CV_BadDepth;                /**/
+                                literal Int32 CV_BadAlphaChannel_ = CV_BadAlphaChannel; /**/
+                                literal Int32 CV_BadOrder_        = CV_BadOrder;                /**/
+                                literal Int32 CV_BadOrigin_       = CV_BadOrigin;               /**/
+                                literal Int32 CV_BadAlign_        = CV_BadAlign;                /**/
+                                literal Int32 CV_BadCallBack_     = CV_BadCallBack;             /**/
+                                literal Int32 CV_BadTileSize_     = CV_BadTileSize;             /**/
+                                literal Int32 CV_BadCOI_          = CV_BadCOI;                  /**/
+                                literal Int32 CV_BadROISize_      = CV_BadROISize;              /**/
+
+                                literal Int32 CV_MaskIsTiled_     = CV_MaskIsTiled;             /**/
+
+                                literal Int32 CV_StsNullPtr_                = CV_StsNullPtr;                            /* null pointer */
+                                literal Int32 CV_StsVecLengthErr_           = CV_StsVecLengthErr;                       /* incorrect vector length */
+                                literal Int32 CV_StsFilterStructContentErr_ = CV_StsFilterStructContentErr; /* incorr. filter structure content */
+                                literal Int32 CV_StsKernelStructContentErr_ = CV_StsKernelStructContentErr; /* incorr. transform kernel content */
+                                literal Int32 CV_StsFilterOffsetErr_        = CV_StsFilterOffsetErr;            /* incorrect filter ofset value */
+
+                                /*extra for CV */
+                                literal Int32 CV_StsBadSize_               = CV_StsBadSize;                             /* the input/output structure size is incorrect  */
+                                literal Int32 CV_StsDivByZero_             = CV_StsDivByZero;                   /* division by zero */
+                                literal Int32 CV_StsInplaceNotSupported_   = CV_StsInplaceNotSupported; /* inplace operation is not supported */
+                                literal Int32 CV_StsObjectNotFound_        = CV_StsObjectNotFound;              /* request can't be completed */
+                                literal Int32 CV_StsUnmatchedFormats_      = CV_StsUnmatchedFormats;    /* formats of input/output arrays differ */
+                                literal Int32 CV_StsBadFlag_               = CV_StsBadFlag;                             /* flag is wrong or not supported */  
+                                literal Int32 CV_StsBadPoint_              = CV_StsBadPoint;                    /* bad CvPoint */ 
+                                literal Int32 CV_StsBadMask_               = CV_StsBadMask;                             /* bad format of mask (neither 8uC1 nor 8sC1)*/
+                                literal Int32 CV_StsUnmatchedSizes_        = CV_StsUnmatchedSizes;              /* sizes of input/output structures do not match */
+                                literal Int32 CV_StsUnsupportedFormat_     = CV_StsUnsupportedFormat;   /* the data format/type is not supported by the function*/
+                                literal Int32 CV_StsOutOfRange_            = CV_StsOutOfRange;                  /* some of parameters are out of range */
+                                literal Int32 CV_StsParseError_            = CV_StsParseError;                  /* invalid syntax/structure of the parsed file */
+                                literal Int32 CV_StsNotImplemented_        = CV_StsNotImplemented;              /* the requested function/feature is not implemented */
+                                literal Int32 CV_StsBadMemBlock_           = CV_StsBadMemBlock;                 /* an allocated block has been corrupted */
+                                
+                                // cvGet/SetErrMode
+                                literal Int32 CV_ErrModeLeaf_ = CV_ErrModeLeaf;
+                                literal Int32 CV_ErrModeParent_ = CV_ErrModeParent;
+                                literal Int32 CV_ErrModeSilent_ = CV_ErrModeSilent;
+
                                 // CvFileNode
-                                literal Int32 CV_NODE_NONE_ = CV_NODE_NONE;
-                                literal Int32 CV_NODE_INTEGER_ = CV_NODE_INTEGER;
-                                literal Int32 CV_NODE_FLOAT_ = CV_NODE_FLOAT;
-                                literal Int32 CV_NODE_STRING_ = CV_NODE_STRING;
-                                literal Int32 CV_NODE_REF_ = CV_NODE_REF;
-                                literal Int32 CV_NODE_SEQ_ =  CV_NODE_SEQ;
-                                literal Int32 CV_NODE_MAP_ =  CV_NODE_MAP;
-                                literal Int32 CV_NODE_FLOW_ = CV_NODE_FLOW;
-                                literal Int32 CV_NODE_USER_ = CV_NODE_USER;
-                                literal Int32 CV_NODE_EMPTY_ = CV_NODE_EMPTY;
-                                literal Int32 CV_NODE_NAMED_ = CV_NODE_NAMED;
+                                literal Int32 CV_NODE_NONE_             = CV_NODE_NONE;
+                                literal Int32 CV_NODE_INTEGER_  = CV_NODE_INTEGER;
+                                literal Int32 CV_NODE_FLOAT_    = CV_NODE_FLOAT;
+                                literal Int32 CV_NODE_STRING_   = CV_NODE_STRING;
+                                literal Int32 CV_NODE_REF_              = CV_NODE_REF;
+                                literal Int32 CV_NODE_SEQ_              = CV_NODE_SEQ;
+                                literal Int32 CV_NODE_MAP_              = CV_NODE_MAP;
+                                literal Int32 CV_NODE_FLOW_             = CV_NODE_FLOW;
+                                literal Int32 CV_NODE_USER_             = CV_NODE_USER;
+                                literal Int32 CV_NODE_EMPTY_    = CV_NODE_EMPTY;
+                                literal Int32 CV_NODE_NAMED_    = CV_NODE_NAMED;
                                 // cvFindChessboardCorners
                                 literal Int32 CV_CALIB_CB_ADAPTIVE_THRESH_ = CV_CALIB_CB_ADAPTIVE_THRESH;

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp.Extern/OpenCvSharp.Extern.vcproj

@@ -609 +609 @@
                                 </File>
                                 <File
+                                        RelativePath=".\WCvTypeInfo.cpp"
+                                        >
+                                </File>
+                                <File
                                         RelativePath=".\WIplConvKernel.cpp"
                                         >
@@ -803 +807 @@
                                 </File>
                                 <File
+                                        RelativePath=".\WCvTypeInfo.h"
+                                        >
+                                </File>
+                                <File
                                         RelativePath=".\WIplConvKernel.h"
                                         >

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp.Extern/WBase.h

@@ -1 @@
-/**
+/*
  * (C) 2008-2009 Schima
  * This code is licenced under the LGPL.

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp.Extern/WCvConDensation.h

@@ -1 @@
-/**
-* (C) 2008-2009 Schima
-* This code is licenced under the LGPL.
-*/
+/*
+ * (C) 2008-2009 Schima
+ * This code is licenced under the LGPL.
+ */
 
 #pragma once

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

@@ -145 +145 @@
             else
             {
-                ArrayAddress2<float>^ aa = gcnew ArrayAddress2<float>(neighbors);
+                ArrayAddress2<Single>^ aa = gcnew ArrayAddress2<Single>(neighbors);
                                 neighbors_ptr = new float*[aa->Pointer->Length];
                                 for(int i=0; i<aa->Pointer->Length; i++)

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

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

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp.Test/OpenCvSharp.Test.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>{B691EDEE-E08C-40A1-ACFC-91A8921F919D}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OpenCvSharp.Test</RootNamespace>
+    <RootNamespace>KwsmLab.OpenCvSharp.Test</RootNamespace>
     <AssemblyName>OpenCvSharp.Test</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
@@ -123 +123 @@
     <Compile Include="Samples\PyrSegmentation.cs" />
     <Compile Include="Samples\Resize.cs" />
+    <Compile Include="Samples\SeqPartition.cs" />
     <Compile Include="Samples\SeqTest.cs" />
     <Compile Include="Samples\Snake.cs" />

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp.Test/Program.cs

@@ -84 +84 @@
             //new Test.CornerDetect();                // コーナーの検出
 
-            new Test.Delaunay();                    // ドロネー
+            //new Test.Delaunay();                    // ドロネー
 
             //new Test.DFT();                         // 離散フーリエ変換
@@ -111 +111 @@
 
             // !TODO : bugfix
-            //new Test.Kalman();                      // カルマンフィルタ
+            //snew Test.Kalman();                      // カルマンフィルタ
 
             //new Test.LineIterator();                // CvLineIterator sample
@@ -145 +145 @@
             //new Test.Resize();                      // 画像のサイズ変更
 
+            new Test.SeqPartition();                   // Partitioning 2d point set.
+
             //new Test.SeqTest();                     // CvSeqのテスト
 

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>
@@ -140 +140 @@
   <ItemGroup>
     <Compile Include="Src\Class\CvTreeNode.cs" />
+    <Compile Include="Src\Class\CvTypeInfo.cs" />
+    <Compile Include="Src\Delegate\CvIsInstanceFunc.cs" />
+    <Compile Include="Src\Delegate\CvReleaseFunc.cs" />
+    <Compile Include="Src\Delegate\CvReadFunc.cs" />
+    <Compile Include="Src\Delegate\CvWriteFunc.cs" />
+    <Compile Include="Src\Delegate\CvCloneFunc.cs" />
+    <Compile Include="Src\Enum\CvStatus.cs" />
+    <Compile Include="Src\Enum\ErrMode.cs" />
+    <Compile Include="Src\Struct\CvAttrList.cs" />
     <Compile Include="Src\Struct\CvBox2D.cs" />
     <Compile Include="Src\Class\CvChainPtReader.cs" />
@@ -299 +308 @@
     <Compile Include="Src\Struct\CvLineSegmentPoint.cs" />
     <Compile Include="Src\Tool\Pointer.cs" />
+    <Compile Include="Src\Tool\PointerAccessor\1D\PointerAccessor1D.cs" />
+    <Compile Include="Src\Tool\PointerAccessor\2D\IPointerAccessor2D.cs" />
+    <Compile Include="Src\Tool\PointerAccessor\2D\PointerAccessor2D.Single.cs" />
     <Compile Include="Src\Tool\TimeMeasurer.cs" />
     <Compile Include="Src\Tool\StructurePointer.cs" />
@@ -318 +330 @@
     <Compile Include="Src\Struct\CvScalar.cs" />
     <Compile Include="Src\Struct\CvSize.cs" />
-    <Compile Include="Src\Tool\PointerAccessor\IPointerAccessor.cs" />
+    <Compile Include="Src\Tool\PointerAccessor\1D\IPointerAccessor1D.cs" />
     <Compile Include="Src\Tool\ScopedGCHandle.cs" />
     <Compile Include="Src\Tool\Win32API.cs" />
     <Compile Include="Src\Tool\WriteableBitmapConverter.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" />
+    <Compile Include="Src\Tool\PointerAccessor\1D\PointerAccessor1D_Byte.cs" />
+    <Compile Include="Src\Tool\PointerAccessor\1D\PointerAccessor1D_Int16.cs" />
+    <Compile Include="Src\Tool\PointerAccessor\1D\PointerAccessor1D_Int32.cs" />
+    <Compile Include="Src\Tool\PointerAccessor\1D\PointerAccessor1D_Single.cs" />
+    <Compile Include="Src\Tool\PointerAccessor\1D\PointerAccessor1D_Double.cs" />
     <Compile Include="Src\CvObject.cs" />
   </ItemGroup>

lang/cpluspluscli/OpenCvSharp2/trunk/wrapped functions.csv

@@ -167 +167 @@
 EqualizeHist;X;
 Erode;X;
-Error;;
-ErrorStr;;
+Error;X;
+ErrorStr;X;
 EstimateHMMStateParams;;
 EstimateObsProb;;
@@ -194 +194 @@
 FindStereoCorrespondenceBM;X;
 FindStereoCorrespondenceGC;X;
-FindType;;
-FirstType;;
+FindType;X;
+FirstType;X;
 FitEllipse;X;
 FitLine2D;X;
@@ -212 +212 @@
 GetDims;X;
 GetElemType;X;
-GetErrMode;;
-GetErrStatus;;
+GetErrMode;X;
+GetErrStatus;X;
 GetFileNode;X;
 GetFileNodeByName;X;
@@ -226 +226 @@
 GetMat;;
 GetMinMaxHistValue;X;
-GetModuleInfo;;
+GetModuleInfo;X;
 GetNextSparseNode;X;
 GetNormalizedCentralMoment;X;
@@ -386 +386 @@
 Reduce;X;
 RegisterModule;;
-RegisterType;;
-Release;;
+RegisterType;X;
+Release;X;
 Release2DHMM;;
 ReleaseCapture;X;
@@ -427 +427 @@
 RunningAvg;X;
 SampleLine;X;
-Save;;
+Save;X;
 SaveImage;X;
 SaveMemStoragePos;X;
@@ -436 +436 @@
 SeqInsertSlice;X;
 SeqInvert;X;
-SeqPartition;;
+SeqPartition;X;
 SeqPop;X;
 SeqPopFront;X;
@@ -454 +454 @@
 SetCaptureProperty;X;
 SetData;X;
-SetErrMode;;
-SetErrStatus;;
+SetErrMode;X;
+SetErrStatus;X;
 SetHistBinRanges;X;
 SetIdentity;X;
@@ -515 +515 @@
 Transpose;X;
 TreeToNodeSeq;X;
-TypeOf;;
+TypeOf;X;
 Undistort2;X;
 UndistortPoints;X;
 UniformImgSegm;;
-UnregisterType;;
+UnregisterType;X;
 UpdateMotionHistory;X;
 UseOptimized;X;