A diagnostic capable of recording spatially and temporally resolved x-ray self-emission data was developed to characterize experiments on the MAGPIE pulsed-power generator. The diagnostic used two separate imaging systems: a pinhole imaging system with two-dimensional spatial resolution and a slit imaging system with one-dimensional spatial resolution. The two-dimensional imaging system imaged light onto the image plate. The one-dimensional imaging system imaged light onto the same piece of image plate and a linear array of silicon photodiodes. This design allowed the cross-comparison of different images, allowing a picture of the spatial and temporal distribution of x-ray self-emission to be established. The design was tested in a series of pulsed-power-driven magnetic-reconnection experiments.