Date: Mon, 3 Jun 2013 02:50:54 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/179219: graphics/fbm: Fix build with clang Message-ID: <20130603025054.1587cb2f8329f15052229ada@yahoo.com> Resent-Message-ID: <201306021810.r52IA4Fb099509@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 179219
>Category: ports
>Synopsis: graphics/fbm: Fix build with clang
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Jun 02 18:10:03 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 8.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Fix build with clang
New file:
files/patch-fbquant.c
files/patch-flgifc.c
files/patch-flgife.c
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/graphics/fbm/files/patch-fbquant.c graphics/fbm/files/patch-fbquant.c
--- /usr/ports/graphics/fbm/files/patch-fbquant.c 1970-01-01 09:00:00.000000000 +0900
+++ graphics/fbm/files/patch-fbquant.c 2013-06-03 00:00:00.000000000 +0900
@@ -0,0 +1,47 @@
+--- fbquant.c.orig
++++ fbquant.c
+@@ -131,6 +131,10 @@
+
+ int outtype = DEF_8BIT; /* Output format desired */
+
++static void clr_quantize (FBM *input, FBM *output, COLOR *cmap, int colors);
++static void split_box (PIXEL *box, int boxlen, int clr, int numclr, COLOR *cmap);
++static void load_config (char *filenm);
++
+ /****************************************************************
+ * main
+ ****************************************************************/
+@@ -319,8 +323,7 @@
+ * load_config: Read a series of fixed/ignore color settings from a file
+ ****************************************************************/
+
+-load_config (filenm)
+-char *filenm;
++static void load_config (char *filenm)
+ { FILE *infile = NULL;
+ char buf[BUFSIZ];
+ int aindx, ard, agr, abl; /* Get 'i' arguments from sscanf */
+@@ -530,10 +533,7 @@
+ * algorithm.
+ ****************************************************************/
+
+-split_box (box, boxlen, clr, numclr, cmap)
+-PIXEL *box;
+-int boxlen, clr, numclr;
+-COLOR *cmap;
++static void split_box (PIXEL *box, int boxlen, int clr, int numclr, COLOR *cmap)
+ { int maxv[3], minv[3], numv[3];
+ int pcnt[3][CUBSID];
+ int sbox, snum, split, half, maxdif, dif;
+@@ -841,10 +841,7 @@
+ * clr_quantize: Do Floyd Steinberg quantizing on the image
+ ****************************************************************/
+
+-clr_quantize (input, output, cmap, colors, fmap, fixedcolors)
+-FBM *input, *output;
+-COLOR *cmap, *fmap;
+-int colors, fixedcolors;
++static void clr_quantize (FBM *input, FBM *output, COLOR *cmap, int colors)
+ { int **cerr, **lerr, **terr;
+ int width = input->hdr.cols, height = input->hdr.rows;
+ int rowlen = input->hdr.rowlen, plnlen = input->hdr.plnlen;
diff -urN /usr/ports/graphics/fbm/files/patch-flgifc.c graphics/fbm/files/patch-flgifc.c
--- /usr/ports/graphics/fbm/files/patch-flgifc.c 1970-01-01 09:00:00.000000000 +0900
+++ graphics/fbm/files/patch-flgifc.c 2013-06-03 00:00:00.000000000 +0900
@@ -0,0 +1,14 @@
+--- flgifc.c.orig
++++ flgifc.c
+@@ -168,10 +168,7 @@
+ code available free from MLM@CS.CMU.EDU and from UUNET archives$";
+ #endif
+
+-compress( init_bits, outfile, ReadValue )
+-int init_bits;
+-FILE *outfile;
+-ifunptr ReadValue;
++void compress( int init_bits, FILE *outfile, ifunptr ReadValue )
+ {
+ register long fcode;
+ register code_int i = 0;
diff -urN /usr/ports/graphics/fbm/files/patch-flgife.c graphics/fbm/files/patch-flgife.c
--- /usr/ports/graphics/fbm/files/patch-flgife.c 1970-01-01 09:00:00.000000000 +0900
+++ graphics/fbm/files/patch-flgife.c 2013-06-03 00:00:00.000000000 +0900
@@ -0,0 +1,10 @@
+--- flgife.c.orig
++++ flgife.c
+@@ -57,6 +57,7 @@
+ code available free from MLM@CS.CMU.EDU and from UUNET archives$";
+ #endif
+
++void compress( int init_bits, FILE *outfile, ifunptr ReadValue );
+
+ /*
+ * Bump the 'curx' and 'cury' to point to the next pixel
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130603025054.1587cb2f8329f15052229ada>