fix: array2d<matrix> does not consider template row and columns

add: support ToString for Point
fix: remove FHogArray2DMatrix

Author: takuya-takeuchi

src/DlibDotNet.Native/dlib/array2d/array2d.h

@@ -72,6 +72,12 @@ DLLEXPORT bool point_operator_equal(dlib::point* point, dlib::point* rhs)
     return *point == *rhs;
 }
 
+DLLEXPORT void point_operator_left_shift(dlib::point* point, std::ostringstream* stream)
+{
+    dlib::point& p = *point;
+    *stream << p;
+}
+
 #pragma endregion operator
 
 #endif

src/DlibDotNet.Native/dlib/geometry/point.h

@@ -200,53 +200,6 @@ DLLEXPORT int rectangle_get_rect(array2d_type img_type, void* img, rectangle** r
     return err;
 }
 
-DLLEXPORT int rectangle_get_rect2(matrix_element_type type, void* img, rectangle** rect)
-{
-    int err = ERR_OK;
-
-    switch(type)
-    {
-        case matrix_element_type::UInt8:
-            *rect = new dlib::rectangle(get_rect(*((array2d<matrix<uint8_t>>*)img)));
-			break;
-        case matrix_element_type::UInt16:
-            *rect = new dlib::rectangle(get_rect(*((array2d<matrix<uint16_t>>*)img)));
-			break;
-        case matrix_element_type::UInt32:
-            *rect = new dlib::rectangle(get_rect(*((array2d<matrix<uint32_t>>*)img)));
-			break;
-        case matrix_element_type::Int8:
-            *rect = new dlib::rectangle(get_rect(*((array2d<matrix<int8_t>>*)img)));
-			break;
-        case matrix_element_type::Int16:
-            *rect = new dlib::rectangle(get_rect(*((array2d<matrix<int16_t>>*)img)));
-			break;
-        case matrix_element_type::Int32:
-            *rect = new dlib::rectangle(get_rect(*((array2d<matrix<int32_t>>*)img)));
-			break;
-        case matrix_element_type::Float:
-            *rect = new dlib::rectangle(get_rect(*((array2d<matrix<float>>*)img)));
-			break;
-        case matrix_element_type::Double:
-            *rect = new dlib::rectangle(get_rect(*((array2d<matrix<double>>*)img)));
-			break;
-        case matrix_element_type::RgbPixel:
-            *rect = new dlib::rectangle(get_rect(*((array2d<matrix<rgb_pixel>>*)img)));
-			break;
-        case matrix_element_type::HsiPixel:
-            *rect = new dlib::rectangle(get_rect(*((array2d<matrix<hsi_pixel>>*)img)));
-			break;
-        case matrix_element_type::RgbAlphaPixel:
-            *rect = new dlib::rectangle(get_rect(*((array2d<matrix<rgb_alpha_pixel>>*)img)));
-			break;
-        default:
-            err = ERR_INPUT_ELEMENT_TYPE_NOT_SUPPORT;
-            break;
-    }
-    
-    return err;
-}
-
 DLLEXPORT rectangle* rectangle_translate_rect(rectangle* rect, point* p)
 {
     rectangle result = dlib::translate_rect(*rect, *p);

src/DlibDotNet.Native/dlib/geometry/rectangle.h

@@ -345,114 +345,4 @@ DLLEXPORT int draw_fhog_object_detector_scan_fhog_pyramid(const pyramid_type pyr
 
 #pragma endregion draw_fhog
 
-#pragma region fhog_matrix
-
-DLLEXPORT void* array2d_fhog_matrix_new(matrix_element_type type)
-{
-    switch(type)
-    {
-        case matrix_element_type::Float:
-            return new dlib::array2d<matrix<float, 31, 1>>();
-        case matrix_element_type::Double:
-            return new dlib::array2d<matrix<double, 31, 1>>();
-        default:
-            return nullptr;
-    }
-}
-
-DLLEXPORT void* array2d_fhog_matrix_new1(matrix_element_type type, int rows, int cols)
-{
-    switch(type)
-    {
-        case matrix_element_type::Float:
-            return new dlib::array2d<matrix<float, 31, 1>>(rows, cols);
-        case matrix_element_type::Double:
-            return new dlib::array2d<matrix<double, 31, 1>>(rows, cols);
-        default:
-            return nullptr;
-    }
-}
-
-DLLEXPORT bool array2d_fhog_matrix_nc(matrix_element_type type, void* array, int* ret)
-{
-    switch(type)
-    {
-        case matrix_element_type::Float:
-            *ret = ((dlib::array2d<matrix<float, 31, 1>>*)array)->nc();
-            return true;
-        case matrix_element_type::Double:
-            *ret = ((dlib::array2d<matrix<double, 31, 1>>*)array)->nc();
-            return true;
-        default:
-            return false;
-    }
-}
-
-DLLEXPORT bool array2d_fhog_matrix_nr(matrix_element_type type, void* array, int* ret)
-{
-    switch(type)
-    {
-        case matrix_element_type::Float:
-            *ret = ((dlib::array2d<matrix<float, 31, 1>>*)array)->nr();
-            return true;
-        case matrix_element_type::Double:
-            *ret = ((dlib::array2d<matrix<double, 31, 1>>*)array)->nr();
-            return true;
-        default:
-            return false;
-    }
-}
-
-DLLEXPORT bool array2d_fhog_matrix_size(matrix_element_type type, void* array, int* ret)
-{
-    switch(type)
-    {
-        case matrix_element_type::Float:
-            *ret = ((dlib::array2d<matrix<float, 31, 1>>*)array)->size();
-            return true;
-        case matrix_element_type::Double:
-            *ret = ((dlib::array2d<matrix<double, 31, 1>>*)array)->size();
-            return true;
-        default:
-            return false;
-    }
-}
-
-DLLEXPORT void array2d_fhog_matrix_delete(matrix_element_type type, void* array)
-{
-    switch(type)
-    {
-        case matrix_element_type::Float:
-            delete ((dlib::array2d<matrix<float, 31, 1>>*)array);
-            break;
-        case matrix_element_type::Double:
-            delete ((dlib::array2d<matrix<double, 31, 1>>*)array);
-            break;
-        default:
-            break;
-    }
-}
-
-DLLEXPORT int array2d_fhog_matrix_get_rect2(matrix_element_type type, void* img, rectangle** rect)
-{
-    int err = ERR_OK;
-
-    switch(type)
-    {
-        case matrix_element_type::Float:
-            *rect = new dlib::rectangle(get_rect(*((array2d<matrix<float, 31, 1>>*)img)));
-			break;
-        case matrix_element_type::Double:
-            *rect = new dlib::rectangle(get_rect(*((array2d<matrix<double, 31, 1>>*)img)));
-			break;
-        default:
-            err = ERR_INPUT_ELEMENT_TYPE_NOT_SUPPORT;
-            break;
-    }
-    
-    return err;
-}
-
-#pragma endregion fhog_matrix
-
 #endif

src/DlibDotNet.Native/dlib/image_transforms/fhog.h

@@ -79,6 +79,10 @@ do {\
     {\
         *ret = ((dlib::matrix<ELEMENT, 1, 3>*)matrix)->nc();\
     }\
+    else if (templateRows == 31 && templateColumns == 1)\
+    {\
+        *ret = ((dlib::matrix<ELEMENT, 31, 1>*)matrix)->nc();\
+    }\
 } while (0)
 
 #define matrix_nr_template(matrix, templateRows, templateColumns, ret) \
@@ -95,6 +99,10 @@ do {\
     {\
         *ret = ((dlib::matrix<ELEMENT, 1, 3>*)matrix)->nr();\
     }\
+    else if (templateRows == 31 && templateColumns == 1)\
+    {\
+        *ret = ((dlib::matrix<ELEMENT, 31, 1>*)matrix)->nr();\
+    }\
 } while (0)
 
 #define matrix_size_template(matrix, templateRows, templateColumns, ret) \
@@ -111,6 +119,10 @@ do {\
     {\
         *ret = ((dlib::matrix<ELEMENT, 1, 3>*)matrix)->size();\
     }\
+    else if (templateRows == 31 && templateColumns == 1)\
+    {\
+        *ret = ((dlib::matrix<ELEMENT, 31, 1>*)matrix)->size();\
+    }\
 } while (0)
 
 #define matrix_delete_template(matrix, templateRows, templateColumns) \
@@ -127,6 +139,10 @@ do {\
     {\
         delete ((dlib::matrix<ELEMENT, 1, 3>*)matrix);\
     }\
+    else if (templateRows == 31 && templateColumns == 1)\
+    {\
+        delete ((dlib::matrix<ELEMENT, 31, 1>*)matrix);\
+    }\
 } while (0)
 
 #define matrix_operator_get_one_row_column_template(matrix, index, templateRows, templateColumns, ret) \
@@ -146,6 +162,11 @@ do {\
         dlib::matrix<ELEMENT, 1, 3>& tmp = *(static_cast<dlib::matrix<ELEMENT, 1, 3>*>(matrix));\
         *ret = tmp(index);\
     }\
+    else if (templateRows == 31 && templateColumns == 1)\
+    {\
+        dlib::matrix<ELEMENT, 31, 1>& tmp = *(static_cast<dlib::matrix<ELEMENT, 31, 1>*>(matrix));\
+        *ret = tmp(index);\
+    }\
 } while (0)
 
 #define matrix_operator_set_one_row_column_template(matrix, index, templateRows, templateColumns, value) \
@@ -165,6 +186,11 @@ do {\
         dlib::matrix<ELEMENT, 1, 3>& tmp = *(static_cast<dlib::matrix<ELEMENT, 1, 3>*>(matrix));\
         tmp(index) = value;\
     }\
+    else if (templateRows == 31 && templateColumns == 1)\
+    {\
+        dlib::matrix<ELEMENT, 31, 1>& tmp = *(static_cast<dlib::matrix<ELEMENT, 31, 1>*>(matrix));\
+        tmp(index) = value;\
+    }\
 } while (0)
 
 #define matrix_operator_get_row_column_template(matrix, row, column, templateRows, templateColumns, ret) \
