提交 a13b9631 编写于 作者: G Gines Hidalgo

Fixed Ubuntu compilation issues

Signed-off-by: NGines Hidalgo <gineshidalgo99@gmail.com>
上级 89e6767a
......@@ -50,9 +50,10 @@ int handFromJsonTest()
op::WrapperHandFromJsonTest<op::Datum> opWrapper;
// Pose configuration (use WrapperStructPose{} for default and recommended configuration)
op::WrapperStructPose wrapperStructPose{
op::PoseMode::Disabled, op::flagsToPoint("656x368"), op::flagsToPoint("1280x720"), op::ScaleMode::InputResolution,
FLAGS_num_gpu, FLAGS_num_gpu_start, 1, 0.15f, op::RenderMode::None, op::PoseModel::BODY_25, true, 0.f, 0.f,
0, "models/", {}, op::ScaleMode::ZeroToOneFixedAspect, false, 0.05f, -1, false};
op::PoseMode::Disabled, op::flagsToPoint("656x368", "?x?"), -1.0, op::flagsToPoint("1280x720", "?x?"),
op::ScaleMode::InputResolution, FLAGS_num_gpu, FLAGS_num_gpu_start, 1, 0.15f, op::RenderMode::None,
op::PoseModel::BODY_25, true, 0.f, 0.f, 0, "models/", {}, op::ScaleMode::ZeroToOneFixedAspect, false,
0.05f, -1, false};
wrapperStructPose.modelFolder = op::String(FLAGS_model_folder);
// Hand configuration (use op::WrapperStructHand{} to disable it)
const op::WrapperStructHand wrapperStructHand{
......
......@@ -183,9 +183,8 @@ namespace op
// Get input scales and sizes
const auto scaleAndSizeExtractor = std::make_shared<ScaleAndSizeExtractor>(
wrapperStructPose.netInputSize, finalOutputSize, wrapperStructPose.scalesNumber,
wrapperStructPose.scaleGap
);
wrapperStructPose.netInputSize, (float)wrapperStructPose.netInputSizeDynamicBehavior, finalOutputSize,
wrapperStructPose.scalesNumber, wrapperStructPose.scaleGap);
spWScaleAndSizeExtractor = std::make_shared<WScaleAndSizeExtractor<TDatumsPtr>>(scaleAndSizeExtractor);
// Input cvMat to OpenPose format
......
......@@ -39,8 +39,8 @@ namespace op
OP_API DisplayMode flagsToDisplayMode(const int display, const bool enabled3d);
/**
* E.g., const auto netInputSize = flagsToPoint(op::String(FLAGS_net_resolution), "-1x368");
* E.g., const Point<int> resolution = flagsToPoint(resolutionString, "-1280x720");
* E.g., const Point<int> netInputSize = flagsToPoint(op::String(FLAGS_net_resolution), "-1x368");
* E.g., const Point<int> resolution = flagsToPoint(resolutionString, "1280x720");
*/
OP_API Point<int> flagsToPoint(const String& pointString, const String& pointExample);
}
......
......@@ -291,8 +291,7 @@ namespace op
// Get input scales and sizes
const auto scaleAndSizeExtractor = std::make_shared<ScaleAndSizeExtractor>(
wrapperStructPose.netInputSize, (float)wrapperStructPose.netInputSizeDynamicBehavior, finalOutputSize,
wrapperStructPose.scalesNumber, wrapperStructPose.scaleGap
);
wrapperStructPose.scalesNumber, wrapperStructPose.scaleGap);
scaleAndSizeExtractorW = std::make_shared<WScaleAndSizeExtractor<TDatumsSP>>(scaleAndSizeExtractor);
// Input cvMat to OpenPose input & output format
......
......@@ -59,7 +59,6 @@ namespace op
else // if (poseNetInputSize.y <= 0)
poseNetInputSize.y = 16 * positiveIntRound(1 / 16.f *
fastMin(poseNetInputSize.x * mNetInputResolutionDynamicBehavior * 9.f / 16.f, poseNetInputSize.x * inputResolution.y / (float)inputResolution.x));
poseNetInputSize.y = 16 * positiveIntRound(1 / 16.f * poseNetInputSize.x * inputResolution.y / (float)inputResolution.x);
}
else // No mNetInputResolutionDynamicBehavior behavior
{
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册