diff --git a/vtkm/rendering/CMakeLists.txt b/vtkm/rendering/CMakeLists.txt index 207e863f7..add1b528f 100644 --- a/vtkm/rendering/CMakeLists.txt +++ b/vtkm/rendering/CMakeLists.txt @@ -50,6 +50,8 @@ set(headers ColorLegendAnnotation.h ConnectivityProxy.h Cylinderizer.h + DecodePNG.h # deprecated + EncodePNG.h # deprecated LineRenderer.h MatrixHelpers.h Scene.h diff --git a/vtkm/rendering/DecodePNG.h b/vtkm/rendering/DecodePNG.h new file mode 100644 index 000000000..66cdbd70a --- /dev/null +++ b/vtkm/rendering/DecodePNG.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 +#include +#include + +namespace vtkm +{ +namespace rendering +{ + +VTKM_RENDERING_EXPORT +vtkm::UInt32 DecodePNG(std::vector& 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 \ No newline at end of file diff --git a/vtkm/rendering/EncodePNG.h b/vtkm/rendering/EncodePNG.h new file mode 100644 index 000000000..4bcb37735 --- /dev/null +++ b/vtkm/rendering/EncodePNG.h @@ -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 +#include + +namespace vtkm +{ +namespace rendering +{ + +VTKM_RENDERING_EXPORT +vtkm::UInt32 EncodePNG(std::vector 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 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