From 50464fd1e3072c2ca4bb97afdc5630db052cba97 Mon Sep 17 00:00:00 2001 From: Marten Richter Date: Sat, 11 Nov 2017 08:42:02 +0100 Subject: [PATCH] Small fixes for debian stretch --- GNUmakefile | 2 +- osdopenvg.cc | 6 +++--- osdvector.cc | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 0682e5d..d841611 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -90,7 +90,7 @@ endif ifeq ($(vomp_platform),raspberry) $(info Raspberry pi flags) LDFLAGS = -Wall $(PICTURES) -LIBS = -L/opt/vc/lib -lpthread -lrt -lEGL -lOpenVG -lopenmaxil -lbcm_host -lavformat -lavcodec -lavutil -lavresample +LIBS = -L/opt/vc/lib -lpthread -lrt -lbrcmEGL -lbrcmOpenVG -lopenmaxil -lbcm_host -lavformat -lavcodec -lavutil -lavresample OBJECTS += main.o threadp.o osdvector.o surfacevector.o osdopenvg.o ledraspberry.o mtdraspberry.o videoomx.o audioomx.o imageomx.o wjpegsimple.o remotelinux.o signal.o LIBS+= -ldl -lfontconfig -lfreetype -L/usr/lib/arm-linux-gnueabihf -lMagick++-6.Q16 diff --git a/osdopenvg.cc b/osdopenvg.cc index 631fa3b..18a1dc2 100644 --- a/osdopenvg.cc +++ b/osdopenvg.cc @@ -783,9 +783,9 @@ int OsdOpenVG::loadFont(bool newfont) { error=FT_Load_Glyph(ft_face,glyph,FT_LOAD_DEFAULT); if (error){ - FT_Done_Face(ft_face); - Log::getInstance()->log("OSD", Log::WARN, "Could not load glyph %x",error); - return 0; + cur_char = FT_Get_Next_Char(ft_face,cur_char,&glyph); + Log::getInstance()->log("OSD", Log::WARN, "Could not load glyph %x %c",error); + continue; } VGPath path; FT_Outline ot=ft_face->glyph->outline; diff --git a/osdvector.cc b/osdvector.cc index 3c1812f..aab8b17 100644 --- a/osdvector.cc +++ b/osdvector.cc @@ -27,9 +27,11 @@ // The next section is activated, if the magick++ PictureReader is provided, it should be available for many POSIX platforms #ifdef PICTURE_DECODER_MAGICK +#define MAGICKCORE_QUANTUM_DEPTH 16 +#define MAGICKCORE_HDRI_ENABLE 0 #include -using namespace Magick; +using namespace Magick; class MagickDecoder: public OsdVector::PictureDecoder { public: -- 2.39.2