From ee4adcc2dbb83d3921d1080ccbb3aac0d0e93841 Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Fri, 17 Oct 2025 19:24:19 +0200 Subject: [PATCH] change rename image metadata type --- src/kds_s2000w_handler.c | 2 +- src/kds_s2000w_image_converter.h | 4 ++-- src/kds_s2000w_image_converter_netpbm.c | 8 ++++---- tests/kds_s2000w_image_converter_tests.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c index 90c2184..14f94de 100644 --- a/src/kds_s2000w_handler.c +++ b/src/kds_s2000w_handler.c @@ -305,7 +305,7 @@ void kds_s2000w_handler_get_current_metadata(handler_t* h, metadata_t* params) if (h->image->data == NULL) return; - image_metadata* mdata = malloc(sizeof(image_metadata)); + image_metadata_t* mdata = malloc(sizeof(image_metadata_t)); if (mdata == NULL) return; blobdata_t* scanner_image = malloc(sizeof(blobdata_t)); diff --git a/src/kds_s2000w_image_converter.h b/src/kds_s2000w_image_converter.h index 5f17e9e..f4af842 100644 --- a/src/kds_s2000w_image_converter.h +++ b/src/kds_s2000w_image_converter.h @@ -12,9 +12,9 @@ typedef struct { uint32_t width; uint32_t height; uint8_t depth; -} image_metadata; +} image_metadata_t; -void kds_s2000w_image_converter_metadata_from_scanner_image(blobdata_t* image, image_metadata* mdata); +void kds_s2000w_image_converter_metadata_from_scanner_image(blobdata_t* image, image_metadata_t* mdata); void kds_s2000w_image_converter_to_pnm(blobdata_t* in, blobdata_t* out); #endif \ 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 8c75810..e924b62 100644 --- a/src/kds_s2000w_image_converter_netpbm.c +++ b/src/kds_s2000w_image_converter_netpbm.c @@ -113,7 +113,7 @@ uint32_t _kds_s2000w_image_converter_get_number_from_substring(const char* data, return number; } -void _kds_s2000w_image_converter_tiff_metadata(blobdata_t* image, image_metadata* mdata) +void _kds_s2000w_image_converter_tiff_metadata(blobdata_t* image, image_metadata_t* mdata) { tiff_reader* tiff_handler = malloc(sizeof(tiff_reader)); if (tiff_handler == NULL) @@ -136,7 +136,7 @@ void _kds_s2000w_image_converter_tiff_metadata(blobdata_t* image, image_metadata TIFFClose(tiff); } -void _kds_s2000w_image_converter_pnm_metadata(const blobdata_t* image, image_metadata* mdata) +void _kds_s2000w_image_converter_pnm_metadata(const blobdata_t* image, image_metadata_t* mdata) { kds_s2000w_debug_printf(ALL, "kds_s2000w_image_converter_pnm_metadata"); @@ -154,7 +154,7 @@ void _kds_s2000w_image_converter_pnm_metadata(const blobdata_t* image, image_met mdata->height = _kds_s2000w_image_converter_get_number_from_substring(image_data, middle, end); } -void _kds_s2000w_image_converter_jpeg_metadata(blobdata_t* image, image_metadata* mdata) +void _kds_s2000w_image_converter_jpeg_metadata(blobdata_t* image, image_metadata_t* mdata) { kds_s2000w_debug_printf(ALL, "kds_s2000w_image_converter_jpeg_metadata"); @@ -281,7 +281,7 @@ void _kds_s2000w_image_converter_gray_or_color_jpg_to_pnm(j_decompress_ptr cinfo decompress_data = NULL; } -void kds_s2000w_image_converter_metadata_from_scanner_image(blobdata_t* image, image_metadata* mdata) +void kds_s2000w_image_converter_metadata_from_scanner_image(blobdata_t* image, image_metadata_t* mdata) { kds_s2000w_debug_printf(ALL, "kds_s2000w_image_converter_metadata_from_scanner_image"); diff --git a/tests/kds_s2000w_image_converter_tests.c b/tests/kds_s2000w_image_converter_tests.c index 070f2bd..5f69920 100644 --- a/tests/kds_s2000w_image_converter_tests.c +++ b/tests/kds_s2000w_image_converter_tests.c @@ -35,7 +35,7 @@ void get_metadata_from_image_test() for (uint32_t i = 11; i < 17; i++) { image_data[i] = (char) 0xff; } - image_metadata* mdata = malloc(sizeof(image_metadata)); + image_metadata_t* mdata = malloc(sizeof(image_metadata_t)); if (mdata == NULL) { free(image->data); image->data = NULL; -- 2.47.3