kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Guard against null bytes, use combine for svg.n path

Browse Source
This commit is contained in:
Joshua Granick
2015-05-05 18:24:17 -07:00
parent 46094c1dc4
commit 8bab88bcd7
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lime/tools/helpers/IconHelper.hx
View File

@@ -199,17 +199,24 @@ class IconHelper {
if (image != null) { if (image != null) {
var data = null;
if (size < 256) { if (size < 256) {
imageData.push (BMP.encode (image, ICO)); data = BMP.encode (image, ICO);
} else { } else {
imageData.push (image.encode ("png")); data = image.encode ("png");
} }
images.push (image); if (data != null) {
imageData.push (data);
images.push (image);
}
} }

2
lime/tools/helpers/ImageHelper.hx
View File

@@ -23,7 +23,7 @@ class ImageHelper {
// try using Lime "legacy" to rasterize SVG first, since it is much faster // try using Lime "legacy" to rasterize SVG first, since it is much faster
ProcessHelper.runCommand ("", "neko", [ PathHelper.getHaxelib (new Haxelib ("lime")) + "/svg.n", "process", path, Std.string (width), Std.string (height), temp ], true, true); ProcessHelper.runCommand ("", "neko", [ PathHelper.combine (PathHelper.getHaxelib (new Haxelib ("lime")), "svg.n"), "process", path, Std.string (width), Std.string (height), temp ], true, true);
if (FileSystem.exists (temp)) { if (FileSystem.exists (temp)) {