merged

985b9609 · Davis King · 1b76017c · 4887e1c4 · 985b9609 · 985b9609
Commit 985b9609 authored Jul 22, 2015 by Davis King
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 3 deletions

dlib/image_transforms/colormaps.h dlib/image_transforms/colormaps.h +8 -2

dlib/sqlite/sqlite_tools.h dlib/sqlite/sqlite_tools.h +1 -1

No files found.
--- a/dlib/image_transforms/colormaps.h
+++ b/dlib/image_transforms/colormaps.h
@@ -145,7 +145,10 @@ namespace dlib
    )
    {
        typedef op_heatmap<image_type> op;
-        return matrix_op<op>(op(img,max(mat(img)),min(mat(img))));
+        if (img.size() != 0)
+            return matrix_op<op>(op(img,max(mat(img)),min(mat(img))));
+        else
+            return matrix_op<op>(op(img,0,0));
    }
 // ----------------------------------------------------------------------------------------
@@ -252,7 +255,10 @@ namespace dlib
    )
    {
        typedef op_jet<image_type> op;
-        return matrix_op<op>(op(img,max(mat(img)),min(mat(img))));
+        if (img.size() != 0)
+            return matrix_op<op>(op(img,max(mat(img)),min(mat(img))));
+        else
+            return matrix_op<op>(op(img,0,0));
    }
 // ----------------------------------------------------------------------------------------

--- a/dlib/sqlite/sqlite_tools.h
+++ b/dlib/sqlite/sqlite_tools.h
@@ -33,7 +33,7 @@ namespace dlib
            }
        }
-        ~transaction()
+        ~transaction() throw (std::exception)
        {
            if (!committed)
                db.exec("rollback");