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.

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

Jump to bottom

AddingImages: enable to set beta param if use_data is true #52

Merged
merged 14 commits into from
Mar 26, 2017
Merged

AddingImages: enable to set beta param if use_data is true #52

merged 14 commits into from
Mar 26, 2017

Conversation

k-okada
Copy link
Contributor

@k-okada k-okada commented Mar 19, 2017 •
edited
Loading

addweight

@k-okada k-okada mentioned this pull request Mar 19, 2017
Closed
This was referenced Mar 19, 2017
Closed
Closed
k-okada
k-okada commented Mar 19, 2017
View reviewed changes
src/nodelet/adding_images_nodelet.cpp Outdated
cv::Mat image2 =
cv_bridge::toCvShare(image_msg2, sensor_msgs::image_encodings::BGR8)->image;
cv_bridge::toCvShare(image_msg2, image_msg2->encoding)->image;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we need to assume two input are same encoding.

@wkentaro wkentaro mentioned this pull request Mar 19, 2017
Merged
@wkentaro
Copy link
Member

Need k-okada#1

@wkentaro
Copy link
Member

LGTM

@k-okada
Copy link
Contributor Author

k-okada commented Mar 24, 2017

@wkentaro please check if 3ed06e9 works.

@wkentaro
Copy link
Member

OK

@wkentaro
Support adding images whose encodings are same kind
c380d5e 
- For example adding rgb8 + bgr8

- modified:   src/nodelet/adding_images_nodelet.cpp
@wkentaro
Do dynamic scaling for float/double images
fc1b798 
- src/nodelet/adding_images_nodelet.cpp
@wkentaro
Copy link
Member

We need k-okada#2

k-okada and others added 3 commits March 24, 2017 16:53
@wkentaro
Copy link
Member 

[0m/home/travis/catkin_ws/src/opencv_apps/src/nodelet/adding_images_nodelet.cpp: In member function 'void adding_images::AddingImagesNodelet::do_work(const ConstPtr&, const ConstPtr&, std::string)': �[0m�[0m
/home/travis/catkin_ws/src/opencv_apps/src/nodelet/adding_images_nodelet.cpp:191:11: error: 'CvtColorForDisplayOptions' is not a member of 'cv_bridge' �[0m�[0m
/home/travis/catkin_ws/src/opencv_apps/src/nodelet/adding_images_nodelet.cpp:191:48: error: expected ';' before 'options' �[0m�[0m
/home/travis/catkin_ws/src/opencv_apps/src/nodelet/adding_images_nodelet.cpp:195:13: error: 'options' was not declared in this scope �[0m�[0m
/home/travis/catkin_ws/src/opencv_apps/src/nodelet/adding_images_nodelet.cpp:197:36: error: 'cvtColorForDisplay' is not a member of 'cv_bridge' �[0m�[0m
/home/travis/catkin_ws/src/opencv_apps/src/nodelet/adding_images_nodelet.cpp:197:104: error: 'options' was not declared in this scope �[0m�[0m
make[2]: *** [CMakeFiles/opencv_apps.dir/src/nodelet/adding_images_nodelet.cpp.o] Error 1 �[0m�[0m
make[1]: *** [CMakeFiles/opencv_apps.dir/all] Error 2 �[0m�[0m

@wkentaro
Copy link
Member

cvtColorForDisplay is also unsupported..

@k-okada k-okada merged commit 8b34651 into ros-perception:indigo Mar 26, 2017
@k-okada k-okada deleted the add_image_beta branch March 26, 2017 06:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@k-okada @wkentaro