Commit 3d62b85c authored by Kino's avatar Kino Committed by Davis E. King

generic image all the way - colormaps.h (#971)

Still hunting down pre-generic_image implementations
parent 9b51351b
...@@ -145,7 +145,7 @@ namespace dlib ...@@ -145,7 +145,7 @@ namespace dlib
) )
{ {
typedef op_heatmap<image_type> op; typedef op_heatmap<image_type> op;
if (img.size() != 0) if (num_columns(img) * num_rows(img) != 0)
return matrix_op<op>(op(img,max(mat(img)),min(mat(img)))); return matrix_op<op>(op(img,max(mat(img)),min(mat(img))));
else else
return matrix_op<op>(op(img,0,0)); return matrix_op<op>(op(img,0,0));
...@@ -255,7 +255,7 @@ namespace dlib ...@@ -255,7 +255,7 @@ namespace dlib
) )
{ {
typedef op_jet<image_type> op; typedef op_jet<image_type> op;
if (img.size() != 0) if (num_columns(img) * num_rows(img) != 0)
return matrix_op<op>(op(img,max(mat(img)),min(mat(img)))); return matrix_op<op>(op(img,max(mat(img)),min(mat(img))));
else else
return matrix_op<op>(op(img,0,0)); return matrix_op<op>(op(img,0,0));
......
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