Move to 'using namespace std;' in all .cpp files.

[movit] / colorspace_conversion_effect.cpp

diff --git a/colorspace_conversion_effect.cpp b/colorspace_conversion_effect.cpp
index 3a8ad95c578c4626b190b7c04ce14b5c9c6e7770..0fcea612c4198b8cf8d8a96d40bfbea4c8b25f8e 100644 (file)
--- a/colorspace_conversion_effect.cpp
+++ b/colorspace_conversion_effect.cpp
@@ -1,12 +1,13 @@
 #include <assert.h>
-
+#include <Eigen/Core>
 #include <Eigen/LU>
 
 #include "colorspace_conversion_effect.h"
-#include "util.h"
 #include "d65.h"
+#include "util.h"
 
 using namespace Eigen;
+using namespace std;
 
 // Color coordinates from Rec. 709; sRGB uses the same primaries.
 static const double rec709_x_R = 0.640, rec709_x_G = 0.300, rec709_x_B = 0.150;
@@ -18,6 +19,10 @@ static const double rec601_525_y_R = 0.340, rec601_525_y_G = 0.595, rec601_525_y
 static const double rec601_625_x_R = 0.640, rec601_625_x_G = 0.290, rec601_625_x_B = 0.150;
 static const double rec601_625_y_R = 0.330, rec601_625_y_G = 0.600, rec601_625_y_B = 0.060;
 
+// Color coordinates from Rec. 2020.
+static const double rec2020_x_R = 0.708, rec2020_x_G = 0.170, rec2020_x_B = 0.131;
+static const double rec2020_y_R = 0.292, rec2020_y_G = 0.797, rec2020_y_B = 0.046;
+
 ColorspaceConversionEffect::ColorspaceConversionEffect()
        : source_space(COLORSPACE_sRGB),
          destination_space(COLORSPACE_sRGB)
@@ -26,7 +31,7 @@ ColorspaceConversionEffect::ColorspaceConversionEffect()
        register_int("destination_space", (int *)&destination_space);
 }
 
-Matrix3d get_xyz_matrix(Colorspace space)
+Matrix3d ColorspaceConversionEffect::get_xyz_matrix(Colorspace space)
 {
        if (space == COLORSPACE_XYZ) {
                return Matrix3d::Identity();
@@ -48,6 +53,10 @@ Matrix3d get_xyz_matrix(Colorspace space)
                x_R = rec601_625_x_R; x_G = rec601_625_x_G; x_B = rec601_625_x_B;
                y_R = rec601_625_y_R; y_G = rec601_625_y_G; y_B = rec601_625_y_B;
                break;
+       case COLORSPACE_REC_2020:
+               x_R = rec2020_x_R; x_G = rec2020_x_G; x_B = rec2020_x_B;
+               y_R = rec2020_y_R; y_G = rec2020_y_G; y_B = rec2020_y_B;
+               break;
        default:
                assert(false);
        }
@@ -65,8 +74,8 @@ Matrix3d get_xyz_matrix(Colorspace space)
        //
        // Some algebraic fiddling yields (unsurprisingly):
        //
-       //   X_R = (x_R / y_R) Y_R
-       //   Z_R = (z_R / y_R) Y_R
+       //   X_R = (x_R / y_R) Y_R   (so define k1 = x_R / y_R)
+       //   Z_R = (z_R / y_R) Y_R   (so define k4 = z_R / y_R)
        //
        // We also know that since RGB=(1,1,1) should give us the
        // D65 illuminant, we must have
@@ -75,8 +84,8 @@ Matrix3d get_xyz_matrix(Colorspace space)
        //   Y_R + Y_G + Y_B = D65_Y
        //   Z_R + Z_G + Z_B = D65_Z
        //
-       // But since we already know how to express Y and Z by
-       // some constant multiple of X, this reduces to
+       // But since we already know how to express X and Z by
+       // some constant multiple of Y, this reduces to
        //
        //   k1 Y_R + k2 Y_G + k3 Y_B = D65_X
        //      Y_R +    Y_G +    Y_B = D65_Y
@@ -118,7 +127,7 @@ Matrix3d get_xyz_matrix(Colorspace space)
        return m;
 }
 
-std::string ColorspaceConversionEffect::output_fragment_shader()
+string ColorspaceConversionEffect::output_fragment_shader()
 {
        // Create a matrix to convert from source space -> XYZ,
        // another matrix to convert from XYZ -> destination space,