projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f2577fd
)
Improve speed when encoding lots of identical frames when the same subtitles.
author
Carl Hetherington
<cth@carlh.net>
Tue, 30 Jun 2015 23:38:13 +0000
(
00:38
+0100)
committer
Carl Hetherington
<cth@carlh.net>
Tue, 30 Jun 2015 23:38:13 +0000
(
00:38
+0100)
src/lib/position_image.cc
patch
|
blob
|
history
diff --git
a/src/lib/position_image.cc
b/src/lib/position_image.cc
index 44c1262b3a90d11aba8e6ec94438e39cff950102..47e8f1a987e7d08fca0cd62e1542231841ed2019 100644
(file)
--- a/
src/lib/position_image.cc
+++ b/
src/lib/position_image.cc
@@
-25,11
+25,12
@@
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) {
+ /* Neither has image and the positions are the same */
return true;
}