@@ -184,6 +210,11 @@ do {\
         dlib::matrix<ELEMENT, 1, 3>& tmp = *(static_cast<dlib::matrix<ELEMENT, 1, 3>*>(matrix));\
         *ret = tmp(row, column);\
     }\
+    else if (templateRows == 31 && templateColumns == 1)\
+    {\
+        dlib::matrix<ELEMENT, 31, 1>& tmp = *(static_cast<dlib::matrix<ELEMENT, 31, 1>*>(matrix));\
+        *ret = tmp(row, column);\
+    }\
 } while (0)
 
 #define matrix_operator_set_row_column_template(matrix, row, column, templateRows, templateColumns, value) \
@@ -203,6 +234,11 @@ do {\
         dlib::matrix<ELEMENT, 1, 3>& tmp = *(static_cast<dlib::matrix<ELEMENT, 1, 3>*>(matrix));\
         tmp(row, column) = value;\
     }\
+    else if (templateRows == 31 && templateColumns == 1)\
+    {\
+        dlib::matrix<ELEMENT, 31, 1>& tmp = *(static_cast<dlib::matrix<ELEMENT, 31, 1>*>(matrix));\
+        tmp(row, column) = value;\
+    }\
 } while (0)
 
 #define matrix_operator_left_shift_template(matrix, templateRows, templateColumns, stream) \
