From: Carl Hetherington <cth@carlh.net>
Date: Tue, 20 Jan 2015 11:27:34 +0000 (+0000)
Subject: More informative error when failing to decode JPEG2000 files.
X-Git-Tag: v2.0.48~297
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=636f38514b91b4e5bc85b78d61bd1d121e73b9cf

More informative error when failing to decode JPEG2000 files.
---

diff --git a/ChangeLog b/ChangeLog
index f205716b2..393e67147 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-20  c.hetherington  <cth@carlh.net>
+
+	* More informative error when failing to decode
+	JPEG2000 files.
+
 2015-01-15  Carl Hetherington  <cth@carlh.net>
 
 	* Version 2.0.34 released.
diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc
index e8db326c7..6212875b1 100644
--- a/src/lib/image_examiner.cc
+++ b/src/lib/image_examiner.cc
@@ -25,6 +25,7 @@
 #include "config.h"
 #include "cross.h"
 #include <dcp/xyz_frame.h>
+#include <dcp/exceptions.h>
 #include <Magick++.h>
 #include <iostream>
 
@@ -53,7 +54,12 @@ ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const Imag
 		}
 		fread (buffer, 1, size, f);
 		fclose (f);
-		_video_size = dcp::decompress_j2k (buffer, size, 0)->size ();
+		try {
+			_video_size = dcp::decompress_j2k (buffer, size, 0)->size ();
+		} catch (dcp::DCPReadError& e) {
+			delete[] buffer;
+			throw DecodeError (String::compose (_("Could not decode JPEG2000 file %1 (%2)"), path, e.what ()));
+		}
 		delete[] buffer;
 	} else {
 		Magick::Image* image = new Magick::Image (content->path(0).string());