Named Types

1 files changed, 22 insertions, 22 deletions

diff --git a/lib/seg/mask_data.c b/lib/seg/mask_data.c
index 8c4b037..dc3a811 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
-struct MaskData* create_mask_data(uint16_t label)
+struct MaskData* create_mask_data(ImageMaskData_t label)
 {
   struct MaskData *data = (struct MaskData*)malloc(sizeof(struct MaskData));
   data->label = label;
@@ -90,7 +90,7 @@ 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)
 {
   struct MaskData* data = create_mask_data(label);
   struct Result result = insert_mask(node, data);
@@ -112,7 +112,7 @@ 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)
 {
   if (root == NULL) {
     return FALSE;
@@ -131,7 +131,7 @@ bool_t increase_label_area(struct AVLNode* root, uint16_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)
 {
   if (root == NULL) {
     return FALSE;
@@ -151,7 +151,7 @@ bool_t increase_label_perimeter(struct AVLNode* root, uint16_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)
 {
   struct AVLNode* new_root = root;
   bool_t success = increase_label_area(new_root, label);
@@ -164,7 +164,7 @@ struct AVLNode* increase_label_area_alloc(struct AVLNode* root, uint16_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)
 {
   struct AVLNode* new_root = root;
   bool_t success = increase_label_perimeter(new_root, label);
@@ -175,34 +175,34 @@ struct AVLNode* increase_label_perimeter_alloc(struct AVLNode* root, uint16_t la
   return new_root;
 }
 
-// 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)
 {
   return *s1 < *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)
 {
   if (root != NULL) {
-    print_in_order_uint16_t(root->left);
-    printf("%d ", *((uint16_t*)root->data));
-    print_in_order_uint16_t(root->right);
+    print_in_order_image_mask_data_t(root->left);
+    printf("%d ", *((ImageMaskData_t*)root->data));
+    print_in_order_image_mask_data_t(root->right);
   }
 }
 
-// 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)
 {
   if (root == NULL) {
     return FALSE;
   }
-  if (*((uint16_t*)root->data) == value) {
+  if (*((ImageMaskData_t*)root->data) == value) {
     return TRUE;
-  } else if (value < *((uint16_t*)root->data)) {
-    return in_uint16_t_tree(root->left, value);
+  } else if (value < *((ImageMaskData_t*)root->data)) {
+    return in_image_mask_data_t_tree(root->left, value);
   } else {
-    return in_uint16_t_tree(root->right, value);
+    return in_image_mask_data_t_tree(root->right, value);
   }
 }
 
@@ -216,7 +216,7 @@ struct AVLNode* get_small_labels(struct AVLNode* removal_tree, struct AVLNode* l
     struct MaskData* node_data = (struct MaskData*)label_tree->data;
     if ((node_data->area < min_area) || (node_data->perimeter < min_perimeter)) {
       // Insert
-      struct Result result = avl_insert(return_tree, &node_data->label, (bool_t (*)(void*,void*))compare_uint16_t);
+      struct Result result = avl_insert(return_tree, &node_data->label, (bool_t (*)(void*,void*))compare_image_mask_data_t);
       if (result.success) {
 	return_tree = result.data;
       }
@@ -227,7 +227,7 @@ struct AVLNode* get_small_labels(struct AVLNode* removal_tree, struct AVLNode* l
 }
 
 // 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)
 {
   struct AVLNode* root = NULL;
   for (size_t y = 0; y < height; y++) {
@@ -245,7 +245,7 @@ struct AVLNode* get_mask_data(uint16_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)
 {
   struct AVLNode* root = get_mask_data(masks, width, height);
   struct AVLNode* small_label_tree = NULL;
@@ -253,7 +253,7 @@ void filter_small_masks(uint16_t* masks, uint32_t width, uint32_t height, size_t
   for (size_t y = 0; y < height; y++) {
     for (size_t x = 0; x < width; x++) {
       size_t coord = x + y*width;
-      if (in_uint16_t_tree(small_label_tree, masks[coord])) {
+      if (in_image_mask_data_t_tree(small_label_tree, masks[coord])) {
 	masks[coord] = 0;
       }
     }