From 79a9b6ac44775e31459bc0b3493b3e31e252fcc6 Mon Sep 17 00:00:00 2001 From: Ralph Little Date: Tue, 13 Sep 2022 22:43:49 -0700 Subject: [PATCH] brother_mfp: fixes to hopefully satisfy the pipeline. --- acinclude.m4 | 7 +++++++ backend/brother_mfp-driver.cpp | 5 ----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 71e22c8d4..37ebe06f1 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -569,6 +569,13 @@ for be in ${BACKENDS}; do fi ;; + brother_mfp) + if test "${HAVE_CXX11}" != "1"; then + echo "*** $be backend requires C++11 support - $DISABLE_MSG" + backend_supported="no" + fi + ;; + mustek_pp) if test "${sane_cv_use_libieee1284}" != "yes" && test "${enable_parport_directio}" != "yes"; then echo "*** $be backend requires libieee1284 or parport-directio libraries - $DISABLE_MSG" diff --git a/backend/brother_mfp-driver.cpp b/backend/brother_mfp-driver.cpp index 77aba407f..c768468a2 100644 --- a/backend/brother_mfp-driver.cpp +++ b/backend/brother_mfp-driver.cpp @@ -61,11 +61,6 @@ const char* BrotherDriver::ScanModeToText (BrotherScanMode scan_mode) static const char *scan_mode_text[] = { "CGRAY", "GRAY64", "ERRDIF", "TEXT" }; - if (scan_mode > (sizeof(scan_mode_text) / sizeof(scan_mode_text[0]))) - { - return nullptr; - } - return scan_mode_text[scan_mode]; }