[Ming-cvs] ming/util Makefile.am,1.13,1.14 gif2mask.c,1.4,1.5

[Klaus R. <kre...@us...>]

Update of /cvsroot/ming/ming/util
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6410/util

Modified Files:
	Makefile.am gif2mask.c 
Log Message:
alpha masks require zlib compressed data. even with no compression zlib adds a header and crc data.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/ming/ming/util/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Makefile.am	15 Jul 2007 19:40:03 -0000	1.13
--- Makefile.am	15 Jul 2007 19:57:53 -0000	1.14
***************
*** 6,11 ****
  if USE_ZLIB
  gifprograms = gif2mask gif2dbl
- else
- gifprograms =
  endif
  else
--- 6,9 ----

Index: gif2mask.c
===================================================================
RCS file: /cvsroot/ming/ming/util/gif2mask.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** gif2mask.c	24 Jun 2007 11:35:16 -0000	1.4
--- gif2mask.c	15 Jul 2007 19:57:53 -0000	1.5
***************
*** 8,15 ****
  
  #include <gif_lib.h>
- 
- #ifdef USE_ZLIB
  #include <zlib.h>
- #endif
  
  #define max(a,b,c) (((a)>(b))?(((c)>(a))?(c):(a)):(((c)>(b))?(c):(b)))
--- 8,12 ----
***************
*** 94,106 ****
    outdata = malloc(outsize = (int)floor(size*1.01+12));
  
- #ifdef USE_ZLIB
    /* zlib-compress the gif data */
    compress2(outdata, &outsize, data, size, 9);
    outsize = size;
- #else
-   /* No zlib, so just copy the data to the result location */
-   memcpy(outdata, data, size);
-   outsize = size;
- #endif
  
    /* dump to outfile */
--- 91,97 ----