Browse Source

Adapted to Corrade changes.

pull/306/merge
Vladimír Vondruš 7 years ago
parent
commit
e6db895452
  1. 2
      doc/snippets/MagnumTrade.cpp
  2. 2
      src/Magnum/Audio/AbstractImporter.cpp
  3. 2
      src/Magnum/GL/Shader.cpp
  4. 2
      src/Magnum/Text/AbstractFont.cpp
  5. 2
      src/Magnum/Text/AbstractFontConverter.cpp
  6. 2
      src/Magnum/Trade/AbstractImporter.cpp
  7. 4
      src/MagnumPlugins/AnyImageConverter/Test/AnyImageConverterTest.cpp

2
doc/snippets/MagnumTrade.cpp

@ -134,7 +134,7 @@ importer->setFileCallback([](const std::string& filename,
{
auto found = data.files.find(filename);
if(found == data.files.end()) {
if(!Utility::Directory::fileExists(filename))
if(!Utility::Directory::exists(filename))
return Containers::NullOpt;
found = data.files.emplace(filename, Utility::Directory::read(filename)).first;
}

2
src/Magnum/Audio/AbstractImporter.cpp

@ -82,7 +82,7 @@ void AbstractImporter::doOpenFile(const std::string& filename) {
CORRADE_ASSERT(features() & Feature::OpenData, "Audio::AbstractImporter::openFile(): not implemented", );
/* Open file */
if(!Utility::Directory::fileExists(filename)) {
if(!Utility::Directory::exists(filename)) {
Error() << "Trade::AbstractImporter::openFile(): cannot open file" << filename;
return;
}

2
src/Magnum/GL/Shader.cpp

@ -740,7 +740,7 @@ void Shader::addSourceImplementationEmscriptenPthread(std::string source) {
#endif
Shader& Shader::addFile(const std::string& filename) {
CORRADE_ASSERT(Utility::Directory::fileExists(filename),
CORRADE_ASSERT(Utility::Directory::exists(filename),
"GL::Shader file " << '\'' + filename + '\'' << " cannot be read.", *this);
addSource(Utility::Directory::readString(filename));

2
src/Magnum/Text/AbstractFont.cpp

@ -123,7 +123,7 @@ auto AbstractFont::doOpenFile(const std::string& filename, const Float size) ->
"Text::AbstractFont::openFile(): not implemented", {});
/* Open file */
if(!Utility::Directory::fileExists(filename)) {
if(!Utility::Directory::exists(filename)) {
Error() << "Trade::AbstractFont::openFile(): cannot open file" << filename;
return {};
}

2
src/Magnum/Text/AbstractFontConverter.cpp

@ -226,7 +226,7 @@ Containers::Pointer<GlyphCache> AbstractFontConverter::doImportGlyphCacheFromFil
"Text::AbstractFontConverter::importGlyphCacheFromFile(): not implemented", nullptr);
/* Open file */
if(!Utility::Directory::fileExists(filename)) {
if(!Utility::Directory::exists(filename)) {
Error() << "Trade::AbstractFontConverter::importGlyphCacheFromFile(): cannot open file" << filename;
return nullptr;
}

2
src/Magnum/Trade/AbstractImporter.cpp

@ -162,7 +162,7 @@ void AbstractImporter::doOpenFile(const std::string& filename) {
/* Otherwise open the file directly */
} else {
if(!Utility::Directory::fileExists(filename)) {
if(!Utility::Directory::exists(filename)) {
Error() << "Trade::AbstractImporter::openFile(): cannot open file" << filename;
return;
}

4
src/MagnumPlugins/AnyImageConverter/Test/AnyImageConverterTest.cpp

@ -110,13 +110,13 @@ void AnyImageConverterTest::convert() {
const std::string filename = Utility::Directory::join(ANYIMAGECONVERTER_TEST_DIR, data.filename);
if(Utility::Directory::fileExists(filename))
if(Utility::Directory::exists(filename))
CORRADE_VERIFY(Utility::Directory::rm(filename));
/* Just test that the exported file exists */
Containers::Pointer<AbstractImageConverter> converter = _manager.instantiate("AnyImageConverter");
CORRADE_VERIFY(converter->exportToFile(Image, filename));
CORRADE_VERIFY(Utility::Directory::fileExists(filename));
CORRADE_VERIFY(Utility::Directory::exists(filename));
}
void AnyImageConverterTest::detect() {

Loading…
Cancel
Save