1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
|
diff -r fb12dbcd0ad1 -r 01e87b730bb3 src/hugin1/hugin/AboutDialog.cpp
--- a/src/hugin1/hugin/AboutDialog.cpp Wed May 15 17:41:28 2019 +0200
+++ b/src/hugin1/hugin/AboutDialog.cpp Wed May 15 17:47:40 2019 +0200
@@ -42,7 +42,7 @@
// workaround for a conflict between exiv2 and wxWidgets/CMake built
#define HAVE_PID_T 1
#endif
-#include "exiv2/exiv2.hpp"
+#include <exiv2/exiv2.hpp>
#include "lensdb/LensDB.h"
#include "sqlite3.h"
#include <lcms2.h>
diff -r fb12dbcd0ad1 -r 01e87b730bb3 src/hugin1/hugin/PanoOperation.cpp
--- a/src/hugin1/hugin/PanoOperation.cpp Wed May 15 17:41:28 2019 +0200
+++ b/src/hugin1/hugin/PanoOperation.cpp Wed May 15 17:47:40 2019 +0200
@@ -36,8 +36,7 @@
// workaround for a conflict between exiv2 and wxWidgets/CMake built
#define HAVE_PID_T 1
#endif
-#include <exiv2/exif.hpp>
-#include <exiv2/image.hpp>
+#include <exiv2/exiv2.hpp>
#include "base_wx/LensTools.h"
#include "base_wx/wxLensDB.h"
#include "hugin/ResetDialog.h"
diff -r fb12dbcd0ad1 -r 01e87b730bb3 src/hugin1/hugin/RawImport.cpp
--- a/src/hugin1/hugin/RawImport.cpp Wed May 15 17:41:28 2019 +0200
+++ b/src/hugin1/hugin/RawImport.cpp Wed May 15 17:47:40 2019 +0200
@@ -35,10 +35,7 @@
// workaround for a conflict between exiv2 and wxWidgets/CMake built
#define HAVE_PID_T 1
#endif
-#include <exiv2/exif.hpp>
-#include <exiv2/image.hpp>
-#include <exiv2/easyaccess.hpp>
-#include <exiv2/xmpsidecar.hpp>
+#include <exiv2/exiv2.hpp>
#ifdef __WXMSW__
#include <wx/msw/registry.h>
#endif
diff -r fb12dbcd0ad1 -r 01e87b730bb3 src/hugin1/hugin/TextureManager.cpp
--- a/src/hugin1/hugin/TextureManager.cpp Wed May 15 17:41:28 2019 +0200
+++ b/src/hugin1/hugin/TextureManager.cpp Wed May 15 17:47:40 2019 +0200
@@ -65,8 +65,7 @@
// workaround for a conflict between exiv2 and wxWidgets/CMake built
#define HAVE_PID_T 1
#endif
-#include "exiv2/exiv2.hpp"
-#include "exiv2/preview.hpp"
+#include <exiv2/exiv2.hpp>
TextureManager::TextureManager(HuginBase::Panorama *pano, ViewState *view_state_in)
{
diff -r fb12dbcd0ad1 -r 01e87b730bb3 src/hugin1/ptbatcher/FindPanoDialog.cpp
--- a/src/hugin1/ptbatcher/FindPanoDialog.cpp Wed May 15 17:41:28 2019 +0200
+++ b/src/hugin1/ptbatcher/FindPanoDialog.cpp Wed May 15 17:47:40 2019 +0200
@@ -36,8 +36,7 @@
// workaround for a conflict between exiv2 and wxWidgets/CMake built
#define HAVE_PID_T 1
#endif
-#include "exiv2/exiv2.hpp"
-#include "exiv2/preview.hpp"
+#include <exiv2/exiv2.hpp>
#ifdef _WIN32
#include <commctrl.h>
#endif
diff -r fb12dbcd0ad1 -r 01e87b730bb3 src/hugin_base/panodata/Exiv2Helper.cpp
--- a/src/hugin_base/panodata/Exiv2Helper.cpp Wed May 15 17:41:28 2019 +0200
+++ b/src/hugin_base/panodata/Exiv2Helper.cpp Wed May 15 17:47:40 2019 +0200
@@ -28,8 +28,7 @@
#include "Exiv2Helper.h"
#include "hugin_math/hugin_math.h"
#include "hugin_utils/utils.h"
-#include "exiv2/easyaccess.hpp"
-#include "exiv2/version.hpp"
+#include <exiv2/exiv2.hpp>
namespace HuginBase
{
diff -r fb12dbcd0ad1 -r 01e87b730bb3 src/hugin_base/panodata/SrcPanoImage.cpp
--- a/src/hugin_base/panodata/SrcPanoImage.cpp Wed May 15 17:41:28 2019 +0200
+++ b/src/hugin_base/panodata/SrcPanoImage.cpp Wed May 15 17:47:40 2019 +0200
@@ -40,9 +40,7 @@
#include <vigra/diff2d.hxx>
#include <vigra/imageinfo.hxx>
#include <hugin_utils/utils.h>
-#include <exiv2/exif.hpp>
-#include <exiv2/image.hpp>
-#include <exiv2/easyaccess.hpp>
+#include <exiv2/exiv2.hpp>
#include <lensdb/LensDB.h>
#include "Exiv2Helper.h"
|
