projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adjust how macOS drives are analysed and add a couple of tests.
[dcpomatic.git]
/
src
/
lib
/
colour_conversion.h
diff --git
a/src/lib/colour_conversion.h
b/src/lib/colour_conversion.h
index 06a9cf6c3c3d4f1413a82f578101911d43b3d4e0..73b6ad23ccf558f469b2e29a5369d562301ba505 100644
(file)
--- a/
src/lib/colour_conversion.h
+++ b/
src/lib/colour_conversion.h
@@
-1,19
+1,20
@@
/*
Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2013 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/>.
*/
*/
@@
-27,7
+28,6
@@
#include <dcp/colour_conversion.h>
#include <libcxml/cxml.h>
#include <dcp/colour_conversion.h>
#include <libcxml/cxml.h>
-#include <boost/utility.hpp>
namespace xmlpp {
class Node;
namespace xmlpp {
class Node;
@@
-37,8
+37,9
@@
class ColourConversion : public dcp::ColourConversion
{
public:
ColourConversion ();
{
public:
ColourConversion ();
- ColourConversion (dcp::ColourConversion);
+
explicit
ColourConversion (dcp::ColourConversion);
ColourConversion (cxml::NodePtr, int version);
ColourConversion (cxml::NodePtr, int version);
+ virtual ~ColourConversion () {}
virtual void as_xml (xmlpp::Node *) const;
std::string identifier () const;
virtual void as_xml (xmlpp::Node *) const;
std::string identifier () const;
@@
-59,7
+60,7
@@
public:
std::string name;
/** an internal short (non-internationalised) name for this preset */
std::string id;
std::string name;
/** an internal short (non-internationalised) name for this preset */
std::string id;
-
+
static std::vector<PresetColourConversion> all () {
return _presets;
}
static std::vector<PresetColourConversion> all () {
return _presets;
}
@@
-67,7
+68,7
@@
public:
static PresetColourConversion from_id (std::string id);
static void setup_colour_conversion_presets ();
static PresetColourConversion from_id (std::string id);
static void setup_colour_conversion_presets ();
-
+
private:
static std::vector<PresetColourConversion> _presets;
};
private:
static std::vector<PresetColourConversion> _presets;
};