wim/image-tiff
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unchecked casts and magic values for some tags

Browse Source
This commit is contained in:
Andrew Champion committed 2019-12-21 15:57:24 +00:00
1 parent f92be13f6c
commit 298dc8841d
1 file changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files
src/encoder/mod.rs
+4 -4
View File
@@ -587,7 +587,7 @@ impl<'a, W: 'a + Write + Seek, T: ColorType> ImageEncoder<'a, W, T> {
encoder.write_tag(Tag::ImageWidth, width); encoder.write_tag(Tag::ImageWidth, width);
encoder.write_tag(Tag::ImageLength, height); encoder.write_tag(Tag::ImageLength, height);
encoder.write_tag(Tag::Compression, 1u16); encoder.write_tag(Tag::Compression, tags::CompressionMethod::None.to_u16());
encoder.write_tag(Tag::BitsPerSample, <T>::BITS_PER_SAMPLE); encoder.write_tag(Tag::BitsPerSample, <T>::BITS_PER_SAMPLE);
encoder.write_tag(Tag::PhotometricInterpretation, <T>::TIFF_VALUE.to_u16()); encoder.write_tag(Tag::PhotometricInterpretation, <T>::TIFF_VALUE.to_u16());
@@ -597,7 +597,7 @@ impl<'a, W: 'a + Write + Seek, T: ColorType> ImageEncoder<'a, W, T> {
encoder.write_tag(Tag::SamplesPerPixel, <T>::BITS_PER_SAMPLE.len() as u16); encoder.write_tag(Tag::SamplesPerPixel, <T>::BITS_PER_SAMPLE.len() as u16);
encoder.write_tag(Tag::XResolution, Rational { n: 1, d: 1 }); encoder.write_tag(Tag::XResolution, Rational { n: 1, d: 1 });
encoder.write_tag(Tag::YResolution, Rational { n: 1, d: 1 }); encoder.write_tag(Tag::YResolution, Rational { n: 1, d: 1 });
encoder.write_tag(Tag::ResolutionUnit, 1u16); encoder.write_tag(Tag::ResolutionUnit, ResolutionUnit::None.to_u16());
Ok(ImageEncoder { Ok(ImageEncoder {
encoder, encoder,
@@ -651,14 +651,14 @@ impl<'a, W: 'a + Write + Seek, T: ColorType> ImageEncoder<'a, W, T> {
/// Set image resolution /// Set image resolution
pub fn resolution(&mut self, unit: ResolutionUnit, value: Rational) { pub fn resolution(&mut self, unit: ResolutionUnit, value: Rational) {
self.encoder.write_tag(Tag::ResolutionUnit, unit as u16); self.encoder.write_tag(Tag::ResolutionUnit, unit.to_u16());
self.encoder.write_tag(Tag::XResolution, value.clone()); self.encoder.write_tag(Tag::XResolution, value.clone());
self.encoder.write_tag(Tag::YResolution, value); self.encoder.write_tag(Tag::YResolution, value);
} }
/// Set image resolution unit /// Set image resolution unit
pub fn resolution_unit(&mut self, unit: ResolutionUnit) { pub fn resolution_unit(&mut self, unit: ResolutionUnit) {
self.encoder.write_tag(Tag::ResolutionUnit, unit as u16); self.encoder.write_tag(Tag::ResolutionUnit, unit.to_u16());
} }
/// Set image x-resolution /// Set image x-resolution