From d0e346d544cd3abb0007a68137b31923020f7aeb Mon Sep 17 00:00:00 2001 From: Kent Mein Date: Mon, 25 Nov 2002 12:02:15 +0000 Subject: updated .c files to include: #ifdef HAVE_CONFIG_H #include #endif Just need to finish cpp files now :) Kent -- mein@cs.umn.edu --- source/blender/imbuf/intern/allocimbuf.c | 4 ++++ source/blender/imbuf/intern/amiga.c | 4 ++++ source/blender/imbuf/intern/anim.c | 4 ++++ source/blender/imbuf/intern/antialias.c | 5 ++++- source/blender/imbuf/intern/bitplanes.c | 4 +++- source/blender/imbuf/intern/bmp_decode.c | 4 +++- source/blender/imbuf/intern/cmap.c | 4 ++++ source/blender/imbuf/intern/cspace.c | 4 ++++ source/blender/imbuf/intern/data.c | 4 ++++ source/blender/imbuf/intern/dither.c | 4 ++++ source/blender/imbuf/intern/divers.c | 4 +++- source/blender/imbuf/intern/filter.c | 5 ++++- source/blender/imbuf/intern/ham.c | 5 ++++- source/blender/imbuf/intern/hamx.c | 5 +++++ source/blender/imbuf/intern/iff.c | 6 ++++-- source/blender/imbuf/intern/imageprocess.c | 4 ++++ source/blender/imbuf/intern/iris.c | 5 +++-- source/blender/imbuf/intern/jpeg.c | 6 ++++-- source/blender/imbuf/intern/png_decode.c | 4 ++++ source/blender/imbuf/intern/png_encode.c | 4 ++++ source/blender/imbuf/intern/readimage.c | 4 ++++ source/blender/imbuf/intern/rectop.c | 4 ++++ source/blender/imbuf/intern/rotate.c | 4 ++++ source/blender/imbuf/intern/scaling.c | 4 ++++ source/blender/imbuf/intern/targa.c | 4 ++++ source/blender/imbuf/intern/util.c | 4 ++++ source/blender/imbuf/intern/writeimage.c | 4 ++++ 27 files changed, 105 insertions(+), 12 deletions(-) (limited to 'source/blender/imbuf') diff --git a/source/blender/imbuf/intern/allocimbuf.c b/source/blender/imbuf/intern/allocimbuf.c index 8d9eb17c9c2..01f887bd514 100644 --- a/source/blender/imbuf/intern/allocimbuf.c +++ b/source/blender/imbuf/intern/allocimbuf.c @@ -44,6 +44,10 @@ #include "IMB_divers.h" #include "IMB_allocimbuf.h" +#ifdef HAVE_CONFIG_H +#include +#endif + static unsigned int dfltcmap[16] = { 0x00000000, 0xffffffff, 0x777777ff, 0xccccccff, 0xcc3344ff, 0xdd8844ff, 0xccdd44ff, 0x888833ff, diff --git a/source/blender/imbuf/intern/amiga.c b/source/blender/imbuf/intern/amiga.c index a006b415d9c..393b16f6268 100644 --- a/source/blender/imbuf/intern/amiga.c +++ b/source/blender/imbuf/intern/amiga.c @@ -43,6 +43,10 @@ #include "IMB_bitplanes.h" #include "IMB_amiga.h" +#ifdef HAVE_CONFIG_H +#include +#endif + /* actually hard coded endianness */ #define GET_BIG_LONG(x) (((uchar *) (x))[0] << 24 | ((uchar *) (x))[1] << 16 | ((uchar *) (x))[2] << 8 | ((uchar *) (x))[3]) #define GET_LITTLE_LONG(x) (((uchar *) (x))[3] << 24 | ((uchar *) (x))[2] << 16 | ((uchar *) (x))[1] << 8 | ((uchar *) (x))[0]) diff --git a/source/blender/imbuf/intern/anim.c b/source/blender/imbuf/intern/anim.c index 9525fe4ab5f..7fcf094e5e7 100644 --- a/source/blender/imbuf/intern/anim.c +++ b/source/blender/imbuf/intern/anim.c @@ -41,6 +41,10 @@ #include #include +#ifdef HAVE_CONFIG_H +#include +#endif + #undef AVIIF_KEYFRAME // redefined in AVI_avi.h #undef AVIIF_LIST // redefined in AVI_avi.h diff --git a/source/blender/imbuf/intern/antialias.c b/source/blender/imbuf/intern/antialias.c index de45a47a708..6c6513bd107 100644 --- a/source/blender/imbuf/intern/antialias.c +++ b/source/blender/imbuf/intern/antialias.c @@ -40,9 +40,12 @@ #include "imbuf_patch.h" #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" - #include "IMB_allocimbuf.h" +#ifdef HAVE_CONFIG_H +#include +#endif + /* werking: 1 - zoek een overgang in een kolom diff --git a/source/blender/imbuf/intern/bitplanes.c b/source/blender/imbuf/intern/bitplanes.c index 0f1c4bf238c..60e04e0f5ca 100644 --- a/source/blender/imbuf/intern/bitplanes.c +++ b/source/blender/imbuf/intern/bitplanes.c @@ -39,10 +39,12 @@ #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" - #include "IMB_allocimbuf.h" #include "IMB_bitplanes.h" +#ifdef HAVE_CONFIG_H +#include +#endif unsigned int **imb_copyplanelist(struct ImBuf *ibuf) { diff --git a/source/blender/imbuf/intern/bmp_decode.c b/source/blender/imbuf/intern/bmp_decode.c index d8b38f367e0..79a249c6b81 100644 --- a/source/blender/imbuf/intern/bmp_decode.c +++ b/source/blender/imbuf/intern/bmp_decode.c @@ -40,11 +40,13 @@ #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" - #include "IMB_allocimbuf.h" #include "IMB_cmap.h" #include "IMB_bmp.h" +#ifdef HAVE_CONFIG_H +#include +#endif // some code copied from article on microsoft.com, copied // here for enhanced BMP support in the future diff --git a/source/blender/imbuf/intern/cmap.c b/source/blender/imbuf/intern/cmap.c index 300c3049dea..36dd5318380 100644 --- a/source/blender/imbuf/intern/cmap.c +++ b/source/blender/imbuf/intern/cmap.c @@ -42,6 +42,10 @@ #include "IMB_cmap.h" +#ifdef HAVE_CONFIG_H +#include +#endif + static short *lastcube = 0; static uchar *lastcoltab = 0; static short lastmaxcol; diff --git a/source/blender/imbuf/intern/cspace.c b/source/blender/imbuf/intern/cspace.c index 5cd2da5a998..51b1c3c6639 100644 --- a/source/blender/imbuf/intern/cspace.c +++ b/source/blender/imbuf/intern/cspace.c @@ -37,6 +37,10 @@ #include "imbuf_patch.h" #include "IMB_imbuf_types.h" +#ifdef HAVE_CONFIG_H +#include +#endif + /************************************************************************/ /* COLORSPACE */ /************************************************************************/ diff --git a/source/blender/imbuf/intern/data.c b/source/blender/imbuf/intern/data.c index ad9194cb80e..12e7b34436f 100644 --- a/source/blender/imbuf/intern/data.c +++ b/source/blender/imbuf/intern/data.c @@ -35,6 +35,10 @@ #include "imbuf.h" #include "matrix.h" +#ifdef HAVE_CONFIG_H +#include +#endif + /* static short quadbase[31] = { 150,133,117,102, diff --git a/source/blender/imbuf/intern/dither.c b/source/blender/imbuf/intern/dither.c index 608332af244..367e23abcd9 100644 --- a/source/blender/imbuf/intern/dither.c +++ b/source/blender/imbuf/intern/dither.c @@ -39,6 +39,10 @@ #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#ifdef HAVE_CONFIG_H +#include +#endif + void IMB_dit0(struct ImBuf * ibuf, short ofs, short bits) { int x, y, and, add, pix; diff --git a/source/blender/imbuf/intern/divers.c b/source/blender/imbuf/intern/divers.c index 81484ef6dfc..76197aa4eeb 100644 --- a/source/blender/imbuf/intern/divers.c +++ b/source/blender/imbuf/intern/divers.c @@ -38,9 +38,11 @@ #include "imbuf_patch.h" #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" - #include "IMB_divers.h" +#ifdef HAVE_CONFIG_H +#include +#endif void imb_checkncols(struct ImBuf *ibuf) /* struct ImBuf *ibuf; */ diff --git a/source/blender/imbuf/intern/filter.c b/source/blender/imbuf/intern/filter.c index dfc6e26e68a..aac5b2c625d 100644 --- a/source/blender/imbuf/intern/filter.c +++ b/source/blender/imbuf/intern/filter.c @@ -38,9 +38,12 @@ #include "imbuf_patch.h" #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" - #include "IMB_filter.h" +#ifdef HAVE_CONFIG_H +#include +#endif + /************************************************************************/ /* FILTERS */ diff --git a/source/blender/imbuf/intern/ham.c b/source/blender/imbuf/intern/ham.c index f9c6cf996a0..1ac6ca2bafe 100644 --- a/source/blender/imbuf/intern/ham.c +++ b/source/blender/imbuf/intern/ham.c @@ -38,11 +38,14 @@ #include "imbuf_patch.h" #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" - #include "IMB_cmap.h" #include "IMB_hamx.h" #include "IMB_ham.h" +#ifdef HAVE_CONFIG_H +#include +#endif + extern short alpha_col0; #define HAMB 0x0100 diff --git a/source/blender/imbuf/intern/hamx.c b/source/blender/imbuf/intern/hamx.c index 69e686ecdfc..4829b300e81 100644 --- a/source/blender/imbuf/intern/hamx.c +++ b/source/blender/imbuf/intern/hamx.c @@ -33,6 +33,11 @@ */ #include "BLI_blenlib.h" + +#ifdef HAVE_CONFIG_H +#include +#endif + #ifdef WIN32 #include "BLI_winstuff.h" #include diff --git a/source/blender/imbuf/intern/iff.c b/source/blender/imbuf/intern/iff.c index 640eb253c26..c23f18f73b0 100644 --- a/source/blender/imbuf/intern/iff.c +++ b/source/blender/imbuf/intern/iff.c @@ -33,13 +33,15 @@ */ #include "BLI_blenlib.h" - #include "imbuf.h" #include "imbuf_patch.h" #include "IMB_imbuf_types.h" - #include "IMB_iff.h" +#ifdef HAVE_CONFIG_H +#include +#endif + unsigned short imb_start_iff(struct ImBuf *ibuf, int file) { unsigned int *point, size, *buf; diff --git a/source/blender/imbuf/intern/imageprocess.c b/source/blender/imbuf/intern/imageprocess.c index dcdd0692fc4..78550903b69 100644 --- a/source/blender/imbuf/intern/imageprocess.c +++ b/source/blender/imbuf/intern/imageprocess.c @@ -42,6 +42,10 @@ #include "IMB_imbuf.h" +#ifdef HAVE_CONFIG_H +#include +#endif + /* Only this one is used liberally here, and in imbuf */ void IMB_convert_rgba_to_abgr(int size, unsigned int *rect) { diff --git a/source/blender/imbuf/intern/iris.c b/source/blender/imbuf/intern/iris.c index 72a9a76d044..e3a3e490941 100644 --- a/source/blender/imbuf/intern/iris.c +++ b/source/blender/imbuf/intern/iris.c @@ -34,15 +34,16 @@ #include #include "BLI_blenlib.h" - #include "imbuf.h" #include "imbuf_patch.h" #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" - #include "IMB_allocimbuf.h" #include "IMB_iris.h" +#ifdef HAVE_CONFIG_H +#include +#endif typedef struct { unsigned short imagic; /* stuff saved on disk . . */ diff --git a/source/blender/imbuf/intern/jpeg.c b/source/blender/imbuf/intern/jpeg.c index 8132997e5cd..7e6a63f3f5a 100644 --- a/source/blender/imbuf/intern/jpeg.c +++ b/source/blender/imbuf/intern/jpeg.c @@ -41,11 +41,13 @@ #include "imbuf_patch.h" #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" - #include "IMB_jpeg.h" - #include "jpeglib.h" +#ifdef HAVE_CONFIG_H +#include +#endif + /* the types are from the jpeg lib */ static void jpeg_error (j_common_ptr cinfo); static void init_source(j_decompress_ptr cinfo); diff --git a/source/blender/imbuf/intern/png_decode.c b/source/blender/imbuf/intern/png_decode.c index c4d795fa5af..3f9f3936270 100644 --- a/source/blender/imbuf/intern/png_decode.c +++ b/source/blender/imbuf/intern/png_decode.c @@ -32,6 +32,10 @@ #include "png.h" +#ifdef HAVE_CONFIG_H +#include +#endif + #ifdef _WIN32 #include "BLI_winstuff.h" #endif diff --git a/source/blender/imbuf/intern/png_encode.c b/source/blender/imbuf/intern/png_encode.c index a4423f57830..d5d25dceca6 100644 --- a/source/blender/imbuf/intern/png_encode.c +++ b/source/blender/imbuf/intern/png_encode.c @@ -33,6 +33,10 @@ #include "png.h" +#ifdef HAVE_CONFIG_H +#include +#endif + #ifdef WIN32 #include "BLI_winstuff.h" #endif diff --git a/source/blender/imbuf/intern/readimage.c b/source/blender/imbuf/intern/readimage.c index 9c8e42d0702..751d4106200 100644 --- a/source/blender/imbuf/intern/readimage.c +++ b/source/blender/imbuf/intern/readimage.c @@ -47,6 +47,10 @@ #include "IMB_jpeg.h" #include "IMB_bmp.h" +#ifdef HAVE_CONFIG_H +#include +#endif + /* actually hard coded endianness */ #define GET_BIG_LONG(x) (((uchar *) (x))[0] << 24 | ((uchar *) (x))[1] << 16 | ((uchar *) (x))[2] << 8 | ((uchar *) (x))[3]) #define GET_LITTLE_LONG(x) (((uchar *) (x))[3] << 24 | ((uchar *) (x))[2] << 16 | ((uchar *) (x))[1] << 8 | ((uchar *) (x))[0]) diff --git a/source/blender/imbuf/intern/rectop.c b/source/blender/imbuf/intern/rectop.c index 32f01eea6c8..baeda999e89 100644 --- a/source/blender/imbuf/intern/rectop.c +++ b/source/blender/imbuf/intern/rectop.c @@ -32,6 +32,10 @@ * $Id$ */ +#ifdef HAVE_CONFIG_H +#include +#endif + #ifdef WIN32 #include "BLI_winstuff.h" #endif diff --git a/source/blender/imbuf/intern/rotate.c b/source/blender/imbuf/intern/rotate.c index edd82347a8c..34ea65af1ab 100644 --- a/source/blender/imbuf/intern/rotate.c +++ b/source/blender/imbuf/intern/rotate.c @@ -32,6 +32,10 @@ * $Id$ */ +#ifdef HAVE_CONFIG_H +#include +#endif + #ifdef WIN32 #include "BLI_winstuff.h" #endif diff --git a/source/blender/imbuf/intern/scaling.c b/source/blender/imbuf/intern/scaling.c index eb397f6bced..477fbecf5c8 100644 --- a/source/blender/imbuf/intern/scaling.c +++ b/source/blender/imbuf/intern/scaling.c @@ -32,6 +32,10 @@ * $Id$ */ +#ifdef HAVE_CONFIG_H +#include +#endif + #ifdef WIN32 #include "BLI_winstuff.h" #endif diff --git a/source/blender/imbuf/intern/targa.c b/source/blender/imbuf/intern/targa.c index dd1451a939a..fc098deddf4 100644 --- a/source/blender/imbuf/intern/targa.c +++ b/source/blender/imbuf/intern/targa.c @@ -30,6 +30,10 @@ * $Id$ */ +#ifdef HAVE_CONFIG_H +#include +#endif + #ifdef WIN32 #include "BLI_winstuff.h" #include diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c index 52a29217bef..af95e0f8324 100644 --- a/source/blender/imbuf/intern/util.c +++ b/source/blender/imbuf/intern/util.c @@ -42,6 +42,10 @@ #include "IMB_targa.h" #include "IMB_png.h" +#ifdef HAVE_CONFIG_H +#include +#endif + /* from misc_util: flip the bytes from x */ #define GS(x) (((unsigned char *)(x))[0] << 8 | ((unsigned char *)(x))[1]) diff --git a/source/blender/imbuf/intern/writeimage.c b/source/blender/imbuf/intern/writeimage.c index e4d24097760..015a062f1cf 100644 --- a/source/blender/imbuf/intern/writeimage.c +++ b/source/blender/imbuf/intern/writeimage.c @@ -53,6 +53,10 @@ #include "IMB_bitplanes.h" #include "IMB_divers.h" +#ifdef HAVE_CONFIG_H +#include +#endif + short (*IMB_fp_png_encode)(struct ImBuf *ibuf, int file, int flags) = 0; -- cgit v1.2.3