@@ -222,6 +258,11 @@ do {\
         dlib::matrix<ELEMENT, 1, 3>& mat = *(static_cast<dlib::matrix<ELEMENT, 1, 3>*>(matrix));\
         *stream << mat;\
     }\
+    else if (templateRows == 31 && templateColumns == 1)\
+    {\
+        dlib::matrix<ELEMENT, 31, 1>& mat = *(static_cast<dlib::matrix<ELEMENT, 31, 1>*>(matrix));\
+        *stream << mat;\
+    }\
 } while (0)
 
 #pragma endregion template

src/DlibDotNet.Native/dlib/matrix/matrix.h

@@ -29,6 +29,11 @@ do {\
         auto mat = static_cast<matrix_op<op_trans<matrix<ELEMENT_IN, 0, 1>>>*>(obj);\
         delete mat;\
     }\
+    else if (templateRows == 31 && templateColumns == 1)\
+    {\
+        auto mat = static_cast<matrix_op<op_trans<matrix<ELEMENT_IN, 31, 1>>>*>(obj);\
+        delete mat;\
+    }\
 } while (0)
 
 #define matrix_op_op_trans_nc_template(obj, templateRows, templateColumns, ret) \
@@ -43,6 +48,11 @@ do {\
         auto mat = static_cast<matrix_op<op_trans<matrix<ELEMENT_IN, 0, 1>>>*>(obj);\
         *ret = mat->nc();\
     }\
