From 9b51351bbf8afa15fd948bd9a85431b323bbcb30 Mon Sep 17 00:00:00 2001 From: "Davis E. King" Date: Mon, 20 Nov 2017 05:40:24 -0500 Subject: [PATCH 1/2] Update ISSUE_TEMPLATE.md --- ISSUE_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md index d038c2b34..f1c2be0f0 100644 --- a/ISSUE_TEMPLATE.md +++ b/ISSUE_TEMPLATE.md @@ -12,7 +12,7 @@ If you aren't reporting a bug or problem with dlib then delete this template and - + ## Expected Behavior From 3d62b85c502b351e0b9dcd804dbc9b13c2896792 Mon Sep 17 00:00:00 2001 From: Kino Date: Mon, 20 Nov 2017 16:22:24 +0330 Subject: [PATCH 2/2] generic image all the way - colormaps.h (#971) Still hunting down pre-generic_image implementations --- dlib/image_transforms/colormaps.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlib/image_transforms/colormaps.h b/dlib/image_transforms/colormaps.h index 258aaf3cb..813d1ff75 100644 --- a/dlib/image_transforms/colormaps.h +++ b/dlib/image_transforms/colormaps.h @@ -145,7 +145,7 @@ namespace dlib ) { typedef op_heatmap op; - if (img.size() != 0) + if (num_columns(img) * num_rows(img) != 0) return matrix_op(op(img,max(mat(img)),min(mat(img)))); else return matrix_op(op(img,0,0)); @@ -255,7 +255,7 @@ namespace dlib ) { typedef op_jet op; - if (img.size() != 0) + if (num_columns(img) * num_rows(img) != 0) return matrix_op(op(img,max(mat(img)),min(mat(img)))); else return matrix_op(op(img,0,0));