projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix font_id_map errors when importing DCP subtitles that have no
[dcpomatic.git]
/
src
/
lib
/
image_proxy.cc
diff --git
a/src/lib/image_proxy.cc
b/src/lib/image_proxy.cc
index 7013a69c9bca9520a816d2f51b83e9017365c9f7..c426e796fba8d05819ac9d9133f03415dadba4db 100644
(file)
--- a/
src/lib/image_proxy.cc
+++ b/
src/lib/image_proxy.cc
@@
-1,47
+1,53
@@
/*
Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
/*
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.
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
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 "cross.h"
+#include "exceptions.h"
+#include "ffmpeg_image_proxy.h"
+#include "image.h"
#include "image_proxy.h"
#include "image_proxy.h"
-#include "raw_image_proxy.h"
-#include "magick_image_proxy.h"
#include "j2k_image_proxy.h"
#include "j2k_image_proxy.h"
-#include "image.h"
-#include "exceptions.h"
-#include "cross.h"
+#include "raw_image_proxy.h"
+#include <dcp/util.h>
+#include <libcxml/cxml.h>
+#include <iostream>
#include "i18n.h"
#include "i18n.h"
+
using std::cout;
using std::cout;
+using std::make_shared;
+using std::shared_ptr;
using std::string;
using std::string;
-using boost::shared_ptr;
+
shared_ptr<ImageProxy>
image_proxy_factory (shared_ptr<cxml::Node> xml, shared_ptr<Socket> socket)
{
if (xml->string_child("Type") == N_("Raw")) {
shared_ptr<ImageProxy>
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)
);
- } else if (xml->string_child("Type") == N_("
Magick
")) {
- return
shared_ptr<MagickImageProxy> (new MagickImageProxy (xml, socket)
);
+ return
make_shared<RawImageProxy>(xml, socket
);
+ } else if (xml->string_child("Type") == N_("
FFmpeg
")) {
+ return
make_shared<FFmpegImageProxy>(socket
);
} else if (xml->string_child("Type") == N_("J2K")) {
} else if (xml->string_child("Type") == N_("J2K")) {
- return
shared_ptr<J2KImageProxy> (new J2KImageProxy (xml, socket)
);
+ return
make_shared<J2KImageProxy>(xml, socket
);
}
throw NetworkError (_("Unexpected image type received by server"));
}
throw NetworkError (_("Unexpected image type received by server"));