Skip to content

Commit 3cdc0e4

Browse files
committed
Merge pull request #991 from arrybn:issue_912
2 parents 478baf9 + 0cef050 commit 3cdc0e4

File tree

15 files changed

+14939
-5084
lines changed

15 files changed

+14939
-5084
lines changed

modules/dnn/include/opencv2/dnn/all_layers.hpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ namespace dnn
406406
class CV_EXPORTS_W BatchNormLayer : public Layer
407407
{
408408
public:
409-
static CV_WRAP Ptr<BatchNormLayer> create(float eps, bool has_weights, bool has_bias);
409+
static CV_WRAP Ptr<BatchNormLayer> create(bool hasWeights, bool hasBias, float epsilon);
410410
};
411411

412412
class CV_EXPORTS_W MaxUnpoolLayer : public Layer
@@ -415,6 +415,12 @@ namespace dnn
415415
static CV_WRAP Ptr<MaxUnpoolLayer> create(Size unpoolSize);
416416
};
417417

418+
class CV_EXPORTS_W ScaleLayer : public Layer
419+
{
420+
public:
421+
static CV_WRAP Ptr<ScaleLayer> create(bool hasBias);
422+
};
423+
418424
//! @}
419425
//! @}
420426

modules/dnn/misc/caffe/caffe.pb.cc

Lines changed: 10242 additions & 4047 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)