diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-04-30 18:24:11 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-30 18:24:11 +0400 |
commit | 112162e09e486d787ace5ea4373fde8106f898c0 (patch) | |
tree | 7e1dabf372b32fc00cf68c54c490967031b24d9b /source/blender/imbuf | |
parent | 99c29814f0c3960d3f0878ae02e9a100c079edc8 (diff) |
code cleanup: header cleanup
Diffstat (limited to 'source/blender/imbuf')
21 files changed, 75 insertions, 85 deletions
diff --git a/source/blender/imbuf/IMB_imbuf_types.h b/source/blender/imbuf/IMB_imbuf_types.h index 076f518585b..12d71be658e 100644 --- a/source/blender/imbuf/IMB_imbuf_types.h +++ b/source/blender/imbuf/IMB_imbuf_types.h @@ -1,17 +1,4 @@ /* - * IMB_imbuf_types.h (mar-2001 nzc) - * - * Types needed for using the image buffer. - * - * Imbuf is external code, slightly adapted to live in the Blender - * context. It requires an external jpeg module, and the avi-module - * (also external code) in order to function correctly. - * - * This file contains types and some constants that go with them. Most - * are self-explanatory (e.g. IS_amiga tests whether the buffer - * contains an Amiga-format file). - * - * * ***** BEGIN GPL LICENSE BLOCK ***** * * This program is free software; you can redistribute it and/or @@ -37,16 +24,27 @@ * * ***** END GPL LICENSE BLOCK ***** */ + +#ifndef __IMB_IMBUF_TYPES_H__ +#define __IMB_IMBUF_TYPES_H__ + /** * \file IMB_imbuf_types.h * \ingroup imbuf * \brief Contains defines and structs used throughout the imbuf module. * \todo Clean up includes. + * + * Types needed for using the image buffer. + * + * Imbuf is external code, slightly adapted to live in the Blender + * context. It requires an external jpeg module, and the avi-module + * (also external code) in order to function correctly. + * + * This file contains types and some constants that go with them. Most + * are self-explanatory (e.g. IS_amiga tests whether the buffer + * contains an Amiga-format file). */ -#ifndef __IMB_IMBUF_TYPES_H__ -#define __IMB_IMBUF_TYPES_H__ - struct ImMetaData; #define IB_MIPMAP_LEVELS 20 diff --git a/source/blender/imbuf/intern/IMB_allocimbuf.h b/source/blender/imbuf/intern/IMB_allocimbuf.h index 27be9ea1cab..047228926ee 100644 --- a/source/blender/imbuf/intern/IMB_allocimbuf.h +++ b/source/blender/imbuf/intern/IMB_allocimbuf.h @@ -1,7 +1,4 @@ /* - * allocimbuf.h - * - * * ***** BEGIN GPL LICENSE BLOCK ***** * * This program is free software; you can redistribute it and/or diff --git a/source/blender/imbuf/intern/IMB_anim.h b/source/blender/imbuf/intern/IMB_anim.h index 8724f3804d0..6920d49ff51 100644 --- a/source/blender/imbuf/intern/IMB_anim.h +++ b/source/blender/imbuf/intern/IMB_anim.h @@ -1,7 +1,4 @@ /* - * allocimbuf.h - * - * * ***** BEGIN GPL LICENSE BLOCK ***** * * This program is free software; you can redistribute it and/or diff --git a/source/blender/imbuf/intern/IMB_filter.h b/source/blender/imbuf/intern/IMB_filter.h index 6199cc13bb9..eaedb160c94 100644 --- a/source/blender/imbuf/intern/IMB_filter.h +++ b/source/blender/imbuf/intern/IMB_filter.h @@ -1,7 +1,4 @@ /* - * filter.h - * - * * ***** BEGIN GPL LICENSE BLOCK ***** * * This program is free software; you can redistribute it and/or @@ -27,6 +24,7 @@ * * ***** END GPL LICENSE BLOCK ***** */ + /** * \file IMB_filter.h * \ingroup imbuf diff --git a/source/blender/imbuf/intern/cineon/cineonfile.h b/source/blender/imbuf/intern/cineon/cineonfile.h index ea321c87d48..e681153aa6e 100644 --- a/source/blender/imbuf/intern/cineon/cineonfile.h +++ b/source/blender/imbuf/intern/cineon/cineonfile.h @@ -1,6 +1,3 @@ -/** \file blender/imbuf/intern/cineon/cineonfile.h - * \ingroup imbcineon - */ /* * Cineon image file format library definitions. * Cineon file format structures. @@ -29,6 +26,10 @@ #ifndef __CINEONFILE_H__ #define __CINEONFILE_H__ +/** \file blender/imbuf/intern/cineon/cineonfile.h + * \ingroup imbcineon + */ + #include "logImageCore.h" #ifdef __cplusplus diff --git a/source/blender/imbuf/intern/cineon/cineonlib.c b/source/blender/imbuf/intern/cineon/cineonlib.c index ae9f8e0fe97..a9001303679 100644 --- a/source/blender/imbuf/intern/cineon/cineonlib.c +++ b/source/blender/imbuf/intern/cineon/cineonlib.c @@ -1,6 +1,3 @@ -/** \file blender/imbuf/intern/cineon/cineonlib.c - * \ingroup imbcineon - */ /* * Cineon image file format library routines. * @@ -22,6 +19,10 @@ * */ +/** \file blender/imbuf/intern/cineon/cineonlib.c + * \ingroup imbcineon + */ + #include "cineonlib.h" #include "cineonfile.h" diff --git a/source/blender/imbuf/intern/cineon/cineonlib.h b/source/blender/imbuf/intern/cineon/cineonlib.h index 48b5a001b9a..ef992c527b0 100644 --- a/source/blender/imbuf/intern/cineon/cineonlib.h +++ b/source/blender/imbuf/intern/cineon/cineonlib.h @@ -1,6 +1,3 @@ -/** \file blender/imbuf/intern/cineon/cineonlib.h - * \ingroup imbcineon - */ /* * Cineon image file format library definitions. * Also handles DPX files (almost) @@ -26,6 +23,10 @@ #ifndef __CINEONLIB_H__ #define __CINEONLIB_H__ +/** \file blender/imbuf/intern/cineon/cineonlib.h + * \ingroup imbcineon + */ + #include "logImageCore.h" #ifdef __cplusplus diff --git a/source/blender/imbuf/intern/cineon/dpxfile.h b/source/blender/imbuf/intern/cineon/dpxfile.h index dc8fc0bdbd2..8846c7418d5 100644 --- a/source/blender/imbuf/intern/cineon/dpxfile.h +++ b/source/blender/imbuf/intern/cineon/dpxfile.h @@ -1,6 +1,3 @@ -/** \file blender/imbuf/intern/cineon/dpxfile.h - * \ingroup imbcineon - */ /* * Cineon image file format library definitions. * Dpx file format structures. @@ -29,6 +26,10 @@ #ifndef __DPXFILE_H__ #define __DPXFILE_H__ +/** \file blender/imbuf/intern/cineon/dpxfile.h + * \ingroup imbcineon + */ + #include "logImageCore.h" #ifdef __cplusplus diff --git a/source/blender/imbuf/intern/cineon/dpxlib.c b/source/blender/imbuf/intern/cineon/dpxlib.c index c9b9901a495..a4b8c9d3f36 100644 --- a/source/blender/imbuf/intern/cineon/dpxlib.c +++ b/source/blender/imbuf/intern/cineon/dpxlib.c @@ -1,6 +1,3 @@ -/** \file blender/imbuf/intern/cineon/dpxlib.c - * \ingroup imbcineon - */ /* * Dpx image file format library routines. * @@ -22,6 +19,10 @@ * */ +/** \file blender/imbuf/intern/cineon/dpxlib.c + * \ingroup imbcineon + */ + #include "dpxfile.h" #include "dpxlib.h" diff --git a/source/blender/imbuf/intern/cineon/dpxlib.h b/source/blender/imbuf/intern/cineon/dpxlib.h index b09c699ae5b..eb3937f2bf7 100644 --- a/source/blender/imbuf/intern/cineon/dpxlib.h +++ b/source/blender/imbuf/intern/cineon/dpxlib.h @@ -1,6 +1,3 @@ -/** \file blender/imbuf/intern/cineon/dpxlib.h - * \ingroup imbcineon - */ /* * DPX image file format library definitions. * @@ -25,6 +22,10 @@ #ifndef __DPXLIB_H__ #define __DPXLIB_H__ +/** \file blender/imbuf/intern/cineon/dpxlib.h + * \ingroup imbcineon + */ + #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/imbuf/intern/cineon/logImageCore.c b/source/blender/imbuf/intern/cineon/logImageCore.c index e1f1500cb83..f772cc7d477 100644 --- a/source/blender/imbuf/intern/cineon/logImageCore.c +++ b/source/blender/imbuf/intern/cineon/logImageCore.c @@ -1,6 +1,3 @@ -/** \file blender/imbuf/intern/cineon/logImageCore.c - * \ingroup imbcineon - */ /* * Cineon image file format library routines. * @@ -22,6 +19,10 @@ * */ +/** \file blender/imbuf/intern/cineon/logImageCore.c + * \ingroup imbcineon + */ + #include "logImageCore.h" #include <time.h> /* strftime() */ diff --git a/source/blender/imbuf/intern/cineon/logImageCore.h b/source/blender/imbuf/intern/cineon/logImageCore.h index c8592621f08..7d88c10c2d6 100644 --- a/source/blender/imbuf/intern/cineon/logImageCore.h +++ b/source/blender/imbuf/intern/cineon/logImageCore.h @@ -1,6 +1,3 @@ -/** \file blender/imbuf/intern/cineon/logImageCore.h - * \ingroup imbcineon - */ /* * Cineon image file format library definitions. * Cineon and DPX common structures. @@ -30,6 +27,10 @@ #ifndef __LOGIMAGECORE_H__ #define __LOGIMAGECORE_H__ +/** \file blender/imbuf/intern/cineon/logImageCore.h + * \ingroup imbcineon + */ + #include <stdio.h> #include "logImageLib.h" diff --git a/source/blender/imbuf/intern/cineon/logImageLib.c b/source/blender/imbuf/intern/cineon/logImageLib.c index f97df005fc8..f479220d82c 100644 --- a/source/blender/imbuf/intern/cineon/logImageLib.c +++ b/source/blender/imbuf/intern/cineon/logImageLib.c @@ -1,6 +1,3 @@ -/** \file blender/imbuf/intern/cineon/logImageLib.c - * \ingroup imbcineon - */ /* * Cineon and DPX image file format library routines. * @@ -22,6 +19,10 @@ * */ +/** \file blender/imbuf/intern/cineon/logImageLib.c + * \ingroup imbcineon + */ + #include "cineonlib.h" #include "dpxlib.h" diff --git a/source/blender/imbuf/intern/cineon/logImageLib.h b/source/blender/imbuf/intern/cineon/logImageLib.h index 669e25d009f..1c24358e4ef 100644 --- a/source/blender/imbuf/intern/cineon/logImageLib.h +++ b/source/blender/imbuf/intern/cineon/logImageLib.h @@ -1,6 +1,3 @@ -/** \file blender/imbuf/intern/cineon/logImageLib.h - * \ingroup imbcineon - */ /* * Common library definitions for Cineon and DPX image files. * @@ -25,6 +22,10 @@ #ifndef __LOGIMAGELIB_H__ #define __LOGIMAGELIB_H__ +/** \file blender/imbuf/intern/cineon/logImageLib.h + * \ingroup imbcineon + */ + #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/imbuf/intern/cineon/logmemfile.c b/source/blender/imbuf/intern/cineon/logmemfile.c index 3db4241cc14..a9938582f2a 100644 --- a/source/blender/imbuf/intern/cineon/logmemfile.c +++ b/source/blender/imbuf/intern/cineon/logmemfile.c @@ -1,6 +1,3 @@ -/** \file blender/imbuf/intern/cineon/logmemfile.c - * \ingroup imbcineon - */ /* * Cineon image file format library routines. * @@ -21,6 +18,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ + +/** \file blender/imbuf/intern/cineon/logmemfile.c + * \ingroup imbcineon + */ + #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/source/blender/imbuf/intern/cineon/logmemfile.h b/source/blender/imbuf/intern/cineon/logmemfile.h index 2611463148e..df3589a70d3 100644 --- a/source/blender/imbuf/intern/cineon/logmemfile.h +++ b/source/blender/imbuf/intern/cineon/logmemfile.h @@ -1,6 +1,3 @@ -/** \file blender/imbuf/intern/cineon/logmemfile.h - * \ingroup imbcineon - */ /* * Cineon image file format library routines. * @@ -25,6 +22,10 @@ #ifndef __LOGMEMFILE_H__ #define __LOGMEMFILE_H__ +/** \file blender/imbuf/intern/cineon/logmemfile.h + * \ingroup imbcineon + */ + int logimage_fseek(void* logfile, intptr_t offsett, int origin); int logimage_fwrite(void *buffer, unsigned int size, unsigned int count, void *logfile); int logimage_fread(void *buffer, unsigned int size, unsigned int count, void *logfile); diff --git a/source/blender/imbuf/intern/filter.c b/source/blender/imbuf/intern/filter.c index 7b17334f3c9..bc5e85a3c55 100644 --- a/source/blender/imbuf/intern/filter.c +++ b/source/blender/imbuf/intern/filter.c @@ -1,6 +1,4 @@ /* - * - * * ***** BEGIN GPL LICENSE BLOCK ***** * * This program is free software; you can redistribute it and/or @@ -33,13 +31,10 @@ * \ingroup imbuf */ - #include "MEM_guardedalloc.h" #include "BLI_utildefines.h" - - #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" #include "IMB_filter.h" diff --git a/source/blender/imbuf/intern/imageprocess.c b/source/blender/imbuf/intern/imageprocess.c index 2109891a3ce..dea941c9716 100644 --- a/source/blender/imbuf/intern/imageprocess.c +++ b/source/blender/imbuf/intern/imageprocess.c @@ -23,17 +23,19 @@ * Contributor(s): none yet. * * ***** END GPL LICENSE BLOCK ***** + */ + +/** \file blender/imbuf/intern/imageprocess.c + * \ingroup imbuf + * * This file was moved here from the src/ directory. It is meant to * deal with endianness. It resided in a general blending lib. The * other functions were only used during rendering. This single * function remained. It should probably move to imbuf/intern/util.c, - * but we'll keep it here for the time being. (nzc)*/ - -/** \file blender/imbuf/intern/imageprocess.c - * \ingroup imbuf + * but we'll keep it here for the time being. (nzc) + * */ - /* imageprocess.c MIXED MODEL * * april 95 diff --git a/source/blender/imbuf/intern/imbuf.h b/source/blender/imbuf/intern/imbuf.h index 2125583375f..47b4b7b6a58 100644 --- a/source/blender/imbuf/intern/imbuf.h +++ b/source/blender/imbuf/intern/imbuf.h @@ -1,9 +1,4 @@ /* - * imbuf.h (mar-2001 nzc) - * - * This header might have to become external... - * - * * ***** BEGIN GPL LICENSE BLOCK ***** * * This program is free software; you can redistribute it and/or @@ -25,7 +20,7 @@ * * The Original Code is: all of this file. * - * Contributor(s): none yet. + * Contributor(s): mar-2001 nzc. * * ***** END GPL LICENSE BLOCK ***** */ @@ -34,7 +29,6 @@ * \ingroup imbuf */ - #ifndef __IMBUF_H__ #define __IMBUF_H__ diff --git a/source/blender/imbuf/intern/imbuf_cocoa.m b/source/blender/imbuf/intern/imbuf_cocoa.m index db7f93423cb..ebfee7a1a30 100644 --- a/source/blender/imbuf/intern/imbuf_cocoa.m +++ b/source/blender/imbuf/intern/imbuf_cocoa.m @@ -1,6 +1,4 @@ /* - * imbuf_coca.m - * * ***** BEGIN GPL LICENSE BLOCK ***** * * This program is free software; you can redistribute it and/or @@ -22,9 +20,10 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** - * Provides image file loading and saving for Blender, via Cocoa. +/** \file blender/imbuf/intern/imbuf_coca.m + * \ingroup imbuf * + * Provides image file loading and saving for Blender, via Cocoa. */ #include <stdint.h> diff --git a/source/blender/imbuf/intern/tiff.c b/source/blender/imbuf/intern/tiff.c index 08b2e608c8e..e2a956f0dba 100644 --- a/source/blender/imbuf/intern/tiff.c +++ b/source/blender/imbuf/intern/tiff.c @@ -1,7 +1,4 @@ /* - * tiff.c - * - * * ***** BEGIN GPL LICENSE BLOCK ***** * * This program is free software; you can redistribute it and/or |