Changeset 2717Tweet

Timestamp:

08/14/08 20:34:57 (5 years ago)

Author:

sam

Message:

• Add pipi_tile, to create image mosaics.

Location:

libpipi/trunk

Files:

• pipi/Makefile.am (modified) (2 diffs)
• pipi/context.c (modified) (1 diff)
• pipi/paint (added)
• pipi/paint/floodfill.c (moved) (moved from libpipi/trunk/pipi/fill/floodfill.c)
• pipi/paint/tile.c (added)
• pipi/pipi.h (modified) (1 diff)
• src/pipi.c (modified) (1 diff)

libpipi/trunk/pipi/Makefile.am

@@ -24 +24 @@
         dither.c \
         measure.c \
-        fill/floodfill.c \
         $(codec_sources) \
+        $(paint_sources) \
         $(combine_sources) \
         $(filter_sources) \
@@ -40 +40 @@
 
 # Submodules
+paint_sources = \
+        paint/floodfill.c \
+        paint/tile.c
+
 combine_sources = \
         combine/mean.c \

libpipi/trunk/pipi/context.c

@@ -168 +168 @@
         ctx->images[ctx->nimages - 1] = dst;
     }
+    else if(!strcmp(cmd, "tile"))
+    {
+        pipi_image_t *src, *dst;
+        char const *arg;
+        va_list ap;
+        int w, h;
+
+        if(ctx->nimages < 1)
+            return -1;
+        va_start(ap, cmd);
+        arg = va_arg(ap, char const *);
+        va_end(ap);
+        w = atoi(arg);
+        arg = strchr(arg, 'x');
+        if(!arg)
+            return -1;
+        h = atoi(arg + 1);
+        if(w <= 0 || h <= 0)
+            return -1;
+        src = ctx->images[ctx->nimages - 1];
+        dst = pipi_tile(src, w, h);
+        if(dst == NULL)
+            return -1;
+        pipi_free(src);
+        ctx->images[ctx->nimages - 1] = dst;
+    }
     else if(!strcmp(cmd, "scale"))
     {

libpipi/trunk/pipi/pipi.h

@@ -105 +105 @@
 extern pipi_image_t *pipi_autocontrast(pipi_image_t *);
 
+extern pipi_image_t *pipi_tile(pipi_image_t *, int, int);
 extern int pipi_flood_fill(pipi_image_t *,
                            int, int, float, float, float, float);

libpipi/trunk/src/pipi.c

@@ -39 +39 @@
                 return EXIT_FAILURE;
             if(pipi_command(ctx, "geometry", argv[1]) != 0)
+                return EXIT_FAILURE;
+            argv++;
+        }
+        else if(!strcmp(argv[0], "--tile"))
+        {
+            if(argv[1] == NULL)
+                return EXIT_FAILURE;
+            if(pipi_command(ctx, "tile", argv[1]) != 0)
                 return EXIT_FAILURE;
             argv++;