michael/exif-rs
michael
/
exif-rs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove parse_image().

This commit is contained in:
KAMADA Ken'ichi 2017-03-24 23:15:24 +09:00
parent 24b69ed85b
commit f11f3c306b
2 changed files with 0 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/image.rs
View File

@ -1,60 +0,0 @@
//
// Copyright (c) 2016 KAMADA Ken'ichi.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
// are met:
// 1. Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// 2. Redistributions in binary form must reproduce the above copyright
// notice, this list of conditions and the following disclaimer in the
// documentation and/or other materials provided with the distribution.
//
// THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
// OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
// OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
// SUCH DAMAGE.
//
use std::io;
use std::io::Read;
use std::mem;
use error::Error;
use jpeg;
use tiff;
use tiff::Field;
/// Parse the Exif attributes in a JPEG or TIFF image data.
///
/// Returns a Vec of Exif fields and a bool.
/// The boolean value is true if the data is little endian.
/// If an error occurred, `exif::Error` is returned.
///
/// The `buf` must be an empty `Vec<u8>` when this function is called.
/// The raw Exif data is read into it.
#[deprecated(since = "0.1.2", note = "use `exif::Reader` instead")]
pub fn parse_image<'a, R>(mut reader: &mut R, mut buf: &'a mut Vec<u8>)
-> Result<(Vec<Field<'a>>, bool), Error>
where R: io::BufRead
{
try!(reader.by_ref().take(4).read_to_end(buf));
if jpeg::is_jpeg(buf) {
let exif_buf = try!(jpeg::get_exif_attr(
&mut buf.as_mut_slice().chain(reader)));
mem::replace(buf, exif_buf);
} else if tiff::is_tiff(buf) {
try!(reader.read_to_end(&mut buf));
} else {
return Err(Error::InvalidFormat("Unknown image format"));
}
tiff::parse_exif(buf)
}

3
src/lib.rs
View File

@ -44,8 +44,6 @@
//! ```
pub use error::Error;
#[allow(deprecated)]
pub use image::parse_image;
pub use jpeg::get_exif_attr as get_exif_attr_from_jpeg;
pub use reader::Reader;
pub use tag_priv::{Context, Tag};
@ -61,7 +59,6 @@ mod tmacro;
mod endian;
mod error;
mod image;
mod jpeg;
mod reader;
#[path = "tag.rs"]