From 363cd0b5d44ab127d0786ac1f3398e784933dd5d Mon Sep 17 00:00:00 2001 From: Gines Hidalgo Date: Tue, 3 Sep 2019 21:39:03 -0400 Subject: [PATCH] OpenPose v1.5.1 --- CMakeLists.txt | 2 +- doc/release_notes.md | 9 ++++++++- examples/tutorial_api_python/01_body_from_image.py | 2 +- examples/tutorial_api_python/02_whole_body_from_image.py | 2 +- examples/tutorial_api_python/04_keypoints_from_images.py | 2 +- .../05_keypoints_from_images_multi_gpu.py | 2 +- examples/tutorial_api_python/06_face_from_image.py | 2 +- examples/tutorial_api_python/07_hand_from_image.py | 2 +- examples/tutorial_api_python/08_heatmaps_from_image.py | 2 +- .../tutorial_api_python/09_keypoints_from_heatmaps.py | 2 +- include/openpose/core/macros.hpp | 2 +- scripts/ubuntu/Makefile.example | 2 +- 12 files changed, 19 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 25d45c0b..6fce7c52 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ ### VERSION INFO set(OpenPose_VERSION_MAJOR 1) set(OpenPose_VERSION_MINOR 5) -set(OpenPose_VERSION_PATCH 0) +set(OpenPose_VERSION_PATCH 1) set(OpenPose_VERSION ${OpenPose_VERSION_MAJOR}.${OpenPose_VERSION_MINOR}.${OpenPose_VERSION_PATCH}) diff --git a/doc/release_notes.md b/doc/release_notes.md index cd78ab41..fbd737dc 100644 --- a/doc/release_notes.md +++ b/doc/release_notes.md @@ -365,7 +365,7 @@ OpenPose Library - Release Notes -## Current version - future OpenPose 1.5.1 +## OpenPose 1.5.1 (Sep 03, 2019) 1. Main improvements: 1. Highly improved 3D triangulation for >3 cameras by fixing some small bugs. 2. Added community-based support for Nvidia NVCaffe. @@ -380,6 +380,13 @@ OpenPose Library - Release Notes 3. Main bugs fixed: 1. Windows: Added back support for OpenGL and Spinnaker, as well as DLLs for debug compilation. 2. `06_face_from_image.cpp`, `07_hand_from_image.cpp`, and `09_keypoints_from_heatmaps` working again, they stopped working in version 1.5.0 with the GPU image resize for the GUI. + + + +## Current version - Future OpenPose 1.5.2 +1. Main improvements: +2. Functions or parameters renamed: +3. Main bugs fixed: 4. Changes/additions that affect the compatibility with the OpenPose Unity Plugin: diff --git a/examples/tutorial_api_python/01_body_from_image.py b/examples/tutorial_api_python/01_body_from_image.py index a03e24b4..544d523f 100644 --- a/examples/tutorial_api_python/01_body_from_image.py +++ b/examples/tutorial_api_python/01_body_from_image.py @@ -64,7 +64,7 @@ try: # Display Image print("Body keypoints: \n" + str(datum.poseKeypoints)) - cv2.imshow("OpenPose 1.5.0 - Tutorial Python API", datum.cvOutputData) + cv2.imshow("OpenPose 1.5.1 - Tutorial Python API", datum.cvOutputData) cv2.waitKey(0) except Exception as e: # print(e) diff --git a/examples/tutorial_api_python/02_whole_body_from_image.py b/examples/tutorial_api_python/02_whole_body_from_image.py index 59aaee38..c573c961 100644 --- a/examples/tutorial_api_python/02_whole_body_from_image.py +++ b/examples/tutorial_api_python/02_whole_body_from_image.py @@ -69,7 +69,7 @@ try: print("Face keypoints: \n" + str(datum.faceKeypoints)) print("Left hand keypoints: \n" + str(datum.handKeypoints[0])) print("Right hand keypoints: \n" + str(datum.handKeypoints[1])) - cv2.imshow("OpenPose 1.5.0 - Tutorial Python API", datum.cvOutputData) + cv2.imshow("OpenPose 1.5.1 - Tutorial Python API", datum.cvOutputData) cv2.waitKey(0) except Exception as e: # print(e) diff --git a/examples/tutorial_api_python/04_keypoints_from_images.py b/examples/tutorial_api_python/04_keypoints_from_images.py index 9e92428a..6fd0697f 100644 --- a/examples/tutorial_api_python/04_keypoints_from_images.py +++ b/examples/tutorial_api_python/04_keypoints_from_images.py @@ -72,7 +72,7 @@ try: print("Body keypoints: \n" + str(datum.poseKeypoints)) if not args[0].no_display: - cv2.imshow("OpenPose 1.5.0 - Tutorial Python API", datum.cvOutputData) + cv2.imshow("OpenPose 1.5.1 - Tutorial Python API", datum.cvOutputData) key = cv2.waitKey(15) if key == 27: break diff --git a/examples/tutorial_api_python/05_keypoints_from_images_multi_gpu.py b/examples/tutorial_api_python/05_keypoints_from_images_multi_gpu.py index e0ef57c6..79574363 100644 --- a/examples/tutorial_api_python/05_keypoints_from_images_multi_gpu.py +++ b/examples/tutorial_api_python/05_keypoints_from_images_multi_gpu.py @@ -99,7 +99,7 @@ try: print("Body keypoints: \n" + str(datum.poseKeypoints)) if not args[0].no_display: - cv2.imshow("OpenPose 1.5.0 - Tutorial Python API", datum.cvOutputData) + cv2.imshow("OpenPose 1.5.1 - Tutorial Python API", datum.cvOutputData) key = cv2.waitKey(15) if key == 27: break diff --git a/examples/tutorial_api_python/06_face_from_image.py b/examples/tutorial_api_python/06_face_from_image.py index 577e513f..ebc115d1 100644 --- a/examples/tutorial_api_python/06_face_from_image.py +++ b/examples/tutorial_api_python/06_face_from_image.py @@ -76,7 +76,7 @@ try: # Process and display image opWrapper.emplaceAndPop([datum]) print("Face keypoints: \n" + str(datum.faceKeypoints)) - cv2.imshow("OpenPose 1.5.0 - Tutorial Python API", datum.cvOutputData) + cv2.imshow("OpenPose 1.5.1 - Tutorial Python API", datum.cvOutputData) cv2.waitKey(0) except Exception as e: # print(e) diff --git a/examples/tutorial_api_python/07_hand_from_image.py b/examples/tutorial_api_python/07_hand_from_image.py index 3927fd28..50f18691 100644 --- a/examples/tutorial_api_python/07_hand_from_image.py +++ b/examples/tutorial_api_python/07_hand_from_image.py @@ -89,7 +89,7 @@ try: opWrapper.emplaceAndPop([datum]) print("Left hand keypoints: \n" + str(datum.handKeypoints[0])) print("Right hand keypoints: \n" + str(datum.handKeypoints[1])) - cv2.imshow("OpenPose 1.5.0 - Tutorial Python API", datum.cvOutputData) + cv2.imshow("OpenPose 1.5.1 - Tutorial Python API", datum.cvOutputData) cv2.waitKey(0) except Exception as e: # print(e) diff --git a/examples/tutorial_api_python/08_heatmaps_from_image.py b/examples/tutorial_api_python/08_heatmaps_from_image.py index 47241a99..ee045fa8 100644 --- a/examples/tutorial_api_python/08_heatmaps_from_image.py +++ b/examples/tutorial_api_python/08_heatmaps_from_image.py @@ -80,7 +80,7 @@ try: heatmap = heatmaps[counter, :, :].copy() heatmap = cv2.applyColorMap(heatmap, cv2.COLORMAP_JET) combined = cv2.addWeighted(outputImageF, 0.5, heatmap, 0.5, 0) - cv2.imshow("OpenPose 1.5.0 - Tutorial Python API", combined) + cv2.imshow("OpenPose 1.5.1 - Tutorial Python API", combined) key = cv2.waitKey(-1) if key == 27: break diff --git a/examples/tutorial_api_python/09_keypoints_from_heatmaps.py b/examples/tutorial_api_python/09_keypoints_from_heatmaps.py index 9c427a61..a406eaed 100644 --- a/examples/tutorial_api_python/09_keypoints_from_heatmaps.py +++ b/examples/tutorial_api_python/09_keypoints_from_heatmaps.py @@ -81,7 +81,7 @@ try: # Display Image print("Body keypoints: \n" + str(datum.poseKeypoints)) - cv2.imshow("OpenPose 1.5.0 - Tutorial Python API", datum.cvOutputData) + cv2.imshow("OpenPose 1.5.1 - Tutorial Python API", datum.cvOutputData) cv2.waitKey(0) except Exception as e: # print(e) diff --git a/include/openpose/core/macros.hpp b/include/openpose/core/macros.hpp index 656fdc8a..a32c5e49 100644 --- a/include/openpose/core/macros.hpp +++ b/include/openpose/core/macros.hpp @@ -11,7 +11,7 @@ // OpenPose name and version const std::string OPEN_POSE_NAME_STRING = "OpenPose"; -const std::string OPEN_POSE_VERSION_STRING = "1.5.0"; +const std::string OPEN_POSE_VERSION_STRING = "1.5.1"; const std::string OPEN_POSE_NAME_AND_VERSION = OPEN_POSE_NAME_STRING + " " + OPEN_POSE_VERSION_STRING; // #define COMMERCIAL_LICENSE diff --git a/scripts/ubuntu/Makefile.example b/scripts/ubuntu/Makefile.example index 4f596eca..100770f3 100644 --- a/scripts/ubuntu/Makefile.example +++ b/scripts/ubuntu/Makefile.example @@ -34,7 +34,7 @@ LIB_BUILD_DIR := $(BUILD_DIR)/lib STATIC_NAME := $(LIB_BUILD_DIR)/lib$(LIBRARY_NAME).a DYNAMIC_VERSION_MAJOR := 1 DYNAMIC_VERSION_MINOR := 5 -DYNAMIC_VERSION_REVISION := 0 +DYNAMIC_VERSION_REVISION := 1 DYNAMIC_NAME_SHORT := lib$(LIBRARY_NAME).so #DYNAMIC_SONAME_SHORT := $(DYNAMIC_NAME_SHORT).$(DYNAMIC_VERSION_MAJOR) DYNAMIC_VERSIONED_NAME_SHORT := $(DYNAMIC_NAME_SHORT).$(DYNAMIC_VERSION_MAJOR).$(DYNAMIC_VERSION_MINOR).$(DYNAMIC_VERSION_REVISION) -- GitLab