[trunk] use the right cp structure in image.h