pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix build

Browse Source
This commit is contained in:
Prokhorov Kirill
2025-07-10 18:27:15 +03:00
parent 29355d337b
commit f5ddf8c6ce
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
DesktopEditor/graphics/pro/raster.pri
View File

@ -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 \

13
DesktopEditor/raster/heif/heif.cpp
View File

@ -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)
{

12
DesktopEditor/raster/heif/heif.h
View File

@ -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;