potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00
Code Packages Releases Wiki Activity

Merge pull request #19050 from anton-potapov:fix_range_var_clang_warnings

Browse Source
This commit is contained in:
Alexander Alekhin
2021-01-14 10:44:41 +00:00
parent bbdae291ed da5bfefc78
commit 5202186681
12 changed files with 36 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gapi/src/compiler/gcompiler.cpp
+2 -2
View File
@@ -343,7 +343,7 @@ void cv::gimpl::GCompiler::validateInputMeta()
return false; // should never happen
};
for (const auto &meta_arg_idx : ade::util::indexed(ade::util::zip(m_metas, c_expr.m_ins)))
for (const auto meta_arg_idx : ade::util::indexed(ade::util::zip(m_metas, c_expr.m_ins)))
{
const auto &meta = std::get<0>(ade::util::value(meta_arg_idx));
const auto &proto = std::get<1>(ade::util::value(meta_arg_idx));
@@ -370,7 +370,7 @@ void cv::gimpl::GCompiler::validateOutProtoArgs()
return;
}
const auto &c_expr = util::get<cv::GComputation::Priv::Expr>(m_c.priv().m_shape);
for (const auto &out_pos : ade::util::indexed(c_expr.m_outs))
for (const auto out_pos : ade::util::indexed(c_expr.m_outs))
{
const auto &node = proto::origin_of(ade::util::value(out_pos)).node;
if (node.shape() != cv::GNode::NodeShape::CALL)
modules/gapi/src/compiler/gmodelbuilder.cpp
+2 -2
View File
@@ -135,7 +135,7 @@ cv::gimpl::Unrolled cv::gimpl::unrollExpr(const GProtoArgs &ins,
// Put the outputs object description of the node
// so that they are not lost if they are not consumed by other operations
GAPI_Assert(call_p.m_k.outCtors.size() == call_p.m_k.outShapes.size());
for (const auto &it : ade::util::indexed(call_p.m_k.outShapes))
for (const auto it : ade::util::indexed(call_p.m_k.outShapes))
{
std::size_t port = ade::util::index(it);
GShape shape = ade::util::value(it);
@@ -212,7 +212,7 @@ cv::gimpl::GModelBuilder::put(const GProtoArgs &ins, const GProtoArgs &outs)
const GCall::Priv& call_p = call.priv();
ade::NodeHandle call_h = put_OpNode(op_expr_node);
for (const auto &it : ade::util::indexed(call_p.m_args))
for (const auto it : ade::util::indexed(call_p.m_args))
{
const auto in_port = ade::util::index(it);
const auto& in_arg = ade::util::value(it);
modules/gapi/src/compiler/passes/kernels.cpp
+2 -2
View File
@@ -94,7 +94,7 @@ namespace
// Reconnect expanded kernels from graph data objects
// to subgraph data objects, then drop that graph data objects
for (const auto& it : ade::util::zip(in_nhs, sorted_in_nhs))
for (const auto it : ade::util::zip(in_nhs, sorted_in_nhs))
{
const auto& subgr_in_nh = std::get<0>(it);
const auto& comp_in_nh = std::get<1>(it);
@@ -105,7 +105,7 @@ namespace
gr.erase(nh);
for (const auto& it : ade::util::zip(out_nhs, sorted_out_nhs))
for (const auto it : ade::util::zip(out_nhs, sorted_out_nhs))
{
const auto& subgr_out_nh = std::get<0>(it);
const auto& comp_out_nh = std::get<1>(it);
modules/gapi/src/compiler/passes/meta.cpp
+2 -2
View File
@@ -24,7 +24,7 @@ void cv::gimpl::passes::initMeta(ade::passes::PassContext &ctx, const GMetaArgs
const auto &proto = gr.metadata().get<Protocol>();
for (const auto& it : ade::util::indexed(proto.in_nhs))
for (const auto it : ade::util::indexed(proto.in_nhs))
{
auto& data = gr.metadata(ade::util::value(it)).get<Data>();
data.meta = metas.at(ade::util::index(it));
@@ -125,7 +125,7 @@ void cv::gimpl::passes::storeResultingMeta(ade::passes::PassContext &ctx)
const auto &proto = gr.metadata().get<Protocol>();
GMetaArgs output_metas(proto.out_nhs.size());
for (const auto& it : ade::util::indexed(proto.out_nhs))
for (const auto it : ade::util::indexed(proto.out_nhs))
{
auto& data = gr.metadata(ade::util::value(it)).get<Data>();
output_metas[ade::util::index(it)] = data.meta;