projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tweak logging format.
[dcpomatic.git]
/
src
/
lib
/
position_image.cc
diff --git
a/src/lib/position_image.cc
b/src/lib/position_image.cc
index 44c1262b3a90d11aba8e6ec94438e39cff950102..544f08defd4ad75cc603835e7292290a37702ea0 100644
(file)
--- a/
src/lib/position_image.cc
+++ b/
src/lib/position_image.cc
@@
-19,17
+19,19
@@
#include "position_image.h"
#include "image.h"
#include "position_image.h"
#include "image.h"
+#include <iostream>
using std::cout;
bool
PositionImage::same (PositionImage const & other) const
{
using std::cout;
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;
}