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

Fix type narrowing error with clang; adding gitignores #7

Merged
merged 4 commits into from
Nov 29, 2015
Merged

Fix type narrowing error with clang; adding gitignores #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
185bcaf
type narrowing error with clang.
autosquid Nov 29, 2015
79e7487
type narrowing error with clang.
autosquid Nov 29, 2015
8b00619
type narrowing error with clang.
autosquid Nov 29, 2015
9f1f12a
ignore cmakelist.txt.ser and build dir.
autosquid Nov 29, 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: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
build/*
*.user
4 changes: 3 additions & 1 deletion basevh.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -854,7 +854,9 @@ void BaseVH::displayContour3D( std::vector< std::vector< cv::Point2f > > contour

edgePolyData->InsertNextCell( VTK_LINE , cell );

const unsigned char _color[] = { colorVecs[ ee1 ][ ee2 ][ 0 ] , colorVecs[ ee1 ][ ee2 ][ 1 ] , colorVecs[ ee1 ][ ee2 ][ 2 ]};
const unsigned char _color[] = { (unsigned char) colorVecs[ ee1 ][ ee2 ][ 0 ] ,
(unsigned char) colorVecs[ ee1 ][ ee2 ][ 1 ] ,
(unsigned char) colorVecs[ ee1 ][ ee2 ][ 2 ]};

colors->InsertNextTupleValue(_color);
}
Expand Down
6 changes: 5 additions & 1 deletion display3droutines.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,11 @@ void Display3DRoutines::displayPointSet(std::vector< Eigen::Vector3d >& vertices

for (int vv = 0; vv < numVerts; vv++)
{
unsigned char col[] = { colors[vv](0) * 255, colors[vv](1) * 255, colors[vv](2) * 255 };
unsigned char col[] = {(unsigned char) (colors[vv](0) * 255),
(unsigned char) (colors[vv](1) * 255),
(unsigned char) (colors[vv](2) * 255) };



vColors->InsertNextTupleValue(col);

Expand Down
4 changes: 3 additions & 1 deletion epvh.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2569,7 +2569,9 @@ namespace tr{

edgePolyData->InsertNextCell( VTK_LINE , cell );

const unsigned char _color[] = { colorVecs[ ee1 ][ ee2 ][ 0 ] , colorVecs[ ee1 ][ ee2 ][ 1 ] , colorVecs[ ee1 ][ ee2 ][ 2 ]};
const unsigned char _color[] = { (unsigned char)colorVecs[ ee1 ][ ee2 ][ 0 ] ,
(unsigned char) colorVecs[ ee1 ][ ee2 ][ 1 ] ,
(unsigned char) colorVecs[ ee1 ][ ee2 ][ 2 ]};

colors->InsertNextTupleValue(_color);
}
Expand Down