diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-01-29 00:37:06 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-01-29 00:37:06 +0000 |
| commit | f213fd833a840fc97e3875979ae7dc7cbbc883b1 (patch) | |
| tree | bf585e448f263668ebaf39d37a8b90757c1dea91 /src/lib/magick_image_proxy.cc | |
| parent | c58b1a4a478201b76a4f8491fa075cbe476af484 (diff) | |
Move Socket to dcpomatic_socket.{cc,h}.
Diffstat (limited to 'src/lib/magick_image_proxy.cc')
| -rw-r--r-- | src/lib/magick_image_proxy.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/magick_image_proxy.cc b/src/lib/magick_image_proxy.cc index c9cddd899..e4417f366 100644 --- a/src/lib/magick_image_proxy.cc +++ b/src/lib/magick_image_proxy.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2014 Carl Hetherington <cth@carlh.net> + Copyright (C) 2014-2015 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 @@ -21,8 +21,9 @@ #include "magick_image_proxy.h" #include "cross.h" #include "exceptions.h" -#include "util.h" +#include "dcpomatic_socket.h" #include "image.h" +#include "compose.hpp" #include "i18n.h" |