diff --git a/src/dicom-file.c b/src/dicom-file.c index f1f05b7..2e691ca 100644 --- a/src/dicom-file.c +++ b/src/dicom-file.c @@ -319,8 +319,8 @@ static bool get_frame_size(DcmError **error, return false; } - *frame_width = width; - *frame_height = height; + *frame_width = (uint32_t) width; + *frame_height = (uint32_t) height; return true; } @@ -350,8 +350,8 @@ static bool get_tiles(DcmError **error, height = frame_width; (void) get_tag_int(NULL, metadata, "TotalPixelMatrixRows", &height); - *tiles_across = width / frame_width + !!(width % frame_width); - *tiles_down = height / frame_height + !!(height % frame_height); + *tiles_across = (uint32_t) width / frame_width + !!(width % frame_width); + *tiles_down = (uint32_t) height / frame_height + !!(height % frame_height); return true; } @@ -664,28 +664,28 @@ static bool set_pixel_description(DcmError **error, !dcm_element_get_value_integer(error, element, 0, &value)) { return false; } - desc->rows = value; + desc->rows = (uint64_t) value; element = dcm_dataset_get(error, metadata, 0x00280011); if (element == NULL || !dcm_element_get_value_integer(error, element, 0, &value)) { return false; } - desc->columns = value; + desc->columns = (uint64_t) value; element = dcm_dataset_get(error, metadata, 0x00280002); if (element == NULL || !dcm_element_get_value_integer(error, element, 0, &value)) { return false; } - desc->samples_per_pixel = value; + desc->samples_per_pixel = (uint64_t) value; element = dcm_dataset_get(error, metadata, 0x00280100); if (element == NULL || !dcm_element_get_value_integer(error, element, 0, &value)) { return false; } - desc->bits_allocated = value; + desc->bits_allocated = (uint64_t) value; element = dcm_dataset_get(error, metadata, 0x00280101); if (element == NULL || @@ -699,14 +699,14 @@ static bool set_pixel_description(DcmError **error, !dcm_element_get_value_integer(error, element, 0, &value)) { return false; } - desc->pixel_representation = value; + desc->pixel_representation = (uint64_t) value; element = dcm_dataset_get(error, metadata, 0x00280006); if (element == NULL || !dcm_element_get_value_integer(error, element, 0, &value)) { return false; } - desc->planar_configuration = value; + desc->planar_configuration = (uint64_t) value; element = dcm_dataset_get(error, metadata, 0x00280004); if (element == NULL ||