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

Suppress Nurbs warnings #3345

Merged
merged 14 commits into from
Oct 30, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
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
60 changes: 32 additions & 28 deletions surface/include/pcl/surface/3rdparty/opennurbs/opennurbs_archive.h
Original file line number Diff line number Diff line change
Expand Up @@ -890,11 +890,11 @@ class ON_CLASS ON_BinaryArchive // use for generic serialization of binary data
bool ReadBool( bool* );

bool ReadChar( // Read an array of 8 bit chars
size_t, // number of chars to read
std::size_t, // number of chars to read
char*
);
bool ReadChar( // Read an array of 8 bit unsigned chars
size_t, // number of unsigned chars to read
std::size_t, // number of unsigned chars to read
unsigned char*
);
bool ReadChar( // Read a single 8 bit char
Expand All @@ -905,11 +905,11 @@ class ON_CLASS ON_BinaryArchive // use for generic serialization of binary data
);

bool ReadShort( // Read an array of 16 bit shorts
size_t, // number of shorts to read
std::size_t, // number of shorts to read
short*
);
bool ReadShort( // Read an array of 16 bit unsigned shorts
size_t, // number of shorts to read
std::size_t, // number of shorts to read
unsigned short*
);
bool ReadShort( // Read a single 16 bit short
Expand All @@ -920,11 +920,11 @@ class ON_CLASS ON_BinaryArchive // use for generic serialization of binary data
);

bool ReadInt( // Read an array of 32 bit integers
size_t, // number of ints to read
std::size_t, // number of ints to read
int*
);
bool ReadInt( // Read an array of 32 bit integers
size_t, // number of ints to read
std::size_t, // number of ints to read
unsigned int*
);
bool ReadInt( // Read a single 32 bit integer
Expand All @@ -935,11 +935,11 @@ class ON_CLASS ON_BinaryArchive // use for generic serialization of binary data
);

bool ReadBigInt( // Read an array of 64 bit integers
size_t, // number of ints to read
std::size_t, // number of ints to read
ON__INT64*
);
bool ReadBigInt( // Read an array of 64 bit integers
size_t, // number of ints to read
std::size_t, // number of ints to read
ON__UINT64*
);
bool ReadBigInt( // Read a single 64 bit integer
Expand All @@ -950,11 +950,11 @@ class ON_CLASS ON_BinaryArchive // use for generic serialization of binary data
);

bool ReadLong( // Read an array of 32 bit integers
size_t, // number of ints to read
std::size_t, // number of ints to read
long*
);
bool ReadLong( // Read an array of 32 bit integers
size_t, // number of ints to read
std::size_t, // number of ints to read
unsigned long*
);
bool ReadLong( // Read a single 32 bit integer
Expand All @@ -964,7 +964,7 @@ class ON_CLASS ON_BinaryArchive // use for generic serialization of binary data
unsigned long*
);
bool ReadSize( // Read a single std::size_t
size_t*
std::size_t*
);

bool ReadBigSize( std::size_t* ); // 64 bits
Expand All @@ -973,14 +973,14 @@ class ON_CLASS ON_BinaryArchive // use for generic serialization of binary data


