Renamed field

modules/dnn/src/layers/flatten_layer.cpp

@@ -71,7 +71,7 @@ FlattenLayer::FlattenLayer(LayerParams &params) : Layer(params)
     }
     else
     {
-        _endAxis = _num_axes + params.end_axis;
+        _endAxis = _numAxes + params.end_axis;
     }
 }
 
@@ -80,7 +80,7 @@ void FlattenLayer::checkInputs(const std::vector<Blob*> &inputs)
     CV_Assert(inputs.size() > 0);
     for (size_t i = 0; i < inputs.size(); i++)
     {
-        for (size_t j = 0; j < _num_axes; j++)
+        for (size_t j = 0; j < _numAxes; j++)
         {
             CV_Assert(inputs[i]->shape[j] == inputs[0]->shape[j]);
         }
@@ -110,7 +110,7 @@ void FlattenLayer::allocate(const std::vector<Blob*> &inputs, std::vector<Blob>
         outputShape[i] = inputs[0]->shape()[i - interval];
     }
     outputShape[_endAxis] = flattenedDimensionSize;
-    for (size_t i = _endAxis + 1; i < _num_axes; i++)
+    for (size_t i = _endAxis + 1; i < _numAxes; i++)
     {
         outputShape[i] = inputs[0]->shape()[i];
     }

modules/dnn/src/layers/flatten_layer.hpp

@@ -52,7 +52,7 @@ class FlattenLayer : public Layer
     size_t _startAxis;
     size_t _endAxis;
 
-    static const size_t _num_axes = 4;
+    static const size_t _numAxes = 4;
 
 public:
     FlattenLayer(LayerParams &params);

modules/dnn/src/layers/normalize_bbox_layer.cpp

@@ -76,7 +76,7 @@ void NormalizeBBoxLayer::checkInputs(const std::vector<Blob*> &inputs)
     CV_Assert(inputs.size() > 0);
     for (size_t i = 0; i < inputs.size(); i++)
     {
-        for (size_t j = 0; j < _num_axes; j++)
+        for (size_t j = 0; j < _numAxes; j++)
         {
             CV_Assert(inputs[i]->shape[j] == inputs[0]->shape[j]);
         }

modules/dnn/src/layers/normalize_bbox_layer.hpp

@@ -71,7 +71,7 @@ class NormalizeBBoxLayer : public Layer
     size_t _channelSize;
     size_t _imageSize;
 
-    static const size_t _num_axes = 4;
+    static const size_t _numAxes = 4;
 
 public:
     NormalizeBBoxLayer(LayerParams &params);

modules/dnn/src/layers/permute_layer.cpp

@@ -57,7 +57,7 @@ PermuteLayer::PermuteLayer(LayerParams &params) : Layer(params)
     }
     else
     {
-        for (size_t i = 0; i < _num_axes; i++)
+        for (size_t i = 0; i < _numAxes; i++)
         {
             size_t current_order = params.order(i);
 
@@ -69,7 +69,7 @@ PermuteLayer::PermuteLayer(LayerParams &params) : Layer(params)
         }
 
         _needsPermute = false;
-        for (int i = 0; i < _num_axes; ++i)
+        for (int i = 0; i < _numAxes; ++i)
         {
             if (_order[i] != i)
             {
@@ -86,7 +86,7 @@ void PermuteLayer::allocate(const std::vector<Blob*> &inputs, std::vector<Blob>
 
     _oldDimensionSize = inputs[0]->shape();
 
-    for (size_t i = 0; i < _num_axes; i++)
+    for (size_t i = 0; i < _numAxes; i++)
     {
         _newDimensionSize[i] = _oldDimensionSize[order[i]];
     }
@@ -99,8 +99,8 @@ void PermuteLayer::allocate(const std::vector<Blob*> &inputs, std::vector<Blob>
         outputs[i].create(BlobShape(_newDimensionSize));
     }
 
-    _oldStride.resize(_num_axes);
-    _newStride.resize(_num_axes);
+    _oldStride.resize(_numAxes);
+    _newStride.resize(_numAxes);
 
     _oldStride[3] = 1;
     _newStride[3] = 1;
@@ -135,7 +135,7 @@ void PermuteLayer::forward(std::vector<Blob*> &inputs, std::vector<Blob> &output
             int oldPosition = 0;
             int newPosition = i;
 
-            for (int j = 0; j < _num_axes; ++j)
+            for (int j = 0; j < _numAxes; ++j)
             {
                 oldPosition += (newPosition / _newStride[j]) * _oldStride[_order[j]];
                 newPosition %= _newStride[j];

modules/dnn/src/layers/permute_layer.hpp

@@ -59,7 +59,7 @@ class PermuteLayer : public Layer
     std::vector<size_t> _newStride;
     bool _needsPermute;
 
-    static const size_t _num_axes = 4;
+    static const size_t _numAxes = 4;
 
 public:
     PermuteLayer(LayerParams &params);