projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a comment.
[dcpomatic.git]
/
src
/
lib
/
position_image.cc
diff --git
a/src/lib/position_image.cc
b/src/lib/position_image.cc
index 44c1262b3a90d11aba8e6ec94438e39cff950102..9ba2e9c3f9f2d2fdb343bc4fb98e7c0fb1ceed66 100644
(file)
--- a/
src/lib/position_image.cc
+++ b/
src/lib/position_image.cc
@@
-1,35
+1,37
@@
/*
/*
- 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/>.
*/
*/
+
#include "position_image.h"
#include "image.h"
#include "position_image.h"
#include "image.h"
-using std::cout;
bool
PositionImage::same (PositionImage const & other) const
{
bool
PositionImage::same (PositionImage const & other) const
{
- if (
image != other.image
|| position != other.position) {
+ if (
(!image && other.image) || (image && !other.image)
|| position != other.position) {
return false;
}
if (!image) {
return false;
}
if (!image) {
+ /* Neither has image and the positions are the same */
return true;
}
return true;
}