projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
C++11 tidying.
[dcpomatic.git]
/
src
/
lib
/
rgba.h
diff --git
a/src/lib/rgba.h
b/src/lib/rgba.h
index f950187b0c1a3366a552ac742b243f3e93937be4..96fed710ef4582e3cc5676bc77d0aa0f5429e147 100644
(file)
--- a/
src/lib/rgba.h
+++ b/
src/lib/rgba.h
@@
-1,41
+1,39
@@
/*
/*
- Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2016
-2021
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/>.
*/
*/
+
#ifndef DCPOMATIC_RGBA_H
#define DCPOMATIC_RGBA_H
#ifndef DCPOMATIC_RGBA_H
#define DCPOMATIC_RGBA_H
+
#include <libcxml/cxml.h>
#include <stdint.h>
#include <libcxml/cxml.h>
#include <stdint.h>
+
/** @class RGBA
* @brief A 32-bit RGBA colour.
*/
/** @class RGBA
* @brief A 32-bit RGBA colour.
*/
-
class RGBA
{
public:
class RGBA
{
public:
- RGBA ()
- : r (0)
- , g (0)
- , b (0)
- , a (0)
- {}
+ RGBA () {}
RGBA (uint8_t r_, uint8_t g_, uint8_t b_, uint8_t a_)
: r (r_)
RGBA (uint8_t r_, uint8_t g_, uint8_t b_, uint8_t a_)
: r (r_)
@@
-44,16
+42,17
@@
public:
, a (a_)
{}
, a (a_)
{}
- RGBA (cxml::ConstNodePtr node);
+
explicit
RGBA (cxml::ConstNodePtr node);
void as_xml (xmlpp::Node* parent) const;
void as_xml (xmlpp::Node* parent) const;
- uint8_t r;
- uint8_t g;
- uint8_t b;
- uint8_t a;
+ uint8_t r
= 0
;
+ uint8_t g
= 0
;
+ uint8_t b
= 0
;
+ uint8_t a
= 0
;
bool operator< (RGBA const & other) const;
};
bool operator< (RGBA const & other) const;
};
+
#endif
#endif