From 3cfdec959d9ae00d6b44391cc8daec5ded831295 Mon Sep 17 00:00:00 2001
From: Christian C <cc@localhost>
Date: Sun, 23 Mar 2025 15:43:59 -0700
Subject: Refactor mask field
---
lib/data/image_types.c | 16 ++++++++--------
lib/seg/util.c | 10 +++++-----
2 files changed, 13 insertions(+), 13 deletions(-)
(limited to 'lib')
diff --git a/lib/data/image_types.c b/lib/data/image_types.c
index 0375a24..74c7ec4 100644
--- a/lib/data/image_types.c
+++ b/lib/data/image_types.c
@@ -19,10 +19,10 @@ ImageMask* create_image_mask(size_t width, size_t height)
ImageMask* ip = (ImageMask*)malloc(sizeof(ImageMask));
ip->width = width;
ip->height = height;
- ip->mask = (ImageMaskData_t**)malloc(sizeof(ImageMaskData_t*) * ip->height);
+ ip->image = (ImageMaskData_t**)malloc(sizeof(ImageMaskData_t*) * ip->height);
ImageMaskData_t* image_data = calloc(width*height, sizeof(ImageMaskData_t));
for (size_t y = 0; y < height; y++) {
- ip->mask[y] = &image_data[y*width];
+ ip->image[y] = &image_data[y*width];
}
return ip;
}
@@ -44,13 +44,13 @@ void free_image(Image* image)
void free_image_mask(ImageMask* image_mask)
{
- if (image_mask->mask[0] != NULL) {
- free(image_mask->mask[0]);
- image_mask->mask[0] = NULL;
+ if (image_mask->image[0] != NULL) {
+ free(image_mask->image[0]);
+ image_mask->image[0] = NULL;
}
- if (image_mask->mask != NULL) {
- free(image_mask->mask);
- image_mask->mask = NULL;
+ if (image_mask->image != NULL) {
+ free(image_mask->image);
+ image_mask->image = NULL;
}
if (image_mask != NULL) {
free(image_mask);
diff --git a/lib/seg/util.c b/lib/seg/util.c
index 6eee1a2..afced0a 100644
--- a/lib/seg/util.c
+++ b/lib/seg/util.c
@@ -209,8 +209,8 @@ ImageMask* combine_masks(ImageMask *destination, ImageMask *extra_labels)
}
for (size_t y = 0; y < destination->height; y++) {
for (size_t x = 0; x < destination->width; x++) {
- if (destination->mask[y][x] == 0) {
- destination->mask[y][x] = extra_labels->mask[y][x];
+ if (destination->image[y][x] == 0) {
+ destination->image[y][x] = extra_labels->image[y][x];
}
}
}
@@ -275,21 +275,21 @@ ImageMask* tif_to_labels(char* tif_file_name, uint32_t *width, uint32_t *height,
TIFFClose(tif);
return NULL;
}
- if (im_data->mask == NULL) {
+ if (im_data->image == NULL) {
fprintf(stderr, "Memory allocation error\n");
free_image_mask(im_data);
free(image_data);
TIFFClose(tif);
return NULL;
}
- if (im_data->mask[0] == NULL) {
+ if (im_data->image[0] == NULL) {
fprintf(stderr, "Memory allocation error\n");
free_image_mask(im_data);
free(image_data);
TIFFClose(tif);
return NULL;
}
- ImageMaskData_t *labels = im_data->mask[0];
+ ImageMaskData_t *labels = im_data->image[0];
/*
labels = (ImageMaskData_t*)calloc((*width)*(*height),sizeof(ImageMaskData_t));
if (labels == NULL) {
--
cgit v1.2.1