From 370055e6dd33da9fe285dacc0a203a93e2487698 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 8 Sep 2013 16:11:51 +0200 Subject: [PATCH] Adapted to Corrade PluginManager changes. --- src/TextureTools/distance-field.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/TextureTools/distance-field.cpp b/src/TextureTools/distance-field.cpp index 021430853..8b1b5d9b4 100644 --- a/src/TextureTools/distance-field.cpp +++ b/src/TextureTools/distance-field.cpp @@ -78,23 +78,20 @@ int DistanceFieldConverter::exec() { } /* Instance plugins */ - Trade::AbstractImporter* importer = importerManager.instance(args.value("importer")); - Trade::AbstractImageConverter* converter = converterManager.instance(args.value("converter")); - CORRADE_INTERNAL_ASSERT(importer && converter); + std::unique_ptr importer = importerManager.instance(args.value("importer")); + CORRADE_INTERNAL_ASSERT(importer); + std::unique_ptr converter = converterManager.instance(args.value("converter")); + CORRADE_INTERNAL_ASSERT(converter); /* Open input file */ std::optional image; if(!importer->openFile(args.value("input")) || !(image = importer->image2D(0))) { Error() << "Cannot open file" << args.value("input"); - delete importer; - delete converter; return 1; } - delete importer; if(image->format() != ImageFormat::Red) { Error() << "Unsupported image format" << image->format(); - delete converter; return 1; } @@ -120,11 +117,9 @@ int DistanceFieldConverter::exec() { output.image(0, result); if(!converter->exportToFile(result, args.value("output"))) { Error() << "Cannot save file" << args.value("output"); - delete converter; return 1; } - delete converter; return 0; }