projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
[dcpomatic.git]
/
src
/
lib
/
raw_image_proxy.cc
diff --git
a/src/lib/raw_image_proxy.cc
b/src/lib/raw_image_proxy.cc
index 21a2b0de42a0f9232fc8f59a9bba387eaaa23649..21201faa69264826db4129b7db3eaccb931e10c1 100644
(file)
--- a/
src/lib/raw_image_proxy.cc
+++ b/
src/lib/raw_image_proxy.cc
@@
-1,25
+1,26
@@
/*
/*
- Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014
-2018
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 "raw_image_proxy.h"
#include "image.h"
*/
#include "raw_image_proxy.h"
#include "image.h"
-#include
"raw_convert.h"
+#include
<dcp/raw_convert.h>
#include <dcp/util.h>
#include <libcxml/cxml.h>
extern "C" {
#include <dcp/util.h>
#include <libcxml/cxml.h>
extern "C" {
@@
-30,9
+31,12
@@
extern "C" {
#include "i18n.h"
using std::string;
#include "i18n.h"
using std::string;
+using std::pair;
+using std::make_pair;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using boost::optional;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using boost::optional;
+using dcp::raw_convert;
RawImageProxy::RawImageProxy (shared_ptr<Image> image)
: _image (image)
RawImageProxy::RawImageProxy (shared_ptr<Image> image)
: _image (image)
@@
-50,10
+54,10
@@
RawImageProxy::RawImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> soc
_image->read_from_socket (socket);
}
_image->read_from_socket (socket);
}
-
shared_ptr<Image
>
-RawImageProxy::image (optional<dcp::
NoteHandler
>) const
+
pair<shared_ptr<Image>, int
>
+RawImageProxy::image (optional<dcp::
Size
>) const
{
{
- return
_image
;
+ return
make_pair (_image, 0)
;
}
void
}
void
@@
-62,7
+66,7
@@
RawImageProxy::add_metadata (xmlpp::Node* node) const
node->add_child("Type")->add_child_text (N_("Raw"));
node->add_child("Width")->add_child_text (raw_convert<string> (_image->size().width));
node->add_child("Height")->add_child_text (raw_convert<string> (_image->size().height));
node->add_child("Type")->add_child_text (N_("Raw"));
node->add_child("Width")->add_child_text (raw_convert<string> (_image->size().width));
node->add_child("Height")->add_child_text (raw_convert<string> (_image->size().height));
- node->add_child("PixelFormat")->add_child_text (raw_convert<string> (
_image->pixel_format (
)));
+ node->add_child("PixelFormat")->add_child_text (raw_convert<string> (
static_cast<int> (_image->pixel_format ()
)));
}
void
}
void
@@
-79,11
+83,11
@@
RawImageProxy::same (shared_ptr<const ImageProxy> other) const
return false;
}
return false;
}
- return (*_image.get()) == (*rp->image().get());
+ return (*_image.get()) == (*rp->image().
first.
get());
}
}
-
AVPixelForma
t
-RawImageProxy::
pixel_format
() const
+
size_
t
+RawImageProxy::
memory_used
() const
{
{
- return _image->
pixel_format
();
+ return _image->
memory_used
();
}
}