From: Bastian Dehn <hhaalo@arcor.de>
Date: Sun, 10 Mar 2024 14:22:10 +0000 (+0100)
Subject: remove metadata image
X-Git-Tag: v1.0.0^2~117^2
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=4b9d56ec0955964cea95445f737be628acfd6213;p=sane-kds-s2000w-net.git

remove metadata image
---

diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c
index e06bd86..d2379fd 100644
--- a/src/kds_s2000w_handler.c
+++ b/src/kds_s2000w_handler.c
@@ -42,7 +42,7 @@ void _get_current_metadata(handler* h)
 	mdata_value = NULL;
 
 	mdata_value = json_object_object_get(metadata, "ImageSize");
-	h->current_metadata->size = json_object_get_int(mdata_value);
+	h->image->size = json_object_get_int(mdata_value);
 	mdata_value = NULL;
 
 	mdata_value = json_object_object_get(metadata, "ImageWidth");
@@ -182,14 +182,12 @@ handler* init_handler()
 	h->current_metadata->format = 1;
 	h->current_metadata->channels = 3;
 	h->current_metadata->is_last = 1;
-	h->current_metadata->size = 0;
 	h->current_metadata->bytes_per_line = 0;
 	h->current_metadata->pixels_per_line = 0;
 	h->current_metadata->lines = 0;
 	h->current_metadata->depth = 8;
 	h->current_metadata->valid = 0;
 	h->current_metadata->scanned_all_complete = 0;
-	h->current_metadata->image = NULL;
 	h->read_info->scan_started = 0;
 	h->read_info->cancel = 0;
 	h->read_info->read_size = 0;
@@ -206,8 +204,6 @@ void free_handler(handler* h)
 	debug_printf(ALL, "free handler");
 	free(h->current_scan_status);
 	h->current_scan_status = NULL;
-	free(h->current_metadata->image);
-	h->current_metadata->image = NULL;
 	free(h->current_metadata);
 	h->current_metadata = NULL;
 	free(h->read_info);
@@ -223,8 +219,8 @@ void free_handler(handler* h)
 void reset_handler(handler* h)
 {
 	debug_printf(ALL, "reset handler");
-	free(h->current_metadata->image);
-	h->current_metadata->image = NULL;
+	free(h->image->data);
+	h->image->data = NULL;
 
 	h->state = NOTCONNECTED;
 	h->current_scan_status->current_image_number = 1;
@@ -234,14 +230,12 @@ void reset_handler(handler* h)
 	h->current_metadata->format = 1;
 	h->current_metadata->channels = 3;
 	h->current_metadata->is_last = 1;
-	h->current_metadata->size = 0;
 	h->current_metadata->bytes_per_line = 0;
 	h->current_metadata->pixels_per_line = 0;
 	h->current_metadata->lines = 0;
 	h->current_metadata->depth = 8;
 	h->current_metadata->valid = 0;
 	h->current_metadata->scanned_all_complete = 0;
-	h->current_metadata->image = NULL;
 	h->read_info->scan_started = 0;
 	h->read_info->cancel = 0;
 	h->read_info->read_size = 0;
diff --git a/src/kds_s2000w_handler.h b/src/kds_s2000w_handler.h
index a4ded97..55d6b8a 100644
--- a/src/kds_s2000w_handler.h
+++ b/src/kds_s2000w_handler.h
@@ -20,14 +20,12 @@ typedef struct {
 	int format;
 	int channels;
 	int is_last;
-	int size;
 	int bytes_per_line;
 	int pixels_per_line;
 	int lines;
 	int depth;
 	int valid;
 	int scanned_all_complete;
-	void* image;
 } metadata;
 
 typedef struct {
diff --git a/tests/kds_s2000w_net_read_tests.c b/tests/kds_s2000w_net_read_tests.c
index e110c43..a8a472d 100644
--- a/tests/kds_s2000w_net_read_tests.c
+++ b/tests/kds_s2000w_net_read_tests.c
@@ -58,7 +58,7 @@ START_TEST(sane_kds_s2000w_net_read_empty_image)
 {
 	int length = 0;
 	handler* h = init_handler();
-	h->current_metadata->size = 1;
+	h->image->size = 1;
 	char* image = malloc(sizeof(char));
 	image[0] = 0;
 	h->image->data = image;