remove metadata image

diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c
index e06bd86250f94a0862eb0e5e16e8b21edb1b5a20..d2379fdf8293ac46f0cc957642a34cd40929cb0a 100644 (file)
--- 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 a4ded974e0edc880c5377b6cb94b035e527d3902..55d6b8ae7ebefc0078750522f84c3428a0622be4 100644 (file)
--- 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 e110c43881fc3eb2b71315d4f77e9d9e7d27e271..a8a472df4d25e1a10d87b5670b2b80bc1f836551 100644 (file)
--- 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;