Changeset 2705Tweet

Timestamp:

Aug 12, 2008, 7:18:25 PM (14 years ago)

Author:

Sam Hocevar

Message:

• mean.c: implement pipi_mean() to compute a mean image.

Location:

libpipi/trunk

Files:

• pipi/Makefile.am (modified) (2 diffs)
• pipi/combine (added)
• pipi/combine/mean.c (added)
• pipi/context.c (modified) (1 diff)
• pipi/pipi.h (modified) (1 diff)
• src/pipi.c (modified) (1 diff)

libpipi/trunk/pipi/Makefile.am

@@ -26 +26 @@
         fill/floodfill.c \
         $(codec_sources) \
+        $(combine_sources) \
         $(filter_sources) \
         $(dither_sources) \
@@ -39 +40 @@
 
 # Submodules
+combine_sources = \
+        combine/mean.c
+
 filter_sources = \
         filter/autocontrast.c \

libpipi/trunk/pipi/context.c

@@ -132 +132 @@
         ctx->images[ctx->nimages - 1] = dst;
     }
+    else if(!strcmp(cmd, "mean"))
+    {
+        pipi_image_t *dst;
+
+        if(ctx->nimages < 2)
+            return -1;
+        dst = pipi_mean(ctx->images[ctx->nimages - 2],
+                        ctx->images[ctx->nimages - 1]);
+        if(dst == NULL)
+            return -1;
+        pipi_free(ctx->images[ctx->nimages - 2]);
+        pipi_free(ctx->images[ctx->nimages - 1]);
+        ctx->images[ctx->nimages - 2] = dst;
+        ctx->nimages--;
+    }
     else if(!strcmp(cmd, "wrap"))
     {

libpipi/trunk/pipi/pipi.h

@@ -86 +86 @@
 extern pipi_image_t *pipi_resize(pipi_image_t *, int, int);
 
+extern pipi_image_t *pipi_mean(pipi_image_t *, pipi_image_t *);
+
 extern pipi_image_t *pipi_convolution(pipi_image_t *, int, int, double[]);
 extern pipi_image_t *pipi_gaussian_blur(pipi_image_t *, float);

libpipi/trunk/src/pipi.c

@@ -52 +52 @@
                 return EXIT_FAILURE;
         }
+        else if(!strcmp(argv[0], "--mean"))
+        {
+            if(pipi_command(ctx, "mean") != 0)
+                return EXIT_FAILURE;
+        }
         else if(!strcmp(argv[0], "--output") || !strcmp(argv[0], "-o"))
         {