Imported Upstream version 0.9.0

[platform/upstream/libjxl.git] / lib / jxl / opsin_params.cc

diff --git a/lib/jxl/opsin_params.cc b/lib/jxl/opsin_params.cc
index f80a18a..e1fdda5 100644 (file)
--- a/lib/jxl/opsin_params.cc
+++ b/lib/jxl/opsin_params.cc
@@ -5,17 +5,19 @@
 
 #include "lib/jxl/opsin_params.h"
 
-#include <stdlib.h>
+#include "lib/jxl/cms/opsin_params.h"
 
-#include "lib/jxl/linalg.h"
+#define INVERSE_OPSIN_FROM_SPEC 1
 
-namespace jxl {
+#if not(INVERSE_OPSIN_FROM_SPEC)
+#include "lib/jxl/base/matrix_ops.h"
+#endif
 
-#define INVERSE_OPSIN_FROM_SPEC 1
+namespace jxl {
 
 const float* GetOpsinAbsorbanceInverseMatrix() {
 #if INVERSE_OPSIN_FROM_SPEC
-  return DefaultInverseOpsinAbsorbanceMatrix();
+  return jxl::cms::DefaultInverseOpsinAbsorbanceMatrix();
 #else   // INVERSE_OPSIN_FROM_SPEC
   // Compute the inverse opsin matrix from the forward matrix. Less precise
   // than taking the values from the specification, but must be used if the