firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ImageCache should handle images that fail to decode (#4118)

Browse Source
This commit is contained in:
Adam Barth 2016-05-24 16:53:14 -07:00
parent f012a0fdfb
commit d97df402b8
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/flutter/lib/src/services/image_cache.dart
View File

@ -4,10 +4,11 @@
import 'dart:async'; import 'dart:async';
import 'dart:collection'; import 'dart:collection';
import 'dart:ui' show hashValues; import 'dart:ui' show hashValues, Image;
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/http.dart' as http; import 'package:flutter/http.dart' as http;
import 'package:mojo/core.dart' as mojo;
import 'image_decoder.dart'; import 'image_decoder.dart';
import 'image_resource.dart'; import 'image_resource.dart';
@ -53,10 +54,14 @@ class _UrlFetcher implements ImageProvider {
@override @override
Future<ImageInfo> loadImage() async { Future<ImageInfo> loadImage() async {
try { try {
return new ImageInfo( final Uri resolvedUrl = Uri.base.resolve(_url);
image: await decodeImageFromDataPipe(await http.readDataPipe(Uri.base.resolve(_url))), final mojo.MojoDataPipeConsumer dataPipe = await http.readDataPipe(resolvedUrl);
scale: _scale if (dataPipe == null)
); throw 'Unable to read data from: $resolvedUrl';
final Image image = await decodeImageFromDataPipe(dataPipe);
if (image == null)
throw 'Unable to decode image data from: $resolvedUrl';
return new ImageInfo(image: image, scale: _scale);
} catch (exception, stack) { } catch (exception, stack) {
FlutterError.reportError(new FlutterErrorDetails( FlutterError.reportError(new FlutterErrorDetails(
exception: exception, exception: exception,