ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

TgaImporter, TgaImageConverter: cleanup.

pull/107/head
Vladimír Vondruš 11 years ago
parent
34b2aad420
commit
2ca5f06a46
2 changed files with 19 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      src/MagnumPlugins/TgaImageConverter/TgaImageConverter.h
  2. 24
      src/MagnumPlugins/TgaImporter/TgaImporter.h

14
src/MagnumPlugins/TgaImageConverter/TgaImageConverter.h
Unescape View File

@ -36,14 +36,14 @@
#ifndef DOXYGEN_GENERATING_OUTPUT #ifndef DOXYGEN_GENERATING_OUTPUT
#ifndef MAGNUM_TGAIMAGECONVERTER_BUILD_STATIC #ifndef MAGNUM_TGAIMAGECONVERTER_BUILD_STATIC
#if defined(TgaImageConverter_EXPORTS) || defined(TgaImageConverterObjects_EXPORTS) #if defined(TgaImageConverter_EXPORTS) || defined(TgaImageConverterObjects_EXPORTS)
#define MAGNUM_TRADE_TGAIMAGECONVERTER_EXPORT CORRADE_VISIBILITY_EXPORT #define MAGNUM_TGAIMAGECONVERTER_EXPORT CORRADE_VISIBILITY_EXPORT
#else #else
#define MAGNUM_TRADE_TGAIMAGECONVERTER_EXPORT CORRADE_VISIBILITY_IMPORT #define MAGNUM_TGAIMAGECONVERTER_EXPORT CORRADE_VISIBILITY_IMPORT
#endif #endif
#else #else
#define MAGNUM_TRADE_TGAIMAGECONVERTER_EXPORT CORRADE_VISIBILITY_STATIC #define MAGNUM_TGAIMAGECONVERTER_EXPORT CORRADE_VISIBILITY_STATIC
#endif #endif
#define MAGNUM_TRADE_TGAIMAGECONVERTER_LOCAL CORRADE_VISIBILITY_LOCAL #define MAGNUM_TGAIMAGECONVERTER_LOCAL CORRADE_VISIBILITY_LOCAL
#endif #endif
namespace Magnum { namespace Trade { namespace Magnum { namespace Trade {
@ -63,7 +63,7 @@ component of `Magnum` package in CMake and link to
`${MAGNUM_TGAIMAGECONVERTER_LIBRARIES}`. See @ref building, @ref cmake and `${MAGNUM_TGAIMAGECONVERTER_LIBRARIES}`. See @ref building, @ref cmake and
@ref plugins for more information. @ref plugins for more information.
*/ */
class MAGNUM_TRADE_TGAIMAGECONVERTER_EXPORT TgaImageConverter: public AbstractImageConverter { class MAGNUM_TGAIMAGECONVERTER_EXPORT TgaImageConverter: public AbstractImageConverter {
public: public:
/** @brief Default constructor */ /** @brief Default constructor */
explicit TgaImageConverter(); explicit TgaImageConverter();
@ -72,8 +72,8 @@ class MAGNUM_TRADE_TGAIMAGECONVERTER_EXPORT TgaImageConverter: public AbstractIm
explicit TgaImageConverter(PluginManager::AbstractManager& manager, std::string plugin); explicit TgaImageConverter(PluginManager::AbstractManager& manager, std::string plugin);
private: private:
Features MAGNUM_TRADE_TGAIMAGECONVERTER_LOCAL doFeatures() const override; Features MAGNUM_TGAIMAGECONVERTER_LOCAL doFeatures() const override;
Containers::Array<char> MAGNUM_TRADE_TGAIMAGECONVERTER_LOCAL doExportToData(const ImageReference2D& image) const override; Containers::Array<char> MAGNUM_TGAIMAGECONVERTER_LOCAL doExportToData(const ImageReference2D& image) const override;
}; };
}} }}

24
src/MagnumPlugins/TgaImporter/TgaImporter.h
Unescape View File

