代码拉取完成,页面将自动刷新
同步操作将从 src-openEuler/kylin-photo-viewer 强制同步,此操作会覆盖自 Fork 仓库以来所做的任何修改,且无法恢复!!!
确定后同步将在后台操作,完成时将刷新页面,请耐心等待。
From f91d8c6daf58bd43e7e9619ca4536f3b1e970264 Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Tue, 7 Feb 2023 14:19:25 +0800
Subject: [PATCH] fix compile error of kylin-photo-viewer
---
codec/kylinimagecodec/image_load/image_load.cpp | 1 +
codec/kylinimagecodec/image_save/image_save.cpp | 1 +
codec/kylinimagecodec/kylinimagecodec.cpp | 4 ++--
codec/kylinimagecodec/kylinimagecodec.pro | 2 +-
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/codec/kylinimagecodec/image_load/image_load.cpp b/codec/kylinimagecodec/image_load/image_load.cpp
index ae4c559..4d6c182 100644
--- a/codec/kylinimagecodec/image_load/image_load.cpp
+++ b/codec/kylinimagecodec/image_load/image_load.cpp
@@ -1,3 +1,4 @@
+#define STB_IMAGE_IMPLEMENTATION
#include "kylinimagecodec.h"
MatResult KylinImageCodec::loadImageToMat(QString path)
diff --git a/codec/kylinimagecodec/image_save/image_save.cpp b/codec/kylinimagecodec/image_save/image_save.cpp
index 62ebd95..2d57ce7 100644
--- a/codec/kylinimagecodec/image_save/image_save.cpp
+++ b/codec/kylinimagecodec/image_save/image_save.cpp
@@ -1,3 +1,4 @@
+#define STB_IMAGE_WRITE_IMPLEMENTATION
#include "kylinimagecodec.h"
QStringList* KylinImageCodec::m_list = new QStringList;
diff --git a/codec/kylinimagecodec/kylinimagecodec.cpp b/codec/kylinimagecodec/kylinimagecodec.cpp
index 24a429b..09b9962 100644
--- a/codec/kylinimagecodec/kylinimagecodec.cpp
+++ b/codec/kylinimagecodec/kylinimagecodec.cpp
@@ -71,8 +71,8 @@ QHash<QString, int> KylinImageCodec::creatFormats()
tmpFormats.insert("DDS",FIF_DDS);
tmpFormats.insert("GIF",FIF_GIF);
tmpFormats.insert("HDR",FIF_HDR);
- tmpFormats.insert("FAX",FIF_FAXG3);
- tmpFormats.insert("G3",FIF_FAXG3);
+// tmpFormats.insert("FAX",FIF_FAXG3);
+// tmpFormats.insert("G3",FIF_FAXG3);
tmpFormats.insert("SGI",FIF_SGI);
tmpFormats.insert("CUT",FIF_CUT);
tmpFormats.insert("JNG",FIF_JNG);
diff --git a/codec/kylinimagecodec/kylinimagecodec.pro b/codec/kylinimagecodec/kylinimagecodec.pro
index 49413d6..1db55c5 100644
--- a/codec/kylinimagecodec/kylinimagecodec.pro
+++ b/codec/kylinimagecodec/kylinimagecodec.pro
@@ -24,7 +24,7 @@ LIBS += -lopencv_core \
-lopencv_imgproc \
#stb
-LIBS += -lstb \
+#LIBS += -lstb \
#gif
LIBS += -lgif \
--
2.33.0
此处可能存在不合适展示的内容,页面不予展示。您可通过相关编辑功能自查并修改。
如您确认内容无涉及 不当用语 / 纯广告导流 / 暴力 / 低俗色情 / 侵权 / 盗版 / 虚假 / 无价值内容或违法国家有关法律法规的内容,可点击提交进行申诉,我们将尽快为您处理。