diff --git a/CMakeLists.txt b/CMakeLists.txt index 53463f9c..0e269073 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 1) +set(OpenPose_VERSION_MINOR 6) +set(OpenPose_VERSION_PATCH 0) 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 a692d188..fcac086a 100644 --- a/doc/release_notes.md +++ b/doc/release_notes.md @@ -383,7 +383,7 @@ OpenPose Library - Release Notes -## Current version - Future OpenPose 1.6.0 +## OpenPose 1.6.0 (Apr 26, 2020) 1. Main improvements: 1. Multi-camera (3D) working on Asynchronous mode. 1. Functions `WrapperT::waitAndEmplace()` and `WrapperT::tryEmplace()` improved, allowing multi-camera/3-D (`TDatums` of size > 1). @@ -411,6 +411,13 @@ OpenPose Library - Release Notes 1. All or some skeletons were not properly displayed or completely missing on images with many people (e.g., videos with about 32 people). 2. All or some skeletons were not properly displayed or completely missing on images where the multiplication of people and image resolution was too big (e.g., videos with about 32 people on 4k resolution). 3. Flag `output_resolution` was not working with GPU resize, redirected to CPU in those cases. + + + +## Current version - Future OpenPose 1.6.1 +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 337aa275..b7a32067 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.1 - Tutorial Python API", datum.cvOutputData) + cv2.imshow("OpenPose 1.6.0 - 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 d1e70b5d..77766713 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.1 - Tutorial Python API", datum.cvOutputData) + cv2.imshow("OpenPose 1.6.0 - 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 f37a0a03..f9f9dfc5 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.1 - Tutorial Python API", datum.cvOutputData) + cv2.imshow("OpenPose 1.6.0 - 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 59f0b44b..a99995eb 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.1 - Tutorial Python API", datum.cvOutputData) + cv2.imshow("OpenPose 1.6.0 - 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 c1f572bd..40387e49 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.1 - Tutorial Python API", datum.cvOutputData) + cv2.imshow("OpenPose 1.6.0 - 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 fab69535..5227bf5c 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.1 - Tutorial Python API", datum.cvOutputData) + cv2.imshow("OpenPose 1.6.0 - 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 66ed3d39..9f0ced11 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.1 - Tutorial Python API", combined) + cv2.imshow("OpenPose 1.6.0 - 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 d9faa68c..35fdbd54 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.1 - Tutorial Python API", datum.cvOutputData) + cv2.imshow("OpenPose 1.6.0 - 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 0938acb7..c9ce1f54 100644 --- a/include/openpose/core/macros.hpp +++ b/include/openpose/core/macros.hpp @@ -10,7 +10,7 @@ // OpenPose name and version const std::string OPEN_POSE_NAME_STRING = "OpenPose"; -const std::string OPEN_POSE_VERSION_STRING = "1.5.1"; +const std::string OPEN_POSE_VERSION_STRING = "1.6.0"; 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 100770f3..dc55fcf9 100644 --- a/scripts/ubuntu/Makefile.example +++ b/scripts/ubuntu/Makefile.example @@ -33,8 +33,8 @@ LIBRARY_NAME := $(PROJECT) 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 := 1 +DYNAMIC_VERSION_MINOR := 6 +DYNAMIC_VERSION_REVISION := 0 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)