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

E57SimpleWriter: remove deprecation notices #284

Merged
merged 1 commit into from
Apr 20, 2024
Merged
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
38 changes: 9 additions & 29 deletions include/E57SimpleWriter.h
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,7 @@ namespace e57
/// before making this call.
/// @param [in,out] image2DHeader header metadata
/// @return Returns the image2D index
/// @deprecated Will be removed in 4.0. Use WriteImage2DData(Image2D
/// &,Image2DType,Image2DProjection,int64_t,void
/// *,int64_t) instead.
[[deprecated( "Will be removed in 4.0. Use WriteImage2DData()." )]] // TODO Remove in 4.0
int64_t
NewImage2D( Image2D &image2DHeader );
int64_t NewImage2D( Image2D &image2DHeader );

/// @brief Writes the actual image data
/// @param [in] imageIndex picture block index given by the NewImage2D
Expand All @@ -113,16 +108,9 @@ namespace e57
/// @param [in] start position in the block to start writing
/// @param [in] count size of desired chunk or buffer size
/// @return Returns the number of bytes written
/// @deprecated Will be removed in 4.0. Use WriteImage2DData(Image2D
/// &,Image2DType,Image2DProjection,int64_t,void
/// *,int64_t) instead.
[[deprecated( "Will be removed in 4.0. Use WriteImage2DData(Image2D "
"&,Image2DType,Image2DProjection,int64_t,void "
"*,int64_t)." )]] // TODO Remove in 4.0
int64_t
WriteImage2DData( int64_t imageIndex, Image2DType imageType,
Image2DProjection imageProjection, void *buffer, int64_t start,
int64_t count );
int64_t WriteImage2DData( int64_t imageIndex, Image2DType imageType,
Image2DProjection imageProjection, void *buffer, int64_t start,
int64_t count );

///@}

Expand All @@ -146,28 +134,20 @@ namespace e57
/// before making this call.
/// @param [in,out] data3DHeader scan metadata
/// @return Returns the index of the new scan's data3D block.
/// @deprecated Will be removed in 4.0. Use WriteData3DData() instead.
[[deprecated( "Will be removed in 4.0. Use WriteData3DData()." )]] // TODO Remove in 4.0
int64_t
NewData3D( Data3D &data3DHeader );
int64_t NewData3D( Data3D &data3DHeader );

/// @brief Sets up a writer to write the actual scan data
/// @param [in] dataIndex index returned by NewData3D
/// @param [in] pointCount Number of points to write (number of elements in each of the
/// buffers)
/// @param [in] buffers pointers to user-provided buffers
/// @return returns a vector writer setup to write the selected scan data
/// @deprecated Will be removed in 4.0. Use WriteData3DData() instead.
[[deprecated( "Will be removed in 4.0. Use WriteData3DData()." )]] // TODO Remove in 4.0
CompressedVectorWriter
SetUpData3DPointsData( int64_t dataIndex, size_t pointCount,
const Data3DPointsFloat &buffers );
CompressedVectorWriter SetUpData3DPointsData( int64_t dataIndex, size_t pointCount,
const Data3DPointsFloat &buffers );

/// @overload
[[deprecated( "Will be removed in 4.0. Use WriteData3DData()." )]] // TODO Remove in 4.0
CompressedVectorWriter
SetUpData3DPointsData( int64_t dataIndex, size_t pointCount,
const Data3DPointsDouble &buffers );
CompressedVectorWriter SetUpData3DPointsData( int64_t dataIndex, size_t pointCount,
const Data3DPointsDouble &buffers );

/// @brief Writes out the group data
/// @param [in] dataIndex data block index given by the NewData3D
Expand Down
Loading