Skip to content

Commit f2070c9

Browse files
committed
Merge pull request opencv#10255 from dkurt:dnn_roi_pooling
2 parents 34e414d + 17dcf0e commit f2070c9

File tree

7 files changed

+1297
-393
lines changed

7 files changed

+1297
-393
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,8 @@ CV__DNN_EXPERIMENTAL_NS_BEGIN
242242
{
243243
MAX,
244244
AVE,
245-
STOCHASTIC
245+
STOCHASTIC,
246+
ROI
246247
};
247248

248249
int type;
@@ -251,6 +252,9 @@ CV__DNN_EXPERIMENTAL_NS_BEGIN
251252
bool computeMaxIdx;
252253
String padMode;
253254
bool ceilMode;
255+
// ROIPooling parameters.
256+
Size pooledSize;
257+
float spatialScale;
254258

255259
static Ptr<PoolingLayer> create(const LayerParams& params);
256260
};

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

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

0 commit comments

Comments
 (0)