From d7487f601c55d30ee13b4d4dee077a02435eea1f Mon Sep 17 00:00:00 2001
From: Jonas Strandstedt <jonas.strandstedt@gmail.com>
Date: Thu, 4 Dec 2014 11:20:28 +0100
Subject: [PATCH] OS X compile fixes

---
 include/openspace/abuffer/abufferframebuffer.h | 2 +-
 src/abuffer/abufferframebuffer.cpp             | 4 ++--
 src/engine/openspaceengine.cpp                 | 4 ++++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/include/openspace/abuffer/abufferframebuffer.h b/include/openspace/abuffer/abufferframebuffer.h
index 46d71b1a4d..9c40222aa5 100644
--- a/include/openspace/abuffer/abufferframebuffer.h
+++ b/include/openspace/abuffer/abufferframebuffer.h
@@ -40,7 +40,7 @@ public:
     virtual void preRender();
     virtual void postRender();
     
-    virtual std::string settings();
+    std::vector<fragmentData> pixelData();
 protected:
     virtual bool reinitializeInternal();
     
diff --git a/src/abuffer/abufferframebuffer.cpp b/src/abuffer/abufferframebuffer.cpp
index 0cc5ffe58c..6f2673690b 100644
--- a/src/abuffer/abufferframebuffer.cpp
+++ b/src/abuffer/abufferframebuffer.cpp
@@ -60,8 +60,8 @@ void ABufferFramebuffer::postRender() {
 
 }
 
-std::string ABufferFramebuffer::settings() {
-	return R"()";
+std::vector<ABuffer::fragmentData> ABufferFramebuffer::pixelData() {
+    return std::vector<ABuffer::fragmentData>();
 }
 
 
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 79851862ac..fbcb8b1d58 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -222,6 +222,10 @@ void OpenSpaceEngine::loadFonts() {
 		std::string font;
 		fonts.getValue(key, font);
 		font = absPath(font);
+        if(!FileSys.fileExists(font)) {
+            LERROR("Could not find font '" << font << "'");
+            continue;
+        }
 
 		LINFO("Registering font '" << font << "' with key '" << key << "'");
 		sgct_text::FontManager::instance()->addFont(key, font, local);