Merge branch 'campvis-core-dll' into 'development'

Campvis Core Dll

core/tools/textfileparser.h

@@ -29,6 +29,7 @@
 #include "tgt/filesystem.h"
 #include "tgt/vector.h"
 
+#include "core/coreapi.h"
 #include "core/tools/stringutils.h"
 
 #include <map>
@@ -46,13 +47,13 @@ namespace campvis {
      * \todo    Better vector support (e.g. "x,y,z" format)
      *          Test and debug o_O
      */
-    class TextFileParser {
+    class CAMPVIS_CORE_API TextFileParser {
     public:
         /**
          * Item separator for letting each line in the file result in one key-value pair item.
          * \note    The behaviour is not implemented as functor but by template specialization!
          */
-        struct ItemSeparatorLines {
+        struct CAMPVIS_CORE_API ItemSeparatorLines {
             // no operator() to implement due to template specialization
         };
 
@@ -265,7 +266,7 @@ namespace campvis {
 
     /// Template specialization for avoiding redundant split-join-split of lines.
     template<>
-    inline std::vector<std::string> campvis::TextFileParser::readAndParseItems<TextFileParser::ItemSeparatorLines>() const throw (tgt::FileException, tgt::CorruptedFileException) {
+    CAMPVIS_CORE_API std::vector<std::string> campvis::TextFileParser::readAndParseItems<TextFileParser::ItemSeparatorLines>() const throw (tgt::FileException, tgt::CorruptedFileException) {
         tgt::File* file = FileSys.open(_url);
         if (!file || !file->isOpen())
             throw tgt::FileException("Could not open file " + _url + " for reading.", _url);

core/tools/volumebricking.h

@@ -27,6 +27,7 @@
 
 #include "tgt/vector.h"
 
+#include "core/coreapi.h"
 #include "core/datastructures/imagedata.h"
 
 #include <vector>
@@ -37,7 +38,7 @@ namespace tgt {
 
 namespace campvis {
 
-    class BinaryBrickedVolume {
+    class CAMPVIS_CORE_API BinaryBrickedVolume {
     public:
         BinaryBrickedVolume(const ImageData* referenceImage, size_t brickSize);
 

core/tools/weaklytypedpointer.h

@@ -36,6 +36,8 @@
 #include <IL/ilu.h>
 #endif
 
+#include "core/coreapi.h"
+
 namespace campvis {
 
     /**
@@ -43,7 +45,7 @@ namespace campvis {
      * Therfore it stores an enum value together with the pointer for deducing its data type.
      * \note    WeaklyTypedPointer takes _not_ take ownership of its pointer, hence it won't take care of deleting it!
      */
-    struct WeaklyTypedPointer {
+    struct CAMPVIS_CORE_API WeaklyTypedPointer {
         /**
          * Base data type.
          **/