From 3584157f1c3891259da0f86ea933f390449ad657 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 15 Mar 2019 22:37:47 +0000 Subject: Give a better error when FFmpegImageProxy fails to decode an image that was passed in without a filename. --- src/lib/ffmpeg_image_proxy.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/lib/ffmpeg_image_proxy.cc') diff --git a/src/lib/ffmpeg_image_proxy.cc b/src/lib/ffmpeg_image_proxy.cc index 3548117ff..33c619a2d 100644 --- a/src/lib/ffmpeg_image_proxy.cc +++ b/src/lib/ffmpeg_image_proxy.cc @@ -146,7 +146,12 @@ FFmpegImageProxy::image (optional) const e = avformat_open_input (&format_context, "foo.tga", f, &options); } if (e < 0) { - throw OpenFileError (_path->string(), e, true); + if (_path) { + throw OpenFileError (_path->string(), e, true); + } else { + /* XXX: this needs to be marked translatable after the string freeze is over */ + boost::throw_exception(DecodeError(String::compose("Could not decode image (%1)", e))); + } } if (avformat_find_stream_info(format_context, 0) < 0) { -- cgit v1.2.3