Don't cache image width/height if they are 0

Images that weren't loaded when collagePlus() was run were getting
their width and height cached as 0, causing subsequent calls to
collagePlus to not lay these images out properly.