From ddafa2764240436557aa54484e00f64cc11ec001 Mon Sep 17 00:00:00 2001
From: Christian C <cc@localhost>
Date: Sun, 23 Mar 2025 15:46:37 -0700
Subject: Shorter type name
---
include/lib/algo/flood_fill.h | 2 +-
include/lib/data/image_types.h | 4 ++--
include/lib/seg/mask_data.h | 26 +++++++++++++-------------
include/lib/seg/util.h | 14 +++++++-------
4 files changed, 23 insertions(+), 23 deletions(-)
(limited to 'include')
diff --git a/include/lib/algo/flood_fill.h b/include/lib/algo/flood_fill.h
index e9872eb..f446e3b 100644
--- a/include/lib/algo/flood_fill.h
+++ b/include/lib/algo/flood_fill.h
@@ -15,6 +15,6 @@
// 4. Check if the (x,y) coordinate in the image is the same color as the fill color
// 5. If all hold, set the label for the pixel, and check each neighbor
// Otherwise, stop flooding
-bool_t flood(ImageData_t* image, ImageMaskData_t* mask, size_t width, size_t height, size_t channels, size_t x, size_t y, ImageData_t* fill_color, ImageMaskData_t label);
+bool_t flood(ImageData_t* image, MaskData_t* mask, size_t width, size_t height, size_t channels, size_t x, size_t y, ImageData_t* fill_color, MaskData_t label);
#endif
diff --git a/include/lib/data/image_types.h b/include/lib/data/image_types.h
index fdeeecc..79e395d 100644
--- a/include/lib/data/image_types.h
+++ b/include/lib/data/image_types.h
@@ -6,8 +6,8 @@
#define ImageData_t uint8_t
#define Image_t ImageData_t**
-#define ImageMaskData_t uint16_t
-#define ImageMask_t ImageMaskData_t**
+#define MaskData_t uint16_t
+#define ImageMask_t MaskData_t**
typedef struct Image {
size_t width;
diff --git a/include/lib/seg/mask_data.h b/include/lib/seg/mask_data.h
index 91b9074..72bd5f7 100644
--- a/include/lib/seg/mask_data.h
+++ b/include/lib/seg/mask_data.h
@@ -6,13 +6,13 @@
#include <lib/monad.h>
typedef struct MaskData {
- ImageMaskData_t label;
+ MaskData_t label;
size_t area;
size_t perimeter;
} MaskData;
// Allocate Mask Data for Label
-MaskData* create_mask_data(ImageMaskData_t label);
+MaskData* create_mask_data(MaskData_t label);
// Compare mask data labels
bool_t compare_labels(MaskData* left, MaskData* right);
@@ -25,42 +25,42 @@ Result insert_mask(AVLNode* node, MaskData* data);
// Allocate a label's Mask data in a tree
// If it already exists, skip the allocation
-AVLNode* insert_mask_alloc(AVLNode* node, ImageMaskData_t label);
+AVLNode* insert_mask_alloc(AVLNode* node, MaskData_t label);
// Print AVL Node Mask Data Label
void print_label(AVLNode* root);
// Increase the label's area
-bool_t increase_label_area(AVLNode* root, ImageMaskData_t label);
+bool_t increase_label_area(AVLNode* root, MaskData_t label);
// Increase the label's perimeter
-bool_t increase_label_perimeter(AVLNode* root, ImageMaskData_t label);
+bool_t increase_label_perimeter(AVLNode* root, MaskData_t label);
// Increase the label's area
// Create an AVL node if it doesn't exist
-AVLNode* increase_label_area_alloc(AVLNode* root, ImageMaskData_t label);
+AVLNode* increase_label_area_alloc(AVLNode* root, MaskData_t label);
// Increase the label's perimeter
// Create an AVL node if it doesn't exist
-AVLNode* increase_label_perimeter_alloc(AVLNode* root, ImageMaskData_t label);
+AVLNode* increase_label_perimeter_alloc(AVLNode* root, MaskData_t label);
-// Comparison of ImageMaskData_ts
-bool_t compare_image_mask_data_t(ImageMaskData_t* s1, ImageMaskData_t* s2);
+// Comparison of MaskData_ts
+bool_t compare_image_mask_data_t(MaskData_t* s1, MaskData_t* s2);
// In-order traversal print pointer
void print_in_order_image_mask_data_t(AVLNode* root);
-// Check if ImageMaskData_t in AVLTree with ImageMaskData_t* data
-bool_t in_image_mask_data_t_tree(AVLNode* root, ImageMaskData_t value);
+// Check if MaskData_t in AVLTree with MaskData_t* data
+bool_t in_image_mask_data_t_tree(AVLNode* root, MaskData_t value);
// Filter out small masks
// Assumption: Contiguous labeling
AVLNode* get_small_labels(AVLNode* removal_tree, AVLNode* label_tree, size_t min_area, size_t min_perimeter);
// Get mask label data
-AVLNode* get_mask_data(ImageMaskData_t* masks, uint32_t width, uint32_t height);
+AVLNode* get_mask_data(MaskData_t* masks, uint32_t width, uint32_t height);
// Filter out small masks in mask
-void filter_small_masks(ImageMaskData_t* masks, uint32_t width, uint32_t height, size_t min_area, size_t min_perimeter);
+void filter_small_masks(MaskData_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 88389f6..db46e5a 100644
--- a/include/lib/seg/util.h
+++ b/include/lib/seg/util.h
@@ -12,16 +12,16 @@ 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(ImageMaskData_t* mask, uint32_t width, uint32_t height, size_t x, size_t y);
+bool_t is_on_mask_boundary(MaskData_t* mask, uint32_t width, uint32_t height, size_t x, size_t y);
// Dilate masks by one 4-connected pixel
-void dilate(ImageMaskData_t** mask, uint32_t width, uint32_t height);
+void dilate(MaskData_t** mask, uint32_t width, uint32_t height);
// Erode masks by one 4-connected pixel
-void erode(ImageMaskData_t** mask, uint32_t width, uint32_t height);
+void erode(MaskData_t** mask, uint32_t width, uint32_t height);
// Close up masks by N-pixels
-void closeup(ImageMaskData_t** mask, uint32_t width, uint32_t height, size_t count);
+void closeup(MaskData_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
@@ -31,14 +31,14 @@ ImageMask* combine_masks(ImageMask *destination, ImageMask *extra_labels);
// 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
-ImageMask* tif_to_labels(char* tif_file_name, uint32_t *width, uint32_t *height, ImageMaskData_t *starting_label_p);
+ImageMask* tif_to_labels(char* tif_file_name, uint32_t *width, uint32_t *height, MaskData_t *starting_label_p);
// Convert mask to bitmap
-Bitmap* image_mask_data_to_bitmap(ImageMaskData_t* buffer, uint32_t width, uint32_t height);
+Bitmap* image_mask_data_to_bitmap(MaskData_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(ImageMaskData_t** masks_p, uint32_t width, uint32_t height, ImageMaskData_t* total_labels);
+void reduce_contiguous_regions(MaskData_t** masks_p, uint32_t width, uint32_t height, MaskData_t* total_labels);
#endif
--
cgit v1.2.1