Skip to content

StructuredEdgeDetection to python #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 1, 2014
Merged

StructuredEdgeDetection to python #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions modules/ximgproc/include/opencv2/ximgproc/structured_edge_detection.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ class CV_EXPORTS_W StructuredEdgeDetection : public Algorithm
* \param dst : destination image (grayscale, float, in [0;1])
* where edges are drawn
*/
CV_WRAP virtual void detectEdges(const Mat &src, Mat &dst) const = 0;
CV_WRAP virtual void detectEdges(const Mat &src, CV_OUT Mat &dst) const = 0;
};

/*!
Expand All @@ -119,7 +119,7 @@ class CV_EXPORTS_W StructuredEdgeDetection : public Algorithm
* own forest, pass NULL otherwise
*/
CV_EXPORTS_W Ptr<StructuredEdgeDetection> createStructuredEdgeDetection(const String &model,
const RFFeatureGetter *howToGetFeatures = NULL);
Ptr<const RFFeatureGetter> howToGetFeatures = Ptr<RFFeatureGetter>());

}
}
Expand Down
10 changes: 5 additions & 5 deletions modules/ximgproc/src/structured_edge_detection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,11 +339,11 @@ class StructuredEdgeDetectionImpl : public StructuredEdgeDetection
* \param filename : name of the file where the model is stored
*/
StructuredEdgeDetectionImpl(const cv::String &filename,
const RFFeatureGetter *_howToGetFeatures)
Ptr<const RFFeatureGetter> _howToGetFeatures)
: name("StructuredEdgeDetection"),
howToGetFeatures( _howToGetFeatures != NULL
howToGetFeatures( (!_howToGetFeatures.empty())
? _howToGetFeatures
: createRFFeatureGetter() )
: createRFFeatureGetter().staticCast<const RFFeatureGetter>() )
{
cv::FileStorage modelFile(filename, FileStorage::READ);
CV_Assert( modelFile.isOpened() );
Expand Down Expand Up @@ -631,7 +631,7 @@ class StructuredEdgeDetectionImpl : public StructuredEdgeDetection
String name;

/*! optional feature getter (getFeatures method) */
const RFFeatureGetter *howToGetFeatures;
Ptr<const RFFeatureGetter> howToGetFeatures;

/*! random forest used to detect edges */
struct RandomForest
Expand Down Expand Up @@ -684,7 +684,7 @@ class StructuredEdgeDetectionImpl : public StructuredEdgeDetection
};

Ptr<StructuredEdgeDetection> createStructuredEdgeDetection(const String &model,
const RFFeatureGetter *howToGetFeatures)
Ptr<const RFFeatureGetter> howToGetFeatures)
{
return makePtr<StructuredEdgeDetectionImpl>(model, howToGetFeatures);
}
Expand Down