From f5ddf8c6ce5bdb103a206ace8d1a6fa052609465 Mon Sep 17 00:00:00 2001
From: Prokhorov Kirill <kirill.prohorov@onlyoffice.com>
Date: Thu, 10 Jul 2025 18:27:15 +0300
Subject: [PATCH] Fix build

---
 DesktopEditor/graphics/pro/raster.pri |  7 +++++--
 DesktopEditor/raster/heif/heif.cpp    | 13 +++++++++++++
 DesktopEditor/raster/heif/heif.h      | 12 ------------
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/DesktopEditor/graphics/pro/raster.pri b/DesktopEditor/graphics/pro/raster.pri
index 5683b3d802..ac998ad48a 100644
--- a/DesktopEditor/graphics/pro/raster.pri
+++ b/DesktopEditor/graphics/pro/raster.pri
@@ -17,23 +17,28 @@ DEFINES += \
 core_linux {
 	DEFINES += HAVE_UNISTD_H HAVE_FCNTL_H
 	QMAKE_CXXFLAGS += -Wno-narrowing
+	LIBS += -L$$LIB_GRAPHICS_PRI_PATH/../Common/3dParty/heif/libheif/libheif/api/libheif/libheif -lheif
 }
 
 core_linux_clang {
     QMAKE_CFLAGS += -Wno-incompatible-function-pointer-types
+	LIBS += -L$$LIB_GRAPHICS_PRI_PATH/../Common/3dParty/heif/libheif/libheif/api/libheif/libheif -lheif
 }
 
 core_mac {
 	DEFINES += HAVE_UNISTD_H HAVE_FCNTL_H
+	LIBS += -L$$LIB_GRAPHICS_PRI_PATH/../Common/3dParty/heif/libheif/libheif/api/libheif/libheif -lheif
 }
 
 core_windows {
 	DEFINES += JAS_WIN_MSVC_BUILD NOMINMAX
 	LIBS += -lUser32
+	LIBS += $$LIB_GRAPHICS_PRI_PATH/../Common/3dParty/heif/libheif/libheif/api/libheif/libheif/Release/heif.lib
 }
 
 core_android {
 	QMAKE_CFLAGS += -Wno-incompatible-function-pointer-types
+	LIBS += -L$$LIB_GRAPHICS_PRI_PATH/../Common/3dParty/heif/libheif/libheif/api/libheif/libheif/heif.a
 }
 
 INCLUDEPATH += \
@@ -42,8 +47,6 @@ INCLUDEPATH += \
 	$$LIB_GRAPHICS_PRI_PATH/cximage/png \
 	$$LIB_GRAPHICS_PRI_PATH/../Common/3dParty/heif/libheif/libheif/api \
 
-LIBS += $$LIB_GRAPHICS_PRI_PATH/../Common/3dParty/heif/libheif/libheif/api/libheif/libheif/Release/heif.lib
-
 HEADERS += \
 	$$PWD/../../graphics/Image.h \
 	$$PWD/../../raster/BgraFrame.h \
diff --git a/DesktopEditor/raster/heif/heif.cpp b/DesktopEditor/raster/heif/heif.cpp
index 4b89df7391..4a78cc379f 100644
--- a/DesktopEditor/raster/heif/heif.cpp
+++ b/DesktopEditor/raster/heif/heif.cpp
@@ -1,6 +1,19 @@
 #include "heif.h"
 #include "../../common/File.h"
 
+#include <functional>
+
+#define CONCAT_IMPL(x, y) x##y
+#define CONCAT(x, y) CONCAT_IMPL(x, y)
+#define defer(code) Defer CONCAT(_defer_, __COUNTER__)([&](){code;})
+
+class Defer {
+	std::function<void()> func;
+public:
+	explicit Defer(std::function<void()> func) : func(func) {}
+	~Defer() { func(); }
+};
+
 namespace NSHeif {
 	bool CHeifFile::isHeif(const std::wstring& fileName)
 	{
diff --git a/DesktopEditor/raster/heif/heif.h b/DesktopEditor/raster/heif/heif.h
index 64d28bee71..25b16fba42 100644
--- a/DesktopEditor/raster/heif/heif.h
+++ b/DesktopEditor/raster/heif/heif.h
@@ -1,20 +1,8 @@
 #include "../BgraFrame.h"
 #include "../../Common/3dParty/heif/libheif/libheif/api/libheif/heif.h"
 #include "../../UnicodeConverter/UnicodeConverter.h"
-#include <functional>
 
 namespace NSHeif {
-#define CONCAT_IMPL(x, y) x##y
-#define CONCAT(x, y) CONCAT_IMPL(x, y)
-#define defer(code) Defer CONCAT(_defer_, __COUNTER__)([&](){code;})
-
-	class Defer {
-		std::function<void()> func;
-	public:
-		explicit Defer(std::function<void()> func) : func(func) {}
-		~Defer() { func(); }
-	};
-
 	class GRAPHICS_DECL CHeifFile {
 	private:
 		CHeifFile() = delete;