From 6db0789dedfb033b3a15073de6d778dbb8eb41d8 Mon Sep 17 00:00:00 2001
From: David Tschumperle <David.Tschumperle@unicaen.fr>
Date: Sat, 15 Jan 2022 13:41:05 +0100
Subject: [PATCH] Fix compilation issues with 3.0.2.

---
 include/FilterThread.h   | 4 ++--
 include/ImageConverter.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/FilterThread.h b/include/FilterThread.h
index be1a4fa..c414d00 100644
--- a/include/FilterThread.h
+++ b/include/FilterThread.h
@@ -50,10 +50,10 @@
 #include <QThread>
 #include "Common.h"
 #include "CriticalRef.h"
-#ifndef gmic_build
+#include "gmic.h"
+#ifndef gmic_core
 #include "CImg.h"
 #endif
-#include "gmic.h"
 class ImageSource;
 class QMutex;
 class QImage;
diff --git a/include/ImageConverter.h b/include/ImageConverter.h
index 42e907b..be0c7a5 100644
--- a/include/ImageConverter.h
+++ b/include/ImageConverter.h
@@ -48,10 +48,10 @@
 
 #include <QMutex>
 #include <opencv2/opencv.hpp>
-#ifndef gmic_build
+#include "gmic.h"
+#ifndef gmic_core
 #include "CImg.h"
 #endif
-#include "gmic.h"
 
 class QImage;
 
From 38bc9cb651e3ffb4097125ba403e9d7e34e1b4fe Mon Sep 17 00:00:00 2001
From: David Tschumperle <David.Tschumperle@unicaen.fr>
Date: Sat, 15 Jan 2022 13:34:36 +0100
Subject: [PATCH] Change 'gmic_build' to 'gmic_core'.

---
 zart.pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zart.pro b/zart.pro
index 1d2e88e..1edf966 100644
--- a/zart.pro
+++ b/zart.pro
@@ -117,7 +117,7 @@ equals(GMIC_DYNAMIC_LINKING, "on" ) {
 equals(GMIC_DYNAMIC_LINKING, "off" ) {
  HEADERS += $$GMIC_PATH/gmic_stdlib.h
  SOURCES += $$GMIC_PATH/gmic.cpp
- DEFINES += gmic_build
+ DEFINES += gmic_core
 }
 
 #