change name metadata from scanner

diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c
index bb1b455d976e93f30301e80fd63324ef9857c68f..ce812a056c5e7968184481f67bb2108d98809552 100644 (file)
--- a/src/kds_s2000w_handler.c
+++ b/src/kds_s2000w_handler.c
@@ -280,7 +280,7 @@ void kds_s2000w_handler_get_current_metadata(handler* h, metadata* params)
        if (params->format == 1)
                channels = 3;
 
-       kds_s2000w_image_converter_metadata_from_jpg(scanner_image, mdata);
+       kds_s2000w_image_converter_metadata_from_scanner_image(scanner_image, mdata);
        params->depth = mdata->depth;
        params->pixels_per_line = mdata->width;
        params->lines = mdata->height;

diff --git a/src/kds_s2000w_image_converter.h b/src/kds_s2000w_image_converter.h
index ca8288fbc9c02542e45e37310fe50c1b498dd5f2..d5076915b531aca0f94d8ee3cadc19c1a4fdc34c 100644 (file)
--- a/src/kds_s2000w_image_converter.h
+++ b/src/kds_s2000w_image_converter.h
@@ -13,7 +13,7 @@ typedef struct {
        int depth;
 } image_metadata;
 
-void kds_s2000w_image_converter_metadata_from_jpg(blobdata* image, image_metadata* mdata);
+void kds_s2000w_image_converter_metadata_from_scanner_image(blobdata* image, image_metadata* mdata);
 
 void kds_s2000w_image_converter_jpg_to_pnm(blobdata* in, blobdata* out, int depth);
 void kds_s2000w_image_converter_tiff_to_pnm(blobdata* in, blobdata* out);

diff --git a/src/kds_s2000w_image_converter_magick.c b/src/kds_s2000w_image_converter_magick.c
index 2a35e461d4d482cc1c1d7a4c69c9c8519564212e..7788ea942a14e24688656e07c0fcd9a1092381dd 100644 (file)
--- a/src/kds_s2000w_image_converter_magick.c
+++ b/src/kds_s2000w_image_converter_magick.c
@@ -66,7 +66,7 @@ void _kds_s2000w_image_converter_to_pnm_depth(blobdata* in,
        exception = NULL;
 }
 
-void kds_s2000w_image_converter_metadata_from_jpg(blobdata* image, image_metadata* mdata)
+void kds_s2000w_image_converter_metadata_from_scanner_image(blobdata* image, image_metadata* mdata)
 {
        kds_s2000w_debug_printf(ALL, "kds_s2000w_metadata_from_image");
 

diff --git a/src/kds_s2000w_image_converter_netpbm.c b/src/kds_s2000w_image_converter_netpbm.c
index 9ce1bbd6e86841bb201121f5acb39871d52fb92c..e76c6e6b6f1d7f7f43a9001ad88e41d80952a1f8 100644 (file)
--- a/src/kds_s2000w_image_converter_netpbm.c
+++ b/src/kds_s2000w_image_converter_netpbm.c
@@ -1,6 +1,6 @@
 #include "kds_s2000w_image_converter.h"
 
-void kds_s2000w_image_converter_metadata_from_jpg(blobdata* image, image_metadata* mdata)
+void kds_s2000w_image_converter_metadata_from_scanner_image(blobdata* image, image_metadata* mdata)
 {
        return;
 }

diff --git a/tests/kds_s2000w_image_converter_tests.c b/tests/kds_s2000w_image_converter_tests.c
index 4d1dc46ac3c163a66e3f5a9184891499dada33f7..855b83749ae9f52f2e541a21393d4237fb350997 100644 (file)
--- a/tests/kds_s2000w_image_converter_tests.c
+++ b/tests/kds_s2000w_image_converter_tests.c
@@ -27,7 +27,7 @@ void get_metadata_from_image_test()
        mdata->height = 0;
        mdata->depth = 0;
 
-       kds_s2000w_image_converter_metadata_from_jpg(image, mdata);
+       kds_s2000w_image_converter_metadata_from_scanner_image(image, mdata);
 
        assert_int_equal(mdata->width, 2);
        assert_int_equal(mdata->height, 1);