Pushing changes to bmpshape.cc