From 4ab06ca0d536402576ed5890d4af69f4d6187d67 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Thu, 14 Jul 2016 11:34:55 +0200
Subject: [PATCH] correct tiff includes; further manual edits
---
Core/InputOutput/TiffHandler.cpp | 1 -
Core/InputOutput/TiffHandler.h | 10 +++++-----
Core/Tools/NumpyUtils.cpp | 7 ++++---
Core/Tools/OutputData.cpp | 7 +++----
4 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/Core/InputOutput/TiffHandler.cpp b/Core/InputOutput/TiffHandler.cpp
index 660d46b2a2f..16283f89083 100644
--- a/Core/InputOutput/TiffHandler.cpp
+++ b/Core/InputOutput/TiffHandler.cpp
@@ -15,7 +15,6 @@
#ifdef BORNAGAIN_TIFF_SUPPORT
-#include <tiffio.hxx>
#include "Utils.h"
#include "BornAgainNamespace.h"
#include "TiffHandler.h"
diff --git a/Core/InputOutput/TiffHandler.h b/Core/InputOutput/TiffHandler.h
index d9b46c9a0c1..54ff07397f3 100644
--- a/Core/InputOutput/TiffHandler.h
+++ b/Core/InputOutput/TiffHandler.h
@@ -20,6 +20,7 @@
#include "OutputData.h"
#include <tiffio.h>
+#include <tiffio.hxx>
#include <memory>
//! @class TiffHandler
@@ -34,9 +35,9 @@ public:
void read(std::istream& input_stream);
- const OutputData<double> *getOutputData() const;
+ const OutputData<double>* getOutputData() const;
- void write(const OutputData<double> &data, std::ostream &output_stream);
+ void write(const OutputData<double>& data, std::ostream& output_stream);
private:
void read_header();
@@ -46,13 +47,12 @@ private:
void close();
void create_output_data();
- TIFF *m_tiff;
+ TIFF* m_tiff;
size_t m_width;
size_t m_height;
- std::unique_ptr<OutputData<double> > m_data;
+ std::unique_ptr<OutputData<double>> m_data;
};
#endif // BORNAGAIN_TIFF_SUPPORT
#endif // TIFFHANDLER_H
-
diff --git a/Core/Tools/NumpyUtils.cpp b/Core/Tools/NumpyUtils.cpp
index 3c692e7cdb2..f0f34911317 100644
--- a/Core/Tools/NumpyUtils.cpp
+++ b/Core/Tools/NumpyUtils.cpp
@@ -14,13 +14,14 @@
// ************************************************************************** //
-#include "NumpyUtils.h"
-#include "Exceptions.h"
-
#ifdef BORNAGAIN_PYTHON
+
#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
#define PY_ARRAY_UNIQUE_SYMBOL BORNAGAIN_PYTHONAPI_ARRAY
#define NO_IMPORT_ARRAY
+
+#include "NumpyUtils.h"
+#include "Exceptions.h"
#include "numpy/arrayobject.h"
PyObject* Utils::createNumpyArray(const std::vector<double>& data)
diff --git a/Core/Tools/OutputData.cpp b/Core/Tools/OutputData.cpp
index 2f5dc8ac020..f4d02343f1d 100644
--- a/Core/Tools/OutputData.cpp
+++ b/Core/Tools/OutputData.cpp
@@ -13,15 +13,14 @@
//
// ************************************************************************** //
-#include "OutputData.h"
-
#ifdef BORNAGAIN_PYTHON
+
#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
#define PY_ARRAY_UNIQUE_SYMBOL BORNAGAIN_PYTHONAPI_ARRAY
#define NO_IMPORT_ARRAY
-#include "numpy/arrayobject.h"
-
+#include "OutputData.h"
+#include "numpy/arrayobject.h"
template<>
PyObject *OutputData<double>::getArray() const
--
GitLab