Browse Source

Adapted to Corrade changes.

pull/279/head
Vladimír Vondruš 14 years ago
parent
commit
3744d247d2
  1. 6
      src/Framebuffer.h
  2. 4
      src/Trade/AbstractImporter.h

6
src/Framebuffer.h

@ -19,7 +19,7 @@
* @brief Class Magnum::Framebuffer * @brief Class Magnum::Framebuffer
*/ */
#include <Utility/Set.h> #include <Containers/Set.h>
#include "BufferedImage.h" #include "BufferedImage.h"
#include "CubeMapTexture.h" #include "CubeMapTexture.h"
@ -111,7 +111,7 @@ class MAGNUM_EXPORT Framebuffer {
Stencil = GL_STENCIL_BUFFER_BIT /**< Stencil value */ Stencil = GL_STENCIL_BUFFER_BIT /**< Stencil value */
}; };
typedef Corrade::Utility::Set<Clear, GLbitfield> ClearMask; /**< @brief Mask for clearing */ typedef Corrade::Containers::Set<Clear, GLbitfield> ClearMask; /**< @brief Mask for clearing */
/** /**
* @brief Clear framebuffer * @brief Clear framebuffer
@ -1011,7 +1011,7 @@ class MAGNUM_EXPORT Framebuffer {
* @requires_gl * @requires_gl
* @requires_gl30 Extension @extension{EXT,framebuffer_object} * @requires_gl30 Extension @extension{EXT,framebuffer_object}
*/ */
typedef Corrade::Utility::Set<Blit, GLbitfield> BlitMask; typedef Corrade::Containers::Set<Blit, GLbitfield> BlitMask;
/** /**
* @brief Copy block of pixels from read to draw framebuffer * @brief Copy block of pixels from read to draw framebuffer

4
src/Trade/AbstractImporter.h

@ -19,7 +19,7 @@
* @brief Class Magnum::Trade::AbstractImporter * @brief Class Magnum::Trade::AbstractImporter
*/ */
#include <Utility/Set.h> #include <Containers/Set.h>
#include <PluginManager/Plugin.h> #include <PluginManager/Plugin.h>
#include "ImageData.h" #include "ImageData.h"
@ -65,7 +65,7 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin {
}; };
/** @brief Set of features supported by this importer */ /** @brief Set of features supported by this importer */
typedef Corrade::Utility::Set<Feature, int> Features; typedef Corrade::Containers::Set<Feature, int> Features;
/** @brief Constructor */ /** @brief Constructor */
inline AbstractImporter(Corrade::PluginManager::AbstractPluginManager* manager = nullptr, const std::string& plugin = ""): Plugin(manager, plugin) {} inline AbstractImporter(Corrade::PluginManager::AbstractPluginManager* manager = nullptr, const std::string& plugin = ""): Plugin(manager, plugin) {}

Loading…
Cancel
Save