Changeset 1881Tweet

Timestamp:

Nov 4, 2007, 1:00:00 PM (13 years ago)

Author:

Sam Hocevar

Message:

• Renamed cucul_set_dither_mode() into cucul_set_dither_algorithm(). It’s a longer name but "mode" really wasn’t appropriate here.

Location:

libcaca/trunk/cucul

Files:

• cucul.h (modified) (2 diffs)
• dither.c (modified) (14 diffs)
• legacy.c (modified) (1 diff)

libcaca/trunk/cucul/cucul.h

@@ -223 +223 @@
 char const * const * cucul_get_dither_charset_list(cucul_dither_t const *);
 char const * cucul_get_dither_charset(cucul_dither_t const *);
-int cucul_set_dither_mode(cucul_dither_t *, char const *);
-char const * const * cucul_get_dither_mode_list(cucul_dither_t const *);
-char const * cucul_get_dither_mode(cucul_dither_t const *);
+int cucul_set_dither_algorithm(cucul_dither_t *, char const *);
+char const * const * cucul_get_dither_algorithm_list(cucul_dither_t const *);
+char const * cucul_get_dither_algorithm(cucul_dither_t const *);
 int cucul_dither_bitmap(cucul_canvas_t *, int, int, int, int,
                          cucul_dither_t const *, void *);
@@ -300 +300 @@
     int cucul_rotate(cucul_canvas_t *) CUCUL_DEPRECATED;
     int cucul_set_dither_invert(cucul_dither_t *, int) CUCUL_DEPRECATED;
+    int cucul_set_dither_mode(cucul_dither_t *, char const *) CUCUL_DEPRECATED;
+    char const * const * cucul_get_dither_mode_list(cucul_dither_t
+                                                    const *) CUCUL_DEPRECATED;
 #   define CUCUL_COLOR_BLACK CUCUL_BLACK
 #   define CUCUL_COLOR_BLUE CUCUL_BLUE

libcaca/trunk/cucul/dither.c

@@ -138 +138 @@
     enum color_mode color;
 
-    char const *dither_name;
+    char const *algo_name;
     void (*init_dither) (int);
     unsigned int (*get_dither) (void);
@@ -178 +178 @@
 static int init_lookup(void);
 
-/* Dithering methods */
+/* Dithering algorithms */
 static void init_no_dither(int);
 static unsigned int get_no_dither(void);
@@ -350 +350 @@
     d->glyph_count = sizeof(ascii_glyphs) / sizeof(*ascii_glyphs);
 
-    d->dither_name = "fstein";
+    d->algo_name = "fstein";
     d->init_dither = init_fstein_dither;
     d->get_dither = get_fstein_dither;
@@ -812 +812 @@
 }
 
-/** \brief Set dithering method
- *
- *  Tell the renderer which dithering method should be used. Dithering is
+/** \brief Set dithering algorithm
+ *
+ *  Tell the renderer which dithering algorithm should be used. Dithering is
  *  necessary because the picture being rendered has usually far more colours
  *  than the available palette. Valid values for \c str are:
@@ -828 +828 @@
  *
  *  \param d Dither object.
- *  \param str A string describing the method that needs to be used
+ *  \param str A string describing the algorithm that needs to be used
  *         for the dithering.
  *  \return 0 in case of success, -1 if an error occurred.
  */
-int cucul_set_dither_mode(cucul_dither_t *d, char const *str)
+int cucul_set_dither_algorithm(cucul_dither_t *d, char const *str)
 {
     if(!strcasecmp(str, "none"))
     {
-        d->dither_name = "none";
+        d->algo_name = "none";
         d->init_dither = init_no_dither;
         d->get_dither = get_no_dither;
@@ -843 +843 @@
     else if(!strcasecmp(str, "ordered2"))
     {
-        d->dither_name = "ordered2";
+        d->algo_name = "ordered2";
         d->init_dither = init_ordered2_dither;
         d->get_dither = get_ordered2_dither;
@@ -850 +850 @@
     else if(!strcasecmp(str, "ordered4"))
     {
-        d->dither_name = "ordered4";
+        d->algo_name = "ordered4";
         d->init_dither = init_ordered4_dither;
         d->get_dither = get_ordered4_dither;
@@ -857 +857 @@
     else if(!strcasecmp(str, "ordered8"))
     {
-        d->dither_name = "ordered8";
+        d->algo_name = "ordered8";
         d->init_dither = init_ordered8_dither;
         d->get_dither = get_ordered8_dither;
@@ -864 +864 @@
     else if(!strcasecmp(str, "random"))
     {
-        d->dither_name = "random";
+        d->algo_name = "random";
         d->init_dither = init_random_dither;
         d->get_dither = get_random_dither;
@@ -871 +871 @@
     else if(!strcasecmp(str, "fstein") || !strcasecmp(str, "default"))
     {
-        d->dither_name = "fstein";
+        d->algo_name = "fstein";
         d->init_dither = init_fstein_dither;
         d->get_dither = get_fstein_dither;
@@ -885 +885 @@
 }
 
-/** \brief Get dithering methods
- *
- *  Return a list of available dithering methods for a given dither. The list
- *  is a NULL-terminated array of strings, interleaving a string containing
- *  the internal value for the dithering method, to be used with
- *  cucul_set_dither_dithering(), and a string containing the natural
- *  language description for that dithering method.
+/** \brief Get dithering algorithms
+ *
+ *  Return a list of available dithering algorithms for a given dither. The
+ *  list is a NULL-terminated array of strings, interleaving a string
+ *  containing the internal value for the dithering algorithm, to be used
+ *  with cucul_set_dither_dithering(), and a string containing the natural
+ *  language description for that algorithm.
  *
  *  This function never fails.
@@ -898 +898 @@
  *  \return An array of strings.
  */
-char const * const * cucul_get_dither_mode_list(cucul_dither_t const *d)
+char const * const * cucul_get_dither_algorithm_list(cucul_dither_t const *d)
 {
     static char const * const list[] =
@@ -914 +914 @@
 }
 
-/** \brief Get current dithering method
- *
- *  Return the given dither's current dithering method.
+/** \brief Get current dithering algorithm
+ *
+ *  Return the given dither's current dithering algorithm.
  *
  *  This function never fails.
@@ -923 +923 @@
  *  \return A static string.
  */
-char const * cucul_get_dither_mode(cucul_dither_t const *d)
-{
-    return d->dither_name;
+char const * cucul_get_dither_algorithm(cucul_dither_t const *d)
+{
+    return d->algo_name;
 }
 

libcaca/trunk/cucul/legacy.c

@@ -76 +76 @@
 }
 
+int cucul_set_dither_mode(cucul_dither_t *d, char const *s)
+{
+    return cucul_set_dither_algorithm(d, s);
+}
+
+char const * const * cucul_get_dither_mode_list(cucul_dither_t const *d)
+{
+    return cucul_get_dither_algorithm_list(d);
+}
+
 /*
  * Functions from import.c