Switch to GraphicsMagick. Can be reverted by configoption in makefile

MegaV0lt · Jan 5, 2021 · 3e905e2 · 3e905e2
1 parent ce0be9e
commit 3e905e2
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -28,6 +28,10 @@ SKINFLATPLUS_VDRLOGO = vdrlogo_default
 #DEFINES += -DDEBUGIMAGELOADTIME
 #DEFINES += -DDEBUGEPGTIME
 
+# External image lib to use: imagemagick, graphicsmagick
+#IMAGELIB = imagemagick
+IMAGELIB = graphicsmagick
+
 ### The version number of this plugin (taken from the main source file):
 
 VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
@@ -68,13 +72,17 @@ SOFILE = libvdr-$(PLUGIN).so
 
 ### Includes and Defines and Dependencies (add further entries here):
 
-INCLUDES += $(shell pkg-config --cflags Magick++ freetype2 fontconfig)
+ifeq ($(IMAGELIB), imagemagick)
+	INCLUDES += $(shell pkg-config --cflags Magick++ freetype2 fontconfig)
+	LIBS += $(shell pkg-config --libs Magick++)
+else ifeq ($(IMAGELIB), graphicsmagick)
+	INCLUDES += $(shell pkg-config --cflags GraphicsMagick++ freetype2 fontconfig)
+	LIBS += $(shell pkg-config --libs GraphicsMagick++)
+endif
 
 DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DVDRLOGO=\"$(SKINFLATPLUS_VDRLOGO)\"
 DEFINES += -DWIDGETFOLDER='"$(SKINFLATPLUS_WIDGETDIR)"'
 
-LIBS += $(shell pkg-config --libs Magick++)
-
 ### The object files (add further files here):
 
 OBJS = config.o setup.o imagecache.o imagescaler.o imagemagickwrapper.o imageloader.o baserender.o complexcontent.o textscroller.o displaychannel.o displaymenu.o displaymessage.o \

diff --git a/imageloader.c b/imageloader.c
@@ -8,7 +8,6 @@
 using namespace Magick;
 
 cImageLoader::cImageLoader() {
-    InitializeMagick(NULL);
     logoExtension = "png";
 }
 

diff --git a/imagemagickwrapper.c b/imagemagickwrapper.c
@@ -4,7 +4,6 @@
 #include "imagescaler.h"
 
 cImageMagickWrapper::cImageMagickWrapper() {
-    InitializeMagick(NULL);
 }
 
 cImageMagickWrapper::~cImageMagickWrapper() {

diff --git a/skinflatplus.c b/skinflatplus.c
@@ -7,6 +7,7 @@
  */
 #include <getopt.h>
 #include <vdr/plugin.h>
+#include <Magick++.h>
 
 #if defined(APIVERSNUM) && APIVERSNUM < 10734
 #error "VDR-1.7.34 API version or greater is required!"
@@ -76,6 +77,11 @@ bool cPluginFlat::ProcessArgs(int argc, char *argv[]) {
     return true;
 }
 
+__attribute__((constructor)) static void init(void) {
+   Magick::InitializeMagick(NULL);
+}
+
+
 bool cPluginFlat::Initialize(void) {
     Config.Init();
     return true;