svn commit: r319842 - head/graphics/fbm/files

[Martin Wilke]

Author: miwi
Date: Tue Jun  4 09:56:31 2013
New Revision: 319842
URL: http://svnweb.freebsd.org/changeset/ports/319842

Log:
  - Fix build with clang
  
  PR:		179219
  Submitted by:	Ports Fury

Added:
  head/graphics/fbm/files/patch-fbquant.c   (contents, props changed)
  head/graphics/fbm/files/patch-flgifc.c   (contents, props changed)
  head/graphics/fbm/files/patch-flgife.c   (contents, props changed)

Added: head/graphics/fbm/files/patch-fbquant.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/fbm/files/patch-fbquant.c	Tue Jun  4 09:56:31 2013	(r319842)
@@ -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;

Added: head/graphics/fbm/files/patch-flgifc.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/fbm/files/patch-flgifc.c	Tue Jun  4 09:56:31 2013	(r319842)
@@ -0,0 +1,14 @@
+--- flgifc.c.orig
++++ flgifc.c
+@@ -168,10 +168,7 @@
+ code available free from MLM at 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;

Added: head/graphics/fbm/files/patch-flgife.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/fbm/files/patch-flgife.c	Tue Jun  4 09:56:31 2013	(r319842)
@@ -0,0 +1,10 @@
+--- flgife.c.orig
++++ flgife.c
+@@ -57,6 +57,7 @@
+ code available free from MLM at 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