Commit e6fe1e02 authored by Davis King's avatar Davis King

merged

parents c9faacce 9185e0a7
...@@ -125,8 +125,8 @@ namespace dlib ...@@ -125,8 +125,8 @@ namespace dlib
return _high[idx-4]; return _high[idx-4];
} }
inline simd4f low() const { return _low; } inline const simd4f& low() const { return _low; }
inline simd4f high() const { return _high; } inline const simd4f& high() const { return _high; }
private: private:
simd4f _low, _high; simd4f _low, _high;
...@@ -141,8 +141,8 @@ namespace dlib ...@@ -141,8 +141,8 @@ namespace dlib
inline simd8f_bool(const simd4f_bool& low_, const simd4f_bool& high_): _low(low_),_high(high_){} inline simd8f_bool(const simd4f_bool& low_, const simd4f_bool& high_): _low(low_),_high(high_){}
inline simd4f_bool low() const { return _low; } inline const simd4f_bool& low() const { return _low; }
inline simd4f_bool high() const { return _high; } inline const simd4f_bool& high() const { return _high; }
private: private:
simd4f_bool _low,_high; simd4f_bool _low,_high;
}; };
......
...@@ -91,8 +91,8 @@ namespace dlib ...@@ -91,8 +91,8 @@ namespace dlib
return _high[idx-4]; return _high[idx-4];
} }
inline simd4i low() const { return _low; } inline const simd4i& low() const { return _low; }
inline simd4i high() const { return _high; } inline const simd4i& high() const { return _high; }
private: private:
simd4i _low, _high; simd4i _low, _high;
......
...@@ -124,7 +124,7 @@ int main(int argc, char** argv) try ...@@ -124,7 +124,7 @@ int main(int argc, char** argv) try
// //
// To explain this non-max suppression idea further it's important to understand how // To explain this non-max suppression idea further it's important to understand how
// the detector works. Essentially, sliding window detectors scan all image locations // the detector works. Essentially, sliding window detectors scan all image locations
// and ask "is there a care here?". If there really is a car in a specific location in // and ask "is there a car here?". If there really is a car in a specific location in
// an image then usually many slightly different sliding window locations will produce // an image then usually many slightly different sliding window locations will produce
// high detection scores, indicating that there is a car at those locations. If we // high detection scores, indicating that there is a car at those locations. If we
// just stopped there then each car would produce multiple detections. But that isn't // just stopped there then each car would produce multiple detections. But that isn't
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment