From 59a7365c6ca8008c3839abf9f83eb462a1d50bbc Mon Sep 17 00:00:00 2001 From: Gines Hidalgo Date: Sun, 10 Nov 2019 00:51:05 -0500 Subject: [PATCH] Updated flagsToOpenPose --- src/openpose/utilities/flagsToOpenPose.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/openpose/utilities/flagsToOpenPose.cpp b/src/openpose/utilities/flagsToOpenPose.cpp index 682ae9b6..091d2fbe 100644 --- a/src/openpose/utilities/flagsToOpenPose.cpp +++ b/src/openpose/utilities/flagsToOpenPose.cpp @@ -91,13 +91,13 @@ namespace op else if (keypointScaleMode == 4) return ScaleMode::PlusMinusOne; else if (keypointScaleMode == 5) - return ScaleMode::ZeroToOneAspectRatio; + return ScaleMode::ZeroToOneFixedAspect; else if (keypointScaleMode == 6) - return ScaleMode::PlusMinusOneAspectRatio; + return ScaleMode::PlusMinusOneFixedAspect; // else const std::string message = "Integer does not correspond to any scale mode: set to (0, 1, 2, 3, 4, 5, 6)" " for (InputResolution, NetOutputResolution, OutputResolution, ZeroToOne," - " PlusMinusOne, ZeroToOneAspectRatio, PlusMinusOneAspectRatio)," + " PlusMinusOne, ZeroToOneFixedAspect, PlusMinusOneFixedAspect)," " respectively."; error(message, __LINE__, __FUNCTION__, __FILE__); return ScaleMode::InputResolution; @@ -123,20 +123,20 @@ namespace op else if (heatMapScaleMode == 3) return ScaleMode::NoScale; else if (heatMapScaleMode == 4) - return ScaleMode::ZeroToOneAspectRatio; + return ScaleMode::ZeroToOneFixedAspect; else if (heatMapScaleMode == 5) - return ScaleMode::PlusMinusOneAspectRatio; + return ScaleMode::PlusMinusOneFixedAspect; // else const std::string message = "Integer does not correspond to any scale mode: set to (0, 1, 2, 3, 4, 5)" - " for (PlusMinusOne, ZeroToOne, UnsignedChar, NoScale, PlusMinusOneAspectRatio," - " ZeroToOneAspectRatio), respectively."; + " for (PlusMinusOne, ZeroToOne, UnsignedChar, NoScale, PlusMinusOneFixedAspect," + " ZeroToOneFixedAspect), respectively."; error(message, __LINE__, __FUNCTION__, __FILE__); - return ScaleMode::PlusMinusOneAspectRatio; + return ScaleMode::PlusMinusOneFixedAspect; } catch (const std::exception& e) { error(e.what(), __LINE__, __FUNCTION__, __FILE__); - return ScaleMode::PlusMinusOneAspectRatio; + return ScaleMode::PlusMinusOneFixedAspect; } } -- GitLab