From: Carl Hetherington <cth@carlh.net>
Date: Tue, 9 Sep 2014 20:52:05 +0000 (+0100)
Subject: Merge master.
X-Git-Tag: v2.0.48~614
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=39029279954b1f346d3ba28ec12c58211bfa7436

Merge master.
---

39029279954b1f346d3ba28ec12c58211bfa7436
diff --cc ChangeLog
index cf51e9fcc,67f31f66c..f0ba9f138
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,18 -1,11 +1,26 @@@
 +2014-09-09  Carl Hetherington  <cth@carlh.net>
 +
 +	* Version 2.0.6 released.
 +
 +2014-09-09  Carl Hetherington  <cth@carlh.net>
 +
 +	* Fix missing OS X dependencies.
 +
 +	* Use a different directory for DCP-o-matic 2
 +	configuration (not the same as 1.x).
 +
 +2014-09-08  Carl Hetherington  <cth@carlh.net>
 +
 +	* Version 2.0.5 released.
 +
+ 2014-09-08  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Version 1.73.4 released.
+ 
+ 2014-09-08  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Fix failure to load Targa files.
+ 
  2014-09-07  Carl Hetherington  <cth@carlh.net>
  
  	* Version 1.73.3 released.
diff --cc src/lib/magick_image_proxy.cc
index 0908ed921,000000000..4adf8047f
mode 100644,000000..100644
--- a/src/lib/magick_image_proxy.cc
+++ b/src/lib/magick_image_proxy.cc
@@@ -1,114 -1,0 +1,135 @@@
 +/*
 +    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
 +
 +    This program is free software; you can redistribute it and/or modify
 +    it under the terms of the GNU General Public License as published by
 +    the Free Software Foundation; either version 2 of the License, or
 +    (at your option) any later version.
 +
 +    This program is distributed in the hope that it will be useful,
 +    but WITHOUT ANY WARRANTY; without even the implied warranty of
 +    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +    GNU General Public License for more details.
 +
 +    You should have received a copy of the GNU General Public License
 +    along with this program; if not, write to the Free Software
 +    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 +
 +*/
 +
 +#include <Magick++.h>
 +#include "magick_image_proxy.h"
 +#include "cross.h"
 +#include "exceptions.h"
 +#include "util.h"
 +#include "log.h"
 +#include "image.h"
 +#include "log.h"
 +
 +#include "i18n.h"
 +
 +#define LOG_TIMING(...) _log->microsecond_log (String::compose (__VA_ARGS__), Log::TYPE_TIMING);
 +
++using std::string;
 +using boost::shared_ptr;
 +
 +MagickImageProxy::MagickImageProxy (boost::filesystem::path path, shared_ptr<Log> log)
 +	: ImageProxy (log)
 +{
 +	/* Read the file into a Blob */
 +	
 +	boost::uintmax_t const size = boost::filesystem::file_size (path);
 +	FILE* f = fopen_boost (path, "rb");
 +	if (!f) {
 +		throw OpenFileError (path);
 +	}
 +		
 +	uint8_t* data = new uint8_t[size];
 +	if (fread (data, 1, size, f) != size) {
 +		delete[] data;
 +		throw ReadFileError (path);
 +	}
 +	
 +	fclose (f);
 +	_blob.update (data, size);
 +	delete[] data;
 +}
 +
 +MagickImageProxy::MagickImageProxy (shared_ptr<cxml::Node>, shared_ptr<Socket> socket, shared_ptr<Log> log)
 +	: ImageProxy (log)
 +{
 +	uint32_t const size = socket->read_uint32 ();
 +	uint8_t* data = new uint8_t[size];
 +	socket->read (data, size);
 +	_blob.update (data, size);
 +	delete[] data;
 +}
 +
 +shared_ptr<Image>
 +MagickImageProxy::image () const
 +{
 +	if (_image) {
 +		return _image;
 +	}
 +
 +	LOG_TIMING ("[%1] MagickImageProxy begins decode and convert of %2 bytes", boost::this_thread::get_id(), _blob.length());
 +
 +	Magick::Image* magick_image = 0;
++	string error;
 +	try {
 +		magick_image = new Magick::Image (_blob);
- 	} catch (...) {
- 		throw DecodeError (_("Could not decode image file"));
++	} catch (Magick::Exception& e) {
++		error = e.what ();
++	}
++
++	if (!magick_image) {
++		/* ImageMagick cannot auto-detect Targa files, it seems, so try here with an
++		   explicit format.  I can't find it documented that passing a (0, 0) geometry
++		   is allowed, but it seems to work.
++		*/
++		try {
++			magick_image = new Magick::Image (_blob, Magick::Geometry (0, 0), "TGA");
++		} catch (...) {
++
++		}
++	}
++
++	if (!magick_image) {
++		/* 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));
 +	}
 +
 +	dcp::Size size (magick_image->columns(), magick_image->rows());
 +	LOG_TIMING ("[%1] MagickImageProxy decode finished", boost::this_thread::get_id ());
 +
 +	_image.reset (new Image (PIX_FMT_RGB24, size, true));
 +
 +	/* Write line-by-line here as _image must be aligned, and write() cannot be told about strides */
 +	uint8_t* p = _image->data()[0];
 +	for (int i = 0; i < size.height; ++i) {
 +		using namespace MagickCore;
 +		magick_image->write (0, i, size.width, 1, "RGB", CharPixel, p);
 +		p += _image->stride()[0];
 +	}
 +
 +	delete magick_image;
 +
 +	LOG_TIMING ("[%1] MagickImageProxy completes decode and convert of %2 bytes", boost::this_thread::get_id(), _blob.length());
 +
 +	return _image;
 +}
 +
 +void
 +MagickImageProxy::add_metadata (xmlpp::Node* node) const
 +{
 +	node->add_child("Type")->add_child_text (N_("Magick"));
 +}
 +
 +void
 +MagickImageProxy::send_binary (shared_ptr<Socket> socket) const
 +{
 +	socket->write (_blob.length ());
 +	socket->write ((uint8_t *) _blob.data (), _blob.length ());
 +}