merged

dlib/general_hash/general_hash.h

@@ -5,6 +5,7 @@
 
 
 #include <string>
+#include "hash.h"
 
 namespace dlib 
 {
@@ -68,11 +69,7 @@ namespace dlib
         const std::string& item
     ) const
     {
-        unsigned long hash = 0;
-        std::string::size_type size = item.size();
-        for (std::string::size_type i = 0; i < size; ++i)
-            hash = hash*37 + static_cast<unsigned long>(item[i]);
-        return hash;
+        return hash(item);
     }
 
 // ----------------------------------------------------------------------------------------

docs/docs/term_index.xml

@@ -280,6 +280,9 @@
          <term file="containers.html" name="map"/>
 
 
+         <term file="dlib/matrix/matrix_data_layout_abstract.h.html" name="row_major_layout"/>
+         <term file="dlib/matrix/matrix_data_layout_abstract.h.html" name="column_major_layout"/>
+
          <term file="dlib/matrix/matrix_exp_abstract.h.html" name="matrix_exp"/>
          <term file="dlib/matrix/matrix_abstract.h.html" name="const_temp_matrix"/>
 

examples/image_ex.cpp

@@ -40,8 +40,8 @@ int main(int argc, char** argv)
         array2d<rgb_pixel> img;
 
         // Now load the image file into our image.  If something is wrong then
-        // load_image() will throw an exception.  Also, if you compiled with libpng
-        // and libjpeg then load_image() can also load PNG and JPEG files in addition
+        // load_image() will throw an exception.  Also, if you linked with libpng
+        // and libjpeg then load_image() can load PNG and JPEG files in addition
         // to BMP files.
         load_image(img, argv[1]);
 

examples/surf_ex.cpp

@@ -46,8 +46,8 @@ int main(int argc, char** argv)
         array2d<rgb_pixel> img;
 
         // Now load the image file into our image.  If something is wrong then
-        // load_image() will throw an exception.  Also, if you compiled with libpng
-        // and libjpeg then load_image() can also load PNG and JPEG files in addition
+        // load_image() will throw an exception.  Also, if you linked with libpng
+        // and libjpeg then load_image() can load PNG and JPEG files in addition
         // to BMP files. 
         load_image(img, argv[1]);