Browse Source

Trade: use Corrade::Containers::Array in AbstractImageConverter.

pull/278/head
Vladimír Vondruš 13 years ago
parent
commit
d53110c3ac
  1. 3
      src/Trade/AbstractImageConverter.cpp
  2. 2
      src/Trade/AbstractImageConverter.h

3
src/Trade/AbstractImageConverter.cpp

@ -24,6 +24,7 @@
#include "AbstractImageConverter.h" #include "AbstractImageConverter.h"
#include <Containers/Array.h>
#include <Utility/Assert.h> #include <Utility/Assert.h>
namespace Magnum { namespace Trade { namespace Magnum { namespace Trade {
@ -39,7 +40,7 @@ Image2D* AbstractImageConverter::convertToImage(const Image2D* const) const {
CORRADE_ASSERT(false, "Trade::AbstractImageConverter::convertToImage(): feature not implemented", nullptr); CORRADE_ASSERT(false, "Trade::AbstractImageConverter::convertToImage(): feature not implemented", nullptr);
} }
std::pair<const unsigned char*, std::size_t> AbstractImageConverter::convertToData(const Image2D* const) const { Containers::Array<unsigned char> AbstractImageConverter::convertToData(const Image2D* const) const {
CORRADE_ASSERT(features() & Feature::ConvertToData, CORRADE_ASSERT(features() & Feature::ConvertToData,
"Trade::AbstractImageConverter::convertToData(): feature advertised but not implemented", {}); "Trade::AbstractImageConverter::convertToData(): feature advertised but not implemented", {});

2
src/Trade/AbstractImageConverter.h

@ -100,7 +100,7 @@ class MAGNUM_EXPORT AbstractImageConverter: public PluginManager::AbstractPlugin
* Returns data pointer and size on success, `nullptr` otherwise. * Returns data pointer and size on success, `nullptr` otherwise.
* @see features(), convertToImage(), convertToFile() * @see features(), convertToImage(), convertToFile()
*/ */
virtual std::pair<const unsigned char*, std::size_t> convertToData(const Image2D* image) const; virtual Containers::Array<unsigned char> convertToData(const Image2D* image) const;
/** /**
* @brief Convert image and save it to file * @brief Convert image and save it to file

Loading…
Cancel
Save