diff options
| author | mrwastl <mrwastl@users.sourceforge.net> | 2013-03-21 20:29:45 +0100 |
|---|---|---|
| committer | mrwastl <mrwastl@users.sourceforge.net> | 2013-03-21 20:29:45 +0100 |
| commit | 60bdec72ecd6bb236f2f1153398c9996fb95730f (patch) | |
| tree | 7b6a7667f41002b54dcc78360cef71256b811c94 /glcdgraphics/extformats.c | |
| parent | cf926629084ab015873859e759155f9bfe813e6b (diff) | |
| download | graphlcd-base-60bdec72ecd6bb236f2f1153398c9996fb95730f.tar.gz graphlcd-base-60bdec72ecd6bb236f2f1153398c9996fb95730f.tar.bz2 | |
glcdgraphics: bug fix in glcd.c, moved methods Scale() and Blend() to image.c, added static methods for loading/saving image; showpic and convpic working again; convpic cleaned up; showpic: added parameters for scaling and centering image
Diffstat (limited to 'glcdgraphics/extformats.c')
| -rw-r--r-- | glcdgraphics/extformats.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/glcdgraphics/extformats.c b/glcdgraphics/extformats.c index 3a0ab36..5734fce 100644 --- a/glcdgraphics/extformats.c +++ b/glcdgraphics/extformats.c @@ -8,7 +8,7 @@ * This file is released under the GNU General Public License. Refer * to the COPYING file distributed with this package. * - * (c) 2011-2012 Wolfgang Astleitner <mrwastl AT users sourceforge net> + * (c) 2011-2013 Wolfgang Astleitner <mrwastl AT users sourceforge net> */ #include <stdio.h> @@ -66,7 +66,7 @@ bool cExtFormatFile::LoadScaled(cImage & image, const string & fileName, uint16_ std::vector<Magick::Image>::iterator it; readImages(&extimages, fileName); if (extimages.size() == 0) { - syslog(LOG_ERR, "ERROR: graphlcd: Couldn't load %s", fileName.c_str()); + syslog(LOG_ERR, "glcdgraphics: Couldn't load '%s' (cExtFormatFile::LoadScaled)", fileName.c_str()); return false; } @@ -163,16 +163,16 @@ bool cExtFormatFile::LoadScaled(cImage & image, const string & fileName, uint16_ } } } catch (Magick::Exception &e) { - syslog(LOG_ERR, "ERROR: graphlcd: Couldn't load %s: %s", fileName.c_str(), e.what()); + syslog(LOG_ERR, "glcdgraphics: Couldn't load '%s': %s (cExtFormatFile::LoadScaled)", fileName.c_str(), e.what()); return false; } catch (...) { - syslog(LOG_ERR, "ERROR: graphlcd: Couldn't load %s: Unknown exception caught", fileName.c_str()); + syslog(LOG_ERR, "glcdgraphics: Couldn't load '%s': Unknown exception caught (cExtFormatFile::LoadScaled)", fileName.c_str()); return false; } return true; #else return false; -#endif +#endif } // to be done ... |