Update to latest version.
This commit is contained in:
Elliott Sales de Andrade
parent
e555545543
commit
08687e5341
|
|
@ -1 +1,2 @@
|
|||
/libinsane-1.0.tar.gz
|
||||
/libinsane-1.0.1.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
From 038a7856695cea40c0ec02075fbbb427a64d6d43 Mon Sep 17 00:00:00 2001
|
||||
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
Date: Wed, 29 May 2019 04:47:32 -0400
|
||||
Subject: [PATCH 1/2] Fix reading bits-per-pixel from BMP header.
|
||||
|
||||
This seem to work on little-endian machines since the following data was
|
||||
apparently zeros, but doesn't work on big-endian machines.
|
||||
|
||||
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
---
|
||||
subprojects/libinsane/src/bmp.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/subprojects/libinsane/src/bmp.c b/subprojects/libinsane/src/bmp.c
|
||||
index 5841d6f..886a368 100644
|
||||
--- a/subprojects/libinsane/src/bmp.c
|
||||
+++ b/subprojects/libinsane/src/bmp.c
|
||||
@@ -67,9 +67,9 @@ enum lis_error lis_bmp2scan_params(
|
||||
);
|
||||
return LIS_ERR_INTERNAL_IMG_FORMAT_NOT_SUPPORTED;
|
||||
}
|
||||
- if (le32toh(header->nb_bits_per_pixel) != 24) {
|
||||
+ if (le16toh(header->nb_bits_per_pixel) != 24) {
|
||||
lis_log_error("BMP: Unexpected nb bits per pixel: %u (0x%X)",
|
||||
- le32toh(header->nb_bits_per_pixel),
|
||||
+ le16toh(header->nb_bits_per_pixel),
|
||||
header->nb_bits_per_pixel);
|
||||
return LIS_ERR_INTERNAL_IMG_FORMAT_NOT_SUPPORTED;
|
||||
}
|
||||
--
|
||||
2.21.0
|
||||
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
From 5ed21edab66dbfb50366d32a50f384ecf66918ad Mon Sep 17 00:00:00 2001
|
||||
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
Date: Wed, 29 May 2019 21:18:00 -0400
|
||||
Subject: [PATCH 2/2] Fix broken tests using incorrect types.
|
||||
|
||||
These tests were using the wrong type for the given options.
|
||||
|
||||
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
---
|
||||
subprojects/libinsane/tests/tests_workaround_cache.c | 4 ++--
|
||||
.../libinsane/tests/tests_workaround_check_capabilities.c | 4 ++--
|
||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/subprojects/libinsane/tests/tests_workaround_cache.c b/subprojects/libinsane/tests/tests_workaround_cache.c
|
||||
index 78def74..7650243 100644
|
||||
--- a/subprojects/libinsane/tests/tests_workaround_cache.c
|
||||
+++ b/subprojects/libinsane/tests/tests_workaround_cache.c
|
||||
@@ -279,7 +279,7 @@ static void test_cache_set_value_2(void)
|
||||
|
||||
LIS_ASSERT_EQUAL(lis_dumb_get_nb_get(g_dumb), 1);
|
||||
LIS_ASSERT_EQUAL(lis_dumb_get_nb_set(g_dumb), 0);
|
||||
- value.string = OPT_VALUE_SOURCE_ADF;
|
||||
+ value.integer = 240;
|
||||
err = opts[1]->fn.set_value(opts[1], value, &set_flags);
|
||||
LIS_ASSERT_TRUE(LIS_IS_OK(err));
|
||||
LIS_ASSERT_EQUAL(
|
||||
@@ -293,7 +293,7 @@ static void test_cache_set_value_2(void)
|
||||
// since we got flag 'reload_options', this get_value() will go through
|
||||
err = opts[1]->fn.get_value(opts[1], &value);
|
||||
LIS_ASSERT_TRUE(LIS_IS_OK(err));
|
||||
- LIS_ASSERT_EQUAL(strcmp(value.string, OPT_VALUE_SOURCE_ADF), 0);
|
||||
+ LIS_ASSERT_EQUAL(value.integer, 240);
|
||||
LIS_ASSERT_EQUAL(lis_dumb_get_nb_get(g_dumb), 3);
|
||||
LIS_ASSERT_EQUAL(lis_dumb_get_nb_set(g_dumb), 1);
|
||||
|
||||
diff --git a/subprojects/libinsane/tests/tests_workaround_check_capabilities.c b/subprojects/libinsane/tests/tests_workaround_check_capabilities.c
|
||||
index d055e94..2abdb25 100644
|
||||
--- a/subprojects/libinsane/tests/tests_workaround_check_capabilities.c
|
||||
+++ b/subprojects/libinsane/tests/tests_workaround_check_capabilities.c
|
||||
@@ -73,8 +73,8 @@ static int tests_init(void)
|
||||
.desc = "source desc",
|
||||
.capabilities = LIS_CAP_SW_SELECT,
|
||||
.value = {
|
||||
- .type = LIS_TYPE_INTEGER,
|
||||
- .unit = LIS_UNIT_DPI,
|
||||
+ .type = LIS_TYPE_STRING,
|
||||
+ .unit = LIS_UNIT_NONE,
|
||||
},
|
||||
.constraint = {
|
||||
.type = LIS_CONSTRAINT_LIST,
|
||||
--
|
||||
2.21.0
|
||||
|
||||
|
|
@ -1,15 +1,11 @@
|
|||
Name: libinsane
|
||||
Version: 1.0
|
||||
Release: 2%{?dist}
|
||||
Version: 1.0.1
|
||||
Release: 1%{?dist}
|
||||
Summary: Cross-platform access to image scanners
|
||||
|
||||
License: LGPLv3+
|
||||
URL: https://doc.openpaper.work/libinsane/latest/
|
||||
Source0: https://gitlab.gnome.org/World/OpenPaperwork/%{name}/-/archive/%{version}/%{name}-%{version}.tar.gz
|
||||
# https://gitlab.gnome.org/World/OpenPaperwork/libinsane/merge_requests/31
|
||||
Patch0001: 0001-Fix-reading-bits-per-pixel-from-BMP-header.patch
|
||||
# https://gitlab.gnome.org/World/OpenPaperwork/libinsane/merge_requests/33
|
||||
Patch0002: 0002-Fix-broken-tests-using-incorrect-types.patch
|
||||
|
||||
BuildRequires: meson
|
||||
BuildRequires: gcc
|
||||
|
|
@ -123,6 +119,9 @@ meson test -v -t 15 -C %{_vpath_builddir}
|
|||
|
||||
|
||||
%changelog
|
||||
* Sat Aug 24 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 1.0.1-1
|
||||
- Update to latest version
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (libinsane-1.0.tar.gz) = 65bfbcd1f004b7217b624df0ef0630c36faa1e2dad9be8bd9fef32427224d5290e16811bdd75c268e0b212fbe6674020fd5293ddf659e167ca8651bd8fc8ab2f
|
||||
SHA512 (libinsane-1.0.1.tar.gz) = 1b7091b207b8ea559f21084aa8231c62f34dfa6043e9f358d55708006989c50ee131011dbe5bd03bcd1212cd0219ae9d65a544e57cf3a71c4c2f65e5d89257bc
|
||||
|
|
|
|||
Loading…
Reference in New Issue