Added #185 fix

Author: gineshidalgo99

.github/issue_template.md

@@ -38,6 +38,6 @@ You might select multiple topics, delete the rest:
 **cuDNN version**:
 **GPU model** (`nvidia-smi` in Ubuntu):
 **Caffe version**: Default from OpenPose or custom version.
-**OpenCV version**: installed with `apt-get install libopencv-dev` (Ubuntu) or default from OpenPose (Windows) or OpenCV 2.X or OpenCV 3.X.
+**OpenCV version**: installed with `apt-get install libopencv-dev` (Ubuntu) or default from OpenPose (Windows) or OpenCV 2.X or OpenCV 3.X. Especify **full version** (e.g. 3.3.1)
 Generation mode (only for Ubuntu): Makefile + Makefile.config (default, Ubuntu) or CMake (Ubuntu, Windows) or Visual Studio (Windows).
 Compiler (`gcc --version` in Ubuntu):

examples_beta/openpose3d/src/pointGrey.cpp

@@ -18,12 +18,12 @@ cv::Mat pointGreyToCvMat(const Spinnaker::ImagePtr &imagePtr)
 		const auto colsize = imagePtr->GetHeight();
 
 		// image data contains padding. When allocating cv::Mat container size, you need to account for the X,Y image data padding.
-		return cv::Mat{(int)(colsize + YPadding), (int)(rowsize + XPadding), CV_8UC3, imagePtr->GetData(), imagePtr->GetStride()};
+		return cv::Mat((int)(colsize + YPadding), (int)(rowsize + XPadding), CV_8UC3, imagePtr->GetData(), imagePtr->GetStride());
 	}
 	catch (const std::exception& e)
 	{
 		op::error(e.what(), __LINE__, __FUNCTION__, __FILE__);
-		return cv::Mat{};
+		return cv::Mat();
 	}
 }
 

examples_beta/openpose3d/src/reconstruction3D.cpp

@@ -108,7 +108,7 @@ void reconstructArray(op::Array<float>& keypoints3D, const std::vector<op::Array
             // 3D points to pose
             // OpenCV alternative:
             // // http://docs.opencv.org/2.4/modules/calib3d/doc/camera_calibration_and_3d_reconstruction.html#triangulatepoints
-            // cv::Mat reconstructedcv::Points{4, firstcv::Points.size(), CV_64F};
+            // cv::Mat reconstructedPoints{4, firstcv::Points.size(), CV_64F};
             // cv::triangulatecv::Points(cv::Mat::eye(3,4, CV_64F), M_3_1, firstcv::Points, secondcv::Points, reconstructedcv::Points);
             keypoints3D = op::Array<float>{ { 1, numberBodyParts, 4 }, 0 };
             for (auto index = 0u; index < indexesUsed.size(); index++)

examples_beta/openpose3d/src/renderer.cpp

@@ -341,7 +341,7 @@ WRender3D::WRender3D(const op::PoseModel poseModel)
     // Update sPoseModel
     sPoseModel = poseModel;
     // Init display
-    cv::imshow(GUI_NAME, cv::Mat{ 500, 500, CV_8UC3, cv::Scalar{ 0,0,0 } });
+    cv::imshow(GUI_NAME, cv::Mat( 500, 500, CV_8UC3, cv::Scalar{ 0,0,0 } ));
     //Run OpenGL
     mRenderThread = std::thread{ &WRender3D::visualizationThread, this };
 }

include/openpose/core/opOutputToCvMat.hpp

@@ -14,7 +14,7 @@ namespace op
         cv::Mat formatToCvMat(const Array<float>& outputData) const;
 
     private:
-        const Point<int> mOutputResolution;
+        const std::array<int, 3> mOutputResolution;
     };
 }
 

include/openpose/gui/gui.hpp

@@ -20,7 +20,7 @@ namespace op
 
         void initializationOnThread();
 
-        void update(const cv::Mat& cvOutputData = cv::Mat{});
+        void update(const cv::Mat& cvOutputData = cv::Mat());
 
     private:
         // Frames display

include/openpose/gui/wGui.hpp

@@ -69,7 +69,7 @@ namespace op
                 // T* to T
                 auto& tDatumsNoPtr = *tDatums;
                 // Refresh GUI
