Skip to content

Commit

Permalink
Move non-pub fn below pub fns
Browse files Browse the repository at this point in the history
  • Loading branch information
Roughsketch committed Aug 11, 2020
1 parent 1a43409 commit 5d518e7
Showing 1 changed file with 18 additions and 18 deletions.
36 changes: 18 additions & 18 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,24 +101,6 @@ pub fn image_type(header: &[u8]) -> ImageResult<ImageType> {
Err(std::io::Error::new(std::io::ErrorKind::UnexpectedEof, "Not enough data").into())
}

/// Calls the correct image size method based on the image type
///
/// # Arguments
/// * `reader` - A reader for the data
/// * `header` - The header of the file
fn dispatch_header<R: BufRead + Seek>(reader: &mut R, header: &[u8]) -> ImageResult<ImageSize> {
match image_type(&header)? {
ImageType::Bmp => bmp_size(reader),
ImageType::Gif => gif_size(header),
ImageType::Heif => heif_size(reader),
ImageType::Jpeg => jpeg_size(reader),
ImageType::Png => png_size(reader),
ImageType::Psd => psd_size(reader),
ImageType::Tiff => tiff_size(reader),
ImageType::Webp => webp_size(reader),
}
}

/// Get the image size from a local file
///
/// # Arguments
Expand Down Expand Up @@ -197,6 +179,24 @@ pub fn blob_size(data: &[u8]) -> ImageResult<ImageSize> {
dispatch_header(&mut reader, &header)
}

/// Calls the correct image size method based on the image type
///
/// # Arguments
/// * `reader` - A reader for the data
/// * `header` - The header of the file
fn dispatch_header<R: BufRead + Seek>(reader: &mut R, header: &[u8]) -> ImageResult<ImageSize> {
match image_type(&header)? {
ImageType::Bmp => bmp_size(reader),
ImageType::Gif => gif_size(header),
ImageType::Heif => heif_size(reader),
ImageType::Jpeg => jpeg_size(reader),
ImageType::Png => png_size(reader),
ImageType::Psd => psd_size(reader),
ImageType::Tiff => tiff_size(reader),
ImageType::Webp => webp_size(reader),
}
}

fn bmp_size<R: BufRead + Seek>(reader: &mut R) -> ImageResult<ImageSize> {
reader.seek(SeekFrom::Start(0x12))?;

Expand Down

0 comments on commit 5d518e7

Please sign in to comment.