Merge pull request #217 from Libvisual/gforce-fixing

libvisual-plugins: Fix issues with font loading for actor "gforce"

Author: hartwork

libvisual-plugins/plugins/actor/gforce/CMakeLists.txt

@@ -18,3 +18,5 @@ ADD_SUBDIRECTORY(GForceWaveShapes)
 #ADD_SUBDIRECTORY(NotWorkingWaveShapes)
 ADD_SUBDIRECTORY(unix)
 ADD_SUBDIRECTORY(docs)
+
+INSTALL(FILES deffont DESTINATION ${GFORCE_DATA_DIR})

libvisual-plugins/plugins/actor/gforce/Common/UI/CMakeLists.txt

@@ -1,6 +1,6 @@
 FILE(GLOB gforce_ui_HEADERS "Headers/*")
 
-SET(DATADIR $(LV_PLUGIN_DATA_DIR))
+SET(DATADIR ${LV_PLUGIN_DATA_DIR}/actor/actor_gforce)
 
 # Missing DrawXX.cpp and LineXX.cpp
 SET(gforce_ui_SOURCES

libvisual-plugins/plugins/actor/gforce/unix/libmfl/mfl.c

@@ -51,7 +51,10 @@ mfl_font mfl_LoadRawFont(const char *fname) {
 
   /* Open font file */
   ff = fopen(fname, "rb");
-  if (ff == NULL) goto lrf_open_fault;
+  if (ff == NULL) {
+    visual_log (VISUAL_LOG_WARNING, "Unable to open font file: %s", fname);
+    goto lrf_open_fault;
+  }
 
   /* Get length of font file */
   if (fseek(ff, 0, SEEK_END) != 0) goto lrf_fault;
@@ -70,6 +73,7 @@ mfl_font mfl_LoadRawFont(const char *fname) {
 
   /* Read font data */
   if (fread(f->data, 1, l, ff) != l) {
+    visual_log (VISUAL_LOG_WARNING, "Unable to fully read font file: %s", fname);
     free(f->data);
     free(f);
     f = NULL;
@@ -84,7 +88,9 @@ mfl_font mfl_LoadRawFont(const char *fname) {
 }
 
 void mfl_DestroyFont(mfl_font f) {
-  visual_return_if_fail(f != NULL);
+  if (f == NULL) {
+    return;
+  }
   free(f->data);
   free(f);
 }