archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

remove WITH_* defines from image formats, instead just dont build the files at all.

Browse Source
This commit is contained in:
Campbell Barton
2011-09-19 06:32:19 +00:00
parent 049838fe0c
commit 425a81a29b
9 changed files with 58 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extern/glew/include/GL/glew.h vendored
View File

@@ -16085,7 +16085,7 @@ GLEWAPI GLboolean glewContextIsSupported (const GLEWContext* ctx, const char* na
#else /* GLEW_MX */ #else /* GLEW_MX */
GLEWAPI GLenum glewInit (); GLEWAPI GLenum glewInit (void);
GLEWAPI GLboolean glewIsSupported (const char* name); GLEWAPI GLboolean glewIsSupported (const char* name);
#define glewIsExtensionSupported(x) glewIsSupported(x) #define glewIsExtensionSupported(x) glewIsSupported(x)

14
source/blender/imbuf/CMakeLists.txt
View File

@@ -58,13 +58,11 @@ set(SRC
intern/indexer.c intern/indexer.c
intern/indexer_dv.c intern/indexer_dv.c
intern/iris.c intern/iris.c
intern/jp2.c
intern/jpeg.c intern/jpeg.c
intern/md5.c intern/md5.c
intern/metadata.c intern/metadata.c
intern/module.c intern/module.c
intern/png.c intern/png.c
intern/radiance_hdr.c
intern/readimage.c intern/readimage.c
intern/rectop.c intern/rectop.c
intern/rotate.c intern/rotate.c
@@ -72,7 +70,6 @@ set(SRC
intern/targa.c intern/targa.c
intern/thumbs.c intern/thumbs.c
intern/thumbs_blend.c intern/thumbs_blend.c
intern/tiff.c
intern/util.c intern/util.c
intern/writeimage.c intern/writeimage.c
@@ -119,6 +116,10 @@ if(WITH_IMAGE_TIFF)
list(APPEND INC_SYS list(APPEND INC_SYS
${TIFF_INCLUDE_DIR} ${TIFF_INCLUDE_DIR}
) )
list(APPEND SRC
intern/tiff.c
)
add_definitions(-DWITH_TIFF) add_definitions(-DWITH_TIFF)
endif() endif()
@@ -126,6 +127,10 @@ if(WITH_IMAGE_OPENJPEG)
list(APPEND INC_SYS list(APPEND INC_SYS
${OPENJPEG_INCLUDE_DIRS} ${OPENJPEG_INCLUDE_DIRS}
) )
list(APPEND SRC
intern/jp2.c
)
add_definitions(-DWITH_OPENJPEG) add_definitions(-DWITH_OPENJPEG)
endif() endif()
@@ -165,6 +170,9 @@ if(WITH_IMAGE_CINEON)
endif() endif()
if(WITH_IMAGE_HDR) if(WITH_IMAGE_HDR)
list(APPEND SRC
intern/radiance_hdr.c
)
add_definitions(-DWITH_HDR) add_definitions(-DWITH_HDR)
endif() endif()

6
source/blender/imbuf/SConscript
View File

@@ -22,6 +22,8 @@ if env['WITH_BF_OPENEXR']:
if env['WITH_BF_TIFF']: if env['WITH_BF_TIFF']:
defs.append('WITH_TIFF') defs.append('WITH_TIFF')
else:
sources.remove('intern/tiff.c')
if env['WITH_BF_DDS']: if env['WITH_BF_DDS']:
defs.append('WITH_DDS') defs.append('WITH_DDS')
@@ -31,6 +33,8 @@ if env['WITH_BF_CINEON']:
if env['WITH_BF_HDR']: if env['WITH_BF_HDR']:
defs.append('WITH_HDR') defs.append('WITH_HDR')
else:
sources.remove('intern/radiance_hdr.c')
if env['WITH_BF_FFMPEG']: if env['WITH_BF_FFMPEG']:
defs.append('WITH_FFMPEG') defs.append('WITH_FFMPEG')
@@ -39,6 +43,8 @@ if env['WITH_BF_FFMPEG']:
if env['WITH_BF_OPENJPEG']: if env['WITH_BF_OPENJPEG']:
defs.append('WITH_OPENJPEG') defs.append('WITH_OPENJPEG')
incs += ' ' + env['BF_OPENJPEG_INC'] incs += ' ' + env['BF_OPENJPEG_INC']
else:
sources.remove('intern/jp2.c')
if env['WITH_BF_REDCODE']: if env['WITH_BF_REDCODE']:
defs.append('WITH_REDCODE') defs.append('WITH_REDCODE')

53
source/blender/imbuf/intern/IMB_anim.h
View File

@@ -38,21 +38,21 @@
#define IMB_ANIM_H #define IMB_ANIM_H
#ifdef _WIN32 #ifdef _WIN32
#define INC_OLE2 # define INC_OLE2
#include <windows.h> # include <windows.h>
#include <windowsx.h> # include <windowsx.h>
#include <mmsystem.h> # include <mmsystem.h>
#include <memory.h> # include <memory.h>
#include <commdlg.h> # include <commdlg.h>
#ifndef FREE_WINDOWS # ifndef FREE_WINDOWS
#include <vfw.h> # include <vfw.h>
#endif # endif
#undef AVIIF_KEYFRAME // redefined in AVI_avi.h # undef AVIIF_KEYFRAME // redefined in AVI_avi.h
#undef AVIIF_LIST // redefined in AVI_avi.h # undef AVIIF_LIST // redefined in AVI_avi.h
#define FIXCC(fcc) if (fcc == 0) fcc = mmioFOURCC('N', 'o', 'n', 'e'); \ # define FIXCC(fcc) if (fcc == 0) fcc = mmioFOURCC('N', 'o', 'n', 'e'); \
if (fcc == BI_RLE8) fcc = mmioFOURCC('R', 'l', 'e', '8'); if (fcc == BI_RLE8) fcc = mmioFOURCC('R', 'l', 'e', '8');
#endif #endif
@@ -60,10 +60,11 @@
#include <ctype.h> #include <ctype.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#ifndef _WIN32
#include <dirent.h> #ifdef _WIN32
# include <io.h>
#else #else
#include <io.h> # include <dirent.h>
#endif #endif
#include "BLI_blenlib.h" /* BLI_remlink BLI_filesize BLI_addtail #include "BLI_blenlib.h" /* BLI_remlink BLI_filesize BLI_addtail
@@ -74,23 +75,23 @@
#include "AVI_avi.h" #include "AVI_avi.h"
#ifdef WITH_QUICKTIME #ifdef WITH_QUICKTIME
#if defined(_WIN32) || defined(__APPLE__) # if defined(_WIN32) || defined(__APPLE__)
#include "quicktime_import.h" # include "quicktime_import.h"
#endif /* _WIN32 || __APPLE__ */ # endif /* _WIN32 || __APPLE__ */
#endif /* WITH_QUICKTIME */ #endif /* WITH_QUICKTIME */
#ifdef WITH_FFMPEG #ifdef WITH_FFMPEG
#include <libavformat/avformat.h> # include <libavformat/avformat.h>
#include <libavcodec/avcodec.h> # include <libavcodec/avcodec.h>
#include <libswscale/swscale.h> # include <libswscale/swscale.h>
#endif #endif
#ifdef WITH_REDCODE #ifdef WITH_REDCODE
#ifdef _WIN32 /* on windows we use the one in extern instead */ # ifdef _WIN32 /* on windows we use the one in extern instead */
#include "libredcode/format.h" # include "libredcode/format.h"
#else # else
#include "libredcode/format.h" # include "libredcode/format.h"
#endif # endif
#endif #endif
#include "IMB_imbuf_types.h" #include "IMB_imbuf_types.h"

2
source/blender/imbuf/intern/IMB_indexer.h
View File

@@ -28,7 +28,7 @@
#define IMB_INDEXER_H #define IMB_INDEXER_H
#ifdef WIN32 #ifdef WIN32
#include <io.h> # include <io.h>
#endif #endif
#include <stdlib.h> #include <stdlib.h>

25
source/blender/imbuf/intern/imbuf.h
View File

@@ -44,7 +44,7 @@
#include <stdio.h> #include <stdio.h>
#ifndef WIN32 #ifndef WIN32
#include <unistd.h> # include <unistd.h>
#endif #endif
#include <fcntl.h> #include <fcntl.h>
@@ -53,11 +53,8 @@
#include <math.h> #include <math.h>
#ifndef WIN32 #ifndef WIN32
#include <sys/mman.h> # include <sys/mman.h>
#endif # define O_BINARY 0
#if !defined(WIN32)
#define O_BINARY 0
#endif #endif
#define SWAP_SHORT(x) (((x & 0xff) << 8) | ((x >> 8) & 0xff)) #define SWAP_SHORT(x) (((x & 0xff) << 8) | ((x >> 8) & 0xff))
@@ -66,15 +63,15 @@
#define ENDIAN_NOP(x) (x) #define ENDIAN_NOP(x) (x)
#if defined(__sgi) || defined(__sparc) || defined(__sparc__) || defined (__PPC__) || defined (__hppa__) || (defined (__APPLE__) && !defined(__LITTLE_ENDIAN__)) #if defined(__sgi) || defined(__sparc) || defined(__sparc__) || defined (__PPC__) || defined (__hppa__) || (defined (__APPLE__) && !defined(__LITTLE_ENDIAN__))
#define LITTLE_SHORT SWAP_SHORT # define LITTLE_SHORT SWAP_SHORT
#define LITTLE_LONG SWAP_LONG # define LITTLE_LONG SWAP_LONG
#define BIG_SHORT ENDIAN_NOP # define BIG_SHORT ENDIAN_NOP
#define BIG_LONG ENDIAN_NOP # define BIG_LONG ENDIAN_NOP
#else #else
#define LITTLE_SHORT ENDIAN_NOP # define LITTLE_SHORT ENDIAN_NOP
#define LITTLE_LONG ENDIAN_NOP # define LITTLE_LONG ENDIAN_NOP
#define BIG_SHORT SWAP_SHORT # define BIG_SHORT SWAP_SHORT
#define BIG_LONG SWAP_LONG # define BIG_LONG SWAP_LONG
#endif #endif
typedef unsigned char uchar; typedef unsigned char uchar;

5
source/blender/imbuf/intern/jp2.c
View File

@@ -25,9 +25,6 @@
* \ingroup imbuf * \ingroup imbuf
*/ */
#ifdef WITH_OPENJPEG
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "BLI_blenlib.h" #include "BLI_blenlib.h"
@@ -751,5 +748,3 @@ int imb_savejp2(struct ImBuf *ibuf, const char *name, int flags) {
return 1; return 1;
} }
#endif /* WITH_OPENJPEG */

7
source/blender/imbuf/intern/radiance_hdr.c
View File

@@ -33,9 +33,6 @@
* \ingroup imbuf * \ingroup imbuf
*/ */
#ifdef WITH_HDR
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------
Radiance High Dynamic Range image file IO Radiance High Dynamic Range image file IO
For description and code for reading/writing of radiance hdr files For description and code for reading/writing of radiance hdr files
@@ -45,7 +42,7 @@
*/ */
#ifdef WIN32 #ifdef WIN32
#include <io.h> # include <io.h>
#endif #endif
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
@@ -369,5 +366,3 @@ int imb_savehdr(struct ImBuf *ibuf, const char *name, int flags)
fclose(file); fclose(file);
return 1; return 1;
} }
#endif /* WITH_HDR */

4
source/blender/imbuf/intern/tiff.c
View File

@@ -45,8 +45,6 @@
* used to compress images. * used to compress images.
*/ */
#ifdef WITH_TIFF
#include <string.h> #include <string.h>
#include "imbuf.h" #include "imbuf.h"
@@ -836,5 +834,3 @@ int imb_savetiff(ImBuf *ibuf, const char *name, int flags)
if(pixels16) _TIFFfree(pixels16); if(pixels16) _TIFFfree(pixels16);
return (1); return (1);
} }
#endif /* WITH_TIFF */