Skip to content

Commit b8a24b3

Browse files
committed
Merge pull request opencv#10356 from dkurt:dnn_rfcn
2 parents d2f13a8 + 0ed2cbc commit b8a24b3

File tree

7 files changed

+1586
-631
lines changed

7 files changed

+1586
-631
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,8 @@ CV__DNN_EXPERIMENTAL_NS_BEGIN
242242
// ROIPooling parameters.
243243
Size pooledSize;
244244
float spatialScale;
245+
// PSROIPooling parameters.
246+
int psRoiOutChannels;
245247

246248
static Ptr<PoolingLayer> create(const LayerParams& params);
247249
};

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

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

0 commit comments

Comments
 (0)