fix some build warnings and code problems
Signed-off-by: 侯红勋 <houhongxun@kylinos.cn>
This commit is contained in:
parent
79b2afffd0
commit
0fa0b5b4e5
@ -0,0 +1,50 @@
|
|||||||
|
From e44752c6e0c7dfd08e847b5b4b499818c5443276 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?=E4=BE=AF=E7=BA=A2=E5=8B=8B?= <houhongxun@kylinos.cn>
|
||||||
|
Date: Tue, 23 Apr 2024 09:54:24 +0800
|
||||||
|
Subject: [PATCH] kylin-scanner: fix some build warnings and code problems
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
Signed-off-by: 侯红勋 <houhongxun@kylinos.cn>
|
||||||
|
---
|
||||||
|
src/rectify.cpp | 2 +-
|
||||||
|
src/showimagewidget.cpp | 2 +-
|
||||||
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/rectify.cpp b/src/rectify.cpp
|
||||||
|
index 32828e2..9d58cb5 100644
|
||||||
|
--- a/src/rectify.cpp
|
||||||
|
+++ b/src/rectify.cpp
|
||||||
|
@@ -141,7 +141,7 @@ double CalcDegree(const Mat &srcImage, Mat &dst)
|
||||||
|
//依次画出每条线段
|
||||||
|
size_t i = 0;
|
||||||
|
|
||||||
|
- int loop = 300;
|
||||||
|
+ size_t loop = 300;
|
||||||
|
if (lines.size() > loop) {
|
||||||
|
loop = 300;
|
||||||
|
} else {
|
||||||
|
diff --git a/src/showimagewidget.cpp b/src/showimagewidget.cpp
|
||||||
|
index 0a3e059..7cf46df 100644
|
||||||
|
--- a/src/showimagewidget.cpp
|
||||||
|
+++ b/src/showimagewidget.cpp
|
||||||
|
@@ -20,6 +20,7 @@
|
||||||
|
#include <ukui-log4qt.h>
|
||||||
|
|
||||||
|
ShowImageWidget::ShowImageWidget(QWidget *parent) : QWidget(parent)
|
||||||
|
+ , scannerImagePath(g_config_signal->m_scannerImagePath)
|
||||||
|
, m_stackImage (new QImage())
|
||||||
|
, m_editImage (new QImage())
|
||||||
|
, m_normalImage (new QImage())
|
||||||
|
@@ -29,7 +30,6 @@ ShowImageWidget::ShowImageWidget(QWidget *parent) : QWidget(parent)
|
||||||
|
, m_showImageHLayout (new QHBoxLayout())
|
||||||
|
, m_toolbarWidget (new ToolBarWidget())
|
||||||
|
, m_mainVLayout (new QVBoxLayout())
|
||||||
|
- , scannerImagePath(g_config_signal->m_scannerImagePath)
|
||||||
|
{
|
||||||
|
setupGui();
|
||||||
|
initConnect();
|
||||||
|
--
|
||||||
|
2.43.0
|
||||||
|
|
||||||
@ -1,12 +1,13 @@
|
|||||||
Name: kylin-scanner
|
Name: kylin-scanner
|
||||||
Version: 1.0.4
|
Version: 1.0.4
|
||||||
Release: 1
|
Release: 2
|
||||||
Summary: Kylin Scanner is an interface-friendly scanning software developed with Qt5.
|
Summary: Kylin Scanner is an interface-friendly scanning software developed with Qt5.
|
||||||
License: BSL-1.0 and Libpng and zlib and GPL-2.0-or-later
|
License: BSL-1.0 and Libpng and zlib and GPL-2.0-or-later
|
||||||
URL: https://github.com/UbuntuKylin/kylin-scanner
|
URL: https://github.com/UbuntuKylin/kylin-scanner
|
||||||
Source0: %{name}-%{version}.tar.gz
|
Source0: %{name}-%{version}.tar.gz
|
||||||
Patch01: 0001-fix-compile-error-of-kylin-scanner.patch
|
Patch01: 0001-fix-compile-error-of-kylin-scanner.patch
|
||||||
Patch02: 0002-modify-version-of-kylin-scanner-is-null.patch
|
Patch02: 0002-modify-version-of-kylin-scanner-is-null.patch
|
||||||
|
Patch03: 0001-kylin-scanner-fix-some-build-warnings-and-code-probl.patch
|
||||||
|
|
||||||
BuildRequires: qt5-qtsvg-devel
|
BuildRequires: qt5-qtsvg-devel
|
||||||
BuildRequires: glib2-devel
|
BuildRequires: glib2-devel
|
||||||
@ -40,9 +41,7 @@ and text recognition, etc.
|
|||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%autosetup -n %{name}-%{version} -p1
|
||||||
%patch01 -p1
|
|
||||||
%patch02 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%{qmake_qt5}
|
%{qmake_qt5}
|
||||||
@ -59,6 +58,9 @@ and text recognition, etc.
|
|||||||
%{_datadir}/kylin-user-guide/data/guide/kylin-scanner
|
%{_datadir}/kylin-user-guide/data/guide/kylin-scanner
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Apr 23 2024 houhongxun <houhongxun@kylinos.cn> - 1.0.4-2
|
||||||
|
- fix some build warnings and code problems
|
||||||
|
|
||||||
* Thu May 25 2023 peijiankang <peijiankang@kylinos.cn> - 1.0.4-1
|
* Thu May 25 2023 peijiankang <peijiankang@kylinos.cn> - 1.0.4-1
|
||||||
- update version to 1.0.4
|
- update version to 1.0.4
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user