Changeset 1877Tweet

Timestamp:

Nov 4, 2007, 11:41:07 AM (12 years ago)

Author:

Sam Hocevar

Message:

• Implemented cucul_get_dither_antialias() and cucul_get_dither_color().

Location:

libcaca/trunk/cucul

Files:

• cucul.h (modified) (1 diff)
• dither.c (modified) (8 diffs)

libcaca/trunk/cucul/cucul.h

@@ -216 +216 @@
 int cucul_set_dither_antialias(cucul_dither_t *, char const *);
 char const * const * cucul_get_dither_antialias_list(cucul_dither_t const *);
+char const * cucul_get_dither_antialias(cucul_dither_t const *);
 int cucul_set_dither_color(cucul_dither_t *, char const *);
 char const * const * cucul_get_dither_color_list(cucul_dither_t const *);
+char const * cucul_get_dither_color(cucul_dither_t const *);
 int cucul_set_dither_charset(cucul_dither_t *, char const *);
 char const * const * cucul_get_dither_charset_list(cucul_dither_t const *);

libcaca/trunk/cucul/dither.c

@@ -132 +132 @@
 
     /* Bitmap features */
-    int invert, antialias;
-
-    /* Colour mode used for rendering */
-    enum color_mode color_mode;
+    struct
+    {
+        char const *name;
+        int value;
+    }
+    antialias, color;
+    int invert;
 
     /* Glyphs used for rendering */
@@ -337 +340 @@
 
     /* Default features */
+    d->antialias.name = "prefilter";
+    d->antialias.value = 1;
+    d->color.name = "full16";
+    d->color.value = COLOR_MODE_FULL16;
     d->invert = 0;
-    d->antialias = 1;
-
-    /* Default colour mode */
-    d->color_mode = COLOR_MODE_FULL16;
 
     /* Default character set */
@@ -546 +549 @@
 {
     if(!strcasecmp(str, "none"))
-        d->antialias = 0;
+    {
+        d->antialias.name = "none";
+        d->antialias.value = 0;
+    }
     else if(!strcasecmp(str, "prefilter") || !strcasecmp(str, "default"))
-        d->antialias = 1;
+    {
+        d->antialias.name = "prefilter";
+        d->antialias.value = 1;
+    }
     else
     {
@@ -582 +591 @@
 
     return list;
+}
+
+/** \brief Get current antialiasing method
+ *
+ *  Return the given dither's current antialiasing method.
+ *
+ *  This function never fails.
+ *
+ *  \param d Dither object.
+ *  \return A static string.
+ */
+char const * cucul_get_dither_antialias(cucul_dither_t const *d)
+{
+    return d->antialias.name;
 }
 
@@ -610 +633 @@
 {
     if(!strcasecmp(str, "mono"))
-        d->color_mode = COLOR_MODE_MONO;
+    {
+        d->color.name = "mono";
+        d->color.value = COLOR_MODE_MONO;
+    }
     else if(!strcasecmp(str, "gray"))
-        d->color_mode = COLOR_MODE_GRAY;
+    {
+        d->color.name = "gray";
+        d->color.value = COLOR_MODE_GRAY;
+    }
     else if(!strcasecmp(str, "8"))
-        d->color_mode = COLOR_MODE_8;
+    {
+        d->color.name = "8";
+        d->color.value = COLOR_MODE_8;
+    }
     else if(!strcasecmp(str, "16"))
-        d->color_mode = COLOR_MODE_16;
+    {
+        d->color.name = "16";
+        d->color.value = COLOR_MODE_16;
+    }
     else if(!strcasecmp(str, "fullgray"))
-        d->color_mode = COLOR_MODE_FULLGRAY;
+    {
+        d->color.name = "fullgray";
+        d->color.value = COLOR_MODE_FULLGRAY;
+    }
     else if(!strcasecmp(str, "full8"))
-        d->color_mode = COLOR_MODE_FULL8;
+    {
+        d->color.name = "full8";
+        d->color.value = COLOR_MODE_FULL8;
+    }
     else if(!strcasecmp(str, "full16") || !strcasecmp(str, "default"))
-        d->color_mode = COLOR_MODE_FULL16;
+    {
+        d->color.name = "full16";
+        d->color.value = COLOR_MODE_FULL16;
+    }
     else
     {
@@ -663 +707 @@
 }
 
+/** \brief Get current colour mode
+ *
+ *  Return the given dither's current colour mode.
+ *
+ *  This function never fails.
+ *
+ *  \param d Dither object.
+ *  \return A static string.
+ */
+char const * cucul_get_dither_color(cucul_dither_t const *d)
+{
+    return d->color.name;
+}
+
 /** \brief Choose characters used for dithering
  *
@@ -901 +959 @@
 
         /* First get RGB */
-        if(d->antialias)
+        if(d->antialias.value)
         {
             fromx = (x - x1) * w / deltax;
@@ -984 +1042 @@
 
         /* FIXME: we currently only honour "full16" */
-        if(d->color_mode == COLOR_MODE_FULL16)
+        if(d->color.value == COLOR_MODE_FULL16)
         {
             distmin = INT_MAX;