Skip to content
Snippets Groups Projects
Commit a14e8757 authored by Arvid E. Picciani's avatar Arvid E. Picciani
Browse files

replace flate2 with libflate for portability

fixes #47
parent c8bef8f1
No related branches found
No related tags found
No related merge requests found
...@@ -20,6 +20,6 @@ name = "example" ...@@ -20,6 +20,6 @@ name = "example"
path = "examples/main.rs" path = "examples/main.rs"
[dependencies] [dependencies]
base64 = "0.5.2" base64 = "0.5.2"
xml-rs = "0.3.0" xml-rs = "0.3.0"
flate2 = "1.0.1" libflate = "0.1.18"
extern crate flate2; extern crate libflate;
extern crate xml; extern crate xml;
extern crate base64; extern crate base64;
...@@ -11,7 +11,6 @@ use std::fmt; ...@@ -11,7 +11,6 @@ use std::fmt;
use xml::reader::{EventReader, Error as XmlError}; use xml::reader::{EventReader, Error as XmlError};
use xml::reader::XmlEvent; use xml::reader::XmlEvent;
use xml::attribute::OwnedAttribute; use xml::attribute::OwnedAttribute;
use flate2::read::{ZlibDecoder, GzDecoder};
#[derive(Debug, Copy, Clone)] #[derive(Debug, Copy, Clone)]
pub enum ParseTileError { pub enum ParseTileError {
...@@ -841,7 +840,9 @@ fn parse_base64<R: Read>(parser: &mut EventReader<R>) -> Result<Vec<u8>, TiledEr ...@@ -841,7 +840,9 @@ fn parse_base64<R: Read>(parser: &mut EventReader<R>) -> Result<Vec<u8>, TiledEr
} }
fn decode_zlib(data: Vec<u8>) -> Result<Vec<u8>, TiledError> { fn decode_zlib(data: Vec<u8>) -> Result<Vec<u8>, TiledError> {
let mut zd = ZlibDecoder::new(BufReader::new(&data[..])); use libflate::zlib::{Decoder};
let mut zd = Decoder::new(BufReader::new(&data[..]))
.map_err(|e|TiledError::DecompressingError(e))?;
let mut data = Vec::new(); let mut data = Vec::new();
match zd.read_to_end(&mut data) { match zd.read_to_end(&mut data) {
Ok(_v) => {}, Ok(_v) => {},
...@@ -851,9 +852,12 @@ fn decode_zlib(data: Vec<u8>) -> Result<Vec<u8>, TiledError> { ...@@ -851,9 +852,12 @@ fn decode_zlib(data: Vec<u8>) -> Result<Vec<u8>, TiledError> {
} }
fn decode_gzip(data: Vec<u8>) -> Result<Vec<u8>, TiledError> { fn decode_gzip(data: Vec<u8>) -> Result<Vec<u8>, TiledError> {
let mut gzd = GzDecoder::new(BufReader::new(&data[..])); use libflate::gzip::{Decoder};
let mut zd = Decoder::new(BufReader::new(&data[..]))
.map_err(|e|TiledError::DecompressingError(e))?;
let mut data = Vec::new(); let mut data = Vec::new();
gzd.read_to_end(&mut data).map_err(|e| TiledError::DecompressingError(e))?; zd.read_to_end(&mut data).map_err(|e| TiledError::DecompressingError(e))?;
Ok(data) Ok(data)
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment