projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
image_decoder.cc
diff --git
a/src/lib/image_decoder.cc
b/src/lib/image_decoder.cc
index d3cdbd6f1ee753b994919cd677828662c1b96a8e..8702c1a33b18692dbc43b89c9e60ab416ef9e50e 100644
(file)
--- a/
src/lib/image_decoder.cc
+++ b/
src/lib/image_decoder.cc
@@
-23,7
+23,7
@@
#include "image_content.h"
#include "image_decoder.h"
#include "image.h"
-#include "image_proxy.h"
+#include "
magick_
image_proxy.h"
#include "film.h"
#include "exceptions.h"