Merge branch 'wip-fix-sane' into 'master'

Sane: backend 'net': item->get_options(): always call...

Closes openpaperwork#1

See merge request World/OpenPaperwork/libinsane!29

Author: jflesch

subprojects/libinsane/include/libinsane/workarounds.h

@@ -112,27 +112,6 @@ extern enum lis_error lis_api_workaround_check_capabilities(
 );
 
 
-/*!
- * \brief Set some options only right before scanning.
- *
- * - API: Sane:
- * - Seen on:
- *   - HP Deskjet 2130 and HP Scanjet 5550c
- *   - Client: Libsane 1.0.27 + backend 'net'
- *   - Server: Libsane 1.0.25 + backend 'hpaio'
- *
- * Setting mode=Color makes the whole thing go haywire:
- * It becomes impossible to list options anymore. So 'mode' must be set
- * only right before scanning.
- *
- * \param[in] to_wrap Base implementation to wrap.
- * \param[out] out_impl Implementation of the out_impl including the workaround.
- */
-extern enum lis_error lis_api_workaround_set_opt_late(
-	struct lis_api *to_wrap, struct lis_api **out_impl
-);
-
-
 /*!
  * \brief Thread-safety
  *

subprojects/libinsane/src/bases/sane.c

@@ -806,6 +806,13 @@ static enum lis_error lis_sane_item_get_options(struct lis_item *self,
 	int nb_opts, in, out;
 	const SANE_Option_Descriptor *sane_desc;
 
+	// WORKAROUND(Jflesch):
+	// When using the backend 'net', if we got a SANE_INFO_RELOAD_OPTIONS,
+	// we must first call sane_get_option_descriptor() before sane_control_option()
+	// even if we just want to use sane_control_option() to get the number of options.
+	// --> we make unused call here just to make backend 'net' reloads the options.
+	sane_get_option_descriptor(private->handle, 0);
+
 	err = sane_status_to_lis_error(sane_control_option(
 		private->handle, 0 /* option 0 = number of options */,
 		SANE_ACTION_GET_VALUE, &nb_opts, NULL

subprojects/libinsane/src/meson.build

@@ -27,7 +27,6 @@ libinsane_srcs = files(
     'workarounds/one_page_flatbed.c',
     'workarounds/opt_names.c',
     'workarounds/opt_values.c',
-    'workarounds/set_opt_late.c',
 )
 
 deps = [dependency('threads')]

subprojects/libinsane/src/safebet.c

@@ -27,12 +27,6 @@ static const struct {
 	enum lis_error (*wrap_cb)(struct lis_api *to_wrap, struct lis_api **wrapper);
 	int enabled_by_default;
 } g_implementations[] = {
-	{
-		.name = "workaround_set_opt_late",
-		.env = "LIBINSANE_WORKAROUND_SET_OPT_LATE",
-		.wrap_cb = lis_api_workaround_set_opt_late,
-		.enabled_by_default = 1,
-	},
 	{
 		.name = "workaround_check_capabilities",
 		.env = "LIBINSANE_WORKAROUND_CHECK_CAPABILITIES",

subprojects/libinsane/src/str2impls.c

@@ -93,8 +93,6 @@ enum lis_error lis_str2impls(const char *list_of_impls, struct lis_api **impls)
 				err = lis_api_workaround_dedicated_thread(*impls, &next);
 			} else if (strcmp(tok, "check_capabilities") == 0) {
 				err = lis_api_workaround_check_capabilities(*impls, &next);
-			} else if (strcmp(tok, "set_opt_late") == 0) {
-				err = lis_api_workaround_set_opt_late(*impls, &next);
 			} else if (strcmp(tok, "opt_names") == 0) {
 				err = lis_api_workaround_opt_names(*impls, &next);
 			} else if (strcmp(tok, "opt_values") == 0) {

subprojects/libinsane/src/workarounds/set_opt_late.c

@@ -24,7 +24,6 @@ LIBINSANE_VALGRIND_TESTS = [
     'normalizer_source_types',
     'workaround_cache',
     'workaround_check_capabilities',
-    'workaround_set_opt_late',
     'workaround_dedicated_thread',
     'workaround_one_page_flatbed',
     'workaround_opt_names',