From: Bastian Dehn <hhaalo@arcor.de>
Date: Sat, 25 Jan 2025 17:38:46 +0000 (+0100)
Subject: change naming image converter
X-Git-Tag: v1.0.29^2~4^2~9
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=d5d0cb0dcacbc2c665fefb321ac83d1714df3566;p=sane-kds-s2000w-net.git

change naming image converter
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7c00b05..a165910 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,8 +33,8 @@ IF (RUN_TESTS)
 --wrap,kds_s2000w_client_set_option,\
 --wrap,kds_s2000w_client_init,\
 --wrap,kds_s2000w_client_free,\
---wrap,kds_s2000w_convert_tiff_to_pnm,\
---wrap,kds_s2000w_convert_jpg_to_pnm_with_depth"
+--wrap,kds_s2000w_image_converter_tiff_to_pnm,\
+--wrap,kds_s2000w_image_converter_jpg_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 2dd3064..bb1b455 100644
--- a/src/kds_s2000w_handler.c
+++ b/src/kds_s2000w_handler.c
@@ -280,16 +280,16 @@ void kds_s2000w_handler_get_current_metadata(handler* h, metadata* params)
 	if (params->format == 1)
 		channels = 3;
 
-	kds_s2000w_metadata_from_image(scanner_image, mdata);
+	kds_s2000w_image_converter_metadata_from_jpg(scanner_image, mdata);
 	params->depth = mdata->depth;
 	params->pixels_per_line = mdata->width;
 	params->lines = mdata->height;
 
 	if (params->depth > 8) {
 		params->depth = 8;
-		kds_s2000w_convert_jpg_to_pnm_with_depth(scanner_image, image, params->depth);
+		kds_s2000w_image_converter_jpg_to_pnm(scanner_image, image, params->depth);
 	} else {
-		kds_s2000w_convert_tiff_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.c b/src/kds_s2000w_image_converter.c
index f943768..b0e9278 100644
--- a/src/kds_s2000w_image_converter.c
+++ b/src/kds_s2000w_image_converter.c
@@ -14,7 +14,34 @@
 #include "kds_s2000w_image_converter.h"
 #include "kds_s2000w_debug.h"
 
-void kds_s2000w_convert_to_pnm_with_depth(blobdata* in,
+void kds_s2000w_image_converter_metadata_from_jpg(blobdata* image, image_metadata* mdata)
+{
+	kds_s2000w_debug_printf(ALL, "kds_s2000w_metadata_from_image");
+
+	ExceptionInfo* exception = AcquireExceptionInfo();
+	ImageInfo* image_info = CloneImageInfo(NULL);
+	sprintf(image_info->filename, "image.pnm");
+
+	Image* input_image = BlobToImage(image_info, image->data, image->size , exception);
+
+	if (exception->severity != UndefinedException) {
+		kds_s2000w_debug_printf(ERROR, GetExceptionMessage(exception->error_number));
+		CatchException(exception);
+	}
+
+	mdata->width = input_image->columns;
+	mdata->height = input_image->rows;
+	mdata->depth = input_image->depth;
+
+	DestroyImageInfo(image_info);
+	image_info = NULL;
+	DestroyImage(input_image);
+	input_image = NULL;
+	DestroyExceptionInfo(exception);
+	exception = NULL;
+}
+
+void _kds_s2000w_image_converter_to_pnm_depth(blobdata* in,
 	blobdata* out,
 	int depth,
 	const char* format)
@@ -66,43 +93,16 @@ void kds_s2000w_convert_to_pnm_with_depth(blobdata* in,
 	exception = NULL;
 }
 
-void kds_s2000w_convert_jpg_to_pnm_with_depth(blobdata* in, blobdata* out, int depth)
+void kds_s2000w_image_converter_jpg_to_pnm(blobdata* in, blobdata* out, int depth)
 {
 	kds_s2000w_debug_printf(ALL, "kds_s2000w_convert_jpg_to_pnm_With_depth");
 
-	kds_s2000w_convert_to_pnm_with_depth(in, out, depth, "jpg");
+	_kds_s2000w_image_converter_to_pnm_depth(in, out, depth, "jpg");
 }
 
-void kds_s2000w_convert_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_convert_tiff_to_pnm");
 
-	kds_s2000w_convert_to_pnm_with_depth(in, out, -1, "tiff");
-}
-
-void kds_s2000w_metadata_from_image(blobdata* image, image_metadata* mdata)
-{
-	kds_s2000w_debug_printf(ALL, "kds_s2000w_metadata_from_image");
-
-	ExceptionInfo* exception = AcquireExceptionInfo();
-	ImageInfo* image_info = CloneImageInfo(NULL);
-	sprintf(image_info->filename, "image.pnm");
-
-	Image* input_image = BlobToImage(image_info, image->data, image->size , exception);
-
-	if (exception->severity != UndefinedException) {
-		kds_s2000w_debug_printf(ERROR, GetExceptionMessage(exception->error_number));
-		CatchException(exception);
-	}
-
-	mdata->width = input_image->columns;
-	mdata->height = input_image->rows;
-	mdata->depth = input_image->depth;
-
-	DestroyImageInfo(image_info);
-	image_info = NULL;
-	DestroyImage(input_image);
-	input_image = NULL;
-	DestroyExceptionInfo(exception);
-	exception = NULL;
+	_kds_s2000w_image_converter_to_pnm_depth(in, out, -1, "tiff");
 }
\ No newline at end of file
diff --git a/src/kds_s2000w_image_converter.h b/src/kds_s2000w_image_converter.h
index 2e36d2b..ca8288f 100644
--- a/src/kds_s2000w_image_converter.h
+++ b/src/kds_s2000w_image_converter.h
@@ -13,8 +13,9 @@ typedef struct {
 	int depth;
 } image_metadata;
 
-void kds_s2000w_convert_jpg_to_pnm_with_depth(blobdata* in, blobdata* out, int depth);
-void kds_s2000w_convert_tiff_to_pnm(blobdata* in, blobdata* out);
-void kds_s2000w_metadata_from_image(blobdata* image, image_metadata* mdata);
+void kds_s2000w_image_converter_metadata_from_jpg(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);
 
 #endif
\ No newline at end of file
diff --git a/tests/kds_s2000w_client_mock.c b/tests/kds_s2000w_client_mock.c
index 9397b01..cbea9a4 100644
--- a/tests/kds_s2000w_client_mock.c
+++ b/tests/kds_s2000w_client_mock.c
@@ -89,7 +89,7 @@ void __wrap_kds_s2000w_client_close_session(int64_t sessionid)
 	return;
 }
 
-void __wrap_kds_s2000w_convert_jpg_to_pnm_with_depth(blobdata* in, blobdata* out)
+void __wrap_kds_s2000w_image_converter_jpg_to_pnm(blobdata* in, blobdata* out)
 {
 	if (in->data != NULL) {
 		out->data = malloc(sizeof(char) * in->size);
@@ -100,7 +100,7 @@ void __wrap_kds_s2000w_convert_jpg_to_pnm_with_depth(blobdata* in, blobdata* out
 	return;
 }
 
-void __wrap_kds_s2000w_convert_tiff_to_pnm(blobdata* in, blobdata* out)
+void __wrap_kds_s2000w_image_converter_tiff_to_pnm(blobdata* in, blobdata* out)
 {
 	if (in->data != NULL) {
 		out->data = malloc(sizeof(char) * in->size);
diff --git a/tests/kds_s2000w_image_converter_tests.c b/tests/kds_s2000w_image_converter_tests.c
index f2c7e85..4d1dc46 100644
--- 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_metadata_from_image(image, mdata);
+	kds_s2000w_image_converter_metadata_from_jpg(image, mdata);
 
 	assert_int_equal(mdata->width, 2);
 	assert_int_equal(mdata->height, 1);