gered/ggdt
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

add pixel format option to RgbaBitmap png saving

Browse source
This commit is contained in:
Gered 2023-03-24 20:11:08 -04:00
parent 29ab739323
commit a087c35024
1 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
ggdt/src/graphics/bitmap/png.rs
View file

@ -38,6 +38,12 @@ pub enum PngError {
IOError(#[from] std::io::Error), IOError(#[from] std::io::Error),
} }
#[derive(Debug, Copy, Clone, Eq, PartialEq)]
pub enum PngFormat {
RGB,
RGBA,
}
#[derive(Debug, Copy, Clone, Eq, PartialEq)] #[derive(Debug, Copy, Clone, Eq, PartialEq)]
enum ColorFormat { enum ColorFormat {
Grayscale = 0, Grayscale = 0,
@ -477,6 +483,7 @@ where
fn write_png_bytes<Writer, PixelType>( fn write_png_bytes<Writer, PixelType>(
writer: &mut Writer, writer: &mut Writer,
bitmap: &Bitmap<PixelType>, bitmap: &Bitmap<PixelType>,
format: ColorFormat,
palette: Option<&Palette>, palette: Option<&Palette>,
) -> Result<(), PngError> ) -> Result<(), PngError>
where where
@ -484,12 +491,6 @@ where
PixelType: Pixel, PixelType: Pixel,
ScanlineBuffer: ScanlinePixelConverter<PixelType>, ScanlineBuffer: ScanlinePixelConverter<PixelType>,
{ {
let format = if Bitmap::<PixelType>::PIXEL_SIZE == 1 {
ColorFormat::IndexedColor
} else {
ColorFormat::RGBA
};
// magic PNG header // magic PNG header
writer.write_all(&PNG_HEADER)?; writer.write_all(&PNG_HEADER)?;
@ -579,7 +580,7 @@ impl IndexedBitmap {
writer: &mut T, writer: &mut T,
palette: &Palette, palette: &Palette,
) -> Result<(), PngError> { ) -> Result<(), PngError> {
write_png_bytes(writer, &self, Some(palette)) write_png_bytes(writer, &self, ColorFormat::IndexedColor, Some(palette))
} }
pub fn to_png_file(&self, path: &Path, palette: &Palette) -> Result<(), PngError> { pub fn to_png_file(&self, path: &Path, palette: &Palette) -> Result<(), PngError> {
@ -605,14 +606,26 @@ impl RgbaBitmap {
pub fn to_png_bytes<T: WriteBytesExt>( pub fn to_png_bytes<T: WriteBytesExt>(
&self, &self,
writer: &mut T, writer: &mut T,
format: PngFormat,
) -> Result<(), PngError> { ) -> Result<(), PngError> {
write_png_bytes(writer, &self, None) write_png_bytes(
writer,
&self,
match format {
PngFormat::RGB => ColorFormat::RGB,
PngFormat::RGBA => ColorFormat::RGBA,
},
None,
)
} }
pub fn to_png_file(&self, path: &Path) -> Result<(), PngError> { pub fn to_png_file(
&self, path: &Path,
format: PngFormat,
) -> Result<(), PngError> {
let f = File::create(path)?; let f = File::create(path)?;
let mut writer = BufWriter::new(f); let mut writer = BufWriter::new(f);
self.to_png_bytes(&mut writer) self.to_png_bytes(&mut writer, format)
} }
} }
@ -823,7 +836,7 @@ pub mod tests {
assert!(palette.is_none()); assert!(palette.is_none());
let save_path = tmp_dir.path().join("test_save.png"); let save_path = tmp_dir.path().join("test_save.png");
bmp.to_png_file(&save_path)?; bmp.to_png_file(&save_path, PngFormat::RGB)?;
let (reloaded_bmp, reloaded_palette) = RgbaBitmap::load_png_file(&save_path)?; let (reloaded_bmp, reloaded_palette) = RgbaBitmap::load_png_file(&save_path)?;
assert_eq!(32, reloaded_bmp.width()); assert_eq!(32, reloaded_bmp.width());
assert_eq!(32, reloaded_bmp.height()); assert_eq!(32, reloaded_bmp.height());
@ -848,7 +861,7 @@ pub mod tests {
assert!(palette.is_none()); assert!(palette.is_none());
let save_path = tmp_dir.path().join("test_save.png"); let save_path = tmp_dir.path().join("test_save.png");
bmp.to_png_file(&save_path)?; bmp.to_png_file(&save_path, PngFormat::RGB)?;
let (reloaded_bmp, reloaded_palette) = RgbaBitmap::load_png_file(&save_path)?; let (reloaded_bmp, reloaded_palette) = RgbaBitmap::load_png_file(&save_path)?;
assert_eq!(320, reloaded_bmp.width()); assert_eq!(320, reloaded_bmp.width());
assert_eq!(200, reloaded_bmp.height()); assert_eq!(200, reloaded_bmp.height());
@ -866,7 +879,7 @@ pub mod tests {
assert!(palette.is_none()); assert!(palette.is_none());
let save_path = tmp_dir.path().join("test_save.png"); let save_path = tmp_dir.path().join("test_save.png");
bmp.to_png_file(&save_path)?; bmp.to_png_file(&save_path, PngFormat::RGB)?;
let (reloaded_bmp, reloaded_palette) = RgbaBitmap::load_png_file(&save_path)?; let (reloaded_bmp, reloaded_palette) = RgbaBitmap::load_png_file(&save_path)?;
assert_eq!(320, reloaded_bmp.width()); assert_eq!(320, reloaded_bmp.width());
assert_eq!(200, reloaded_bmp.height()); assert_eq!(200, reloaded_bmp.height());