Enlightenment CVS committal
Author : kwo
Project : e17
Module : libs/imlib2
Dir : e17/libs/imlib2/src/modules/loaders
Modified Files:
Makefile.am loader_argb.c loader_bmp.c loader_bz2.c
loader_gif.c loader_id3.c loader_jpeg.c loader_lbm.c
loader_png.c loader_pnm.c loader_tga.c loader_tiff.c
loader_xpm.c loader_zlib.c
Added Files:
loader_common.h
Log Message:
Add option to build with visibility=hidden + associated fixups.
===================================================================
RCS file: /cvs/e/e17/libs/imlib2/src/modules/loaders/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- Makefile.am 30 Dec 2005 02:50:09 -0000 1.5
+++ Makefile.am 9 Apr 2007 12:55:29 -0000 1.6
@@ -46,6 +46,8 @@
tga.la \
lbm.la
+EXTRA_DIST = loader_common.h
+
jpeg_la_SOURCES = loader_jpeg.c
jpeg_la_LDFLAGS = -module -avoid-version
jpeg_la_LIBADD = @JPEGLIBS@ $(top_builddir)/src/lib/libImlib2.la
===================================================================
RCS file: /cvs/e/e17/libs/imlib2/src/modules/loaders/loader_argb.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- loader_argb.c 5 Nov 2006 04:58:06 -0000 1.3
+++ loader_argb.c 9 Apr 2007 12:55:29 -0000 1.4
@@ -1,17 +1,4 @@
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "common.h"
-#include <string.h>
-
-#include "image.h"
-
-char load(ImlibImage * im, ImlibProgressFunction progress,
- char progress_granularity, char immediate_load);
-char save(ImlibImage * im, ImlibProgressFunction progress,
- char progress_granularity);
-void formats(ImlibLoader * l);
+#include "loader_common.h"
#define SWAP32(x) (x) = \
((((x) & 0x000000ff ) << 24) |\
===================================================================
RCS file: /cvs/e/e17/libs/imlib2/src/modules/loaders/loader_bmp.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- loader_bmp.c 6 Sep 2006 07:09:05 -0000 1.7
+++ loader_bmp.c 9 Apr 2007 12:55:29 -0000 1.8
@@ -8,22 +8,8 @@
* - Simplify and make secure RLE encoding
* - Fix 16 and 32 bit depth (old code was incorrect and it's commented)
*/
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "common.h"
+#include "loader_common.h"
#include <sys/stat.h>
-#include <string.h>
-
-#include "image.h"
-
-char load(ImlibImage * im, ImlibProgressFunction progress,
- char progress_granularity, char immediate_load);
-char save(ImlibImage * im, ImlibProgressFunction progress,
- char progress_granularity);
-void formats(ImlibLoader * l);
typedef struct tagRGBQUAD {
unsigned char rgbBlue;
===================================================================
RCS file: /cvs/e/e17/libs/imlib2/src/modules/loaders/loader_bz2.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- loader_bz2.c 26 Mar 2005 13:13:51 -0000 1.7
+++ loader_bz2.c 9 Apr 2007 12:55:29 -0000 1.8
@@ -1,18 +1,9 @@
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdio.h>
+#include "loader_common.h"
#include <bzlib.h>
-#include <stdlib.h>
-#include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <assert.h>
-
-#include "common.h"
-#include "image.h"
#define OUTBUF_SIZE 16384
#define INBUF_SIZE 1024
===================================================================
RCS file: /cvs/e/e17/libs/imlib2/src/modules/loaders/loader_gif.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- loader_gif.c 5 Nov 2006 04:58:06 -0000 1.3
+++ loader_gif.c 9 Apr 2007 12:55:29 -0000 1.4
@@ -1,22 +1,8 @@
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "common.h"
-#include <stdio.h>
+#include "loader_common.h"
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include <string.h>
-
-#include "image.h"
#include <gif_lib.h>
-
-char load(ImlibImage * im, ImlibProgressFunction progress,
- char progress_granularity, char immediate_load);
-char save(ImlibImage * im, ImlibProgressFunction progress,
- char progress_granularity);
-void formats(ImlibLoader * l);
char
load(ImlibImage * im, ImlibProgressFunction progress, char
progress_granularity,
===================================================================
RCS file: /cvs/e/e17/libs/imlib2/src/modules/loaders/loader_id3.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- loader_id3.c 22 Aug 2005 09:55:18 -0000 1.5
+++ loader_id3.c 9 Apr 2007 12:55:29 -0000 1.6
@@ -1,19 +1,10 @@
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
+#include "loader_common.h"
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <assert.h>
#include <errno.h>
#include <limits.h>
-
-#include "image.h"
-
#include <id3tag.h>
#if ! defined (__STDC_VERSION__) || __STDC_VERSION__ < 199901L
===================================================================
RCS file: /cvs/e/e17/libs/imlib2/src/modules/loaders/loader_jpeg.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- loader_jpeg.c 5 Nov 2006 04:58:06 -0000 1.4
+++ loader_jpeg.c 9 Apr 2007 12:55:29 -0000 1.5
@@ -1,11 +1,4 @@
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "common.h"
-#include <string.h>
-
-#include "image.h"
+#include "loader_common.h"
#include <jpeglib.h>
#include <setjmp.h>
@@ -15,16 +8,7 @@
};
typedef struct ImLib_JPEG_error_mgr *emptr;
-void _JPEGFatalErrorHandler(j_common_ptr cinfo);
-void _JPEGErrorHandler(j_common_ptr cinfo);
-void _JPEGErrorHandler2(j_common_ptr cinfo, int msg_level);
-char load(ImlibImage * im, ImlibProgressFunction progress,
- char progress_granularity, char immediate_load);
-char save(ImlibImage * im, ImlibProgressFunction progress,
- char progress_granularity);
-void formats(ImlibLoader * l);
-
-void
+static void
_JPEGFatalErrorHandler(j_common_ptr cinfo)
{
emptr errmgr;
@@ -35,7 +19,7 @@
return;
}
-void
+static void
_JPEGErrorHandler(j_common_ptr cinfo)
{
emptr errmgr;
@@ -46,7 +30,7 @@
return;
}
-void
+static void
_JPEGErrorHandler2(j_common_ptr cinfo, int msg_level)
{
emptr errmgr;
===================================================================
RCS file: /cvs/e/e17/libs/imlib2/src/modules/loaders/loader_lbm.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- loader_lbm.c 5 Nov 2006 04:58:06 -0000 1.3
+++ loader_lbm.c 9 Apr 2007 12:55:29 -0000 1.4
@@ -11,19 +11,7 @@
* Version: 2004-08-28
*------------------------------------------------------------------------------*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "common.h"
-#include "image.h"
-
-char load(ImlibImage *im, ImlibProgressFunction progress, char
progress_granularity, char immediate_load);
-#if 0
-char save(ImlibImage *im, ImlibProgressFunction progress, char
progress_granularity);
-#endif
-void formats(ImlibLoader *l);
-
+#include "loader_common.h"
#define L2RLONG(a) ((((long)((a)[0]) & 0xff) << 24) + (((long)((a)[1]) & 0xff)
<< 16) + (((long)((a)[2]) & 0xff) << 8) + ((long)((a)[3]) & 0xff))
#define L2RWORD(a) ((((long)((a)[0]) & 0xff) << 8) + ((long)((a)[1]) & 0xff))
@@ -52,13 +40,6 @@
int count;
int rle;
} ILBM;
-
-static void freeilbm(ILBM *);
-static int loadchunks(char *, ILBM *, int);
-static void bodyrow(unsigned char *, int, ILBM *);
-static unsigned char scalegun(unsigned char, int);
-static void scalecmap(ILBM *);
-static void deplane(DATA32 *, int, ILBM *, unsigned char **);
/*------------------------------------------------------------------------------
===================================================================
RCS file: /cvs/e/e17/libs/imlib2/src/modules/loaders/loader_png.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- loader_png.c 5 Nov 2006 04:58:06 -0000 1.3
+++ loader_png.c 9 Apr 2007 12:55:29 -0000 1.4
@@ -1,11 +1,4 @@
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "common.h"
-#include <string.h>
-
-#include "image.h"
+#include "loader_common.h"
#include <png.h>
/* this is a quick sample png loader module... nice and small isnt it? */
@@ -13,13 +6,6 @@
/* PNG stuff */
#define PNG_BYTES_TO_CHECK 4
-char load(ImlibImage * im, ImlibProgressFunction progress,
- char progress_granularity, char immediate_load);
-char save(ImlibImage * im, ImlibProgressFunction progress,
- char progress_granularity);
-void formats(ImlibLoader * l);
-
-static void comment_free(ImlibImage * im, void *data);
static void
comment_free(ImlibImage * im, void *data)
{
===================================================================
RCS file: /cvs/e/e17/libs/imlib2/src/modules/loaders/loader_pnm.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- loader_pnm.c 5 Nov 2006 04:58:06 -0000 1.3
+++ loader_pnm.c 9 Apr 2007 12:55:29 -0000 1.4
@@ -1,17 +1,5 @@
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "common.h"
-#include <string.h>
+#include "loader_common.h"
#include <ctype.h>
-#include "image.h"
-
-char load(ImlibImage * im, ImlibProgressFunction progress,
- char progress_granularity, char immediate_load);
-char save(ImlibImage * im, ImlibProgressFunction progress,
- char progress_granularity);
-void formats(ImlibLoader * l);
char
load(ImlibImage * im, ImlibProgressFunction progress,
===================================================================
RCS file: /cvs/e/e17/libs/imlib2/src/modules/loaders/loader_tga.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- loader_tga.c 5 Nov 2006 04:58:06 -0000 1.5
+++ loader_tga.c 9 Apr 2007 12:55:29 -0000 1.6
@@ -9,25 +9,11 @@
*
* header/footer structures courtesy of the GIMP Targa plugin
*/
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "common.h"
-#include <stdio.h>
-#include <string.h>
+#include "loader_common.h"
#include <sys/stat.h>
#include <sys/mman.h>
-#include "image.h"
#include "colormod.h"
#include "blend.h"
-
-char load(ImlibImage * im, ImlibProgressFunction progress,
- char progress_granularity, char immediate_load);
-char save(ImlibImage * im, ImlibProgressFunction progress,
- char progress_granularity);
-void formats(ImlibLoader * l);
/* flip an inverted image - see RLE reading below */
static void tgaflip(DATA32 * in, int w, int h);
===================================================================
RCS file: /cvs/e/e17/libs/imlib2/src/modules/loaders/loader_tiff.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- loader_tiff.c 5 Nov 2006 04:58:06 -0000 1.8
+++ loader_tiff.c 9 Apr 2007 12:55:29 -0000 1.9
@@ -1,17 +1,9 @@
/* To do: */
/* o Need code to handle tiff with different orientations */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "common.h"
-#include <string.h>
-
+#include "loader_common.h"
#include <setjmp.h>
#include <stdarg.h>
-#include <stdio.h>
-#include "image.h"
#include <tiffio.h>
/* This is a wrapper data structure for TIFFRGBAImage, so that data can be */
@@ -31,21 +23,8 @@
typedef struct TIFFRGBAImage_Extra TIFFRGBAImage_Extra;
-static void put_contig_and_raster(TIFFRGBAImage *, uint32 *,
- uint32, uint32, uint32, uint32,
int32,
- int32, unsigned char *);
-static void put_separate_and_raster(TIFFRGBAImage *, uint32 *, uint32,
- uint32, uint32, uint32, int32,
- int32, unsigned char *,
- unsigned char *, unsigned char *,
- unsigned char *);
static void raster(TIFFRGBAImage_Extra * img, uint32 * raster, uint32
x,
uint32 y, uint32 w, uint32 h);
-char load(ImlibImage * im, ImlibProgressFunction progress,
- char progress_granularity, char immediate_load);
-char save(ImlibImage * im, ImlibProgressFunction progress,
- char progress_granularity);
-void formats(ImlibLoader * l);
static void
put_contig_and_raster(TIFFRGBAImage * img, uint32 * rast,
===================================================================
RCS file: /cvs/e/e17/libs/imlib2/src/modules/loaders/loader_xpm.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- loader_xpm.c 5 Nov 2006 04:58:06 -0000 1.6
+++ loader_xpm.c 9 Apr 2007 12:55:29 -0000 1.7
@@ -1,21 +1,7 @@
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "common.h"
-#include <stdio.h>
+#include "loader_common.h"
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include <string.h>
-
-#include "image.h"
-
-char load(ImlibImage * im, ImlibProgressFunction progress,
- char progress_granularity, char immediate_load);
-char save(ImlibImage * im, ImlibProgressFunction progress,
- char progress_granularity);
-void formats(ImlibLoader * l);
static FILE *rgb_txt = NULL;
===================================================================
RCS file: /cvs/e/e17/libs/imlib2/src/modules/loaders/loader_zlib.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- loader_zlib.c 26 Mar 2005 13:05:30 -0000 1.4
+++ loader_zlib.c 9 Apr 2007 12:55:29 -0000 1.5
@@ -1,17 +1,9 @@
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
+#include "loader_common.h"
#include <zlib.h>
-#include <stdlib.h>
-#include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <assert.h>
-
-#include "common.h"
-#include "image.h"
#define OUTBUF_SIZE 16484
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
