convert with depth

diff --git a/src/kds_s2000w_image_converter.c b/src/kds_s2000w_image_converter.c
index 3237cad11c074f689f44702501f045ae8983053f..0ba9c12e1acbcbaf5958eb3a7c8940a6184565d0 100644 (file)
--- a/src/kds_s2000w_image_converter.c
+++ b/src/kds_s2000w_image_converter.c
@@ -17,6 +17,11 @@ void kds_s2000w_convert_terminate()
 }
 
 void kds_s2000w_convert_jpg_to_pnm(blobdata* in, blobdata* out)
+{
+       kds_s2000w_convert_jpg_to_pnm_With_depth(in, out, -1);
+}
+
+void kds_s2000w_convert_jpg_to_pnm_With_depth(blobdata* in, blobdata* out, int depth)
 {
        ExceptionInfo* exception = NULL;
        Image* input_image = NULL;
@@ -39,6 +44,10 @@ void kds_s2000w_convert_jpg_to_pnm(blobdata* in, blobdata* out)
        exception = AcquireExceptionInfo();
        image_info = CloneImageInfo(NULL);
        strcpy(image_info->filename, "streamout.pnm");
+
+       if (depth > -1)
+               SetImageDepth(input_image, depth);
+
        out->data = ImageToBlob(image_info, input_image, &out->size, exception);
 
        DestroyImageInfo(image_info);

diff --git a/src/kds_s2000w_image_converter.h b/src/kds_s2000w_image_converter.h
index f0aed4e4f72ec57fe069bba0ca918e62d4ff62d1..d6baa985f61d5e9b61c517bf2cfe9a966c85de3b 100644 (file)
--- a/src/kds_s2000w_image_converter.h
+++ b/src/kds_s2000w_image_converter.h
@@ -9,4 +9,5 @@ void kds_s2000w_convert_init();
 void kds_s2000w_convert_terminate();
 
 void kds_s2000w_convert_jpg_to_pnm(blobdata* in, blobdata* out);
+void kds_s2000w_convert_jpg_to_pnm_With_depth(blobdata* in, blobdata* out, int depth);
 #endif
\ No newline at end of file

diff --git a/tools/convert.c b/tools/convert.c
index 1886348468fc9cffada4955b8a73796af9adfa51..6d54d9e9c422aa3f374ec8a5bf13ab0aa3b4873d 100644 (file)
--- a/tools/convert.c
+++ b/tools/convert.c
@@ -33,7 +33,7 @@ int main(int argc, char* argv[])
        fptr = NULL;
 
        kds_s2000w_convert_init();
-       kds_s2000w_convert_jpg_to_pnm(&blob, &output);
+       kds_s2000w_convert_jpg_to_pnm_With_depth(&blob, &output, 8);
        kds_s2000w_convert_terminate();
 
        fptr = fopen("output.pnm", "w");