Commit 21f51b25 authored by Heiko Becker's avatar Heiko Becker
Browse files

Include exiv2.hpp and KImageAnnotator outside of #ifdef HAVE_TIFF

Otherwise having support for tiff disabled can lead to build errors,
like "app/main.cpp:210:5: error: 'kImageAnnotator' has not been
declared".
parent 3f052d33
Pipeline #205980 passed with stage
in 4 minutes and 7 seconds
......@@ -53,13 +53,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <QLoggingCategory>
#include <tiffio.h>
// To enable AVIF/HEIF/JPEG-XL metadata support in Exiv2
#include <exiv2/exiv2.hpp>
#ifdef KIMAGEANNOTATOR_CAN_LOAD_TRANSLATIONS
#include <kImageAnnotator/KImageAnnotator.h>
#endif
namespace
{
Q_DECLARE_LOGGING_CATEGORY(LibTiffLog)
......@@ -79,6 +72,13 @@ static void handleTiffError(const char *mod, const char *fmt, va_list ap)
} // namespace
#endif
// To enable AVIF/HEIF/JPEG-XL metadata support in Exiv2
#include <exiv2/exiv2.hpp>
#ifdef KIMAGEANNOTATOR_CAN_LOAD_TRANSLATIONS
#include <kImageAnnotator/KImageAnnotator.h>
#endif
class StartHelper
{
public:
......
Supports Markdown
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