No-op; fix GPL address and use the explicit-program-name version.

[dcpomatic.git] / src / lib / image_proxy.cc

diff --git a/src/lib/image_proxy.cc b/src/lib/image_proxy.cc
index b6b387b76081947a554290c0846cf81333acd42c..3a09cb8e8cd0cbce273bea7a66403178d34800a8 100644 (file)
--- a/src/lib/image_proxy.cc
+++ b/src/lib/image_proxy.cc
@@ -1,24 +1,23 @@
 /*
     Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic 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,
+    DCP-o-matic 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.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include <dcp/util.h>
-#include <dcp/raw_convert.h>
 #include "image_proxy.h"
 #include "raw_image_proxy.h"
 #include "magick_image_proxy.h"
@@ -26,31 +25,25 @@
 #include "image.h"
 #include "exceptions.h"
 #include "cross.h"
-#include "log.h"
+#include <dcp/util.h>
+#include <libcxml/cxml.h>
+#include <iostream>
 
 #include "i18n.h"
 
-#define LOG_TIMING(...) _log->microsecond_log (String::compose (__VA_ARGS__), Log::TYPE_TIMING);
-
 using std::cout;
 using std::string;
 using boost::shared_ptr;
 
-ImageProxy::ImageProxy (shared_ptr<Log> log)
-       : _log (log)
-{
-
-}
-
 shared_ptr<ImageProxy>
-image_proxy_factory (shared_ptr<cxml::Node> xml, shared_ptr<Socket> socket, shared_ptr<Log> log)
+image_proxy_factory (shared_ptr<cxml::Node> xml, shared_ptr<Socket> socket)
 {
        if (xml->string_child("Type") == N_("Raw")) {
-               return shared_ptr<ImageProxy> (new RawImageProxy (xml, socket, log));
+               return shared_ptr<ImageProxy> (new RawImageProxy (xml, socket));
        } else if (xml->string_child("Type") == N_("Magick")) {
-               return shared_ptr<MagickImageProxy> (new MagickImageProxy (xml, socket, log));
+               return shared_ptr<MagickImageProxy> (new MagickImageProxy (xml, socket));
        } else if (xml->string_child("Type") == N_("J2K")) {
-               return shared_ptr<J2KImageProxy> (new J2KImageProxy (xml, socket, log));
+               return shared_ptr<J2KImageProxy> (new J2KImageProxy (xml, socket));
        }
 
        throw NetworkError (_("Unexpected image type received by server"));