@ -38,14 +38,14 @@
#ifndef DOXYGEN_GENERATING_OUTPUT #ifndef DOXYGEN_GENERATING_OUTPUT
#ifndef MAGNUM_TGAIMPORTER_BUILD_STATIC #ifndef MAGNUM_TGAIMPORTER_BUILD_STATIC
#if defined(TgaImporter_EXPORTS) || defined(TgaImporterObjects_EXPORTS) #if defined(TgaImporter_EXPORTS) || defined(TgaImporterObjects_EXPORTS)
#define MAGNUM_TRADE_TGAIMPORTER_EXPORT CORRADE_VISIBILITY_EXPORT #define MAGNUM_TGAIMPORTER_EXPORT CORRADE_VISIBILITY_EXPORT
#else #else
#define MAGNUM_TRADE_TGAIMPORTER_EXPORT CORRADE_VISIBILITY_IMPORT #define MAGNUM_TGAIMPORTER_EXPORT CORRADE_VISIBILITY_IMPORT
#endif #endif
#else #else
#define MAGNUM_TRADE_TGAIMPORTER_EXPORT CORRADE_VISIBILITY_STATIC #define MAGNUM_TGAIMPORTER_EXPORT CORRADE_VISIBILITY_STATIC
#endif #endif
#define MAGNUM_TRADE_TGAIMPORTER_LOCAL CORRADE_VISIBILITY_LOCAL #define MAGNUM_TGAIMPORTER_LOCAL CORRADE_VISIBILITY_LOCAL
#endif #endif
namespace Magnum { namespace Trade { namespace Magnum { namespace Trade {
@ -71,7 +71,7 @@ and @ref ColorFormat::RGBA. In OpenGL ES 2.0, if @es_extension{EXT,texture_rg}
is not supported, grayscale images use @ref ColorFormat::Luminance instead of is not supported, grayscale images use @ref ColorFormat::Luminance instead of
@ref ColorFormat::Red. @ref ColorFormat::Red.
*/ */
class MAGNUM_TRADE_TGAIMPORTER_EXPORT TgaImporter: public AbstractImporter { class MAGNUM_TGAIMPORTER_EXPORT TgaImporter: public AbstractImporter {
public: public:
/** @brief Default constructor */ /** @brief Default constructor */
explicit TgaImporter(); explicit TgaImporter();
@ -82,13 +82,13 @@ class MAGNUM_TRADE_TGAIMPORTER_EXPORT TgaImporter: public AbstractImporter {
~TgaImporter(); ~TgaImporter();
private: private:
Features MAGNUM_TRADE_TGAIMPORTER_LOCAL doFeatures() const override; Features MAGNUM_TGAIMPORTER_LOCAL doFeatures() const override;
bool MAGNUM_TRADE_TGAIMPORTER_LOCAL doIsOpened() const override; bool MAGNUM_TGAIMPORTER_LOCAL doIsOpened() const override;
void MAGNUM_TRADE_TGAIMPORTER_LOCAL doOpenData(Containers::ArrayReference<const char> data) override; void MAGNUM_TGAIMPORTER_LOCAL doOpenData(Containers::ArrayReference<const char> data) override;
void MAGNUM_TRADE_TGAIMPORTER_LOCAL doOpenFile(const std::string& filename) override; void MAGNUM_TGAIMPORTER_LOCAL doOpenFile(const std::string& filename) override;
void MAGNUM_TRADE_TGAIMPORTER_LOCAL doClose() override; void MAGNUM_TGAIMPORTER_LOCAL doClose() override;
UnsignedInt MAGNUM_TRADE_TGAIMPORTER_LOCAL doImage2DCount() const override; UnsignedInt MAGNUM_TGAIMPORTER_LOCAL doImage2DCount() const override;
std::optional<ImageData2D> MAGNUM_TRADE_TGAIMPORTER_LOCAL doImage2D(UnsignedInt id) override; std::optional<ImageData2D> MAGNUM_TGAIMPORTER_LOCAL doImage2D(UnsignedInt id) override;
std::istream* in; std::istream* in;
}; };

Write Preview
Loading…
Cancel
Save