Changeset 2708Tweet

Timestamp:

08/13/08 22:26:11 (5 years ago)

Author:

sam

Message:

• subadd.c: add pipi_sub() and pipi_add() as another way to combine two images.

Location:

libpipi/trunk

Files:

• pipi/Makefile.am (modified) (1 diff)
• pipi/combine/subadd.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

@@ -42 +42 @@
 combine_sources = \
         combine/mean.c \
-        combine/minmax.c
+        combine/minmax.c \
+        combine/subadd.c
 
 filter_sources = \

libpipi/trunk/pipi/context.c

@@ -147 +147 @@
         ctx->nimages--;
     }
+    else if(!strcmp(cmd, "sub"))
+    {
+        pipi_image_t *dst;
+
+        if(ctx->nimages < 2)
+            return -1;
+        dst = pipi_sub(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, "add"))
+    {
+        pipi_image_t *dst;
+
+        if(ctx->nimages < 2)
+            return -1;
+        dst = pipi_add(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, "min"))
     {

libpipi/trunk/pipi/pipi.h

@@ -89 +89 @@
 extern pipi_image_t *pipi_min(pipi_image_t *, pipi_image_t *);
 extern pipi_image_t *pipi_max(pipi_image_t *, pipi_image_t *);
+extern pipi_image_t *pipi_sub(pipi_image_t *, pipi_image_t *);
+extern pipi_image_t *pipi_add(pipi_image_t *, pipi_image_t *);
 
 extern pipi_image_t *pipi_convolution(pipi_image_t *, int, int, double[]);

libpipi/trunk/src/pipi.c

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