Small fixes for debian stretch

diff --git a/GNUmakefile b/GNUmakefile
index 0682e5d9cc26bc496391f3f3c8fef10e5feb11cc..d84161110af7c9db654635e19ad6a92ac30e00d7 100644 (file)
--- 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 631fa3ba719ee8ccc6af0e11cb7a20ec92d26c57..18a1dc23b48d74d3a68395ab4f88e302b43325da 100644 (file)
--- 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 3c1812f77ec3445e8a64465f28d16470da5948fb..aab8b1757a27a6c641936b827e088cc54b5284a4 100644 (file)
--- 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 <Magick++.h>
 
-using namespace Magick;
+using namespace Magick; 
 
 class MagickDecoder: public OsdVector::PictureDecoder {
 public: