Browse Source

Adapted to Corrade PluginManager changes.

pull/23/head
Vladimír Vondruš 13 years ago
parent
commit
370055e6dd
  1. 13
      src/TextureTools/distance-field.cpp

13
src/TextureTools/distance-field.cpp

@ -78,23 +78,20 @@ int DistanceFieldConverter::exec() {
} }
/* Instance plugins */ /* Instance plugins */
Trade::AbstractImporter* importer = importerManager.instance(args.value("importer")); std::unique_ptr<Trade::AbstractImporter> importer = importerManager.instance(args.value("importer"));
Trade::AbstractImageConverter* converter = converterManager.instance(args.value("converter")); CORRADE_INTERNAL_ASSERT(importer);
CORRADE_INTERNAL_ASSERT(importer && converter); std::unique_ptr<Trade::AbstractImageConverter> converter = converterManager.instance(args.value("converter"));
CORRADE_INTERNAL_ASSERT(converter);
/* Open input file */ /* Open input file */
std::optional<Trade::ImageData2D> image; std::optional<Trade::ImageData2D> image;
if(!importer->openFile(args.value("input")) || !(image = importer->image2D(0))) { if(!importer->openFile(args.value("input")) || !(image = importer->image2D(0))) {
Error() << "Cannot open file" << args.value("input"); Error() << "Cannot open file" << args.value("input");
delete importer;
delete converter;
return 1; return 1;
} }
delete importer;
if(image->format() != ImageFormat::Red) { if(image->format() != ImageFormat::Red) {
Error() << "Unsupported image format" << image->format(); Error() << "Unsupported image format" << image->format();
delete converter;
return 1; return 1;
} }
@ -120,11 +117,9 @@ int DistanceFieldConverter::exec() {
output.image(0, result); output.image(0, result);
if(!converter->exportToFile(result, args.value("output"))) { if(!converter->exportToFile(result, args.value("output"))) {
Error() << "Cannot save file" << args.value("output"); Error() << "Cannot save file" << args.value("output");
delete converter;
return 1; return 1;
} }
delete converter;
return 0; return 0;
} }

Loading…
Cancel
Save