Browse Source

Various cleanup.

pull/110/head
Vladimír Vondruš 11 years ago
parent
commit
39ec4900eb
  1. 2
      src/Magnum/Audio/Source.h
  2. 2
      src/Magnum/Shapes/AbstractShape.h
  3. 12
      src/Magnum/Test/ImageTest.cpp
  4. 2
      src/Magnum/Trade/ImageData.cpp
  5. 12
      src/Magnum/Trade/Test/ImageDataTest.cpp

2
src/Magnum/Audio/Source.h

@ -523,7 +523,7 @@ class MAGNUM_AUDIO_EXPORT Source {
* @brief Play more sources at once
*
* The operation is guaranteed to be done for all sources at the same
* time. `nullptr` is not allowed.
* time.
* @see @ref play(), @ref pause(std::initializer_list<std::reference_wrapper<Source>>),
* @ref stop(std::initializer_list<std::reference_wrapper<Source>>),
* @ref rewind(std::initializer_list<std::reference_wrapper<Source>>),

2
src/Magnum/Shapes/AbstractShape.h

@ -55,7 +55,7 @@ template<UnsignedInt dimensions> class MAGNUM_SHAPES_EXPORT AbstractShape: publi
friend const Implementation::AbstractShape<dimensions>& Implementation::getAbstractShape<>(const AbstractShape<dimensions>&);
#else
/* Otherwise it complains that this is not a function */
template<UnsignedInt _dimensions> friend const Implementation::AbstractShape<_dimensions>& Implementation::getAbstractShape(const Shapes::AbstractShape<_dimensions>&);
template<UnsignedInt dimensions_> friend const Implementation::AbstractShape<dimensions_>& Implementation::getAbstractShape(const Shapes::AbstractShape<dimensions_>&);
#endif
public:

12
src/Magnum/Test/ImageTest.cpp

@ -42,8 +42,8 @@ struct ImageTest: TestSuite::Tester {
void setData();
void setDataCompressed();
void toReference();
void toReferenceCompressed();
void toView();
void toViewCompressed();
void release();
void releaseCompressed();
};
@ -58,8 +58,8 @@ ImageTest::ImageTest() {
&ImageTest::setData,
&ImageTest::setDataCompressed,
&ImageTest::toReference,
&ImageTest::toReferenceCompressed,
&ImageTest::toView,
&ImageTest::toViewCompressed,
&ImageTest::release,
&ImageTest::releaseCompressed});
}
@ -202,7 +202,7 @@ void ImageTest::setDataCompressed() {
CORRADE_COMPARE(a.data().size(), 16);
}
void ImageTest::toReference() {
void ImageTest::toView() {
auto data = new char[3];
const Image2D a{PixelStorage{}.setAlignment(1),
PixelFormat::Red, PixelType::UnsignedByte, {1, 3}, Containers::Array<char>{data, 3}};
@ -227,7 +227,7 @@ void ImageTest::toReference() {
}
}
void ImageTest::toReferenceCompressed() {
void ImageTest::toViewCompressed() {
auto data = new char[8];
const CompressedImage2D a{
#ifndef MAGNUM_TARGET_GLES

2
src/Magnum/Trade/ImageData.cpp

@ -28,7 +28,7 @@
namespace Magnum { namespace Trade {
template<UnsignedInt dimensions> ImageData<dimensions>::ImageData(const PixelStorage storage, const PixelFormat format, const PixelType type, const VectorTypeFor<dimensions, Int>& size, Containers::Array<char>&& data): _compressed{false}, _storage{storage}, _format{format}, _type{type}, _size{size}, _data{std::move(data)} {
CORRADE_ASSERT(Implementation::imageDataSize(*this) <= _data.size(), "Trade::ImageDat::ImageData(): bad image data size, got" << _data.size() << "but expected at least" << Implementation::imageDataSize(*this), );
CORRADE_ASSERT(Implementation::imageDataSize(*this) <= _data.size(), "Trade::ImageData::ImageData(): bad image data size, got" << _data.size() << "but expected at least" << Implementation::imageDataSize(*this), );
}
template<UnsignedInt dimensions> PixelStorage ImageData<dimensions>::storage() const {

12
src/Magnum/Trade/Test/ImageDataTest.cpp

@ -40,8 +40,8 @@ class ImageDataTest: public TestSuite::Tester {
void constructMove();
void constructMoveCompressed();
void toReference();
void toReferenceCompressed();
void toView();
void toViewCompressed();
void release();
void releaseCompressed();
};
@ -53,8 +53,8 @@ ImageDataTest::ImageDataTest() {
&ImageDataTest::constructMove,
&ImageDataTest::constructMoveCompressed,
&ImageDataTest::toReference,
&ImageDataTest::toReferenceCompressed,
&ImageDataTest::toView,
&ImageDataTest::toViewCompressed,
&ImageDataTest::release,
&ImageDataTest::releaseCompressed});
}
@ -165,7 +165,7 @@ void ImageDataTest::constructMoveCompressed() {
CORRADE_COMPARE(c.data().size(), 8);
}
void ImageDataTest::toReference() {
void ImageDataTest::toView() {
auto data = new char[4];
const Trade::ImageData2D a{PixelFormat::Red, PixelType::UnsignedByte, {4, 1}, Containers::Array<char>{data, 4}};
ImageView2D b = a;
@ -188,7 +188,7 @@ void ImageDataTest::toReference() {
}
}
void ImageDataTest::toReferenceCompressed() {
void ImageDataTest::toViewCompressed() {
auto data = new char[8];
const Trade::ImageData2D a{CompressedPixelFormat::RGBAS3tcDxt1, {4, 4}, Containers::Array<char>{data, 8}};
CompressedImageView2D b = a;

Loading…
Cancel
Save