Rename TransferFunction::out() -> TransferFunction::out_j2k().

1 files changed, 10 insertions, 7 deletions

diff --git a/src/colour_conversion.h b/src/colour_conversion.h
index 3cfbf969..aaab720e 100644
--- a/src/colour_conversion.h
+++ b/src/colour_conversion.h
@@ -83,7 +83,7 @@ public:
 		Chromaticity blue,
 		Chromaticity white,
 		boost::optional<Chromaticity> adjusted_white,
-		std::shared_ptr<const TransferFunction> out
+		std::shared_ptr<const TransferFunction> out_j2k
 		);
 
 	std::shared_ptr<const TransferFunction> in() const {
@@ -114,8 +114,9 @@ public:
 		return _adjusted_white;
 	}
 
-	std::shared_ptr<const TransferFunction> out() const {
-		return _out;
+	/** Output transfer function when going to XYZ for JPEG2000 */
+	std::shared_ptr<const TransferFunction> out_j2k() const {
+		return _out_j2k;
 	}
 
 	void set_in(std::shared_ptr<const TransferFunction> f) {
@@ -150,8 +151,8 @@ public:
 		_adjusted_white = boost::optional<Chromaticity>();
 	}
 
-	void set_out(std::shared_ptr<const TransferFunction> f) {
-		_out = f;
+	void set_out_j2k(std::shared_ptr<const TransferFunction> f) {
+		_out_j2k = f;
 	}
 
 	bool about_equal(ColourConversion const & other, float epsilon) const;
@@ -179,8 +180,10 @@ protected:
 	Chromaticity _white;
 	/** White point that we are adjusting to using a Bradford matrix */
 	boost::optional<Chromaticity> _adjusted_white;
-	/** Output transfer function (probably an inverse gamma function, or something similar) */
-	std::shared_ptr<const TransferFunction> _out;
+	/** Output transfer function to be used when going to XYZ for JPEG2000
+	 *  Probably an inverse gamma function, or something similar.
+	 */
+	std::shared_ptr<const TransferFunction> _out_j2k;
 };