1 files changed, 0 insertions, 158 deletions
diff --git a/ml/dlib/tools/python/src/numpy_returns.cpp b/ml/dlib/tools/python/src/numpy_returns.cpp
deleted file mode 100644
index 235816a78..000000000
--- a/ml/dlib/tools/python/src/numpy_returns.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-#include "opaque_types.h"
-#include <dlib/python.h>
-#include "dlib/pixel.h"
-#include <dlib/image_transforms.h>
-
-#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
-#include <numpy/ndarrayobject.h>
-
-
-using namespace dlib;
-using namespace std;
-
-namespace py = pybind11;
-
-// ----------------------------------------------------------------------------------------
-
-py::list get_jitter_images(py::object img, size_t num_jitters = 1, bool disturb_colors = false)
-{
-    static dlib::rand rnd_jitter;
-    if (!is_rgb_python_image(img))
-        throw dlib::error("Unsupported image type, must be RGB image.");
-
-    // Convert the image to matrix<rgb_pixel> for processing
-    matrix<rgb_pixel> img_mat;
-    assign_image(img_mat, numpy_rgb_image(img));
-
-    // The top level list (containing 1 or more images) to return to python
-    py::list jitter_list;
-
-    size_t rows = num_rows(img_mat);
-    size_t cols = num_columns(img_mat);
-
-    // Size of the numpy array
-    npy_intp dims[3] = { num_rows(img_mat), num_columns(img_mat), 3};
-
-    for (int i = 0; i < num_jitters; ++i) {
-        // Get a jittered crop
-        matrix<rgb_pixel> crop = dlib::jitter_image(img_mat, rnd_jitter);
-        // If required disturb colors of the image
-        if(disturb_colors)
-            dlib::disturb_colors(crop, rnd_jitter);
-        
-        PyObject *arr = PyArray_SimpleNew(3, dims, NPY_UINT8);
-        npy_uint8 *outdata = (npy_uint8 *) PyArray_DATA((PyArrayObject*) arr);
-        memcpy(outdata, image_data(crop), rows * width_step(crop));
-                
-        py::handle handle(arr);
-        // Append image to jittered image list
-        jitter_list.append(handle);
-    }
-           
-    return jitter_list;
-}
-
-// ----------------------------------------------------------------------------------------
-
-py::list get_face_chips (
-    py::object img,
-    const std::vector<full_object_detection>& faces,
-    size_t size = 150,
-    float padding = 0.25
-)
-{
-    if (!is_rgb_python_image(img))
-        throw dlib::error("Unsupported image type, must be RGB image.");
-
-    if (faces.size() < 1) {
-        throw dlib::error("No face were specified in the faces array.");
-    }
-
-    py::list chips_list;
-
-    std::vector<chip_details> dets;
-    for (auto& f : faces)
-        dets.push_back(get_face_chip_details(f, size, padding));
-    dlib::array<matrix<rgb_pixel>> face_chips;
-    extract_image_chips(numpy_rgb_image(img), dets, face_chips);
-
-    npy_intp rows = size;
-    npy_intp cols = size;
-
-    // Size of the numpy array
-    npy_intp dims[3] = { rows, cols, 3};
-
-    for (auto& chip : face_chips) 
-    {
-        PyObject *arr = PyArray_SimpleNew(3, dims, NPY_UINT8);
-        npy_uint8 *outdata = (npy_uint8 *) PyArray_DATA((PyArrayObject*) arr);
-        memcpy(outdata, image_data(chip), rows * width_step(chip));
-        py::handle handle(arr);
-
-        // Append image to chips list
-        chips_list.append(handle);
-    }
-    return chips_list;
-}
-
-py::object get_face_chip (
-    py::object img,
-    const full_object_detection& face,
-    size_t size = 150,
-    float padding = 0.25
-)
-{
-    if (!is_rgb_python_image(img))
-        throw dlib::error("Unsupported image type, must be RGB image.");
-
-    matrix<rgb_pixel> chip;
-    extract_image_chip(numpy_rgb_image(img), get_face_chip_details(face, size, padding), chip);
-
-    // Size of the numpy array
-    npy_intp dims[3] = { num_rows(chip), num_columns(chip), 3};
-
-    PyObject *arr = PyArray_SimpleNew(3, dims, NPY_UINT8);
-    npy_uint8 *outdata = (npy_uint8 *) PyArray_DATA((PyArrayObject *) arr);
-    memcpy(outdata, image_data(chip), num_rows(chip) * width_step(chip));
-    py::handle handle(arr);
-    return handle.cast<py::object>();
-}
-
-// ----------------------------------------------------------------------------------------
-
-// we need this wonky stuff because different versions of numpy's import_array macro
-// contain differently typed return statements inside import_array().
-#if PY_VERSION_HEX >= 0x03000000
-#define DLIB_NUMPY_IMPORT_ARRAY_RETURN_TYPE void* 
-#define DLIB_NUMPY_IMPORT_RETURN return 0
-#else
-#define DLIB_NUMPY_IMPORT_ARRAY_RETURN_TYPE void
-#define DLIB_NUMPY_IMPORT_RETURN return
-#endif
-DLIB_NUMPY_IMPORT_ARRAY_RETURN_TYPE import_numpy_stuff()
-{
-    import_array();
-    DLIB_NUMPY_IMPORT_RETURN;
-}
-
-void bind_numpy_returns(py::module &m)
-{
-    import_numpy_stuff();
-
-    m.def("jitter_image", &get_jitter_images, 
-    "Takes an image and returns a list of jittered images."
-    "The returned list contains num_jitters images (default is 1)."
-    "If disturb_colors is set to True, the colors of the image are disturbed (default is False)", 
-    py::arg("img"), py::arg("num_jitters")=1, py::arg("disturb_colors")=false
-    );
-
-    m.def("get_face_chip", &get_face_chip, 
-	"Takes an image and a full_object_detection that references a face in that image and returns the face as a Numpy array representing the image.  The face will be rotated upright and scaled to 150x150 pixels or with the optional specified size and padding.", 
-	py::arg("img"), py::arg("face"), py::arg("size")=150, py::arg("padding")=0.25
-    );
-
-    m.def("get_face_chips", &get_face_chips, 
-	"Takes an image and a full_object_detections object that reference faces in that image and returns the faces as a list of Numpy arrays representing the image.  The faces will be rotated upright and scaled to 150x150 pixels or with the optional specified size and padding.",
-	py::arg("img"), py::arg("faces"), py::arg("size")=150, py::arg("padding")=0.25
-    );
-}