Commit 42f4ff45 authored by Christian Schulte zu Berge's avatar Christian Schulte zu Berge
Browse files

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

Campvis Core Dll
parents 0be65bc3 92a0b826
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include "tgt/filesystem.h" #include "tgt/filesystem.h"
#include "tgt/vector.h" #include "tgt/vector.h"
#include "core/coreapi.h"
#include "core/tools/stringutils.h" #include "core/tools/stringutils.h"
#include <map> #include <map>
...@@ -46,13 +47,13 @@ namespace campvis { ...@@ -46,13 +47,13 @@ namespace campvis {
* \todo Better vector support (e.g. "x,y,z" format) * \todo Better vector support (e.g. "x,y,z" format)
* Test and debug o_O * Test and debug o_O
*/ */
class TextFileParser { class CAMPVIS_CORE_API TextFileParser {
public: public:
/** /**
* Item separator for letting each line in the file result in one key-value pair item. * 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! * \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 // no operator() to implement due to template specialization
}; };
...@@ -265,7 +266,7 @@ namespace campvis { ...@@ -265,7 +266,7 @@ namespace campvis {
/// Template specialization for avoiding redundant split-join-split of lines. /// Template specialization for avoiding redundant split-join-split of lines.
template<> 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); tgt::File* file = FileSys.open(_url);
if (!file || !file->isOpen()) if (!file || !file->isOpen())
throw tgt::FileException("Could not open file " + _url + " for reading.", _url); throw tgt::FileException("Could not open file " + _url + " for reading.", _url);
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "tgt/vector.h" #include "tgt/vector.h"
#include "core/coreapi.h"
#include "core/datastructures/imagedata.h" #include "core/datastructures/imagedata.h"
#include <vector> #include <vector>
...@@ -37,7 +38,7 @@ namespace tgt { ...@@ -37,7 +38,7 @@ namespace tgt {
namespace campvis { namespace campvis {
class BinaryBrickedVolume { class CAMPVIS_CORE_API BinaryBrickedVolume {
public: public:
BinaryBrickedVolume(const ImageData* referenceImage, size_t brickSize); BinaryBrickedVolume(const ImageData* referenceImage, size_t brickSize);
......
...@@ -36,6 +36,8 @@ ...@@ -36,6 +36,8 @@
#include <IL/ilu.h> #include <IL/ilu.h>
#endif #endif
#include "core/coreapi.h"
namespace campvis { namespace campvis {
/** /**
...@@ -43,7 +45,7 @@ namespace campvis { ...@@ -43,7 +45,7 @@ namespace campvis {
* Therfore it stores an enum value together with the pointer for deducing its data type. * 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! * \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. * Base data type.
**/ **/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment