aboutsummaryrefslogtreecommitdiff
path: root/lib/seg/mask_data.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/seg/mask_data.c')
-rw-r--r--lib/seg/mask_data.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/lib/seg/mask_data.c b/lib/seg/mask_data.c
index 52a3ac4..97e9165 100644
--- a/lib/seg/mask_data.c
+++ b/lib/seg/mask_data.c
@@ -4,7 +4,7 @@
#include <stdio.h>
// Allocate Mask Data for Label
-MaskData* create_mask_data(ImageMaskData_t label)
+MaskData* create_mask_data(MaskData_t label)
{
MaskData *data = (MaskData*)malloc(sizeof(MaskData));
data->label = label;
@@ -90,7 +90,7 @@ 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)
{
MaskData* data = create_mask_data(label);
Result result = insert_mask(node, data);
@@ -112,7 +112,7 @@ 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)
{
if (root == NULL) {
return FALSE;
@@ -131,7 +131,7 @@ bool_t increase_label_area(AVLNode* root, ImageMaskData_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)
{
if (root == NULL) {
return FALSE;
@@ -151,7 +151,7 @@ bool_t increase_label_perimeter(AVLNode* root, ImageMaskData_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)
{
AVLNode* new_root = root;
bool_t success = increase_label_area(new_root, label);
@@ -164,7 +164,7 @@ AVLNode* increase_label_area_alloc(AVLNode* root, ImageMaskData_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)
{
AVLNode* new_root = root;
bool_t success = increase_label_perimeter(new_root, label);
@@ -175,8 +175,8 @@ AVLNode* increase_label_perimeter_alloc(AVLNode* root, ImageMaskData_t label)
return new_root;
}
-// 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)
{
return *s1 < *s2;
}
@@ -186,20 +186,20 @@ void print_in_order_image_mask_data_t(AVLNode* root)
{
if (root != NULL) {
print_in_order_image_mask_data_t(root->left);
- printf("%d ", *((ImageMaskData_t*)root->data));
+ printf("%d ", *((MaskData_t*)root->data));
print_in_order_image_mask_data_t(root->right);
}
}
-// 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)
{
if (root == NULL) {
return FALSE;
}
- if (*((ImageMaskData_t*)root->data) == value) {
+ if (*((MaskData_t*)root->data) == value) {
return TRUE;
- } else if (value < *((ImageMaskData_t*)root->data)) {
+ } else if (value < *((MaskData_t*)root->data)) {
return in_image_mask_data_t_tree(root->left, value);
} else {
return in_image_mask_data_t_tree(root->right, value);
@@ -227,7 +227,7 @@ AVLNode* get_small_labels(AVLNode* removal_tree, AVLNode* label_tree, size_t min
}
// 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)
{
AVLNode* root = NULL;
for (size_t y = 0; y < height; y++) {
@@ -245,7 +245,7 @@ AVLNode* get_mask_data(ImageMaskData_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)
{
AVLNode* root = get_mask_data(masks, width, height);
AVLNode* small_label_tree = NULL;