From 8d8d778e4727e3de9200e095e7b9cc963883ef90 Mon Sep 17 00:00:00 2001 From: emeric Date: Fri, 10 Apr 2020 16:40:58 +0200 Subject: [PATCH] Ignore warnings from coders when loading cover images. fixes #48 --- src/libs/cover/impl/Image.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/libs/cover/impl/Image.cpp b/src/libs/cover/impl/Image.cpp index f05fcc73..f48c852f 100644 --- a/src/libs/cover/impl/Image.cpp +++ b/src/libs/cover/impl/Image.cpp @@ -63,6 +63,15 @@ Image::load(const std::vector& rawData) return true; } + catch (Magick::WarningCoder& e) + { + return true; + } + catch (Magick::Warning& e) + { + LMS_LOG(COVER, WARNING) << "Caught Magick warning while loading raw image: " << e.what(); + return false; + } catch (Magick::Exception& e) { LMS_LOG(COVER, ERROR) << "Caught Magick exception while loading raw image: " << e.what(); @@ -79,6 +88,15 @@ Image::load(const std::filesystem::path& p) return true; } + catch (Magick::WarningCoder& e) + { + return true; + } + catch (Magick::Warning& e) + { + LMS_LOG(COVER, WARNING) << "Caught Magick warning while loading raw image: " << e.what(); + return false; + } catch (Magick::Exception& e) { LMS_LOG(COVER, ERROR) << "Caught Magick exception while loading image from file '" << p.string() << "': " << e.what();