Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 934b5ad

Browse files
committed
Merge branch 'paperManu-fix/glog_conflict'
2 parents 36a8749 + 0d9041f commit 934b5ad

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

‎PyOpenPoseLib/OpenPoseWrapper.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@ struct OpenPoseWrapper::PrivateData
2828
PrivateData(const op::Point<int> &netInputSize, const op::Point<int> &netInputSizeFaceAndHands,
2929
const op::Point<int> &outputSize, const op::PoseModel &poseModel,
3030
const std::string &modelFolder, int numScales, float scaleGap, float blendAlpha,
31-
const std::vector<op::HeatMapType> &heatMapTypes, const op::ScaleMode &heatMapScale, int gpuId):
32-
poseExtractorCaffe{poseModel, modelFolder, gpuId, heatMapTypes, heatMapScale},
31+
const std::vector<op::HeatMapType> &heatMapTypes, const op::ScaleMode &heatMapScale, int gpuId, bool logging):
32+
poseExtractorCaffe{poseModel, modelFolder, gpuId, heatMapTypes, heatMapScale, false, logging},
3333
poseRenderer{poseModel, nullptr, 0.05, true, blendAlpha},
3434
scaleAndSizeExtractor{netInputSize, outputSize, numScales, scaleGap},
3535

36-
faceExtractor{netInputSizeFaceAndHands, netInputSizeFaceAndHands, modelFolder, gpuId, heatMapTypes, heatMapScale},
36+
faceExtractor{netInputSizeFaceAndHands, netInputSizeFaceAndHands, modelFolder, gpuId, heatMapTypes, heatMapScale, logging},
3737
faceRenderer{0.4},
3838
faceDetector(poseModel),
3939

4040
handDetector(poseModel),
4141
handRenderer{0.2},
42-
handExtractor{netInputSizeFaceAndHands, netInputSizeFaceAndHands, modelFolder, gpuId, 1, 0.4, heatMapTypes, heatMapScale}
42+
handExtractor{netInputSizeFaceAndHands, netInputSizeFaceAndHands, modelFolder, gpuId, 1, 0.4, heatMapTypes, heatMapScale, logging}
4343

4444
{}
4545

@@ -108,7 +108,7 @@ OpenPoseWrapper::OpenPoseWrapper(const cv::Size &netPoseSize, const cv::Size &ne
108108
membersPtr = std::shared_ptr<PrivateData>(new PrivateData(netInputSize, netInputSizeFaceAndHands,
109109
outputSize, poseModel, modelFolder,
110110
numScales, scaleGap, blendAlpha,
111-
hmt, (op::ScaleMode)scaleMode, gpuId));
111+
hmt, (op::ScaleMode)scaleMode, gpuId, logLevel < 255));
112112

113113
// Step 4 - Initialize resources on desired thread (in this case single thread, i.e. we init resources here)
114114
membersPtr->poseExtractorCaffe.initializationOnThread();

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /