change only one converter method in header file

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b0579c6e5c1d9041769679fd25c6e34339caafa9..d5b0055e2ef0cd7398f7033ead765e98d6f3033e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,8 +33,7 @@ IF (RUN_TESTS)
 --wrap,kds_s2000w_client_delete_image,\
 --wrap,kds_s2000w_client_get_option,\
 --wrap,kds_s2000w_client_set_option,\
---wrap,kds_s2000w_image_converter_jpg_to_pnm,\
---wrap,kds_s2000w_image_converter_tiff_to_pnm"
+--wrap,kds_s2000w_image_converter_to_pnm"
 CACHE STRING "test coverage compiler flags" FORCE)
 ENDIF()
 

diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c
index 65df357fe9ce7aadb0117fe84528332e2c1236f2..83ede1ce95044ccfaf36d3f6e12b534876e6f0d3 100644 (file)
--- a/src/kds_s2000w_handler.c
+++ b/src/kds_s2000w_handler.c
@@ -285,9 +285,7 @@ void kds_s2000w_handler_get_current_metadata(handler* h, metadata* params)
        params->pixels_per_line = mdata->width;
        params->lines = mdata->height;
 
-       kds_s2000w_image_converter_jpg_to_pnm(scanner_image, image);
-       kds_s2000w_image_converter_tiff_to_pnm(scanner_image, image);
-
+       kds_s2000w_image_converter_to_pnm(scanner_image, image);
        kds_s2000w_debug_printf_int(DEBUG, "size of pnm image", image->size);
 
        if (params->depth == 1)

diff --git a/src/kds_s2000w_image_converter.h b/src/kds_s2000w_image_converter.h
index a9b3c3d2f5be6db5fe0c3c62fb8578256e4d623c..dfa932011a0e8d19ab1ae114e094408a70b85ef1 100644 (file)
--- a/src/kds_s2000w_image_converter.h
+++ b/src/kds_s2000w_image_converter.h
@@ -14,8 +14,6 @@ typedef struct {
 } image_metadata;
 
 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);
-void kds_s2000w_image_converter_tiff_to_pnm(blobdata* in, blobdata* out);
+void kds_s2000w_image_converter_to_pnm(blobdata* in, blobdata* out);
 
 #endif
\ No newline at end of file

diff --git a/src/kds_s2000w_image_converter_magick.c b/src/kds_s2000w_image_converter_magick.c
index e4665fd4e7026344a9abf568786e188b30ab87df..0c606f2b4cb509f259b94d69320dcfae73f0786c 100644 (file)
--- a/src/kds_s2000w_image_converter_magick.c
+++ b/src/kds_s2000w_image_converter_magick.c
@@ -86,22 +86,17 @@ void kds_s2000w_image_converter_metadata_from_scanner_image(blobdata* image, ima
        exception = NULL;
 }
 
-void kds_s2000w_image_converter_jpg_to_pnm(blobdata* in, blobdata* out)
+void kds_s2000w_image_converter_to_pnm(blobdata* in, blobdata* out)
 {
-       kds_s2000w_debug_printf(ALL, "kds_s2000w_convert_jpg_to_pnm_With_depth");
+       kds_s2000w_debug_printf(ALL, "kds_s2000w_image_converter_pnm");
 
-       if (!kds_s2000w_image_type_check_is_jpeg(in))
+       if (kds_s2000w_image_type_check_is_jpeg(in)) {
+               _kds_s2000w_image_converter_to_pnm(in, out, "jpg");
                return;
+       }
 
-       _kds_s2000w_image_converter_to_pnm(in, out, "jpg");
-}
-
-void kds_s2000w_image_converter_tiff_to_pnm(blobdata* in, blobdata* out)
-{
-       kds_s2000w_debug_printf(ALL, "kds_s2000w_convert_tiff_to_pnm");
-
-       if (!kds_s2000w_image_type_check_is_tiff(in))
+       if (kds_s2000w_image_type_check_is_tiff(in)) {
+               _kds_s2000w_image_converter_to_pnm(in, out, "tiff");
                return;
-
-       _kds_s2000w_image_converter_to_pnm(in, out, "tiff");
+       }
 }
\ No newline at end of file

diff --git a/src/kds_s2000w_image_converter_netpbm.c b/src/kds_s2000w_image_converter_netpbm.c
index 2ed85bc47cd854469889fdf8141f77eb6690433c..85c1c7c95ed1a1b701157b89a838bc48f4a3e9a8 100644 (file)
--- a/src/kds_s2000w_image_converter_netpbm.c
+++ b/src/kds_s2000w_image_converter_netpbm.c
@@ -241,7 +241,7 @@ void _kds_s2000w_image_converter_write_pnm(unsigned char* data,
        pixels = NULL;
 }
 
-void _kds_s2000w_image_converter_jpg_to_pnm(j_decompress_ptr cinfo,
+void _kds_s2000w_image_converter_gray_or_color_jpg_to_pnm(j_decompress_ptr cinfo,
        FILE* jpeg_stream,
        FILE* pnm_stream,
        enum imgformat format)
@@ -292,7 +292,7 @@ void kds_s2000w_image_converter_metadata_from_scanner_image(blobdata* image, ima
        }
 }
 
-void kds_s2000w_image_converter_jpg_to_pnm(blobdata* in, blobdata* out)
+void _kds_s2000w_image_converter_jpg_to_pnm(blobdata* in, blobdata* out)
 {
        kds_s2000w_debug_printf(ALL, "kds_s2000w_image_converter_jpg_to_pnm");
 
@@ -314,10 +314,10 @@ void kds_s2000w_image_converter_jpg_to_pnm(blobdata* in, blobdata* out)
        FILE* pnm_stream = open_memstream(outdata, &out->size);
 
        if (cinfo.out_color_space == JCS_RGB)
-               _kds_s2000w_image_converter_jpg_to_pnm(&cinfo, jpeg_stream, pnm_stream, RGB);
+               _kds_s2000w_image_converter_gray_or_color_jpg_to_pnm(&cinfo, jpeg_stream, pnm_stream, RGB);
 
        if (cinfo.out_color_space == JCS_GRAYSCALE)
-               _kds_s2000w_image_converter_jpg_to_pnm(&cinfo, jpeg_stream, pnm_stream, GRAY);
+               _kds_s2000w_image_converter_gray_or_color_jpg_to_pnm(&cinfo, jpeg_stream, pnm_stream, GRAY);
 
        fclose(pnm_stream);
        out->data = malloc(sizeof(char) * out->size);
@@ -331,13 +331,10 @@ void kds_s2000w_image_converter_jpg_to_pnm(blobdata* in, blobdata* out)
        jpeg_destroy_decompress(&cinfo);
 }
 
-void kds_s2000w_image_converter_tiff_to_pnm(blobdata* in, blobdata* out)
+void _kds_s2000w_image_converter_tiff_to_pnm(blobdata* in, blobdata* out)
 {
        kds_s2000w_debug_printf(ALL, "kds_s2000w_image_converter_tiff_to_pnm");
 
-       if (!kds_s2000w_image_type_check_is_tiff(in))
-               return;
-
        FILE* tiff_stream = fmemopen(in->data, in->size, "r");
        TIFF* tiff = TIFFClientOpen("input.tiff", "r", tiff_stream,
                _kds_s2000w_image_converter_tiff_read,
@@ -385,3 +382,18 @@ void kds_s2000w_image_converter_tiff_to_pnm(blobdata* in, blobdata* out)
        TIFFClose(tiff);
        tiff = NULL;
 }
+
+void kds_s2000w_image_converter_to_pnm(blobdata* in, blobdata* out)
+{
+       kds_s2000w_debug_printf(ALL, "kds_s2000w_image_converter_pnm");
+
+       if (kds_s2000w_image_type_check_is_jpeg(in)) {
+               _kds_s2000w_image_converter_jpg_to_pnm(in, out);
+               return;
+       }
+
+       if (kds_s2000w_image_type_check_is_tiff(in)) {
+               _kds_s2000w_image_converter_tiff_to_pnm(in, out);
+               return;
+       }
+}
\ No newline at end of file

diff --git a/tests/kds_s2000w_client_mock.c b/tests/kds_s2000w_client_mock.c
index f567bebc3fb24e66cf34e22d5b16ea222a763deb..410024d2598295d7f89481349f476b9dd2e6b821 100644 (file)
--- a/tests/kds_s2000w_client_mock.c
+++ b/tests/kds_s2000w_client_mock.c
@@ -89,20 +89,7 @@ int __wrap_kds_s2000w_client_set_option(int64_t sessionid, response* response)
        return mock_type(int);
 }
 
-void __wrap_kds_s2000w_image_converter_jpg_to_pnm(blobdata* in, blobdata* out)
-{
-       if (in->data == NULL)
-               return;
-
-       out->data = malloc(sizeof(char) * in->size);
-       memcpy(out->data, in->data, in->size);
-       out->size = in->size;
-       free(in->data);
-       in->data = NULL;
-       in->size = 0;
-}
-
-void __wrap_kds_s2000w_image_converter_tiff_to_pnm(blobdata* in, blobdata* out)
+void __wrap_kds_s2000w_image_converter_to_pnm(blobdata* in, blobdata* out)
 {
        if (in->data == NULL)
                return;