Commit 6d2495a2 authored by Davis King's avatar Davis King

Changed extract_fhog_features() back to returning matrix<double> since that's

what it's contract says needs to happen (and what existing code expects).
parent 51065b98
...@@ -385,7 +385,7 @@ namespace dlib ...@@ -385,7 +385,7 @@ namespace dlib
int o, int o,
int x, int x,
int y, int y,
const T& value const float& value
) )
{ {
hog[o][y][x] = value; hog[o][y][x] = value;
...@@ -440,7 +440,7 @@ namespace dlib ...@@ -440,7 +440,7 @@ namespace dlib
int o, int o,
int x, int x,
int y, int y,
const T& value const float& value
) )
{ {
hog[y][x](o) = value; hog[y][x](o) = value;
...@@ -1142,14 +1142,14 @@ namespace dlib ...@@ -1142,14 +1142,14 @@ namespace dlib
template < template <
typename image_type typename image_type
> >
matrix<float,0,1> extract_fhog_features( matrix<double,0,1> extract_fhog_features(
const image_type& img, const image_type& img,
int cell_size = 8, int cell_size = 8,
int filter_rows_padding = 1, int filter_rows_padding = 1,
int filter_cols_padding = 1 int filter_cols_padding = 1
) )
{ {
matrix<float, 0, 1> feats; matrix<double, 0, 1> feats;
extract_fhog_features(img, feats, cell_size, filter_rows_padding, filter_cols_padding); extract_fhog_features(img, feats, cell_size, filter_rows_padding, filter_cols_padding);
return feats; return feats;
} }
......
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