Skip to content
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.

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

Ros2 devel #90

Open
wants to merge 27 commits into
base: ros2
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
successful partial build
  • Loading branch information
pmusau17 committed Jul 20, 2021
commit d3cbb1e596af9d1de3a19c6fca506cc9d717d7e9
12 changes: 7 additions & 5 deletions ar_track_alvar/src/CvTestbed.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -135,30 +135,32 @@ size_t CvTestbed::SetImage(const char *title, cv::Mat *ipl, bool release_at_exit
// if (images[index].release_at_exit) {
// cvReleaseImage(&(images[index]));
// }
images[index] = ipl;
images[index].ipl = ipl;
// images[index].release_at_exit = release_at_exit;
return index;
}

cv::Mat *CvTestbed::CreateImage(const char *title, cv::Size size, int type) {
cv::Mat *ipl=cv::Mat::zeros((size,type);
cv::Mat temp = cv::Mat::zeros(size,type);
cv::Mat *ipl = &temp;
if (!ipl) return NULL;
SetImage(title, ipl, true);
return ipl;
}

cv::Mat *CvTestbed::CreateImageWithProto(const char *title, cv::Mat *proto, int depth /* =0 */, int channels /* =0 */) {
cv::Mat *ipl= cv::Mat::zeros(cv::Size(proto->cols, proto->rows), proto.type);
cv::Mat temp = cv::Mat::zeros(cv::Size(proto->cols, proto->rows), proto->type());
cv::Mat *ipl= &temp;
if (!ipl) return NULL;
ipl->origin = proto->origin;
//ipl->origin = proto->origin;
SetImage(title, ipl, true);
return ipl;
}

cv::Mat *CvTestbed::GetImage(size_t index) {
if (index < 0) return NULL;
if (index >= images.size()) return NULL;
return images[index];
return images[index].ipl;
}

size_t CvTestbed::GetImageIndex(const char *title) {
Expand Down
2 changes: 1 addition & 1 deletion ar_track_alvar/src/Line.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ using namespace std;
namespace alvar {
using namespace std;

Line::Line(float params[4])
Line::Line(cv::Vec4f params)
{
c.x = params[2];
c.y = params[3];
Expand Down