Deprecate EncodePNG and DecodePNG from vtkm::rendering.

This commit is contained in:
NAThompson 2020-04-28 11:14:51 -04:00
parent 51c4e6d4ff
commit 277a0c7f7d
3 changed files with 78 additions and 0 deletions

@ -50,6 +50,8 @@ set(headers
ColorLegendAnnotation.h
ConnectivityProxy.h
Cylinderizer.h
DecodePNG.h # deprecated
EncodePNG.h # deprecated
LineRenderer.h
MatrixHelpers.h
Scene.h

@ -0,0 +1,34 @@
//============================================================================
// Copyright (c) Kitware, Inc.
// All rights reserved.
// See LICENSE.txt for details.
//
// This software is distributed WITHOUT ANY WARRANTY; without even
// the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
// PURPOSE. See the above copyright notice for more information.
//============================================================================
#ifndef vtk_m_rendering_DecodePNG_h
#define vtk_m_rendering_DecodePNG_h
#include <vtkm/Deprecated.h>
#include <vtkm/io/DecodePNG.h>
#include <vtkm/rendering/vtkm_rendering_export.h>
namespace vtkm
{
namespace rendering
{
VTKM_RENDERING_EXPORT
vtkm::UInt32 DecodePNG(std::vector<unsigned char>& out_image,
unsigned long& image_width,
unsigned long& image_height,
const unsigned char* in_png,
std::size_t in_size) VTKM_DEPRECATED("Please use vtkm::io::DecodePNG")
{
return vtkm::io::DecodePNG(out_image, image_width, image_height, in_png, in_size);
}
}
} // vtkm::io
#endif

@ -0,0 +1,42 @@
//============================================================================
// Copyright (c) Kitware, Inc.
// All rights reserved.
// See LICENSE.txt for details.
//
// This software is distributed WITHOUT ANY WARRANTY; without even
// the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
// PURPOSE. See the above copyright notice for more information.
//============================================================================
#ifndef vtk_m_rendering_EncodePNG_h
#define vtk_m_rendering_EncodePNG_h
#include <vtkm/io/EncodePNG.h>
#include <vtkm/rendering/vtkm_rendering_export.h>
namespace vtkm
{
namespace rendering
{
VTKM_RENDERING_EXPORT
vtkm::UInt32 EncodePNG(std::vector<unsigned char> const& image,
unsigned long width,
unsigned long height,
unsigned char* out_png,
std::size_t out_size) VTKM_DEPRECATED("Please use vtkm::io::EncodePNG.")
{
return io::EncodePNG(image, width, height, out_png, out_size);
}
VTKM_IO_EXPORT
vtkm::UInt32 SavePNG(std::string const& filename,
std::vector<unsigned char> const& image,
unsigned long width,
unsigned long height) VTKM_DEPRECATED("Please use SavePNG from vtkm::io")
{
return io::SavePNG(filename, image, width, height);
}
}
} // vtkm::rendering
#endif //vtk_m_rendering_EncodePNG_h