+    else if (templateRows == 31 && templateColumns == 1)\
+    {\
+        auto mat = static_cast<matrix_op<op_trans<matrix<ELEMENT_IN, 31, 1>>>*>(obj);\
+        *ret = mat->nc();\
+    }\
 } while (0)
 
 #define matrix_op_op_trans_nr_template(obj, templateRows, templateColumns, ret) \
@@ -57,6 +67,11 @@ do {\
         auto mat = static_cast<matrix_op<op_trans<matrix<ELEMENT_IN, 0, 1>>>*>(obj);\
         *ret = mat->nr();\
     }\
+    else if (templateRows == 31 && templateColumns == 1)\
+    {\
+        auto mat = static_cast<matrix_op<op_trans<matrix<ELEMENT_IN, 31, 1>>>*>(obj);\
+        *ret = mat->nr();\
+    }\
 } while (0)
 
 #define matrix_op_op_trans_operator_left_shift_template(obj, templateRows, templateColumns, stream) \
@@ -71,6 +86,11 @@ do {\
         matrix_op<op_trans<matrix<ELEMENT_IN, 0, 1>>>& mat = *(static_cast<matrix_op<op_trans<matrix<ELEMENT_IN, 0, 1>>>*>(obj));\
         *stream << mat;\
     }\
+    else if (templateRows == 31 && templateColumns == 1)\
+    {\
+        matrix_op<op_trans<matrix<ELEMENT_IN, 31, 1>>>& mat = *(static_cast<matrix_op<op_trans<matrix<ELEMENT_IN, 31, 1>>>*>(obj));\
+        *stream << mat;\
+    }\
 } while (0)
 
 #pragma endregion template

src/DlibDotNet.Native/dlib/matrix/matrix_op/op_trans.h

@@ -30,6 +30,11 @@ do {\
         dlib::matrix<ELEMENT_IN, 0, 1>& mat = *static_cast<dlib::matrix<ELEMENT_IN, 0, 1>*>(matrix);\
         *ret = dlib::length(mat);\
     }\
+    else if (templateRows == 31 && templateColumns == 1)\
+    {\
+        dlib::matrix<ELEMENT_IN, 31, 1>& mat = *static_cast<dlib::matrix<ELEMENT_IN, 31, 1>*>(matrix);\
+        *ret = dlib::length(mat);\
+    }\
 } while (0)
 
 #define matrix_mean_op_std_vect_to_mat_template(type, matrix, templateRows, templateColumns, ret, err) \
@@ -204,6 +209,13 @@ do {\
         auto joinedMat = dlib::join_rows(mat1, mat2);\
         *ret = new matrix_op<op_join_rows<matrix<ELEMENT_IN, 0, 1>, matrix<ELEMENT_IN, 0, 1>>>(joinedMat);\
     }\
+    else if (templateRows == 31 && templateColumns == 1)\
+    {\
+        dlib::matrix<ELEMENT_IN, 31, 1>& mat1 = *static_cast<dlib::matrix<ELEMENT_IN, 31, 1>*>(matrix1);\
+        dlib::matrix<ELEMENT_IN, 31, 1>& mat2 = *static_cast<dlib::matrix<ELEMENT_IN, 31, 1>*>(matrix2);\
+        auto joinedMat = dlib::join_rows(mat1, mat2);\
+        *ret = new matrix_op<op_join_rows<matrix<ELEMENT_IN, 31, 1>, matrix<ELEMENT_IN, 31, 1>>>(joinedMat);\
+    }\
 } while (0)
 
 #define matrix_trans_template(matrix, templateRows, templateColumns, ret) \
@@ -220,6 +232,12 @@ do {\
         auto transedMat = dlib::trans(mat);\
         *ret = new matrix_op<op_trans<dlib::matrix<ELEMENT_IN, 0, 1>>>(transedMat);\
     }\
+    else if (templateRows == 31 && templateColumns == 1)\
+    {\
+        dlib::matrix<ELEMENT_IN, 31, 1>& mat = *static_cast<dlib::matrix<ELEMENT_IN, 31, 1>*>(matrix);\
+        auto transedMat = dlib::trans(mat);\
+        *ret = new matrix_op<op_trans<dlib::matrix<ELEMENT_IN, 31, 1>>>(transedMat);\
+    }\
 } while (0)
 
 #pragma endregion template