using std::string;
using std::cout;
+using std::pair;
+using std::make_pair;
using boost::shared_ptr;
using boost::optional;
using boost::dynamic_pointer_cast;
MagickImageProxy::MagickImageProxy (boost::filesystem::path path)
+ : _path (path)
{
/* Read the file into a Blob */
delete[] data;
}
-shared_ptr<Image>
+pair<shared_ptr<Image>, int>
MagickImageProxy::image (optional<dcp::NoteHandler>, optional<dcp::Size>) const
{
boost::mutex::scoped_lock lm (_mutex);
if (_image) {
- return _image;
+ return make_pair (_image, 0);
}
Magick::Image* magick_image = 0;
/* If we failed both an auto-detect and a forced-Targa we give the error from
the auto-detect.
*/
- throw DecodeError (String::compose (_("Could not decode image file (%1)"), error));
+ if (_path) {
+ throw DecodeError (String::compose (_("Could not decode image file %1 (%2)"), _path->string(), error));
+ } else {
+ throw DecodeError (String::compose (_("Could not decode image file (%1)"), error));
+ }
}
unsigned char const * data = static_cast<unsigned char const *>(_blob.data());
delete magick_image;
- return _image;
+ return make_pair (_image, 0);
}
void
{
return AV_PIX_FMT_RGB24;
}
+
+size_t
+MagickImageProxy::memory_used () const
+{
+ size_t m = _blob.length();
+ if (_image) {
+ m += _image->memory_used();
+ }
+ return m;
+}