X-Git-Url: https://git.wpitchoune.net/gitweb/?p=psensor.git;a=blobdiff_plain;f=src%2Flib%2Fcolor.h;h=7636b65604df3536f7179f30de681ac61ae12cb6;hp=be818cbe8cf01f3792b71812a3af76dd51ab5c01;hb=c1e20f2631a1249720e9c75d753eacfcb0f6c7b9;hpb=cde76fd1723bbdad164adac96d105111b831bf50

diff --git a/src/lib/color.h b/src/lib/color.h
index be818cb..7636b65 100644
--- a/src/lib/color.h
+++ b/src/lib/color.h
@@ -1,57 +1,44 @@
 /*
-    Copyright (C) 2010-2011 jeanfi@gmail.com
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301 USA
-*/
-
+ * Copyright (C) 2010-2016 jeanfi@gmail.com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
 #ifndef _PSENSOR_COLOR_H_
 #define _PSENSOR_COLOR_H_
 
-/* Represents a RGB color.
-
-   Contains integer and floating RGB representation to avoid useless
-conversion.
-
-   Uses color_set to maintain the coherence of the both
-   representation.
-*/
+/* Represents a RGB color. */
 struct color {
-	/* rgb 0..65535 */
-	unsigned int red;
-	unsigned int green;
-	unsigned int blue;
-
 	/* rgb floating 0..1 */
-	double f_red;
-	double f_green;
-	double f_blue;
+	double red;
+	double green;
+	double blue;
 };
 
-struct color *color_new(unsigned int red,
-			unsigned int green, unsigned int blue);
+/** rgb 0..1 */
+struct color *color_new(double r, double g, double b);
 
 struct color *color_dup(struct color *);
 
-void color_set(struct color *,
-	       unsigned int red, unsigned int green, unsigned int blue);
+/** rgb 0..1 */
+void color_set(struct color *, double r, double g, double b);
 
 int is_color(const char *str);
 
-struct color *string_to_color(const char *str);
+struct color *str_to_color(const char *str);
 
-char *color_to_string(struct color *color);
+char *color_to_str(const struct color *color);
 
 #endif