File _service:obs_scm:0001-fix-compile-error-of-libk... of Package libkysdk-applications

File _service:obs_scm:0001-fix-compile-error-of-libkysdk-applications.patch of Package libkysdk-applications

From 5c2028a45d84c4b6b5fdab3c8a8a22e9ce4333f4 Mon Sep 17 00:00:00 2001
From: huayadong <huayadong@kylinos.cn>
Date: Fri, 29 Mar 2024 10:42:44 +0800
Subject: [PATCH] 0001-fix-compile-error-of-libkysdk-applications.patch

---
 kysdk-application.pro                                 | 11 ++++++-----
 kysdk-kabase/kabase/image/utils.cpp                   |  6 +++---
 kysdk-kabase/kabase/kabase.pro                        |  2 +-
 .../kabase/kylin_image_codec/kylinimagecodec.cpp      |  4 ++--
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/kysdk-application.pro b/kysdk-application.pro
index 81ad905..7afa675 100644
--- a/kysdk-application.pro
+++ b/kysdk-application.pro
@@ -10,8 +10,9 @@ SUBDIRS = \
     kysdk-alm \
     kysdk-ukenv
 
-
-
-
-
-
+pc.files = development-files/*.pc
+pc.path = /usr/share/pkgconfig
+conf.files = config/kysdk-applications.conf
+conf.path = /etc/ld.so.conf.d/
+# Default rules for deployment.
+INSTALLS += pc conf
diff --git a/kysdk-kabase/kabase/image/utils.cpp b/kysdk-kabase/kabase/image/utils.cpp
index 609bbd7..20d9781 100644
--- a/kysdk-kabase/kabase/image/utils.cpp
+++ b/kysdk-kabase/kabase/image/utils.cpp
@@ -166,9 +166,9 @@ FREE_IMAGE_FORMAT Utils::getImageFiFormat(QString path)
         return FIF_GIF;
     case image::ImageFormat::HDR:
         return FIF_HDR;
-    case image::ImageFormat::FAX:
-    case image::ImageFormat::G3:
-        return FIF_FAXG3;
+//    case image::ImageFormat::FAX:
+//    case image::ImageFormat::G3:
+//        return FIF_FAXG3;
     case image::ImageFormat::SGI:
         return FIF_SGI;
     case image::ImageFormat::CUT:
diff --git a/kysdk-kabase/kabase/kabase.pro b/kysdk-kabase/kabase/kabase.pro
index aafb05f..da6a1da 100644
--- a/kysdk-kabase/kabase/kabase.pro
+++ b/kysdk-kabase/kabase/kabase.pro
@@ -14,7 +14,7 @@ CONFIG += c++11 console link_pkgconfig no_keywords
 LIBS += -ldl -lpthread -lsystemd -lkylog -lkyconf -lgif -L/usr/lib/kysdk/kysdk-base
 
 greaterThan(QT_VER_MAJ , 4) {
-    LIBS += -lopencv_core -lopencv_imgcodecs -lopencv_imgproc -lstb -lfreeimage -lfreeimageplus
+    LIBS += -lopencv_core -lopencv_imgcodecs -lopencv_imgproc -lfreeimage -lfreeimageplus
 } else {
     message("--- v10 project ---")
 }
diff --git a/kysdk-kabase/kabase/kylin_image_codec/kylinimagecodec.cpp b/kysdk-kabase/kabase/kylin_image_codec/kylinimagecodec.cpp
index 3e5a9f9..116dd4a 100644
--- a/kysdk-kabase/kabase/kylin_image_codec/kylinimagecodec.cpp
+++ b/kysdk-kabase/kabase/kylin_image_codec/kylinimagecodec.cpp
@@ -97,8 +97,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);
-- 
2.33.0