projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup variable name: j -> dcp
[dcpomatic.git]
/
src
/
lib
/
position_image.h
diff --git
a/src/lib/position_image.h
b/src/lib/position_image.h
index dbd3c600e46ffcf8183a20ad9bf5b227947c0df6..ee352647ca83826e0e359d857ad2928a9d96ea4b 100644
(file)
--- a/
src/lib/position_image.h
+++ b/
src/lib/position_image.h
@@
-1,41
+1,50
@@
/*
/*
- Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014
-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_POSITION_IMAGE_H
#define DCPOMATIC_POSITION_IMAGE_H
#ifndef DCPOMATIC_POSITION_IMAGE_H
#define DCPOMATIC_POSITION_IMAGE_H
+
#include "position.h"
#include "position.h"
+#include <memory>
+
class Image;
class Image;
+
class PositionImage
{
public:
PositionImage () {}
class PositionImage
{
public:
PositionImage () {}
-
- PositionImage (
boost::shared_ptr<
Image> i, Position<int> p)
+
+ PositionImage (
std::shared_ptr<const
Image> i, Position<int> p)
: image (i)
, position (p)
{}
: image (i)
, position (p)
{}
-
-
boost::shared_ptr<
Image> image;
+
+
std::shared_ptr<const
Image> image;
Position<int> position;
Position<int> position;
+
+ bool same (PositionImage const & other) const;
};
};
+
#endif
#endif