Added changes to accept ImageFormat

components/net/image/base.rs

@@ -43,12 +43,13 @@ fn byte_swap_and_premultiply(data: &mut [u8]) {
     }
 }
 
-pub fn load_from_memory(buffer: &[u8]) -> Option<DynamicImage> {
+pub fn load_from_memory(buffer: &[u8],ext: &str) -> Option<DynamicImage> {
     if buffer.len() == 0 {
         return None;
     }
    else {
-	let result = servo_image::load_from_memory(buffer,servo_image::ImageFormat::JPEG);
+
+	let result = servo_image::load_from_memory(buffer,get_format(ext));
 	if (result.is_ok()) {
   	    let v = result.unwrap();
   	    return Some(v);
@@ -57,5 +58,16 @@ pub fn load_from_memory(buffer: &[u8]) -> Option<DynamicImage> {
 	    return None;
 	}		
    }
+   }
+fn get_format(ext: &str) -> servo_image::ImageFormat {
+		match ext.to_ascii().to_uppercase().as_str_ascii() {
+    "PNG" => {return servo_image::ImageFormat::PNG;},
+    "JPEG" => {return servo_image::ImageFormat::JPEG;},
+    "JPG" => {return servo_image::ImageFormat::JPEG;},
+    "GIF"=> {return servo_image::ImageFormat::GIF;},
+    "WEBP" => {return servo_image::ImageFormat::WEBP;},
+    "PPM" => {return servo_image::ImageFormat::PPM;},
+    _ => {return servo_image::ImageFormat::PNG;},
+		}
+	}
 
-}

components/net/image_cache_task.rs

@@ -313,7 +313,12 @@ impl ImageCache {
                 self.task_pool.execute(proc() {
                     let url = url_clone;
                     debug!("image_cache_task: started image decode for {:s}", url.serialize());
-                    let image = load_from_memory(data.as_slice());
+                     let s=url.serialize();
+                let mut ext="";
+                for x in s.as_slice().split('.') { ext=x; }
+                println!("{}",ext);
+
+                    let image = load_from_memory(data.as_slice(),ext);
                     let image = image.map(|image| Arc::new(box image));
                     to_cache.send(StoreImage(url.clone(), image));
                     debug!("image_cache_task: ended image decode for {:s}", url.serialize());
@@ -980,7 +985,7 @@ mod tests {
     #[test]
     fn sync_cache_should_wait_for_images() {
         let mock_resource_task = mock_resource_task(box SendTestImage);
-
+       
         let image_cache_task = ImageCacheTask::new_sync(mock_resource_task.clone(), TaskPool::new(4));
         let url = Url::parse("file:///").unwrap();