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

Fix CPC/LCCP segmentation examples for VTK 7.1 #2063

Merged
merged 5 commits into from
Nov 9, 2017

Conversation

yongduek
Copy link
Contributor

@yongduek yongduek commented Nov 9, 2017

before VTK 7.1
InsertNextTupleValue
after
InsertNextTypedTuple

This change is required if you use VTK version >= 7.1.

Maintainer edit: fixes #2060.

#if (VTK_MAJOR_VERSION < 7) || (VTK_MAJOR_VERSION==7 && VTK_MINOR_VERSION==0)
        colors->InsertNextTupleValue (color);
        colors->InsertNextTupleValue (color);
#else       
        colors->InsertNextTypedTuple(color);
        colors->InsertNextTypedTuple(color);
#endif
#if (VTK_MAJOR_VERSION < 7) || (VTK_MAJOR_VERSION==7 && VTK_MINOR_VERSION==0)
        colors->InsertNextTupleValue (color);
        colors->InsertNextTupleValue (color);
#else       
        colors->InsertNextTypedTuple(color);
        colors->InsertNextTypedTuple(color);
#endif
#if (VTK_MAJOR_VERSION < 7) || (VTK_MAJOR_VERSION==7 && VTK_MINOR_VERSION==0)
        colors->InsertNextTupleValue (color);
        colors->InsertNextTupleValue (color);
#else       
        colors->InsertNextTypedTuple(color);
        colors->InsertNextTypedTuple(color);
#endif
@@ -489,9 +489,13 @@ CPCSegmentation Parameters: \n\
color = concave_color;

// two times since we add also two points per edge
#if (VTK_MAJOR_VERSION < 7) || (VTK_MAJOR_VERSION==7 && VTK_MINOR_VERSION==0)
Copy link
Member

Choose a reason for hiding this comment

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

Please add spaces around ==

colors->InsertNextTupleValue (color);
colors->InsertNextTupleValue (color);

#else
colors->InsertNextTypedTuple(color);
Copy link
Member

Choose a reason for hiding this comment

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

Please add spaces between function name and brackets

@taketwo taketwo merged commit 6555b9a into PointCloudLibrary:master Nov 9, 2017
@taketwo
Copy link
Member

taketwo commented Nov 9, 2017

Thanks for contributing!

@taketwo taketwo added this to the pcl-1.9.0 milestone Nov 9, 2017
UnaNancyOwen pushed a commit to UnaNancyOwen/pcl that referenced this pull request Nov 24, 2017
@taketwo taketwo changed the title VTK function change since version 7.1 Fix CPC/LCCP segmentation examples for VTK 7.1 Sep 2, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants