projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rationalise #undef-ing of ERROR.
[libdcp.git]
/
src
/
modified_gamma_transfer_function.h
diff --git
a/src/modified_gamma_transfer_function.h
b/src/modified_gamma_transfer_function.h
index b38a16b0c824352a3043227533d5a6cd6237690a..0427dd6170e4de18410c4c265762c21e463cc3c3 100644
(file)
--- a/
src/modified_gamma_transfer_function.h
+++ b/
src/modified_gamma_transfer_function.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-20
14
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-20
21
Carl Hetherington <cth@carlh.net>
This file is part of libdcp.
This file is part of libdcp.
@@
-31,14
+31,18
@@
files in the program, then also delete it here.
*/
files in the program, then also delete it here.
*/
+
/** @file src/modified_gamma_transfer_function.h
/** @file src/modified_gamma_transfer_function.h
- * @brief ModifiedGammaTransferFunction class
.
+ * @brief ModifiedGammaTransferFunction class
*/
*/
+
#include "transfer_function.h"
#include "transfer_function.h"
+
namespace dcp {
namespace dcp {
+
/** A transfer function which for an input x gives a linear output y where
*
* y = x / B for x <= threshold
/** A transfer function which for an input x gives a linear output y where
*
* y = x / B for x <= threshold
@@
-70,10
+74,10
@@
public:
return _B;
}
return _B;
}
- bool about_equal (std::shared_ptr<const TransferFunction>, double epsilon) const;
+ bool about_equal (std::shared_ptr<const TransferFunction>, double epsilon) const
override
;
protected:
protected:
-
double * make_lut (int bit_depth, bool inverse) const
;
+
std::vector<double> make_lut (double from, double to, int bit_depth, bool inverse) const override
;
private:
double _power;
private:
double _power;
@@
-82,4
+86,5
@@
private:
double _B;
};
double _B;
};
+
}
}