featuretree.patch
| src1/gen.py (copie de travail) | ||
|---|---|---|
| 84 | 84 |
'CvKalman*', |
| 85 | 85 |
'CvVideoWriter*', |
| 86 | 86 |
'CvContourTree*', |
| 87 |
'CvFeatureTree*', |
|
| 87 | 88 |
'CvFont', |
| 88 | 89 |
'CvFont*', |
| 89 | 90 |
'CvHaarClassifierCascade*', |
| ... | ... | |
| 259 | 260 |
'CvSeqOfCvSURFPoint*', |
| 260 | 261 |
'CvSeqOfCvSURFDescriptor*', |
| 261 | 262 |
'CvContourTree*', |
| 263 |
'CvFeatureTree*', |
|
| 262 | 264 |
'IplConvKernel*', |
| 263 | 265 |
'IplImage*', |
| 264 | 266 |
'CvMat*', |
| src1/api (copie de travail) | ||
|---|---|---|
| 841 | 841 |
CvMemStorage storage |
| 842 | 842 |
CvStarDetectorParams params cvStarDetectorParams() |
| 843 | 843 | |
| 844 |
# FeatureTree |
|
| 845 |
CreateKDTree CvFeatureTree* |
|
| 846 |
CvMat desc |
|
| 847 |
CreateSpillTree CvFeatureTree* |
|
| 848 |
CvMat raw_data |
|
| 849 |
int naive 50 |
|
| 850 |
double rho 0.7 |
|
| 851 |
double tau 0.1 |
|
| 852 |
FindFeatures |
|
| 853 |
CvFeatureTree* tr |
|
| 854 |
CvMat query_points |
|
| 855 |
CvMat indices |
|
| 856 |
CvMat dist |
|
| 857 |
int k |
|
| 858 |
int emax 20 |
|
| 859 |
FindFeaturesBoxed int |
|
| 860 |
CvFeatureTree* tr |
|
| 861 |
CvMat bounds_min |
|
| 862 |
CvMat bounds_max |
|
| 863 |
CvMat results |
|
| 864 | ||
| 844 | 865 |
# Sampling, Interpolation and Geometrical Transforms |
| 845 | 866 |
GetRectSubPix |
| 846 | 867 |
CvArr src |
| src1/cv.cpp (copie de travail) | ||
|---|---|---|
| 106 | 106 |
CvContourTree *a; |
| 107 | 107 |
}; |
| 108 | 108 | |
| 109 |
struct cvfeaturetree_t {
|
|
| 110 |
PyObject_HEAD |
|
| 111 |
CvFeatureTree *a; |
|
| 112 |
}; |
|
| 113 | ||
| 109 | 114 |
struct cvrng_t {
|
| 110 | 115 |
PyObject_HEAD |
| 111 | 116 |
CvRNG a; |
| ... | ... | |
| 1058 | 1063 | |
| 1059 | 1064 |
/************************************************************************/ |
| 1060 | 1065 | |
| 1066 |
/* cvfeaturetree */ |
|
| 1067 | ||
| 1068 |
static PyTypeObject cvfeaturetree_Type = {
|
|
| 1069 |
PyObject_HEAD_INIT(&PyType_Type) |
|
| 1070 |
0, /*size*/ |
|
| 1071 |
MODULESTR".cvfeaturetree", /*name*/ |
|
| 1072 |
sizeof(cvfeaturetree_t), /*basicsize*/ |
|
| 1073 |
}; |
|
| 1074 | ||
| 1075 |
static void cvfeaturetree_specials(void) { }
|
|
| 1076 | ||
| 1077 | ||
| 1078 |
/************************************************************************/ |
|
| 1079 | ||
| 1061 | 1080 |
/* cvsubdiv2dedge */ |
| 1062 | 1081 | |
| 1063 | 1082 |
static PyTypeObject cvsubdiv2dedge_Type = {
|
| ... | ... | |
| 2137 | 2156 |
} |
| 2138 | 2157 |
}*/ |
| 2139 | 2158 | |
| 2159 |
static int convert_to_CvFeatureTreePTR(PyObject *o, CvFeatureTree** dst, const char *name = "no_name") |
|
| 2160 |
{
|
|
| 2161 |
if (PyType_IsSubtype(o->ob_type, &cvfeaturetree_Type)) {
|
|
| 2162 |
(*dst) = ((cvfeaturetree_t*)o)->a; |
|
| 2163 |
return 1; |
|
| 2164 |
} else {
|
|
| 2165 |
(*dst) = NULL; |
|
| 2166 |
return failmsg("Expected CvFeatureTree for argument '%s'", name);
|
|
| 2167 |
} |
|
| 2168 |
} |
|
| 2169 | ||
| 2140 | 2170 |
static int convert_to_CvRNGPTR(PyObject *o, CvRNG** dst, const char *name = "no_name") |
| 2141 | 2171 |
{
|
| 2142 | 2172 |
if (PyType_IsSubtype(o->ob_type, &cvrng_Type)) {
|
| ... | ... | |
| 2614 | 2644 |
return (PyObject*)m; |
| 2615 | 2645 |
}*/ |
| 2616 | 2646 | |
| 2647 |
static PyObject *FROM_CvFeatureTreePTR(CvFeatureTree *r) |
|
| 2648 |
{
|
|
| 2649 |
cvfeaturetree_t *m = PyObject_NEW(cvfeaturetree_t, &cvfeaturetree_Type); |
|
| 2650 |
m->a = r; |
|
| 2651 |
return (PyObject*)m; |
|
| 2652 |
} |
|
| 2653 | ||
| 2617 | 2654 |
static PyObject *FROM_generic(generic r) |
| 2618 | 2655 |
{
|
| 2619 | 2656 |
CvTypeInfo* t = cvTypeOf(r); |
| ... | ... | |
| 4025 | 4062 |
cvSetErrMode(CV_ErrModeParent); |
| 4026 | 4063 | |
| 4027 | 4064 |
MKTYPE(cvcontourtree); |
| 4065 |
MKTYPE(cvfeaturetree); |
|
| 4028 | 4066 |
MKTYPE(cvfont); |
| 4029 | 4067 |
MKTYPE(cvhistogram); |
| 4030 | 4068 |
MKTYPE(cvlineiterator); |