]> gitweb.hhaalo.de Git - sane-kds-s2000w-net.git/commitdiff
Revert "skip header to read data"
authorBastian Dehn <hhaalo@arcor.de>
Sat, 10 Feb 2024 10:45:35 +0000 (11:45 +0100)
committerBastian Dehn <hhaalo@arcor.de>
Sat, 10 Feb 2024 10:45:35 +0000 (11:45 +0100)
This reverts commit 3a379bd596e91950b6e7310d98d64c821e7c6642.

src/kds_s2000w_net.c

index 53fbd413c41549d1fac287a0712e23817b43cc31..c2ed4023dff0aa521d95a8ecfdda6bac54e6a93e 100644 (file)
@@ -13,24 +13,6 @@ metadata current_metadata;
 int read_size = 0;
 int scan_started = 0;
 
-int _sane_kds_s2000w_net_find_first_data_byte(const char* data)
-{
-       const int header_spaces = 3;
-       const char space = 0x0a;
-       int space_count = 0;
-       int byte_count = 0;
-
-       while(space_count < header_spaces) {
-               if (data[byte_count] == space) {
-                       space_count++;
-               }
-
-               byte_count++;
-       }
-
-       return byte_count;
-}
-
 SANE_Status _sane_kds_s2000w_net_init(SANE_Int* version_code, SANE_Auth_Callback authorize)
 {
        *version_code = SANE_VERSION_CODE(1, 0, 0);
@@ -242,12 +224,7 @@ SANE_Status _sane_kds_s2000w_net_read(SANE_Handle handle, SANE_Byte* data,
        SANE_Int max_length, SANE_Int* length)
 {
        printf("is all scanned: %i\n", current_metadata.scanned_all_complete);
-
-       int skip_header_bytes = _sane_kds_s2000w_net_find_first_data_byte(current_metadata.image);
-
-       if (read_size <= 0) {
-               read_size += skip_header_bytes;
-       }
+       char* image_data = (char*) current_metadata.image;
 
        if (readed_lines >= current_metadata.lines ) {
                printf("Image is loaded\n");
@@ -277,7 +254,7 @@ SANE_Status _sane_kds_s2000w_net_read(SANE_Handle handle, SANE_Byte* data,
        }
 
        *length = maxlen;
-       memcpy(data, current_metadata.image + skip_header_bytes + read_size, *length);
+       memcpy(data, current_metadata.image + read_size, *length);
 
        readed_bytes_per_line += *length;
        read_size += *length;