[Patch] Borders again with gfont

[Denis Barbier <nospam@thanx>]

Hi,

i rewrite my previous patch to work when cropping.
Greetings and happy new year

   Denis

--- gfont-1.0.2/gfont_main.c	Tue Sep 16 10:09:22 1997
+++ gfont-1.0.2/gfont_main.c	Thu Dec 31 10:53:24 1998
@@ -216,6 +216,8 @@
     fprintf(stderr, "Rendering Parameters:\n");
     fprintf(stderr, "   -b, --background=RRGGBB  set background color (default: `ffffff')\n");
     fprintf(stderr, "   -f, --foreground=RRGGBB  set foreground color (default: `000000')\n");
+    fprintf(stderr, "   -B, --border=N           set border width (default: `0')\n");
+    fprintf(stderr, "   -C, --bordercolor=RRGGBB set border color (default: `000000')\n");
     fprintf(stderr, "   -F, --fontname=NAME      set specific font (default `CMBoldface-V')\n");
     fprintf(stderr, "   -G, --gdf-path=DIR       add DIR to the path where GdF files are searched\n");
     fprintf(stderr, "\n");
@@ -244,6 +246,8 @@
     { "output-file", 1, NULL, 'o' },
     { "verbose",     0, NULL, 'v' },
     { "version",     0, NULL, 'V' },
+    { "border",      1, NULL, 'B' },
+    { "bordercolor", 1, NULL, 'C' },
     { "help",        0, NULL, 'h' }
 };
 
@@ -268,6 +272,8 @@
     char *outputfile = "out.gif";
     int bg_r, bg_g, bg_b;
     int fg_r, fg_g, fg_b;
+    int bfg, bfg_r, bfg_g, bfg_b;
+    int border = 0;
     char c;
     char *string;
     char *font = "CMBoldface-V";
@@ -282,10 +288,11 @@
 
     hextriple2gdcolor("ffffff", &bg_r, &bg_g, &bg_b);
     hextriple2gdcolor("000000", &fg_r, &fg_g, &fg_b);
+    hextriple2gdcolor("000000", &bfg_r, &bfg_g, &bfg_b);
 
     /*  parse the option arguments */
     opterr = 0;
-    while ((c = getopt_long(argc, argv, ":b:f:a:F:G:cir:o:vVh", options, NULL)) != -1) {
+    while ((c = getopt_long(argc, argv, ":b:f:B:C:a:F:G:cir:o:vVh", options, NULL)) != -1) {
         if (optarg == NULL) 
             optarg = "(null)";
         switch (c) {
@@ -296,6 +303,12 @@
             case 'f':
                 hextriple2gdcolor(optarg, &fg_r, &fg_g, &fg_b);
                 break;
+            case 'B':
+                border = atoi(optarg);
+                break;
+            case 'C':
+                hextriple2gdcolor(optarg, &bfg_r, &bfg_g, &bfg_b);
+                break;
             case 'a':
                 antialias = atoi(optarg);
                 break;
@@ -423,6 +436,9 @@
                     cont = 0;
         y = (y < gdImageSY(ip) ? y+1 : y);
         nH = nH - ((gdImageSY(ip) - 1) - y);
+        /* Add borders */
+        nW += 2*border;
+        nH += 2*border;
         Verbose("%d x %d, origin: (%d,%d)\n", nW, nH, nX, nY);
 
         Verbose("Allocating new image: ");
@@ -436,7 +452,7 @@
         Verbose("Done\n");
 
         Verbose("Copying image: ");
-        gdImageCopy(ipn, ip, 0, 0, nX, nY, nW, nH);
+        gdImageCopy(ipn, ip, border, border, nX, nY, nW-2*border, nH-2*border);
         Verbose("Done\n");
 
         Verbose("Freeing old image: ");
@@ -499,6 +515,13 @@
         gdImageDestroy(ip);
         ip = ipn;
         Verbose("Done\n");
+    }
+    if (border) {
+      Verbose("Border: %d pixels: ",border);
+      bfg = gdImageColorAllocate(ip, bfg_r, bfg_g, bfg_b);         
+        for (x = 0; x < border; x++) 
+           gdImageRectangle(ip, x, x, nW-1-x, nH-1-x, bfg);
+      Verbose("Done\n");
     }
 
     Verbose("Exporting image to GIF file: ");

______________________________________________________________________
Website META Language (WML)                www.engelschall.com/sw/wml/
Official Support Mailing List                   sw-wml@engelschall.com
Automated List Manager                       majordomo@engelschall.com