Commit c839966b authored by Davis King's avatar Davis King

Minor changes to avoid compiler warnings.

parent f1292139
...@@ -52,7 +52,7 @@ namespace dlib ...@@ -52,7 +52,7 @@ namespace dlib
extract_fhog_features(img,hog,cell_size,filter_rows_padding,filter_cols_padding); extract_fhog_features(img,hog,cell_size,filter_rows_padding,filter_cols_padding);
} }
inline long get_num_planes ( inline unsigned long get_num_planes (
) const ) const
{ {
return 31; return 31;
......
...@@ -173,7 +173,7 @@ namespace dlib ...@@ -173,7 +173,7 @@ namespace dlib
feats_to_image(point(c,r),cell_size,filter_rows_padding,filter_cols_padding) feats_to_image(point(c,r),cell_size,filter_rows_padding,filter_cols_padding)
!*/ !*/
inline long get_num_planes ( inline unsigned long get_num_planes (
) const { return 31; } ) const { return 31; }
/*! /*!
ensures ensures
......
...@@ -31,7 +31,7 @@ namespace dlib ...@@ -31,7 +31,7 @@ namespace dlib
dlib::rand rnd; dlib::rand rnd;
std::vector<track_type> tracks; std::vector<track_type> tracks;
std::map<label_type,unsigned long> track_idx; // tracks[track_idx[id]] == track with ID id. std::map<label_type,long> track_idx; // tracks[track_idx[id]] == track with ID id.
for (unsigned long j = 0; j < samples.size(); ++j) for (unsigned long j = 0; j < samples.size(); ++j)
{ {
......
...@@ -113,7 +113,7 @@ namespace ...@@ -113,7 +113,7 @@ namespace
} }
template <typename detection> template <typename detection>
detection sample_detection_from_sensor(unsigned long object_id) detection sample_detection_from_sensor(long object_id)
{ {
DLIB_CASSERT(object_id < num_objects, DLIB_CASSERT(object_id < num_objects,
"You can't ask to sample a detection from an object that doesn't exist."); "You can't ask to sample a detection from an object that doesn't exist.");
...@@ -179,7 +179,7 @@ namespace ...@@ -179,7 +179,7 @@ namespace
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
template <typename detection> template <typename detection>
std::vector<detection> make_random_detections(unsigned long num_dets) std::vector<detection> make_random_detections(long num_dets)
{ {
DLIB_CASSERT(num_dets <= num_objects, DLIB_CASSERT(num_dets <= num_objects,
"You can't ask for more detections than there are objects in our little simulation."); "You can't ask for more detections than there are objects in our little simulation.");
......
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