bool ReadFloat( // Read an array of floats
size_t, // number of floats
std::size_t, // number of floats
float*
);
bool ReadFloat( // Read a single float
float*
);
bool ReadDouble( // Read an array of IEEE doubles
size_t, // number of doubles
std::size_t, // number of doubles
double*
);
bool ReadDouble( // Read a single double
Expand Down Expand Up @@ -1173,11 +1173,11 @@ class ON_CLASS ON_BinaryArchive // use for generic serialization of binary data
bool WriteBool( bool );

bool WriteChar( // Write an array of 8 bit chars
size_t, // number of chars to write
std::size_t, // number of chars to write
const char*
);
bool WriteChar( // Write an array of 8 bit unsigned chars
size_t, // number of unsigned chars to write
std::size_t, // number of unsigned chars to write
const unsigned char*
);
bool WriteChar( // Write a single 8 bit char
Expand All @@ -1188,11 +1188,11 @@ class ON_CLASS ON_BinaryArchive // use for generic serialization of binary data
);

bool WriteShort( // Write an array of 16 bit shorts
size_t, // number of shorts to write
std::size_t, // number of shorts to write
const short*
);
bool WriteShort( // Write an array of 16 bit unsigned shorts
size_t, // number of shorts to write
std::size_t, // number of shorts to write
const unsigned short*
);
bool WriteShort( // Write a single 16 bit short
Expand All @@ -1203,11 +1203,11 @@ class ON_CLASS ON_BinaryArchive // use for generic serialization of binary data
);

bool WriteInt( // Write an array of 32 bit integers
size_t, // number of ints to write
std::size_t, // number of ints to write
const int*
);
bool WriteInt( // Write an array of 32 bit integers
size_t, // number of ints to write
std::size_t, // number of ints to write
const unsigned int*
);
bool WriteInt( // Write a single 32 bit integer
Expand All @@ -1218,11 +1218,11 @@ class ON_CLASS ON_BinaryArchive // use for generic serialization of binary data
);

bool WriteBigInt( // Write an array of 64 bit integers
size_t, // number of ints to write
std::size_t, // number of ints to write
const ON__INT64*
);
bool WriteBigInt( // Write an array of 64 bit integers
size_t, // number of ints to write
std::size_t, // number of ints to write
const ON__UINT64*
);
bool WriteBigInt( // Write a single 64 bit integer
Expand All @@ -1233,11 +1233,11 @@ class ON_CLASS ON_BinaryArchive // use for generic serialization of binary data
);

bool WriteLong( // Write an array of 32 bit integers
size_t, // number of ints to write
std::size_t, // number of ints to write
const long*
);
bool WriteLong( // Write an array of 32 bit integers
size_t, // number of ints to write
std::size_t, // number of ints to write
const unsigned long*
);
bool WriteLong( // Write a single 32 bit integer
Expand All @@ -1247,15 +1247,15 @@ class ON_CLASS ON_BinaryArchive // use for generic serialization of binary data
unsigned long
);
bool WriteSize( // Write a single std::size_t
size_t
std::size_t
);

bool WriteBigSize( std::size_t ); // 64 bits

bool WriteBigTime( time_t ); // UCT seconds since 1 January 1970 (64 bits)

bool WriteFloat( // Write a number of IEEE floats
size_t, // number of doubles
std::size_t, // number of doubles
const float*
);
bool WriteFloat( // Write a single float
Expand Down Expand Up @@ -2485,6 +2485,7 @@ class ON_CLASS ON_BinaryArchive // use for generic serialization of binary data
bool Flush() = 0;

/*
Applications (like Rhino) override this function to load plug-ins
Description:
When ON_BinaryArchive::ReadObject() encounters userdata and
the user data class id is not present, LoadUserDataApplication
Expand All @@ -2495,9 +2496,12 @@ class ON_CLASS ON_BinaryArchive // use for generic serialization of binary data
2 - the application was already loaded
*/
virtual
int LoadUserDataApplication(
ON_UUID application_id
);
int LoadUserDataApplication(
ON_UUID /*application_id*/
)
{
return 0;
}

bool SetArchive3dmVersion(int);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ class ON_CLASS ON_DecodeBase64

// Returns true if an error occured during decoding because
// invalid input was passed to Decode().
const bool Error() const;
bool Error() const;

private:
int m_status; // 1: error - decoding stopped
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ bool ON_SimpleFixedSizePool<T>::Create(
}

template <class T>
size_t ON_SimpleFixedSizePool<T>::SizeofElement() const
std::size_t ON_SimpleFixedSizePool<T>::SizeofElement() const
{
return ON_FixedSizePool::SizeofElement();
}
Expand Down Expand Up @@ -68,13 +68,13 @@ void ON_SimpleFixedSizePool<T>::Destroy()
}

template <class T>
size_t ON_SimpleFixedSizePool<T>::ActiveElementCount() const
std::size_t ON_SimpleFixedSizePool<T>::ActiveElementCount() const
{
return ON_FixedSizePool::ActiveElementCount();
}

template <class T>
size_t ON_SimpleFixedSizePool<T>::TotalElementCount() const
std::size_t ON_SimpleFixedSizePool<T>::TotalElementCount() const
{
return ON_FixedSizePool::TotalElementCount();
}
Expand Down
10 changes: 5 additions & 5 deletions surface/include/pcl/surface/3rdparty/opennurbs/opennurbs_light.h
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,11 @@ class ON_CLASS ON_Light : public ON_Geometry
void SetStyle(ON::light_style);
ON::light_style Style() const;

const ON_BOOL32 IsPointLight() const;
const ON_BOOL32 IsDirectionalLight() const;
const ON_BOOL32 IsSpotLight() const;
const ON_BOOL32 IsLinearLight() const;
const ON_BOOL32 IsRectangularLight() const;
ON_BOOL32 IsPointLight() const;
ON_BOOL32 IsDirectionalLight() const;
ON_BOOL32 IsSpotLight() const;
ON_BOOL32 IsLinearLight() const;
ON_BOOL32 IsRectangularLight() const;

ON::coordinate_system CoordinateSystem() const; // determined by style

Expand Down
3 changes: 3 additions & 0 deletions surface/include/pcl/surface/on_nurbs/fitting_surface_pdm.h
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,9 @@ namespace pcl
*/
FittingSurface (int order, NurbsDataSurface *data, Eigen::Vector3d z = Eigen::Vector3d (0.0, 0.0, 1.0));

/** \brief Default virtual destructor */
virtual ~FittingSurface() = default;

/** \brief Refines surface by inserting a knot in the middle of each element.
* \param[in] dim dimension of refinement (0,1)
*/
Expand Down
6 changes: 3 additions & 3 deletions surface/src/3rdparty/opennurbs/opennurbs_3dm_settings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,7 @@ ON_3dmAnnotationSettings& ON_3dmAnnotationSettings::operator=(const ON_3dmAnnota
return *this;
}

void ON_3dmAnnotationSettings::Dump( ON_TextLog& text_log ) const
void ON_3dmAnnotationSettings::Dump( ON_TextLog& ) const
{
// TODO
}
Expand Down Expand Up @@ -966,7 +966,7 @@ ON_3dmConstructionPlane& ON_3dmConstructionPlane::operator=(const ON_3dmConstruc
}
*/

void ON_3dmConstructionPlane::Dump( ON_TextLog& text_log ) const
void ON_3dmConstructionPlane::Dump( ON_TextLog& ) const
{
// TODO
}
Expand Down Expand Up @@ -1056,7 +1056,7 @@ ON_3dmConstructionPlaneGridDefaults& ON_3dmConstructionPlaneGridDefaults::operat
return *this;
}

