[EGIT] [legacy/imlib2] master 04/04: Silence compiler warnings (filters).

[Kim Woelders - Enlightenment Git]

kwo pushed a commit to branch master.

commit 306f42e0bd2d9b07dcd1eaaa20b6f0db0bcdb624
Author: Kim Woelders <k...@woelders.dk>
Date:   Tue Jul 2 20:33:42 2013 +0200

    Silence compiler warnings (filters).
---
 src/modules/filters/filter_bumpmap.c  | 6 ++----
 src/modules/filters/filter_colormod.c | 3 +--
 src/modules/filters/filter_test.c     | 7 +++++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/modules/filters/filter_bumpmap.c 
b/src/modules/filters/filter_bumpmap.c
index f24764a..8cddc96 100644
--- a/src/modules/filters/filter_bumpmap.c
+++ b/src/modules/filters/filter_bumpmap.c
@@ -18,7 +18,7 @@ bump_map(Imlib_Image im, pIFunctionParam par)
    int                 free_map = 0;
    DATA32             *src;
    DATA32             *mp, *mpy, *mpp;
-   double              z, z_2, x2, y2;
+   double              z, x2, y2;
    int                 w, h, i, j, w2, h2, wh2, mx, my;
 
    for (ptr = par; ptr; ptr = ptr->next)
@@ -60,7 +60,6 @@ bump_map(Imlib_Image im, pIFunctionParam par)
    z = sin(el);
 
    d /= (255 * (255 + 255 + 255));
-   z_2 = z * z;
 
    my = h2;
    for (j = h; --j >= 0;)
@@ -246,7 +245,7 @@ bump_map_point(Imlib_Image im, pIFunctionParam par)
 void
 init(struct imlib_filter_info *info)
 {
-   char               *filters[] = { "bump_map_point", "bump_map" };
+   static const char  *const filters[] = { "bump_map_point", "bump_map" };
    int                 i = (sizeof(filters) / sizeof(*filters));
 
    info->name = strdup("Bump Mapping");
@@ -258,7 +257,6 @@ init(struct imlib_filter_info *info)
    info->filters = malloc(sizeof(char *) * i);
    while (--i >= 0)
       info->filters[i] = strdup(filters[i]);
-
 }
 
 void
diff --git a/src/modules/filters/filter_colormod.c 
b/src/modules/filters/filter_colormod.c
index c66eaa7..e0b2b30 100644
--- a/src/modules/filters/filter_colormod.c
+++ b/src/modules/filters/filter_colormod.c
@@ -226,7 +226,7 @@ colormod(Imlib_Image im, pIFunctionParam par)
 void
 init(struct imlib_filter_info *info)
 {
-   char               *filters[] = { "colormod" };
+   static const char  *const filters[] = { "colormod" };
    int                 i = (sizeof(filters) / sizeof(*filters));
 
    info->name = strdup("Tinting");
@@ -237,7 +237,6 @@ init(struct imlib_filter_info *info)
    info->filters = malloc(sizeof(char *) * i);
    while (--i >= 0)
       info->filters[i] = strdup(filters[i]);
-
 }
 
 void
diff --git a/src/modules/filters/filter_test.c 
b/src/modules/filters/filter_test.c
index 5197f3d..42d862f 100644
--- a/src/modules/filters/filter_test.c
+++ b/src/modules/filters/filter_test.c
@@ -4,7 +4,7 @@
 void
 init(struct imlib_filter_info *info)
 {
-   char               *filters[] = { "tint", "cool_text", "gradient" };
+   static const char  *const filters[] = { "tint", "cool_text", "gradient" };
    int                 i = 0;
 
    info->name = strdup("Test Filter");
@@ -16,7 +16,6 @@ init(struct imlib_filter_info *info)
    info->filters = malloc(sizeof(char *) * 3);
    for (i = 0; i < info->num_filters; i++)
       info->filters[i] = strdup(filters[i]);
-
 }
 
 void
@@ -86,10 +85,12 @@ exec(char *filter, void *im, pIFunctionParam params)
         return imge;
      }
 
+#if 0                           /* Nothing useful here */
    if (strcmp(filter, "cool_text") == 0)
      {
         return imge;
      }
+
    if (strcmp(filter, "gradient") == 0)
      {
         int                 angle = 0;
@@ -100,5 +101,7 @@ exec(char *filter, void *im, pIFunctionParam params)
           }
         return imge;
      }
+#endif
+
    return imge;
 }

-- 

------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:

Build for Windows Store.

http://p.sf.net/sfu/windows-dev2dev