summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorRichard Hughes <richard@hughsie.com>2014-01-09 09:00:34 +0000
committerRichard Hughes <richard@hughsie.com>2014-01-09 09:11:07 +0000
commit2fa0428ec673569e9a15d1b6e635af9e559c14e6 (patch)
treef2ba169977c74325f92fd54fb29976745f5854a2 /contrib
parent2e12ce52ff94bf87086df2734bf8e32e7a108efb (diff)
downloadcolord-2fa0428ec673569e9a15d1b6e635af9e559c14e6.tar.gz
Write the same format CMF files as ArgyllCMS
According to Graeme, the CMF files are unindexed and implicitly XYZ. Also, rework the spectral API a little to be a bit easier to use.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/csv2cmf/cd-main.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/contrib/csv2cmf/cd-main.c b/contrib/csv2cmf/cd-main.c
index f4cbeb0..6ff0271 100644
--- a/contrib/csv2cmf/cd-main.c
+++ b/contrib/csv2cmf/cd-main.c
@@ -51,7 +51,6 @@ main (int argc, char *argv[])
GError *error = NULL;
GFile *file = NULL;
GPtrArray *array = NULL;
- GPtrArray *spectra = NULL;
gboolean ret;
gchar **lines = NULL;
gchar **split;
@@ -130,10 +129,9 @@ main (int argc, char *argv[])
}
/* add spectra to the CMF file */
- spectra = g_ptr_array_new_with_free_func ((GDestroyNotify) cd_spectrum_free);
- for (i = 0; i < 3; i++)
- g_ptr_array_add (spectra, spectrum[i]);
cmf = cd_it8_new_with_kind (CD_IT8_KIND_CMF);
+ for (i = 0; i < 3; i++)
+ cd_it8_add_spectrum (cmf, spectrum[i]);
originator = g_path_get_basename (argv[0]);
cd_it8_set_originator (cmf, originator);
title = g_path_get_basename (argv[1]);
@@ -141,7 +139,6 @@ main (int argc, char *argv[])
if (dot != NULL)
*dot = '\0';
cd_it8_set_title (cmf, title);
- cd_it8_set_spectral_data (cmf, spectra);
/* save */
file = g_file_new_for_path (argv[2]);
@@ -155,8 +152,6 @@ main (int argc, char *argv[])
out:
if (array != NULL)
g_ptr_array_unref (array);
- if (spectra != NULL)
- g_ptr_array_unref (spectra);
if (cmf != NULL)
g_object_unref (cmf);
if (file != NULL)