Browse Source

Temporary fix for build error in BufferedImage.

It fails because Magnum::Type cannot be written to Corrade::Debug. The
function will be rewritten anyway, thus fixing it only temporarily.
pull/279/head
Vladimír Vondruš 14 years ago
parent
commit
6d894ba14b
  1. 2
      src/BufferedImage.h
  2. 2
      src/Image.h

2
src/BufferedImage.h

@ -95,7 +95,7 @@ template<size_t imageDimensions> class BufferedImage {
*/ */
template<class T> void setData(const T* data) { template<class T> void setData(const T* data) {
if(TypeTraits<typename TypeTraits<T>::TextureType>::glType() != _type) { if(TypeTraits<typename TypeTraits<T>::TextureType>::glType() != _type) {
Corrade::Utility::Error() << "BufferedImage: Passed data have type" << TypeTraits<typename TypeTraits<T>::TextureType>::glType() << "but it should be" << _type; Corrade::Utility::Error() << "BufferedImage: Passed data have wrong type";
return; return;
} }

2
src/Image.h

@ -100,7 +100,7 @@ template<size_t imageDimensions> class Image {
*/ */
template<class T> void setData(const T* data) { template<class T> void setData(const T* data) {
if(TypeTraits<typename TypeTraits<T>::TextureType>::glType() != _type) { if(TypeTraits<typename TypeTraits<T>::TextureType>::glType() != _type) {
Corrade::Utility::Error() << "Image: Passed data have type" << TypeTraits<typename TypeTraits<T>::TextureType>::glType() << "but it should be" << _type; Corrade::Utility::Error() << "Image: Passed data have wrong type";
return; return;
} }

Loading…
Cancel
Save