Fixed Windows warnings

pull/750/head
apetrovichev 9 years ago
parent 2596baf963
commit 463fd687fe
  1. 2
      modules/dnn/src/layers/normalize_bbox_layer.cpp
  2. 4
      modules/dnn/src/layers/prior_box_layer.cpp

@ -96,7 +96,7 @@ T NormalizeBBoxLayer::getParameter(const LayerParams &params,
NormalizeBBoxLayer::NormalizeBBoxLayer(LayerParams &params) : Layer(params) NormalizeBBoxLayer::NormalizeBBoxLayer(LayerParams &params) : Layer(params)
{ {
_eps = getParameter<float>(params, "eps", 0, false, 1e-10); _eps = getParameter<float>(params, "eps", 0, false, 1e-10f);
_across_spatial = getParameter<bool>(params, "across_spatial"); _across_spatial = getParameter<bool>(params, "across_spatial");
_channel_shared = getParameter<bool>(params, "channel_shared"); _channel_shared = getParameter<bool>(params, "channel_shared");
} }

@ -153,7 +153,7 @@ void PriorBoxLayer::getVariance(const LayerParams &params)
else else
{ {
// Set default to 0.1. // Set default to 0.1.
_variance.push_back(0.1); _variance.push_back(0.1f);
} }
} }
} }
@ -211,8 +211,6 @@ void PriorBoxLayer::allocate(const std::vector<Blob*> &inputs, std::vector<Blob>
void PriorBoxLayer::forward(std::vector<Blob*> &inputs, std::vector<Blob> &outputs) void PriorBoxLayer::forward(std::vector<Blob*> &inputs, std::vector<Blob> &outputs)
{ {
(void)inputs; // to suppress unused parameter warning
float* outputPtr = outputs[0].ptrf(); float* outputPtr = outputs[0].ptrf();
// first prior: aspect_ratio = 1, size = min_size // first prior: aspect_ratio = 1, size = min_size

Loading…
Cancel
Save