Changeset 1941:339d957d24ad in roaraudio

Timestamp:

06/06/09 15:46:51 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added some basic functions for color operations

Files:

• include/libroarlight/colors.h (modified) (2 diffs)
• libroarlight/colors.c (modified) (1 diff)

include/libroarlight/colors.h

@@ -59 +59 @@
 //#define ROAR_COLOR_TYPE_              0x0100
 
+#define ROAR_COLORSYSTEM_NONE          (ROAR_COLOR_TYPE_NONE)
 #define ROAR_COLORSYSTEM_GRAY          (ROAR_COLOR_TYPE_K)
 #define ROAR_COLORSYSTEM_RGB           (ROAR_COLOR_TYPE_R|ROAR_COLOR_TYPE_G|ROAR_COLOR_TYPE_B)
@@ -102 +103 @@
 //#define roar_color_new_rgb(color,r,g,b) (color)->system = ROAR_COLORSYSTEM_RGB; (color)->color.rgb.r = (r); (color)->color.rgb.b = (g); (color)->color.rgb.b = (b)
 
+int roar_color_new        (struct roar_color * c);
 int roar_color_new_gray   (struct roar_color * c, unsigned char k);
 int roar_color_new_rgb    (struct roar_color * c, unsigned char r, unsigned char g, unsigned char b);

libroarlight/colors.c

@@ -25 +25 @@
 #include "libroarlight.h"
 
+int roar_color_new        (struct roar_color * c) {
+ if ( c == NULL )
+  return -1;
+
+ memset(c, 0, sizeof(struct roar_color));
+
+ c->system = ROAR_COLORSYSTEM_NONE;
+
+ return 0;
+}
+
+int roar_color_new_gray   (struct roar_color * c, unsigned char k) {
+ if ( roar_color_new(c) == -1 )
+  return -1;
+
+ c->system = ROAR_COLORSYSTEM_GRAY;
+
+ c->color.gray.k = k;
+
+ return 0;
+}
+
+int roar_color_new_rgb    (struct roar_color * c, unsigned char r, unsigned char g, unsigned char b) {
+ if ( roar_color_new(c) == -1 )
+  return -1;
+
+ c->system = ROAR_COLORSYSTEM_RGB;
+
+ c->color.rgb.r = r;
+ c->color.rgb.g = g;
+ c->color.rgb.b = b;
+
+ return 0;
+}
+
+int roar_color_copy       (struct roar_color * dst, struct roar_color * src) {
+ if ( dst == NULL || src == NULL )
+  return -1;
+
+ memcpy(dst, src, sizeof(struct roar_color));
+
+ return 0;
+}
+
+int roar_color_conv       (struct roar_color * c, uint32_t system) {
+ if ( c == NULL )
+  return -1;
+
+ switch (c->system) {
+  case ROAR_COLORSYSTEM_GRAY:
+    return roar_color_conv_gray(c, system);
+   break;
+  case ROAR_COLORSYSTEM_RGB:
+    return roar_color_conv_rgb(c, system);
+   break;
+ }
+
+ return -1;
+}
+
+int roar_color_conv_gray  (struct roar_color * c, uint32_t system) {
+ unsigned char k;
+
+ if ( c == NULL )
+  return -1;
+
+ if ( c->system != ROAR_COLORSYSTEM_GRAY )
+  return -1;
+
+ switch (system) {
+  case ROAR_COLORSYSTEM_RGB:
+    k = c->color.gray.k;
+    c->color.rgb.r = k;
+    c->color.rgb.g = k;
+    c->color.rgb.b = k;
+    c->system = ROAR_COLORSYSTEM_RGB;
+    return 0;
+   break;
+ }
+
+ return -1;
+}
+
+int roar_color_conv_rgb   (struct roar_color * c, uint32_t system) {
+ if ( c == NULL )
+  return -1;
+
+ if ( c->system != ROAR_COLORSYSTEM_GRAY )
+  return -1;
+
+ switch (system) {
+ }
+
+ return -1;
+}
+
 //ll