change convert without depth

diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c
index 6ce4c50bbb707d8311ee796006c9e26d84bc07c6..65df357fe9ce7aadb0117fe84528332e2c1236f2 100644 (file)
--- a/src/kds_s2000w_handler.c
+++ b/src/kds_s2000w_handler.c
@@ -285,7 +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, params->depth);
+       kds_s2000w_image_converter_jpg_to_pnm(scanner_image, image);
        kds_s2000w_image_converter_tiff_to_pnm(scanner_image, image);
 
        kds_s2000w_debug_printf_int(DEBUG, "size of pnm image", image->size);

diff --git a/src/kds_s2000w_image_converter.h b/src/kds_s2000w_image_converter.h
index d5076915b531aca0f94d8ee3cadc19c1a4fdc34c..a9b3c3d2f5be6db5fe0c3c62fb8578256e4d623c 100644 (file)
--- a/src/kds_s2000w_image_converter.h
+++ b/src/kds_s2000w_image_converter.h
@@ -15,7 +15,7 @@ typedef struct {
 
 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_jpg_to_pnm(blobdata* in, blobdata* out);
 void kds_s2000w_image_converter_tiff_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 6da2dd7e5b9d11eb9134034d0191600ddb530fa6..e4665fd4e7026344a9abf568786e188b30ab87df 100644 (file)
--- a/src/kds_s2000w_image_converter_magick.c
+++ b/src/kds_s2000w_image_converter_magick.c
@@ -16,9 +16,8 @@
 #include "kds_s2000w_image_type_check.h"
 #include "kds_s2000w_debug.h"
 
-void _kds_s2000w_image_converter_to_pnm_depth(blobdata* in,
+void _kds_s2000w_image_converter_to_pnm(blobdata* in,
        blobdata* out,
-       int depth,
        const char* format)
 {
        kds_s2000w_debug_printf(ALL, "kds_s2000w_convert_to_pnm_With_depth");
@@ -50,14 +49,6 @@ void _kds_s2000w_image_converter_to_pnm_depth(blobdata* in,
        image_info = CloneImageInfo(NULL);
        sprintf(image_info->filename, "streamout.pnm");
 
-       if (depth > -1)
-#if IMAGE_MAGICK_MAJOR == 6
-               SetImageDepth(input_image, depth);
-#endif
-#if IMAGE_MAGICK_MAJOR == 7
-               SetImageDepth(input_image, depth, exception);
-#endif
-
        out->data = ImageToBlob(image_info, input_image, &out->size, exception);
 
        DestroyImageInfo(image_info);
@@ -95,14 +86,14 @@ 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, int depth)
+void kds_s2000w_image_converter_jpg_to_pnm(blobdata* in, blobdata* out)
 {
        kds_s2000w_debug_printf(ALL, "kds_s2000w_convert_jpg_to_pnm_With_depth");
 
        if (!kds_s2000w_image_type_check_is_jpeg(in))
                return;
 
-       _kds_s2000w_image_converter_to_pnm_depth(in, out, depth, "jpg");
+       _kds_s2000w_image_converter_to_pnm(in, out, "jpg");
 }
 
 void kds_s2000w_image_converter_tiff_to_pnm(blobdata* in, blobdata* out)
@@ -112,5 +103,5 @@ void kds_s2000w_image_converter_tiff_to_pnm(blobdata* in, blobdata* out)
        if (!kds_s2000w_image_type_check_is_tiff(in))
                return;
 
-       _kds_s2000w_image_converter_to_pnm_depth(in, out, -1, "tiff");
+       _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 a7291054fc07afa0d5f197ca31dd7766f57fb9fe..2ed85bc47cd854469889fdf8141f77eb6690433c 100644 (file)
--- a/src/kds_s2000w_image_converter_netpbm.c
+++ b/src/kds_s2000w_image_converter_netpbm.c
@@ -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, int depth)
+void kds_s2000w_image_converter_jpg_to_pnm(blobdata* in, blobdata* out)
 {
        kds_s2000w_debug_printf(ALL, "kds_s2000w_image_converter_jpg_to_pnm");