Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
活在明天
openpose
提交
a13b9631
O
openpose
项目概览
活在明天
/
openpose
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
openpose
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
a13b9631
编写于
1月 11, 2021
作者:
G
Gines Hidalgo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed Ubuntu compilation issues
Signed-off-by:
N
Gines Hidalgo
<
gineshidalgo99@gmail.com
>
上级
89e6767a
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
9 addition
and
11 deletion
+9
-11
examples/tests/handFromJsonTest.cpp
examples/tests/handFromJsonTest.cpp
+4
-3
examples/tests/wrapperHandFromJsonTest.hpp
examples/tests/wrapperHandFromJsonTest.hpp
+2
-3
include/openpose/utilities/flagsToOpenPose.hpp
include/openpose/utilities/flagsToOpenPose.hpp
+2
-2
include/openpose/wrapper/wrapperAuxiliary.hpp
include/openpose/wrapper/wrapperAuxiliary.hpp
+1
-2
src/openpose/core/scaleAndSizeExtractor.cpp
src/openpose/core/scaleAndSizeExtractor.cpp
+0
-1
未找到文件。
examples/tests/handFromJsonTest.cpp
浏览文件 @
a13b9631
...
...
@@ -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.15
f
,
op
::
RenderMode
::
None
,
op
::
PoseModel
::
BODY_25
,
true
,
0.
f
,
0.
f
,
0
,
"models/"
,
{},
op
::
ScaleMode
::
ZeroToOneFixedAspect
,
false
,
0.05
f
,
-
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.15
f
,
op
::
RenderMode
::
None
,
op
::
PoseModel
::
BODY_25
,
true
,
0.
f
,
0.
f
,
0
,
"models/"
,
{},
op
::
ScaleMode
::
ZeroToOneFixedAspect
,
false
,
0.05
f
,
-
1
,
false
};
wrapperStructPose
.
modelFolder
=
op
::
String
(
FLAGS_model_folder
);
// Hand configuration (use op::WrapperStructHand{} to disable it)
const
op
::
WrapperStructHand
wrapperStructHand
{
...
...
examples/tests/wrapperHandFromJsonTest.hpp
浏览文件 @
a13b9631
...
...
@@ -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
...
...
include/openpose/utilities/flagsToOpenPose.hpp
浏览文件 @
a13b9631
...
...
@@ -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
);
}
...
...
include/openpose/wrapper/wrapperAuxiliary.hpp
浏览文件 @
a13b9631
...
...
@@ -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
...
...
src/openpose/core/scaleAndSizeExtractor.cpp
浏览文件 @
a13b9631
...
...
@@ -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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录