Changeset 2694Tweet

Timestamp:

Aug 11, 2008, 2:51:05 AM (15 years ago)

Author:

Sam Hocevar

Message:

• context.c: implement various dithering commands and Gaussian blur.
• pipi.c: add "--blur" and "--dither" commandline options.
• blur.c dither.c: remove these examples, pipi.c works a lot better:

pipi src.png --blur 10 dest.png
pipi src.png --dither dbs dest.png

(and of course combinations are possible)

Location:

libpipi/trunk

Files:

• .gitignore (modified) (1 diff)
• examples/Makefile.am (modified) (1 diff)
• examples/blur.c (deleted)
• examples/dither.c (deleted)
• pipi/context.c (modified) (1 diff)
• src/pipi.c (modified) (1 diff)

libpipi/trunk/.gitignore

@@ -12 +12 @@
 src/pipi
 genethumb/genethumb
-examples/blur
-examples/dither
 examples/edd
+examples/floodfill
 examples/img2rubik
 examples/sharpen

libpipi/trunk/examples/Makefile.am

@@ -3 +3 @@
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/pipi
 
-bin_PROGRAMS = blur dither edd img2rubik sharpen floodfill
-
-blur_SOURCES = blur.c
-blur_LDADD = ../pipi/libpipi.la
-
-dither_SOURCES = dither.c
-dither_LDADD = ../pipi/libpipi.la
+bin_PROGRAMS = edd img2rubik sharpen floodfill
 
 edd_SOURCES = edd.c

libpipi/trunk/pipi/context.c

@@ -72 +72 @@
         pipi_free(ctx->images[ctx->nimages]);
     }
+    else if(!strcmp(cmd, "dither"))
+    {
+        pipi_image_t *src, *dst;
+        char const *method;
+        va_list ap;
+
+        if(ctx->nimages <= 0)
+            return -1;
+        va_start(ap, cmd);
+        method = va_arg(ap, char const *);
+        va_end(ap);
+        src = ctx->images[ctx->nimages - 1];
+        dst = NULL;
+        if(!strcmp(method, "fs"))
+            dst = pipi_dither_floydsteinberg(src, 0);
+        else if(!strcmp(method, "sfs"))
+            dst = pipi_dither_floydsteinberg(src, 1);
+        else if(!strcmp(method, "ost"))
+            dst = pipi_dither_ostromoukhov(src, 0);
+        else if(!strcmp(method, "sost"))
+            dst = pipi_dither_ostromoukhov(src, 1);
+        else if(!strcmp(method, "ordered"))
+            dst = pipi_dither_ordered(src);
+        else if(!strcmp(method, "random"))
+            dst = pipi_dither_random(src);
+        else if(!strcmp(method, "dbs"))
+            dst = pipi_dither_dbs(src);
+        if(dst == NULL)
+            return -1;
+        pipi_free(src);
+        ctx->images[ctx->nimages - 1] = dst;
+    }
+    else if(!strcmp(cmd, "blur"))
+    {
+        pipi_image_t *src, *dst;
+        char const *arg;
+        va_list ap;
+
+        if(ctx->nimages <= 0)
+            return -1;
+        va_start(ap, cmd);
+        arg = va_arg(ap, char const *);
+        va_end(ap);
+        src = ctx->images[ctx->nimages - 1];
+        dst = pipi_gaussian_blur(src, atoi(arg));
+        if(dst == NULL)
+            return -1;
+        pipi_free(src);
+        ctx->images[ctx->nimages - 1] = dst;
+    }
     else if(!strcmp(cmd, "free"))
     {

libpipi/trunk/src/pipi.c

@@ -16 +16 @@
     while(*++argv)
     {
-        if(!strcmp(argv[0], "--output") || !strcmp(argv[0], "-o"))
+        if(!strcmp(argv[0], "--dup"))
+        {
+            if(pipi_command(ctx, "dup") != 0)
+                return EXIT_FAILURE;
+        }
+        else if(!strcmp(argv[0], "--dither"))
+        {
+            if(argv[1] == NULL)
+                return EXIT_FAILURE;
+            if(pipi_command(ctx, "dither", argv[1]) != 0)
+                return EXIT_FAILURE;
+            argv++;
+        }
+        else if(!strcmp(argv[0], "--blur"))
+        {
+            if(argv[1] == NULL)
+                return EXIT_FAILURE;
+            if(pipi_command(ctx, "blur", argv[1]) != 0)
+                return EXIT_FAILURE;
+            argv++;
+        }
+        else if(!strcmp(argv[0], "--output") || !strcmp(argv[0], "-o"))
         {
             if(argv[1] == NULL)