Merge pull request #9019 from alalek:dnn_trace
authorMaksim Shabunin <maksim.shabunin@gmail.com>
Thu, 29 Jun 2017 07:33:46 +0000 (07:33 +0000)
committerMaksim Shabunin <maksim.shabunin@gmail.com>
Thu, 29 Jun 2017 07:33:46 +0000 (07:33 +0000)
1  2 
modules/dnn/src/dnn.cpp
modules/dnn/src/layers/convolution_layer.cpp
modules/dnn/src/layers/detection_output_layer.cpp
modules/dnn/src/layers/elementwise_layers.cpp
modules/dnn/src/layers/permute_layer.cpp
modules/dnn/src/layers/prior_box_layer.cpp
modules/dnn/src/layers/recurrent_layers.cpp
modules/dnn/src/layers/softmax_layer.cpp
modules/dnn/src/torch/torch_importer.cpp

@@@ -317,10 -323,12 +323,12 @@@ private
  
  struct LayerData
  {
 -    LayerData() {}
 +    LayerData() : id(-1), flag(0) {}
      LayerData(int _id, const String &_name, const String &_type, LayerParams &_params)
 -        : id(_id), name(_name), type(_type), params(_params)
 +        : id(_id), name(_name), type(_type), params(_params), flag(0)
      {
+         CV_TRACE_FUNCTION();
          //add logging info
          params.name = name;
          params.type = type;