fix: resolve comments
This commit is contained in:
1 parent
1c6001ea5d
commit
4a9e1d152b
2 files changed
+4
-5
No files matched your search
@@ -156,7 +156,7 @@ pub(crate) struct ReadoutLayout {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Image {
|
impl Image {
|
||||||
pub fn from_reader_with_options<R: Read + Seek>(
|
pub fn from_reader<R: Read + Seek>(
|
||||||
decoder: &mut ValueReader<R>,
|
decoder: &mut ValueReader<R>,
|
||||||
ifd: &Directory,
|
ifd: &Directory,
|
||||||
lenient: bool,
|
lenient: bool,
|
||||||
|
|||||||
+3
-4
@@ -858,8 +858,7 @@ impl<R: Read + Seek> Decoder<R> {
|
|||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
let image =
|
let image = Image::from_reader(&mut self.value_reader, &self.directory, self.lenient)?;
|
||||||
Image::from_reader_with_options(&mut self.value_reader, &self.directory, self.lenient)?;
|
|
||||||
Ok((
|
Ok((
|
||||||
self.image.insert(image),
|
self.image.insert(image),
|
||||||
&mut self.value_reader,
|
&mut self.value_reader,
|
||||||
@@ -1044,7 +1043,7 @@ impl<R: Read + Seek> Decoder<R> {
|
|||||||
/// error is returned.
|
/// error is returned.
|
||||||
pub fn seek_to_image(&mut self, ifd_index: usize) -> TiffResult<()> {
|
pub fn seek_to_image(&mut self, ifd_index: usize) -> TiffResult<()> {
|
||||||
let (offset, directory) = self.find_nth_ifd(ifd_index)?;
|
let (offset, directory) = self.find_nth_ifd(ifd_index)?;
|
||||||
self.image = Some(Image::from_reader_with_options(
|
self.image = Some(Image::from_reader(
|
||||||
&mut self.value_reader,
|
&mut self.value_reader,
|
||||||
&directory,
|
&directory,
|
||||||
self.lenient,
|
self.lenient,
|
||||||
@@ -1141,7 +1140,7 @@ impl<R: Read + Seek> Decoder<R> {
|
|||||||
pub fn next_image(&mut self) -> TiffResult<()> {
|
pub fn next_image(&mut self) -> TiffResult<()> {
|
||||||
let next_ifd = self.directory.next();
|
let next_ifd = self.directory.next();
|
||||||
let (offset, directory) = self.read_chained_ifd(self.current_ifd_pointer, next_ifd)?;
|
let (offset, directory) = self.read_chained_ifd(self.current_ifd_pointer, next_ifd)?;
|
||||||
self.image = Some(Image::from_reader_with_options(
|
self.image = Some(Image::from_reader(
|
||||||
&mut self.value_reader,
|
&mut self.value_reader,
|
||||||
&directory,
|
&directory,
|
||||||
self.lenient,
|
self.lenient,
|
||||||
|
|||||||
Reference in new issue
Block a user