Merge pull request opencv#19520 from WeiChungChang:refine

alalek · alalek · commit cceec841397c · 2021-02-13T18:18:12.000Z
diff --git a/modules/dnn/src/layers/proposal_layer.cpp b/modules/dnn/src/layers/proposal_layer.cpp
@@ -54,11 +54,11 @@ class ProposalLayerImpl CV_FINAL : public ProposalLayer
             for (int i = 0; i < ratios.size(); ++i)
             {
                 float ratio = ratios.get<float>(i);
+                float width = std::floor(baseSize / sqrt(ratio) + 0.5f);
+                float height = std::floor(width * ratio + 0.5f);
                 for (int j = 0; j < scales.size(); ++j)
                 {
                     float scale = scales.get<float>(j);
-                    float width = std::floor(baseSize / sqrt(ratio) + 0.5f);
-                    float height = std::floor(width * ratio + 0.5f);
                     widths.push_back(scale * width);
                     heights.push_back(scale * height);
                 }

Original file line number	Diff line number	Diff line change
`@@ -54,11 +54,11 @@ class ProposalLayerImpl CV_FINAL : public ProposalLayer`
`54`	`54`	`for (int i = 0; i < ratios.size(); ++i)`
`55`	`55`	`{`
`56`	`56`	`float ratio = ratios.get<float>(i);`
	`57`	`+ float width = std::floor(baseSize / sqrt(ratio) + 0.5f);`
	`58`	`+ float height = std::floor(width * ratio + 0.5f);`
`57`	`59`	`for (int j = 0; j < scales.size(); ++j)`
`58`	`60`	`{`
`59`	`61`	`float scale = scales.get<float>(j);`
`60`		`- float width = std::floor(baseSize / sqrt(ratio) + 0.5f);`
`61`		`- float height = std::floor(width * ratio + 0.5f);`
`62`	`62`	`widths.push_back(scale * width);`
`63`	`63`	`heights.push_back(scale * height);`
`64`	`64`	`}`