Merge "Pixel" type in to PixelFormat header

It's a type specific to that class, so let's keep them close for
clarity.
5 files changed