From 16422831ed49c573c1b8a43ba907bceb00fd5eea Mon Sep 17 00:00:00 2001 From: Christian C Date: Sat, 22 Mar 2025 22:27:40 -0700 Subject: Named Types --- include/lib/seg/mask_data.h | 29 +++++++++++++++-------------- include/lib/seg/util.h | 17 +++++++++-------- 2 files changed, 24 insertions(+), 22 deletions(-) (limited to 'include/lib/seg') diff --git a/include/lib/seg/mask_data.h b/include/lib/seg/mask_data.h index 8e2ae3a..bbaf38c 100644 --- a/include/lib/seg/mask_data.h +++ b/include/lib/seg/mask_data.h @@ -2,16 +2,17 @@ #define INC_LIB_SEG_MASK_DATA_H #include +#include #include struct MaskData { - uint16_t label; + ImageMaskData_t label; size_t area; size_t perimeter; }; // Allocate Mask Data for Label -struct MaskData* create_mask_data(uint16_t label); +struct MaskData* create_mask_data(ImageMaskData_t label); // Compare mask data labels bool_t compare_labels(struct MaskData* left, struct MaskData* right); @@ -24,42 +25,42 @@ struct Result insert_mask(struct AVLNode* node, struct MaskData* data); // Allocate a label's Mask data in a tree // If it already exists, skip the allocation -struct AVLNode* insert_mask_alloc(struct AVLNode* node, uint16_t label); +struct AVLNode* insert_mask_alloc(struct AVLNode* node, ImageMaskData_t label); // Print AVL Node Mask Data Label void print_label(struct AVLNode* root); // Increase the label's area -bool_t increase_label_area(struct AVLNode* root, uint16_t label); +bool_t increase_label_area(struct AVLNode* root, ImageMaskData_t label); // Increase the label's perimeter -bool_t increase_label_perimeter(struct AVLNode* root, uint16_t label); +bool_t increase_label_perimeter(struct AVLNode* root, ImageMaskData_t label); // Increase the label's area // Create an AVL node if it doesn't exist -struct AVLNode* increase_label_area_alloc(struct AVLNode* root, uint16_t label); +struct AVLNode* increase_label_area_alloc(struct AVLNode* root, ImageMaskData_t label); // Increase the label's perimeter // Create an AVL node if it doesn't exist -struct AVLNode* increase_label_perimeter_alloc(struct AVLNode* root, uint16_t label); +struct AVLNode* increase_label_perimeter_alloc(struct AVLNode* root, ImageMaskData_t label); -// Comparison of uint16_ts -bool_t compare_uint16_t(uint16_t* s1, uint16_t* s2); +// Comparison of ImageMaskData_ts +bool_t compare_image_mask_data_t(ImageMaskData_t* s1, ImageMaskData_t* s2); // In-order traversal print pointer -void print_in_order_uint16_t(struct AVLNode* root); +void print_in_order_image_mask_data_t(struct AVLNode* root); -// Check if uint16_t in AVLTree with uint16_t* data -bool_t in_uint16_t_tree(struct AVLNode* root, uint16_t value); +// Check if ImageMaskData_t in AVLTree with ImageMaskData_t* data +bool_t in_image_mask_data_t_tree(struct AVLNode* root, ImageMaskData_t value); // Filter out small masks // Assumption: Contiguous labeling struct AVLNode* get_small_labels(struct AVLNode* removal_tree, struct AVLNode* label_tree, size_t min_area, size_t min_perimeter); // Get mask label data -struct AVLNode* get_mask_data(uint16_t* masks, uint32_t width, uint32_t height); +struct AVLNode* get_mask_data(ImageMaskData_t* masks, uint32_t width, uint32_t height); // Filter out small masks in mask -void filter_small_masks(uint16_t* masks, uint32_t width, uint32_t height, size_t min_area, size_t min_perimeter); +void filter_small_masks(ImageMaskData_t* masks, uint32_t width, uint32_t height, size_t min_area, size_t min_perimeter); #endif diff --git a/include/lib/seg/util.h b/include/lib/seg/util.h index c54b0e0..ef85c2c 100644 --- a/include/lib/seg/util.h +++ b/include/lib/seg/util.h @@ -2,6 +2,7 @@ #define INC_LIB_SEG_UTIL_H #include +#include #include #include @@ -10,33 +11,33 @@ size_t xy_to_coord(size_t x, size_t y, uint32_t width, uint32_t height); // Determine if coordinate is on a mask boundary // Assumes mask is (WxH) -bool_t is_on_mask_boundary(uint16_t* mask, uint32_t width, uint32_t height, size_t x, size_t y); +bool_t is_on_mask_boundary(ImageMaskData_t* mask, uint32_t width, uint32_t height, size_t x, size_t y); // Dilate masks by one 4-connected pixel -void dilate(uint16_t** mask, uint32_t width, uint32_t height); +void dilate(ImageMaskData_t** mask, uint32_t width, uint32_t height); // Erode masks by one 4-connected pixel -void erode(uint16_t** mask, uint32_t width, uint32_t height); +void erode(ImageMaskData_t** mask, uint32_t width, uint32_t height); // Close up masks by N-pixels -void closeup(uint16_t** mask, uint32_t width, uint32_t height, size_t count); +void closeup(ImageMaskData_t** mask, uint32_t width, uint32_t height, size_t count); // Combine Label Masks // For all empty spaces in the destination, put the extra label if it exists // Allocates an array if destination is unallocated -uint16_t* combine_masks(uint16_t *destination, uint16_t *extra_labels, uint32_t width, uint32_t height); +ImageMaskData_t* combine_masks(ImageMaskData_t *destination, ImageMaskData_t *extra_labels, uint32_t width, uint32_t height); // Process Tif File to Labels // width, height will be overwritten with image dimensions // starting_label_p will be incremented for each label found in the image -uint16_t* tif_to_labels(char* tif_file_name, uint32_t *width, uint32_t *height, uint16_t *starting_label_p); +ImageMaskData_t* tif_to_labels(char* tif_file_name, uint32_t *width, uint32_t *height, ImageMaskData_t *starting_label_p); // Convert mask to bitmap -struct bitmap_t* uint16_to_bitmap(uint16_t* buffer, uint32_t width, uint32_t height); +struct bitmap_t* image_mask_data_to_bitmap(ImageMaskData_t* buffer, uint32_t width, uint32_t height); // Reduce a mask to the contiguous regions // Automatically update pointer to contiguous mask // Freeing previous mask -void reduce_contiguous_regions(uint16_t** masks_p, uint32_t width, uint32_t height, uint16_t* total_labels); +void reduce_contiguous_regions(ImageMaskData_t** masks_p, uint32_t width, uint32_t height, ImageMaskData_t* total_labels); #endif -- cgit v1.2.1