void ON_3dmConstructionPlaneGridDefaults::Dump(ON_TextLog& text_log) const
void ON_3dmConstructionPlaneGridDefaults::Dump(ON_TextLog&) const
{
// TODO
}
Expand Down
2 changes: 1 addition & 1 deletion surface/src/3rdparty/opennurbs/opennurbs_annotation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ ON_Annotation::ON_Annotation()
Create();
}

ON_Annotation::ON_Annotation(const ON_Annotation& src)
ON_Annotation::ON_Annotation(const ON_Annotation& src) : ON_Geometry(src)
{
Create();
*this = src;
Expand Down
39 changes: 21 additions & 18 deletions surface/src/3rdparty/opennurbs/opennurbs_annotation2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ void ON_TextExtra::SetDefaults()
m_border_offset = 0.1;
}

void ON_TextExtra::Dump( ON_TextLog& text_log ) const
void ON_TextExtra::Dump( ON_TextLog& ) const
{
// do nothing
}
Expand Down Expand Up @@ -278,7 +278,7 @@ void ON_DimensionExtra::SetDefaults()
m_modelspace_basepoint = ON_origin;
}

void ON_DimensionExtra::Dump( ON_TextLog& text_log ) const
void ON_DimensionExtra::Dump( ON_TextLog& ) const
{
// do nothing
}
Expand Down Expand Up @@ -3081,7 +3081,7 @@ ON_AngularDimension2Extra::~ON_AngularDimension2Extra()
{
}

void ON_AngularDimension2Extra::Dump( ON_TextLog& text_log ) const
void ON_AngularDimension2Extra::Dump( ON_TextLog& ) const
{
// do nothing
}
Expand Down Expand Up @@ -5820,13 +5820,14 @@ void ON_Annotation2Text::SetText(const wchar_t* s)

// SDKBREAK Oct 30, 07 - LW
// This function should not be used any longer
[[deprecated("Use the version that takes a model transform argument")]]
bool ON_Annotation2::GetTextXform(
ON_RECT gdi_text_rect,
const ON_Font& font,
const ON_DimStyle& dimstyle,
double dimscale,
const ON_Viewport* vp,
ON_Xform& xform
ON_RECT /*gdi_text_rect*/,
kunaltyagi marked this conversation as resolved.
Show resolved Hide resolved
const ON_Font& /*font*/,
const ON_DimStyle& /*dimstyle*/,
double /*dimscale*/,
const ON_Viewport* /*vp*/,
ON_Xform& /*xform*/
) const
{
ON_ERROR("This function should not be used. Use the version that takes a model transform argument.");
Expand Down Expand Up @@ -5859,6 +5860,7 @@ bool ON_Annotation2::GetTextXform(
// New function added Oct 30, 07 - LW
// To use model xform to draw annotation in blocks correctly
#if 0
[[deprecated("Use the version that takes a dimstyle pointer")]]
bool ON_Annotation2::GetTextXform(
ON_RECT gdi_text_rect,
const ON_Font& font,
Expand Down Expand Up @@ -5987,16 +5989,17 @@ static bool GetLeaderEndAndDirection( const ON_Annotation2* pAnn,

// SDKBREAK Oct 30, 07 - LW
// This function should not be used any longer
[[deprecated("Use the version that takes a model transform argument")]]
bool ON_Annotation2::GetTextXform(
ON_RECT gdi_text_rect,
int gdi_height_of_I,
double dimstyle_textheight,
double dimstyle_textgap,
ON::eTextDisplayMode dimstyle_textalignment,
double dimscale,
ON_3dVector cameraX,
ON_3dVector cameraY,
ON_Xform& xform
ON_RECT /*gdi_text_rect*/,
int /*gdi_height_of_I*/,
double /*dimstyle_textheight*/,
double /*dimstyle_textgap*/,
ON::eTextDisplayMode /*dimstyle_textalignment*/,
double /*dimscale*/,
ON_3dVector /*cameraX*/,
ON_3dVector /*cameraY*/,
ON_Xform& /*xform*/
) const
{
ON_ERROR("This function should not be used. Use the version that takes a model transform argument.");
Expand Down
Loading