libcolord: Add cd_spectrum_get_value_raw()

3 files changed, 27 insertions, 0 deletions

diff --git a/lib/colord/cd-spectrum.c b/lib/colord/cd-spectrum.c
index 6f6038b..472f49d 100644
--- a/lib/colord/cd-spectrum.c
+++ b/lib/colord/cd-spectrum.c
@@ -103,6 +103,26 @@ cd_spectrum_get_value (const CdSpectrum *spectrum, guint idx)
 }
 
 /**
+ * cd_spectrum_get_value_raw:
+ * @spectrum: a #CdSpectrum instance.
+ * @idx: an index into the data
+ *
+ * Gets the spectrum data at a specified index, without any normalization
+ * applied. Most people should use cd_spectrum_get_value() instead.
+ *
+ * Return value: spectral data value, or -1 for invalid
+ *
+ * Since: 1.2.6
+ **/
+gdouble
+cd_spectrum_get_value_raw (const CdSpectrum *spectrum, guint idx)
+{
+	g_return_val_if_fail (spectrum != NULL, -1.0f);
+	g_return_val_if_fail (idx < spectrum->data->len, -1.0f);
+	return g_array_index (spectrum->data, gdouble, idx);
+}
+
+/**
  * cd_spectrum_get_wavelength:
  * @spectrum: a #CdSpectrum instance.
  * @idx: an index into the data
diff --git a/lib/colord/cd-spectrum.h b/lib/colord/cd-spectrum.h
index 46fb71b..ba853bd 100644
--- a/lib/colord/cd-spectrum.h
+++ b/lib/colord/cd-spectrum.h
@@ -52,6 +52,8 @@ gdouble		 cd_spectrum_get_norm		(const CdSpectrum	*spectrum);
 guint		 cd_spectrum_get_size		(const CdSpectrum	*spectrum);
 gdouble		 cd_spectrum_get_value		(const CdSpectrum	*spectrum,
 						 guint			 idx);
+gdouble		 cd_spectrum_get_value_raw	(const CdSpectrum	*spectrum,
+						 guint			 idx);
 gdouble		 cd_spectrum_get_wavelength	(const CdSpectrum	*spectrum,
 						 guint			 idx);
 gdouble		 cd_spectrum_get_value_for_nm	(const CdSpectrum	*spectrum,
diff --git a/lib/colord/cd-test-private.c b/lib/colord/cd-test-private.c
index bb36ee5..3449dd1 100644
--- a/lib/colord/cd-test-private.c
+++ b/lib/colord/cd-test-private.c
@@ -233,6 +233,11 @@ colord_spectrum_func (void)
 	g_assert_cmpfloat (ABS (cd_spectrum_get_value (s, 2) - 1.333f), <, 0.001f);
 	g_assert_cmpfloat (ABS (cd_spectrum_get_norm (s) - 1.333f), <, 0.001f);
 
+	/* test raw value */
+	g_assert_cmpfloat (ABS (cd_spectrum_get_value_raw (s, 0) - 0.5f), <, 0.001f);
+	g_assert_cmpfloat (ABS (cd_spectrum_get_value_raw (s, 1) - 0.75f), <, 0.001f);
+	g_assert_cmpfloat (ABS (cd_spectrum_get_value_raw (s, 2) - 1.f), <, 0.001f);
+
 	cd_spectrum_free (s);
 }