Fix issue with image size not correctly being passed to convolution operator

Closes #2089

@f0k
Ideally this `enough_shape` can be removed. It seems like the wrong approach here.