Made chip_details do something more benign when the user gives an empty

rectangle.

Made chip_details do something more benign when the user gives an empty
rectangle.
c210395c · Davis King · 2ed128e2 · c210395c
Commit c210395c authored May 26, 2018 by Davis King
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 5 deletions

dlib/image_transforms/interpolation.h dlib/image_transforms/interpolation.h +12 -5

No files found.
--- a/dlib/image_transforms/interpolation.h
+++ b/dlib/image_transforms/interpolation.h
@@ -1758,11 +1758,18 @@ namespace dlib
            unsigned long size
        ) 
        {
-            const double relative_size = std::sqrt(size/(double)rect.area());
+            if (rect.is_empty())
-            rows = static_cast<unsigned long>(rect.height()*relative_size + 0.5);
+            {
-            cols  = static_cast<unsigned long>(size/(double)rows + 0.5);
+                cols = rows = std::round(std::sqrt((double)size));
-            rows = std::max(1ul,rows);
+            }
-            cols = std::max(1ul,cols);
+            else
+            {
+                const double relative_size = std::sqrt(size/(double)rect.area());
+                rows = static_cast<unsigned long>(rect.height()*relative_size + 0.5);
+                cols  = static_cast<unsigned long>(size/(double)rows + 0.5);
+                rows = std::max(1ul,rows);
+                cols = std::max(1ul,cols);
+            }
        }
    };