-                const auto cvOutputData = (!tDatumsNoPtr.empty() ? tDatumsNoPtr[0].cvOutputData : cv::Mat{});
+                const auto cvOutputData = (!tDatumsNoPtr.empty() ? tDatumsNoPtr[0].cvOutputData : cv::Mat());
                 spGui->update(cvOutputData);
                 // Profiling speed
                 if (!tDatumsNoPtr.empty())

include/openpose/pose/enumClasses.hpp

@@ -11,7 +11,8 @@ namespace op
         COCO_18 = 0,    /**< COCO model, with 18+1 components (see poseParameters.hpp for details). */
         MPI_15 = 1,     /**< MPI model, with 15+1 components (see poseParameters.hpp for details). */
         MPI_15_4 = 2,   /**< Variation of the MPI model, reduced number of CNN stages to 4: faster but less accurate.*/
-        BODY_22 = 3,    /**< Experimental. Do not use. */
+        BODY_18 = 3,    /**< Experimental. Do not use. */
+        BODY_22 = 4,    /**< Experimental. Do not use. */
         Size,
     };
 

include/openpose/pose/poseParameters.hpp

@@ -101,6 +101,15 @@ namespace op
           0.f,    85.f,   255.f, \
           0.f,     0.f,   255.f
     const std::vector<float> POSE_MPI_COLORS_RENDER{POSE_MPI_COLORS_RENDER_GPU};
+    // BODY_18
+    const std::map<unsigned int, std::string> POSE_BODY_18_BODY_PARTS   {POSE_COCO_BODY_PARTS};
+    const unsigned int POSE_BODY_18_NUMBER_PARTS                        {POSE_COCO_NUMBER_PARTS};
+    const std::vector<unsigned int> POSE_BODY_18_MAP_IDX                {POSE_COCO_MAP_IDX};
+    #define POSE_BODY_18_PAIRS_RENDER_GPU                               POSE_COCO_PAIRS_RENDER_GPU
+    const std::vector<unsigned int> POSE_BODY_18_PAIRS_RENDER           {POSE_BODY_18_PAIRS_RENDER_GPU};
+    const std::vector<unsigned int> POSE_BODY_18_PAIRS                  {POSE_COCO_PAIRS};
+    #define POSE_BODY_18_COLORS_RENDER_GPU                              POSE_COCO_COLORS_RENDER_GPU
+    const std::vector<float> POSE_BODY_18_COLORS_RENDER                 {POSE_BODY_18_COLORS_RENDER_GPU};
     // BODY_22 (experimental, do not use)
     const std::map<unsigned int, std::string> POSE_BODY_22_BODY_PARTS {
         {0,  "Nose"},
@@ -161,30 +170,32 @@ namespace op
         POSE_MAX_PEOPLE,        POSE_MAX_PEOPLE,        POSE_MAX_PEOPLE,        POSE_MAX_PEOPLE
     };
     const std::array<unsigned int, (int)PoseModel::Size> POSE_NUMBER_BODY_PARTS{
-        POSE_COCO_NUMBER_PARTS, POSE_MPI_NUMBER_PARTS,  POSE_MPI_NUMBER_PARTS,  POSE_BODY_22_NUMBER_PARTS
+        POSE_COCO_NUMBER_PARTS, POSE_MPI_NUMBER_PARTS,  POSE_MPI_NUMBER_PARTS,  POSE_BODY_18_NUMBER_PARTS,  POSE_BODY_22_NUMBER_PARTS
     };
     const std::array<std::vector<unsigned int>, (int)PoseModel::Size> POSE_BODY_PART_PAIRS{
-        POSE_COCO_PAIRS,        POSE_MPI_PAIRS,         POSE_MPI_PAIRS,         POSE_BODY_22_PAIRS
+        POSE_COCO_PAIRS,        POSE_MPI_PAIRS,         POSE_MPI_PAIRS,         POSE_BODY_18_PAIRS,         POSE_BODY_22_PAIRS
     };
     const std::array<std::vector<unsigned int>, (int)PoseModel::Size> POSE_BODY_PART_PAIRS_RENDER{
-        POSE_COCO_PAIRS_RENDER, POSE_MPI_PAIRS,         POSE_MPI_PAIRS,         POSE_BODY_22_PAIRS_RENDER
+        POSE_COCO_PAIRS_RENDER, POSE_MPI_PAIRS,         POSE_MPI_PAIRS,         POSE_BODY_18_PAIRS_RENDER,  POSE_BODY_22_PAIRS_RENDER
     };
     const std::array<std::vector<unsigned int>, (int)PoseModel::Size> POSE_MAP_IDX{
-        POSE_COCO_MAP_IDX,      POSE_MPI_MAP_IDX,       POSE_MPI_MAP_IDX,       POSE_BODY_22_MAP_IDX
+        POSE_COCO_MAP_IDX,      POSE_MPI_MAP_IDX,       POSE_MPI_MAP_IDX,       POSE_BODY_18_MAP_IDX,       POSE_BODY_22_MAP_IDX
     };
     const std::array<std::vector<float>, (int)PoseModel::Size> POSE_COLORS{
-        POSE_COCO_COLORS_RENDER,POSE_MPI_COLORS_RENDER, POSE_MPI_COLORS_RENDER, POSE_BODY_22_COLORS_RENDER
+        POSE_COCO_COLORS_RENDER,POSE_MPI_COLORS_RENDER, POSE_MPI_COLORS_RENDER, POSE_BODY_18_COLORS_RENDER, POSE_BODY_22_COLORS_RENDER
     };
     const std::array<std::string, (int)PoseModel::Size> POSE_PROTOTXT{
         "pose/coco/pose_deploy_linevec.prototxt",
         "pose/mpi/pose_deploy_linevec.prototxt",
         "pose/mpi/pose_deploy_linevec_faster_4_stages.prototxt",
+        "pose/body_18/pose_deploy.prototxt",
         "pose/body_22/pose_deploy.prototxt"
     };
     const std::array<std::string, (int)PoseModel::Size> POSE_TRAINED_MODEL{
         "pose/coco/pose_iter_440000.caffemodel",
         "pose/mpi/pose_iter_160000.caffemodel",
         "pose/mpi/pose_iter_160000.caffemodel",
+        "pose/body_18/pose_iter_XXXXXX.caffemodel",
         "pose/body_22/pose_iter_40000.caffemodel"
     };
     // POSE_BODY_PART_MAPPING crashes on Windows at dynamic initialization, to avoid this crash:
