Changeset 2753 for libpipi/trunkTweet

Timestamp:

Aug 23, 2008, 11:11:10 AM (15 years ago)

Author:

Sam Hocevar

Message:

• rgb.c: implement pipi_rgb(), to combine three RGB channels.

Location:

libpipi/trunk

Files:

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

@@ -46 +46 @@
 
 combine_sources = \
+        combine/rgb.c \
         combine/mean.c \
         combine/minmax.c \

libpipi/trunk/pipi/context.c

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

libpipi/trunk/pipi/pipi.h

@@ -106 +106 @@
 extern pipi_image_t *pipi_resize(pipi_image_t *, int, int);
 
+extern pipi_image_t *pipi_rgb(pipi_image_t *, pipi_image_t *, pipi_image_t *);
 extern pipi_image_t *pipi_mean(pipi_image_t *, pipi_image_t *);
 extern pipi_image_t *pipi_min(pipi_image_t *, pipi_image_t *);

libpipi/trunk/src/pipi.c

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