Skip to content

various fixes #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fmessmer merged 2 commits into from
Dec 12, 2019
Merged

various fixes #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ea7cb5
removed unused Boost signals dependency
fmessmer Dec 11, 2019
a9947fb
fix -Wswitch-bool warning
fmessmer Dec 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cob_people_detection/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ find_package(catkin REQUIRED COMPONENTS
${catkin_BUILD_PACKAGES}
)

find_package(Boost REQUIRED COMPONENTS signals system filesystem)
find_package(Boost REQUIRED COMPONENTS system filesystem)
find_package(OpenCV REQUIRED)
#find_package(orocos_kdl REQUIRED)
#find_package(PCL REQUIRED)
Expand Down
15 changes: 4 additions & 11 deletions cob_people_detection/common/src/munkres/munkres.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,12 +572,8 @@ bool munkres::step5(int r, int c)
//create our sequence
while (!done)
{
switch (looking_for_star)
if (looking_for_star)
{

//if we're looking for a star
case true:

//special case protection
a = r;

Expand Down Expand Up @@ -611,11 +607,9 @@ bool munkres::step5(int r, int c)
//we can't do this earlier due to needing to check for stars in the column
//mark the column as starred
column_starred[c] = true;
break;

//if we're looking for a prime
case false:

}
else
{
//prime current index
cell_array[r][c].primed = false;
//unstar current index
Expand All @@ -630,7 +624,6 @@ bool munkres::step5(int r, int c)

//set case to look for star next
looking_for_star = true;
break;
}
}

Expand Down