@@ -197,19 +208,19 @@ namespace op
     // Default Model Parameters
     // They might be modified on running time
     const std::array<float, (int)PoseModel::Size>           POSE_DEFAULT_NMS_THRESHOLD{
-        0.05f,      0.6f,       0.3f,       0.05f
+        0.05f,      0.6f,       0.3f,       0.05f,      0.05f
     };
     const std::array<unsigned int, (int)PoseModel::Size>    POSE_DEFAULT_CONNECT_INTER_MIN_ABOVE_THRESHOLD{
-        9,          8,          8,          9
+        9,          8,          8,          9,          9
     };
     const std::array<float, (int)PoseModel::Size>           POSE_DEFAULT_CONNECT_INTER_THRESHOLD{
-        0.05f,      0.01f,      0.01f,      0.05f
+        0.05f,      0.01f,      0.01f,      0.05f,      0.05f
     };
     const std::array<unsigned int, (int)PoseModel::Size>    POSE_DEFAULT_CONNECT_MIN_SUBSET_CNT{
-        3,          3,          3,          3
+        3,          3,          3,          3,          3
     };
     const std::array<float, (int)PoseModel::Size>           POSE_DEFAULT_CONNECT_MIN_SUBSET_SCORE{
-        0.4f,       0.4f,       0.4f,       0.4f
+        0.4f,       0.4f,       0.4f,       0.4f,       0.4f
     };
 
     // Rendering parameters

include/openpose/utilities/openCv.hpp

@@ -9,11 +9,11 @@ namespace op
 {
     OP_API void putTextOnCvMat(cv::Mat& cvMat, const std::string& textToDisplay, const Point<int>& position, const cv::Scalar& color, const bool normalizeWidth);
 
-    OP_API void floatPtrToUCharCvMat(cv::Mat& cvMat, const float* const floatImage, const Point<int>& resolutionSize, const int resolutionChannels);
+    OP_API void floatPtrToUCharCvMat(cv::Mat& uCharCvMat, const float* const floatPtrImage, const std::array<int, 3> resolutionSize);
 
     OP_API void unrollArrayToUCharCvMat(cv::Mat& cvMatResult, const Array<float>& array);
 
-    OP_API void uCharCvMatToFloatPtr(float* floatImage, const cv::Mat& cvImage, const bool normalize);
+    OP_API void uCharCvMatToFloatPtr(float* floatPtrImage, const cv::Mat& cvImage, const bool normalize);
 
     OP_API double resizeGetScaleFactor(const Point<int>& initialSize, const Point<int>& targetSize);