Browse Source

Added constexpr to inline const functions where possible.

pull/279/head
Vladimír Vondruš 14 years ago
parent
commit
04793390e1
  1. 2
      src/BufferedImage.h
  2. 4
      src/Image.h
  3. 2
      src/Texture.h
  4. 4
      src/Trade/ImageData.h

2
src/BufferedImage.h

@ -50,7 +50,7 @@ template<size_t imageDimensions> class BufferedImage: public AbstractImage {
BufferedImage(Components components, ComponentType type): AbstractImage(components, type), _buffer(Buffer::Target::PixelPack) {} BufferedImage(Components components, ComponentType type): AbstractImage(components, type), _buffer(Buffer::Target::PixelPack) {}
/** @brief %Image dimensions */ /** @brief %Image dimensions */
inline Math::Vector<Dimensions, GLsizei> dimensions() const { return _dimensions; } inline constexpr Math::Vector<Dimensions, GLsizei> dimensions() const { return _dimensions; }
/** /**
* @brief Data * @brief Data

4
src/Image.h

@ -77,10 +77,10 @@ template<size_t imageDimensions> class Image: public AbstractImage {
inline ~Image() { delete[] _data; } inline ~Image() { delete[] _data; }
/** @brief %Image dimensions */ /** @brief %Image dimensions */
inline const Math::Vector<Dimensions, GLsizei>& dimensions() const { return _dimensions; } inline constexpr const Math::Vector<Dimensions, GLsizei>& dimensions() const { return _dimensions; }
/** @brief Pointer to raw data */ /** @brief Pointer to raw data */
inline const void* data() const { return _data; } inline constexpr const void* data() const { return _data; }
/** /**
* @brief Set image data * @brief Set image data

2
src/Texture.h

@ -103,7 +103,7 @@ template<size_t textureDimensions> class Texture: public AbstractTexture {
inline Texture(GLint layer = 0, Target target = DataHelper<Dimensions>::target()): AbstractTexture(layer, static_cast<GLenum>(target)) {} inline Texture(GLint layer = 0, Target target = DataHelper<Dimensions>::target()): AbstractTexture(layer, static_cast<GLenum>(target)) {}
/** @brief %Texture target */ /** @brief %Texture target */
inline Target target() const { return static_cast<Target>(_target); } inline constexpr Target target() const { return static_cast<Target>(_target); }
/** /**
* @brief Set wrapping * @brief Set wrapping

4
src/Trade/ImageData.h

@ -62,10 +62,10 @@ template<size_t imageDimensions> class ImageData: public AbstractImage {
inline ~ImageData() { delete[] _data; } inline ~ImageData() { delete[] _data; }
/** @brief %Image dimensions */ /** @brief %Image dimensions */
inline const Math::Vector<Dimensions, GLsizei>& dimensions() const { return _dimensions; } inline constexpr const Math::Vector<Dimensions, GLsizei>& dimensions() const { return _dimensions; }
/** @brief Pointer to raw data */ /** @brief Pointer to raw data */
inline const void* data() const { return _data; } inline constexpr const void* data() const { return _data; }
private: private:
Math::Vector<Dimensions, GLsizei> _dimensions; Math::Vector<Dimensions, GLsizei> _dimensions;

Loading…
Cancel
Save