Fix crash with GraphicsMagick >= 1.3.8 and non-XPM images.

4 files changed, 9 insertions, 0 deletions

diff --git a/HISTORY b/HISTORY
index 4865ab0..461ae26 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7,6 +7,7 @@ ____-__-__: Version 1.3.1
 - Makefile adjustments for VDR 1.7.13.
 - Fixed segmentation fault with 16bit images (closes #258 - thanks to
   domml@vdrportal)
+- Fixed crash with GraphicsMagick >= 1.3.8 and non-XPM images.
 
 2009-10-06: Version 1.3
 
diff --git a/bitmap.c b/bitmap.c
index 2a9037c..9213555 100644
--- a/bitmap.c
+++ b/bitmap.c
@@ -90,6 +90,12 @@ bool cText2SkinBitmap::Available(const std::string &Filename, int Alpha, int hei
 		return access(Filename.c_str(), F_OK) == 0;
 }
 
+void cText2SkinBitmap::Init(void) {
+#ifdef HAVE_IMAGEMAGICK
+	InitializeMagick(NULL);
+#endif
+}
+
 cText2SkinBitmap::cText2SkinBitmap(void) {
 	mCurrent = 0;
 	mLastGet = 0;
diff --git a/bitmap.h b/bitmap.h
index 7dede8b..f396f01 100644
--- a/bitmap.h
+++ b/bitmap.h
@@ -82,6 +82,7 @@ public:
 	                      int width = 0, int colors = 0);
 	static void ResetCache(void) { mCache.Reset(); }
 	static void FlushCache(void) { mCache.Flush(); }
+	static void Init(void);
 	
 	virtual ~cText2SkinBitmap();
 
diff --git a/text2skin.c b/text2skin.c
index d5e3655..9435cce 100644
--- a/text2skin.c
+++ b/text2skin.c
@@ -51,6 +51,7 @@ cString cText2SkinPlugin::SVDRPCommand(const char *Command, const char *Option,
 
 bool cText2SkinPlugin::Start(void) {
 	Text2SkinStatus.SetLanguage(I18nCurrentLanguage());
+	cText2SkinBitmap::Init();
 	cText2SkinLoader::Start();
 	return true;
 }