Fixed some #include order problems I just introduced by making some of the

geometry components use the optimization tools.

dlib/image_transforms/spatial_filtering.h

@@ -9,6 +9,7 @@
 #include "../assert.h"
 #include "../array2d.h"
 #include "../matrix.h"
+#include "../geometry/border_enumerator.h"
 #include <limits>
 
 namespace dlib

dlib/matrix/matrix_assign.h

@@ -3,7 +3,6 @@
 #ifndef DLIB_MATRIx_ASSIGn_
 #define DLIB_MATRIx_ASSIGn_
 
-#include "../geometry.h"
 #include "matrix.h"
 #include "matrix_utilities.h"
 #include "matrix_subexp.h"

dlib/matrix/matrix_default_mul.h

@@ -3,7 +3,7 @@
 #ifndef DLIB_MATRIx_DEFAULT_MULTIPLY_
 #define DLIB_MATRIx_DEFAULT_MULTIPLY_
 
-#include "../geometry.h"
+#include "../geometry/rectangle.h"
 #include "matrix.h"
 #include "matrix_utilities.h"
 #include "../enable_if.h"

dlib/matrix/matrix_subexp_abstract.h

@@ -4,7 +4,7 @@
 #ifdef DLIB_MATRIx_SUBEXP_ABSTRACT_
 
 #include "matrix_abstract.h"
-#include "../geometry.h"
+#include "../geometry/rectangle.h"
 
 namespace dlib
 {

dlib/matrix/matrix_utilities_abstract.h

@@ -6,7 +6,7 @@
 #include "matrix_abstract.h"
 #include <complex>
 #include "../pixel.h"
-#include "../geometry.h"
+#include "../geometry/rectangle.h"
 #inclue <vector>
 
 namespace dlib