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
/
colour_conversion.cc
diff --git
a/src/lib/colour_conversion.cc
b/src/lib/colour_conversion.cc
index cd1a81b257dcadfa76b1c6196ae7e7267f9dfce6..73ee722490eaa33a7b46c1182459f9ea0164d67a 100644
(file)
--- a/
src/lib/colour_conversion.cc
+++ b/
src/lib/colour_conversion.cc
@@
-18,8
+18,8
@@
*/
#include <libxml++/libxml++.h>
*/
#include <libxml++/libxml++.h>
-#include <
lib
dcp/colour_matrix.h>
-#include <
lib
dcp/raw_convert.h>
+#include <dcp/colour_matrix.h>
+#include <dcp/raw_convert.h>
#include <libcxml/cxml.h>
#include "config.h"
#include "colour_conversion.h"
#include <libcxml/cxml.h>
#include "config.h"
#include "colour_conversion.h"
@@
-33,7
+33,7
@@
using std::cout;
using std::vector;
using boost::shared_ptr;
using boost::optional;
using std::vector;
using boost::shared_ptr;
using boost::optional;
-using
lib
dcp::raw_convert;
+using dcp::raw_convert;
ColourConversion::ColourConversion ()
: input_gamma (2.4)
ColourConversion::ColourConversion ()
: input_gamma (2.4)
@@
-43,7
+43,7
@@
ColourConversion::ColourConversion ()
{
for (int i = 0; i < 3; ++i) {
for (int j = 0; j < 3; ++j) {
{
for (int i = 0; i < 3; ++i) {
for (int j = 0; j < 3; ++j) {
- matrix (i, j) =
lib
dcp::colour_matrix::srgb_to_xyz[i][j];
+ matrix (i, j) = dcp::colour_matrix::srgb_to_xyz[i][j];
}
}
}
}
}
}