From c958169f88f4fe6272be38e46e3fadc44b813b22 Mon Sep 17 00:00:00 2001 From: FreeSlave Date: Sun, 7 Jun 2015 14:34:15 +0300 Subject: [PATCH] Log exception and return null on xpm loading failure. Add copyright --- src/dlangui/graphics/images.d | 10 ++++++++-- src/dlangui/graphics/xpm/reader.d | 9 +++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/dlangui/graphics/images.d b/src/dlangui/graphics/images.d index c302b309..0a6ecc04 100644 --- a/src/dlangui/graphics/images.d +++ b/src/dlangui/graphics/images.d @@ -64,8 +64,14 @@ ColorDrawBuf loadImage(immutable ubyte[] data, string filename) { import std.algorithm : endsWith; if (filename.endsWith(".xpm")) { import dlangui.graphics.xpm.reader; - - return parseXPM(data); + try { + return parseXPM(data); + } + catch(Exception e) { + Log.e("Failed to load image from file ", filename); + Log.e(to!string(e)); + return null; + } } version (USE_DEIMAGE) { diff --git a/src/dlangui/graphics/xpm/reader.d b/src/dlangui/graphics/xpm/reader.d index d2e3242d..471fe508 100644 --- a/src/dlangui/graphics/xpm/reader.d +++ b/src/dlangui/graphics/xpm/reader.d @@ -1,5 +1,14 @@ module dlangui.graphics.xpm.reader; +/** + * Reading .xpm files. + * + * Copyright: Roman Chistokhodov, 2015 + * License: Boost License 1.0 + * Authors: Roman Chistokhodov, freeslave93@gmail.com + * + */ + import dlangui.graphics.xpm.colors; import dlangui.graphics.colors;