Skip to content

Commit

Permalink
DdsImporter: Remove unnecessary code.
Browse files Browse the repository at this point in the history
Signed-off-by: Squareys <Squareys@googlemail.com>
  • Loading branch information
Squareys committed Aug 10, 2015
1 parent 5946c48 commit df19c00
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 14 deletions.
13 changes: 0 additions & 13 deletions src/MagnumPlugins/DdsImporter/DdsImporter.cpp
Expand Up @@ -352,28 +352,15 @@ void DdsImporter::loadCompressedImageData(const CompressedColorFormat format,
}
}

void DdsImporter::doOpenFile(const std::string& filename) {
/* let doOpenData handle it */
AbstractImporter::doOpenFile(filename);
}

UnsignedInt DdsImporter::doImage2DCount() const { return _imageData2D.size(); }

std::optional<ImageData2D> DdsImporter::doImage2D(UnsignedInt id) {
if (id < _imageData2D.size()) {
return std::move(_imageData2D[id]);
}

return std::optional<ImageData2D>();
}

UnsignedInt DdsImporter::doImage3DCount() const { return _imageData3D.size(); }

std::optional<ImageData3D> DdsImporter::doImage3D(UnsignedInt id) {
if (id < _imageData3D.size()) {
return std::move(_imageData3D[id]);
}

return std::optional<ImageData3D>();
}

Expand Down
1 change: 0 additions & 1 deletion src/MagnumPlugins/DdsImporter/DdsImporter.h
Expand Up @@ -53,7 +53,6 @@ class DdsImporter: public AbstractImporter {
bool doIsOpened() const override;
void doClose() override;
void doOpenData(Containers::ArrayView<const char> data) override;
void doOpenFile(const std::string& filename) override;

UnsignedInt doImage2DCount() const override;
std::optional<ImageData2D> doImage2D(UnsignedInt id) override;
Expand Down

0 comments on commit df19c00

Please sign in to comment.