Skip to content

Commit 13dd4a9

Browse files
JsonOfStream working again
1 parent 54635dd commit 13dd4a9

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

src/openpose/filestream/cocoJsonSaver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ namespace op
128128
{
129129
if (numberBodyParts == 135)
130130
{
131-
indexesInCocoOrder = std::vector<int>(70);
131+
indexesInCocoOrder = std::vector<int>(68);
132132
std::iota(indexesInCocoOrder.begin(), indexesInCocoOrder.end(), F135);
133133
}
134134
}

src/openpose/filestream/jsonOfstream.cpp

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -76,19 +76,22 @@ namespace op
7676
{
7777
try
7878
{
79+
// Moved(std::unique_ptr) will be a nullptr in the old one
7980
if (upOfstream != nullptr)
81+
{
8082
enterAndTab(*upOfstream, mHumanReadable, mBracesCounter, mBracketsCounter);
8183

82-
if (mBracesCounter != 0 || mBracketsCounter != 0)
83-
{
84-
std::string errorMessage = "Json file wronly generated";
85-
if (mBracesCounter != 0)
86-
errorMessage += ", number \"{\" != number \"}\": " + std::to_string(mBracesCounter) + ".";
87-
else if (mBracketsCounter != 0)
88-
errorMessage += ", number \"[\" != number \"]\": " + std::to_string(mBracketsCounter) + ".";
89-
else
90-
errorMessage += ".";
91-
error(errorMessage, __LINE__, __FUNCTION__, __FILE__);
84+
if (mBracesCounter != 0 || mBracketsCounter != 0)
85+
{
86+
std::string errorMessage = "Json file wronly generated";
87+
if (mBracesCounter != 0)
88+
errorMessage += ", number \"{\" != number \"}\": " + std::to_string(mBracesCounter) + ".";
89+
else if (mBracketsCounter != 0)
90+
errorMessage += ", number \"[\" != number \"]\": " + std::to_string(mBracketsCounter) + ".";
91+
else
92+
errorMessage += ".";
93+
error(errorMessage, __LINE__, __FUNCTION__, __FILE__);
94+
}
9295
}
9396
}
9497
catch (const std::exception& e)

0 commit comments

Comments
 (0)