Merge branch 'release/debian/1.1.1-1'debian/1.1.1-1

1 files changed, 5 insertions, 22 deletions

diff --git a/backend/genesys/settings.cpp b/backend/genesys/settings.cpp
index 7f64798..d409683 100644
--- a/backend/genesys/settings.cpp
+++ b/backend/genesys/settings.cpp
@@ -16,27 +16,6 @@
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-   As a special exception, the authors of SANE give permission for
-   additional uses of the libraries contained in this release of SANE.
-
-   The exception is that, if you link a SANE library with other files
-   to produce an executable, this does not by itself cause the
-   resulting executable to be covered by the GNU General Public
-   License.  Your use of that executable is in no way restricted on
-   account of linking the SANE library code into it.
-
-   This exception does not, however, invalidate any other reasons why
-   the executable file might be covered by the GNU General Public
-   License.
-
-   If you submit changes to SANE to the maintainers to be included in
-   a subsequent release, you agree by submitting the changes that
-   those changes may be distributed with this exception intact.
-
-   If you write modifications of your own for SANE, it is your choice
-   whether to permit this exception to apply to your modifications.
-   If you do not wish that, delete this exception notice.
 */
 
 #define DEBUG_DECLARE_ONLY
@@ -86,6 +65,8 @@ std::ostream& operator<<(std::ostream& out, const SetupParams& params)
         << "    channels: " << params.channels << '\n'
         << "    scan_mode: " << params.scan_mode << '\n'
         << "    color_filter: " << params.color_filter << '\n'
+        << "    contrast_adjustment: " << params.contrast_adjustment << '\n'
+        << "    brightness_adjustment: " << params.brightness_adjustment << '\n'
         << "    flags: " << params.flags << '\n'
         << "}";
     return out;
@@ -127,7 +108,8 @@ bool ScanSession::operator==(const ScanSession& other) const
         shading_pixel_offset == other.shading_pixel_offset &&
         buffer_size_read == other.buffer_size_read &&
         enable_ledadd == other.enable_ledadd &&
-        use_host_side_calib == other.use_host_side_calib;
+        use_host_side_calib == other.use_host_side_calib &&
+        use_host_side_gray == other.use_host_side_gray;
 }
 
 std::ostream& operator<<(std::ostream& out, const ScanSession& session)
@@ -164,6 +146,7 @@ std::ostream& operator<<(std::ostream& out, const ScanSession& session)
         << "    buffer_size_read: " << session.buffer_size_read << '\n'
         << "    enable_ledadd: " << session.enable_ledadd << '\n'
         << "    use_host_side_calib: " << session.use_host_side_calib << '\n'
+        << "    use_host_side_gray: " << session.use_host_side_gray << '\n'
         << "    params: " << format_indent_braced_list(4, session.params) << '\n'
         << "}";
     return out;