diff options
| -rw-r--r-- | include/lib/seg/util.h | 2 | ||||
| -rw-r--r-- | lib/seg/util.c | 5 | ||||
| -rw-r--r-- | src/prog.c | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/include/lib/seg/util.h b/include/lib/seg/util.h index 78f948b..9f66670 100644 --- a/include/lib/seg/util.h +++ b/include/lib/seg/util.h @@ -31,7 +31,7 @@ Mask* combine_masks(Mask *destination, Mask *extra_labels); Mask* tif_to_labels(char* tif_file_name, MaskData_t *starting_label_p); // Convert mask to bitmap -Bitmap* image_mask_data_to_bitmap(MaskData_t* buffer, uint32_t width, uint32_t height); +Bitmap* image_mask_data_to_bitmap(const Mask* mask); // Reduce a mask to the contiguous regions // Automatically update pointer to contiguous mask diff --git a/lib/seg/util.c b/lib/seg/util.c index bc2f837..7b8d317 100644 --- a/lib/seg/util.c +++ b/lib/seg/util.c @@ -283,8 +283,11 @@ Mask *tif_to_labels(char *tif_file_name, MaskData_t *starting_label_p) } // Convert mask to bitmap -Bitmap* image_mask_data_to_bitmap(MaskData_t* buffer, uint32_t width, uint32_t height) +Bitmap* image_mask_data_to_bitmap(const Mask* mask) { + MaskData_t *buffer = mask->image[0]; + uint32_t width = mask->width; + uint32_t height = mask->height; Pixel* out_buffer = (Pixel*)calloc(width*height, sizeof(Pixel)); if (out_buffer == NULL) { return NULL; @@ -201,7 +201,7 @@ int main(int argc, char** argv) //-SAVE-MASK-AS-BINARY-AND-PNG------------------- //----------------------------------------------- if (masks_im != NULL) { - Bitmap* bitmap = image_mask_data_to_bitmap(masks_im->image[0], width, height); + Bitmap* bitmap = image_mask_data_to_bitmap(masks_im); if (bitmap != NULL) { save_png(bitmap, png_file); free(bitmap); |