fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-30 04:48:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Raw-rs: make decoder for ARW1 and ARW2 formats (#1775)

Browse Source 
* convert Tag into a trait

* Create ARW 1 decoder

* add decoder for sony tone curve table

* create decoder for arw 2.1 format

* add windsock.arw to the tests

* create derive macro for Tag and use it in decoders

* add license to tag-derive

* add code to identify model

* impl Display for Ifd

* Code review

* Fix type variable name

* Fix compilation

---------

Co-authored-by: Keavon Chambers <keavon@keavon.com>
This commit is contained in:
Elbert Ronnie
2024-06-28 03:23:05 -07:00
committed by GitHub
co-authored by Keavon Chambers
parent c9a33e44bd
commit fd3613018a
16 changed files with 720 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/raw-rs/src/lib.rs
+32 -7
View File
@@ -1,11 +1,13 @@
pub mod decoder;
pub mod tiff;
use tag_derive::Tag;
use tiff::file::TiffRead;
use tiff::tags::{Compression, ImageLength, ImageWidth, Model, StripByteCounts, SubIfd, Tag};
use tiff::{Ifd, TiffError};
use std::io::{Read, Seek};
use thiserror::Error;
use tiff::file::TiffRead;
use tiff::tags::{COMPRESSION, SUBIFD};
use tiff::{Ifd, TiffError};
pub struct RawImage {
pub data: Vec<u16>,
@@ -20,21 +22,44 @@ pub struct Image<T> {
pub channels: u8,
}
#[allow(dead_code)]
#[derive(Tag)]
struct ArwIfd {
image_width: ImageWidth,
image_height: ImageLength,
compression: Compression,
strip_byte_counts: StripByteCounts,
}
pub fn decode<R: Read + Seek>(reader: &mut R) -> Result<RawImage, DecoderError> {
let mut file = TiffRead::new(reader)?;
let ifd = Ifd::new_first_ifd(&mut file)?;
// TODO: This is only for the tests to pass for now. Replace this with the correct implementation when the decoder is complete.
let subifd = ifd.get(SUBIFD, &mut file)?;
let model = ifd.get_value::<Model, _>(&mut file)?;
Ok(decoder::uncompressed::decode(subifd, &mut file))
if model == "DSLR-A100" {
Ok(decoder::arw1::decode_a100(ifd, &mut file))
} else {
let sub_ifd = ifd.get_value::<SubIfd, _>(&mut file)?;
let arw_ifd = sub_ifd.get_value::<ArwIfd, _>(&mut file)?;
if arw_ifd.compression == 1 {
Ok(decoder::uncompressed::decode(sub_ifd, &mut file))
} else if arw_ifd.strip_byte_counts[0] == arw_ifd.image_width * arw_ifd.image_height {
Ok(decoder::arw2::decode(sub_ifd, &mut file))
} else {
// TODO: implement for arw 1.
todo!()
}
}
}
pub fn process_8bit(image: RawImage) -> Image<u8> {
pub fn process_8bit(_image: RawImage) -> Image<u8> {
todo!()
}
pub fn process_16bit(image: RawImage) -> Image<u16> {
pub fn process_16bit(_image: RawImage) -> Image<u16> {
todo!()
}