Skip to content

fix bug for serial number with leading 0 #81

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

Closed
peterkty wants to merge 2 commits into from
Closed

fix bug for serial number with leading 0 #81

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
1a7f9ab
fix bug for serial number with leading 0
peterkty Apr 19, 2015
52404b5
fix bug when using acircle
peterkty Apr 19, 2015
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 kinect2_bridge/launch/kinect2_bridge.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<launch>

<arg name="base_name" default="kinect2"/>
<arg name="sensor" default="-1" />
<arg name="sensor" default="" />
<arg name="publish_tf" default="false" />
<arg name="base_name_tf" default="$(arg base_name)" />
<arg name="fps_limit" default="-1.0"/>
Expand Down
8 changes: 1 addition & 7 deletions kinect2_bridge/src/kinect2_bridge.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,6 @@ class Kinect2Bridge
double fps_limit, maxDepth, minDepth;
bool use_png, bilateral_filter, edge_aware_filter;
int32_t jpeg_quality, png_level, queueSize, reg_dev, depth_dev, worker_threads;
double tmp;
std::string depth_method, reg_method, calib_path, sensor;

std::string depthDefault = "cpu";
Expand All @@ -240,7 +239,7 @@ class Kinect2Bridge
#endif

nh.param("base_name", ns, std::string(K2_DEFAULT_NS));
nh.param("sensor", tmp, -1.0);
nh.param("sensor", sensor, std::string(""));
nh.param("fps_limit", fps_limit, -1.0);
nh.param("calib_path", calib_path, std::string(K2_CALIB_PATH));
nh.param("use_png", use_png, false);
Expand All @@ -259,11 +258,6 @@ class Kinect2Bridge
nh.param("base_name_tf", baseNameTF, ns);
nh.param("worker_threads", worker_threads, 4);

if(tmp > 0)
{
sensor = std::to_string((uint64_t)tmp);
}

worker_threads = std::max(1, worker_threads);
threads.resize(worker_threads);

Expand Down
2 changes: 1 addition & 1 deletion kinect2_calibration/src/kinect2_calibration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1152,7 +1152,7 @@ int main(int argc, char **argv)
{
symmetric = arg.find("circle") == 0;
circleBoard = true;
const size_t start = 6;
const size_t start = 6 + (symmetric ? 0 : 1);
const size_t leftX = arg.find('x');
const size_t rightX = arg.rfind('x');
const size_t end = arg.size();
Expand Down