Resize Image Canvas to fit Image

I have an image in a gallery and the images that are shown/uploaded are all different sizes. I am looking for a way to resize the canvas to fit the image. I don't want to resize the image to canvas. I have the image position set to fit so it keeps the proportions of the image and for most of the images that means it is going to be wide enough but the image is not very tall so the canvas is bigger then the image. My gallery is a flexabile height and because the canvas is bigger than the image it looks like there is a space between my image and text in other rows of my gallery.

Is there any way to fix this? Any help would be great.