]>
Commit | Line | Data |
---|---|---|
0811744b JR |
1 | --- hugin-2018.0.0/src/hugin_base/panodata/Exiv2Helper.h~ 2015-05-10 08:52:11.000000000 +0200 |
2 | +++ hugin-2018.0.0/src/hugin_base/panodata/Exiv2Helper.h 2019-02-13 00:21:38.240804793 +0100 | |
3 | @@ -30,7 +30,7 @@ | |
4 | ||
5 | #include <string> | |
6 | #include <vector> | |
7 | -#include <exiv2/exif.hpp> | |
8 | +#include <exiv2/exiv2.hpp> | |
9 | ||
10 | // these functions are intentionally not exposed to public | |
11 | // they are supposed only be used by SrcPanoImage.cpp for internal use | |
ce06bd99 AG |
12 | --- hugin-2019.0.0/src/hugin1/hugin/RawImport.cpp~ 2019-02-02 11:11:01.000000000 +0100 |
13 | +++ hugin-2019.0.0/src/hugin1/hugin/RawImport.cpp 2019-10-12 16:35:33.327500060 +0200 | |
14 | @@ -35,10 +35,7 @@ | |
15 | // workaround for a conflict between exiv2 and wxWidgets/CMake built | |
16 | #define HAVE_PID_T 1 | |
17 | #endif | |
18 | -#include <exiv2/exif.hpp> | |
19 | -#include <exiv2/image.hpp> | |
20 | -#include <exiv2/easyaccess.hpp> | |
21 | -#include <exiv2/xmpsidecar.hpp> | |
22 | +#include <exiv2/exiv2.hpp> | |
23 | #ifdef __WXMSW__ | |
24 | #include <wx/msw/registry.h> | |
25 | #endif |