audacity/linuxdeploy
1
0
Fork 0
mirror of https://github.com/audacity/linuxdeploy.git synced 2026-04-13 06:51:05 -05:00
Code Issues Packages Projects Releases 1 Wiki Activity

Fix SVG deployment

Browse Source
This commit is contained in:
TheAssassin
2018-06-16 03:33:55 +02:00
parent 68c1768543
commit b491870cab
1 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/core/appdir.cpp
View File

@@ -334,30 +334,32 @@ namespace linuxdeploy {
ldLog() << "Deploying icon" << path << std::endl;
Magick::Image image;
try {
image.read(path.string());
} catch (const Magick::Exception& e) {
ldLog() << LD_ERROR << "Magick error: " << e.what() << std::endl;
return false;
}
auto xRes = image.columns();
auto yRes = image.rows();
if (xRes != yRes) {
ldLog() << LD_WARNING << "x and y resolution of icon are not equal:" << path;
}
auto resolution = std::to_string(xRes) + "x" + std::to_string(yRes);
auto format = image.format();
std::string resolution;
// if file is a vector image, use "scalable" directory
if (util::strLower(bf::extension(path)) == "svg") {
resolution = "scalable";
} else {
Magick::Image image;
try {
image.read(path.string());
} catch (const Magick::Exception& e) {
ldLog() << LD_ERROR << "Magick error: " << e.what() << std::endl;
return false;
}
auto xRes = image.columns();
auto yRes = image.rows();
if (xRes != yRes) {
ldLog() << LD_WARNING << "x and y resolution of icon are not equal:" << path;
}
resolution = std::to_string(xRes) + "x" + std::to_string(yRes);
auto format = image.format();
// otherwise, test resolution against "known good" values, and reject invalid ones
const auto knownResolutions = {8, 16, 20, 22, 24, 32, 48, 64, 72, 96, 128, 192, 256, 512};