Removed clutter from spec file and also fixed a bug in the assign_border_pixels() and

zero_border_pixels() functions.  Their contracts said there was no upper limit on the
size of the border that could be assigned/zeroed but the implementations failed to
handle the case where the border was bigger than the image.

--HG--
extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%403056

dlib/image_transforms/assign_image.h

@@ -74,6 +74,9 @@ namespace dlib
             << "\n\ty_border_size: " << y_border_size
             );
 
+        y_border_size = std::min(y_border_size, img.nr()/2+1);
+        x_border_size = std::min(x_border_size, img.nc()/2+1);
+
         // assign the top border
         for (long r = 0; r < y_border_size; ++r)
         {

dlib/image_transforms/assign_image_abstract.h

@@ -107,30 +107,6 @@ namespace dlib
                       (i.e. assigns 0 to every pixel in the border of img)
     !*/
 
-// ----------------------------------------------------------------------------------------
-
-    template <
-        typename image_type
-        >
-    void assign_border_pixels (
-        image_type& img,
-        long x_border_size,
-        long y_border_size
-    );
-    /*!
-        requires
-            - image_type == is an implementation of array2d/array2d_kernel_abstract.h
-            - x_border_size >= 0
-            - y_border_size >= 0
-        ensures
-            - #img.nc() == img.nc()
-            - #img.nr() == img.nr()
-              (i.e. the size of img isn't changed by this function)
-            - let p be a pixel such that get_pixel_intensity(p) == 0
-            - performs assign_border_pixels(img, x_border_size, y_border_size, p)
-              (i.e. zeros the border of the given image)
-    !*/
-
 // ----------------------------------------------------------------------------------------
 
 }

dlib/test/image.cpp

@@ -8,6 +8,7 @@
 #include <dlib/array2d.h>
 #include <dlib/image_transforms.h>
 #include <dlib/image_io.h>
+#include <dlib/matrix.h>
 
 #include "tester.h"
 
@@ -391,6 +392,50 @@ namespace
 
         }
 
+        {
+            array2d<unsigned char>::kernel_1a_c img;
+            img.set_size(10,10);
+            assign_all_pixels(img, 0);
+
+            assign_border_pixels(img, 2,2, 4);
+
+            DLIB_TEST(zeros_matrix<unsigned char>(6,6) == subm(array_to_matrix(img), rectangle(2,2,7,7)));
+            DLIB_TEST(uniform_matrix<unsigned char>(1,10, 4) == rowm(array_to_matrix(img), 0));
+            DLIB_TEST(uniform_matrix<unsigned char>(1,10, 4) == rowm(array_to_matrix(img), 1));
+            DLIB_TEST(uniform_matrix<unsigned char>(1,10, 4) == rowm(array_to_matrix(img), 8));
+            DLIB_TEST(uniform_matrix<unsigned char>(1,10, 4) == rowm(array_to_matrix(img), 9));
+
+            DLIB_TEST(uniform_matrix<unsigned char>(10,1, 4) == colm(array_to_matrix(img), 0));
+            DLIB_TEST(uniform_matrix<unsigned char>(10,1, 4) == colm(array_to_matrix(img), 1));
+            DLIB_TEST(uniform_matrix<unsigned char>(10,1, 4) == colm(array_to_matrix(img), 8));
+            DLIB_TEST(uniform_matrix<unsigned char>(10,1, 4) == colm(array_to_matrix(img), 9));
+
+
+            assign_border_pixels(img, 7, 7, 5);
+            DLIB_TEST(uniform_matrix<unsigned char>(10,10, 5) == array_to_matrix(img));
+        }
+
+        {
+            array2d<unsigned char>::kernel_1a_c img;
+            img.set_size(11,11);
+            assign_all_pixels(img, 0);
+
+            assign_border_pixels(img, 2,2, 4);
+
+            DLIB_TEST(zeros_matrix<unsigned char>(7,7) == subm(array_to_matrix(img), rectangle(2,2,8,8)));
+            DLIB_TEST(uniform_matrix<unsigned char>(1,11, 4) == rowm(array_to_matrix(img), 0));
+            DLIB_TEST(uniform_matrix<unsigned char>(1,11, 4) == rowm(array_to_matrix(img), 1));
+            DLIB_TEST(uniform_matrix<unsigned char>(1,11, 4) == rowm(array_to_matrix(img), 9));
+            DLIB_TEST(uniform_matrix<unsigned char>(1,11, 4) == rowm(array_to_matrix(img), 10));
+
+            DLIB_TEST(uniform_matrix<unsigned char>(11,1, 4) == colm(array_to_matrix(img), 0));
+            DLIB_TEST(uniform_matrix<unsigned char>(11,1, 4) == colm(array_to_matrix(img), 1));
+            DLIB_TEST(uniform_matrix<unsigned char>(11,1, 4) == colm(array_to_matrix(img), 9));
+            DLIB_TEST(uniform_matrix<unsigned char>(11,1, 4) == colm(array_to_matrix(img), 10));
+
+            assign_border_pixels(img, 7, 7, 5);
+            DLIB_TEST(uniform_matrix<unsigned char>(11,11, 5) == array_to_matrix(img));
+        }
 
 
     }