diff options
Diffstat (limited to 'source/blender/imbuf')
51 files changed, 182 insertions, 182 deletions
diff --git a/source/blender/imbuf/IMB_colormanagement.h b/source/blender/imbuf/IMB_colormanagement.h index 5e5b3e85b38..5f149f0ab71 100644 --- a/source/blender/imbuf/IMB_colormanagement.h +++ b/source/blender/imbuf/IMB_colormanagement.h @@ -24,8 +24,8 @@ * \ingroup imbuf */ -#include "BLI_sys_types.h" #include "BLI_compiler_compat.h" +#include "BLI_sys_types.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/imbuf/IMB_moviecache.h b/source/blender/imbuf/IMB_moviecache.h index d26ec4d2c2d..175a18ef618 100644 --- a/source/blender/imbuf/IMB_moviecache.h +++ b/source/blender/imbuf/IMB_moviecache.h @@ -24,8 +24,8 @@ * \ingroup imbuf */ -#include "BLI_utildefines.h" #include "BLI_ghash.h" +#include "BLI_utildefines.h" /* Cache system for movie data - now supports storing ImBufs only * Supposed to provide unified cache system for movie clips, sequencer and diff --git a/source/blender/imbuf/intern/IMB_anim.h b/source/blender/imbuf/intern/IMB_anim.h index 9ad88f24693..3d1d99963c7 100644 --- a/source/blender/imbuf/intern/IMB_anim.h +++ b/source/blender/imbuf/intern/IMB_anim.h @@ -26,21 +26,21 @@ #ifdef _WIN32 # define INC_OLE2 -# include <windows.h> -# include <windowsx.h> -# include <mmsystem.h> -# include <memory.h> # include <commdlg.h> +# include <memory.h> +# include <mmsystem.h> # include <vfw.h> +# include <windows.h> +# include <windowsx.h> # undef AVIIF_KEYFRAME // redefined in AVI_avi.h # undef AVIIF_LIST // redefined in AVI_avi.h #endif /* _WIN32 */ -#include <sys/types.h> #include <ctype.h> -#include <stdlib.h> #include <stdio.h> +#include <stdlib.h> +#include <sys/types.h> #ifdef _WIN32 # include <io.h> @@ -54,14 +54,14 @@ # include "AVI_avi.h" #endif -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_allocimbuf.h" #ifdef WITH_FFMPEG -# include <libavformat/avformat.h> # include <libavcodec/avcodec.h> +# include <libavformat/avformat.h> # include <libswscale/swscale.h> #endif diff --git a/source/blender/imbuf/intern/IMB_colormanagement_intern.h b/source/blender/imbuf/intern/IMB_colormanagement_intern.h index a83f2d60b8c..f0e599c1375 100644 --- a/source/blender/imbuf/intern/IMB_colormanagement_intern.h +++ b/source/blender/imbuf/intern/IMB_colormanagement_intern.h @@ -24,8 +24,8 @@ * \ingroup imbuf */ -#include "DNA_listBase.h" #include "BLI_sys_types.h" +#include "DNA_listBase.h" struct ImBuf; struct OCIO_ConstProcessorRcPtr; diff --git a/source/blender/imbuf/intern/IMB_indexer.h b/source/blender/imbuf/intern/IMB_indexer.h index 4817518dab6..61bb50aff38 100644 --- a/source/blender/imbuf/intern/IMB_indexer.h +++ b/source/blender/imbuf/intern/IMB_indexer.h @@ -25,9 +25,9 @@ # include <io.h> #endif -#include <stdlib.h> -#include <stdio.h> #include "IMB_anim.h" +#include <stdio.h> +#include <stdlib.h> /* * separate animation index files to solve the following problems: * diff --git a/source/blender/imbuf/intern/allocimbuf.c b/source/blender/imbuf/intern/allocimbuf.c index 381de9de610..6c17254e697 100644 --- a/source/blender/imbuf/intern/allocimbuf.c +++ b/source/blender/imbuf/intern/allocimbuf.c @@ -30,16 +30,16 @@ #include "IMB_imbuf_types.h" #include "IMB_allocimbuf.h" +#include "IMB_colormanagement_intern.h" #include "IMB_filetype.h" #include "IMB_metadata.h" -#include "IMB_colormanagement_intern.h" #include "imbuf.h" #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" static SpinLock refcounter_spin; diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c index 6a5a97e24e4..e9ac40de442 100644 --- a/source/blender/imbuf/intern/anim_movie.c +++ b/source/blender/imbuf/intern/anim_movie.c @@ -41,21 +41,21 @@ #endif -#include <sys/types.h> #include <ctype.h> -#include <stdlib.h> -#include <stdio.h> -#include <math.h> #include <limits.h> +#include <math.h> +#include <stdio.h> +#include <stdlib.h> +#include <sys/types.h> #ifndef _WIN32 # include <dirent.h> #else # include <io.h> #endif -#include "BLI_utildefines.h" -#include "BLI_string.h" #include "BLI_path_util.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" #include "MEM_guardedalloc.h" @@ -63,8 +63,8 @@ # include "AVI_avi.h" #endif -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_colormanagement.h" #include "IMB_colormanagement_intern.h" @@ -76,8 +76,8 @@ #ifdef WITH_FFMPEG # include "BKE_global.h" /* ENDIAN_ORDER */ -# include <libavformat/avformat.h> # include <libavcodec/avcodec.h> +# include <libavformat/avformat.h> # include <libavutil/rational.h> # include <libswscale/swscale.h> diff --git a/source/blender/imbuf/intern/bmp.c b/source/blender/imbuf/intern/bmp.c index 58ecfce5a63..3cac0be7935 100644 --- a/source/blender/imbuf/intern/bmp.c +++ b/source/blender/imbuf/intern/bmp.c @@ -21,14 +21,14 @@ * \ingroup imbuf */ -#include "BLI_utildefines.h" #include "BLI_fileops.h" +#include "BLI_utildefines.h" #include "imbuf.h" -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "IMB_filetype.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_colormanagement.h" #include "IMB_colormanagement_intern.h" diff --git a/source/blender/imbuf/intern/cache.c b/source/blender/imbuf/intern/cache.c index 7ddf4423bbf..176b41d2706 100644 --- a/source/blender/imbuf/intern/cache.c +++ b/source/blender/imbuf/intern/cache.c @@ -20,15 +20,15 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_listbase.h" #include "BLI_memarena.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" +#include "IMB_filetype.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "IMB_filetype.h" #include "imbuf.h" diff --git a/source/blender/imbuf/intern/cineon/cineon_dpx.c b/source/blender/imbuf/intern/cineon/cineon_dpx.c index a8902baa54a..18942c9abb8 100644 --- a/source/blender/imbuf/intern/cineon/cineon_dpx.c +++ b/source/blender/imbuf/intern/cineon/cineon_dpx.c @@ -20,14 +20,14 @@ * \ingroup imbcineon */ +#include "logImageCore.h" +#include <math.h> #include <stdio.h> #include <string.h> -#include <math.h> -#include "logImageCore.h" -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "IMB_filetype.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_colormanagement.h" #include "IMB_colormanagement_intern.h" diff --git a/source/blender/imbuf/intern/cineon/cineonlib.c b/source/blender/imbuf/intern/cineon/cineonlib.c index 63014919dfb..1223033f535 100644 --- a/source/blender/imbuf/intern/cineon/cineonlib.c +++ b/source/blender/imbuf/intern/cineon/cineonlib.c @@ -25,12 +25,12 @@ #include "cineonlib.h" #include "logmemfile.h" -#include <stdio.h> #include <math.h> +#include <stdio.h> #include <stdlib.h> -#include <time.h> -#include <sys/types.h> #include <string.h> +#include <sys/types.h> +#include <time.h> #include "BLI_fileops.h" #include "BLI_utildefines.h" diff --git a/source/blender/imbuf/intern/cineon/dpxlib.c b/source/blender/imbuf/intern/cineon/dpxlib.c index 00d59643967..8acfc23439f 100644 --- a/source/blender/imbuf/intern/cineon/dpxlib.c +++ b/source/blender/imbuf/intern/cineon/dpxlib.c @@ -25,12 +25,12 @@ #include "dpxlib.h" #include "logmemfile.h" -#include <stdio.h> #include <math.h> +#include <stdio.h> #include <stdlib.h> -#include <time.h> -#include <sys/types.h> #include <string.h> +#include <sys/types.h> +#include <time.h> #include "BLI_fileops.h" #include "BLI_utildefines.h" diff --git a/source/blender/imbuf/intern/cineon/logImageCore.c b/source/blender/imbuf/intern/cineon/logImageCore.c index 5d1623374d4..e9030496498 100644 --- a/source/blender/imbuf/intern/cineon/logImageCore.c +++ b/source/blender/imbuf/intern/cineon/logImageCore.c @@ -22,14 +22,14 @@ * Cineon image file format library routines. */ -#include "logmemfile.h" #include "logImageCore.h" -#include "dpxlib.h" #include "cineonlib.h" +#include "dpxlib.h" +#include "logmemfile.h" +#include <math.h> #include <stdlib.h> #include <string.h> -#include <math.h> #include "BLI_fileops.h" #include "BLI_utildefines.h" diff --git a/source/blender/imbuf/intern/colormanagement.c b/source/blender/imbuf/intern/colormanagement.c index a18764cd6ab..2a458ba5474 100644 --- a/source/blender/imbuf/intern/colormanagement.c +++ b/source/blender/imbuf/intern/colormanagement.c @@ -24,8 +24,8 @@ #include "IMB_colormanagement.h" #include "IMB_colormanagement_intern.h" -#include <string.h> #include <math.h> +#include <string.h> #include "DNA_color_types.h" #include "DNA_image_types.h" @@ -33,21 +33,21 @@ #include "DNA_scene_types.h" #include "DNA_space_types.h" -#include "IMB_imbuf.h" -#include "IMB_imbuf_types.h" #include "IMB_filetype.h" #include "IMB_filter.h" -#include "IMB_moviecache.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_metadata.h" +#include "IMB_moviecache.h" #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" #include "BLI_math.h" #include "BLI_math_color.h" +#include "BLI_rect.h" #include "BLI_string.h" #include "BLI_threads.h" -#include "BLI_rect.h" #include "BKE_appdir.h" #include "BKE_colortools.h" diff --git a/source/blender/imbuf/intern/colormanagement_inline.c b/source/blender/imbuf/intern/colormanagement_inline.c index 42c90b8414f..e93fdd51040 100644 --- a/source/blender/imbuf/intern/colormanagement_inline.c +++ b/source/blender/imbuf/intern/colormanagement_inline.c @@ -24,8 +24,8 @@ #ifndef __IMB_COLORMANAGEMENT_INLINE_C__ #define __IMB_COLORMANAGEMENT_INLINE_C__ -#include "IMB_colormanagement_intern.h" #include "BLI_math_vector.h" +#include "IMB_colormanagement_intern.h" /* Convert a float RGB triplet to the correct luminance weighted average. * diff --git a/source/blender/imbuf/intern/dds/BlockDXT.cpp b/source/blender/imbuf/intern/dds/BlockDXT.cpp index b1ca6221753..4397c1febab 100644 --- a/source/blender/imbuf/intern/dds/BlockDXT.cpp +++ b/source/blender/imbuf/intern/dds/BlockDXT.cpp @@ -48,10 +48,10 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. +#include <BlockDXT.h> +#include <ColorBlock.h> #include <Common.h> #include <Stream.h> -#include <ColorBlock.h> -#include <BlockDXT.h> /* --------------------------------------------------------------------------- * BlockDXT1 diff --git a/source/blender/imbuf/intern/dds/BlockDXT.h b/source/blender/imbuf/intern/dds/BlockDXT.h index b167fba71a2..16937bce042 100644 --- a/source/blender/imbuf/intern/dds/BlockDXT.h +++ b/source/blender/imbuf/intern/dds/BlockDXT.h @@ -51,9 +51,9 @@ #ifndef __BLOCKDXT_H__ #define __BLOCKDXT_H__ -#include <Common.h> #include <Color.h> #include <ColorBlock.h> +#include <Common.h> #include <Stream.h> /// DXT1 block. diff --git a/source/blender/imbuf/intern/dds/ColorBlock.cpp b/source/blender/imbuf/intern/dds/ColorBlock.cpp index cbc85962a36..69757d797b5 100644 --- a/source/blender/imbuf/intern/dds/ColorBlock.cpp +++ b/source/blender/imbuf/intern/dds/ColorBlock.cpp @@ -28,8 +28,8 @@ // This code is in the public domain -- castanyo@yahoo.es #include <ColorBlock.h> -#include <Image.h> #include <Common.h> +#include <Image.h> #if 0 // Get approximate luminance. diff --git a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp index 3f222a096ac..ab68d933c6f 100644 --- a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp +++ b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp @@ -48,13 +48,13 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. -#include <DirectDrawSurface.h> #include <BlockDXT.h> +#include <DirectDrawSurface.h> #include <PixelFormat.h> +#include <math.h> // sqrt #include <stdio.h> // printf #include <stdlib.h> // malloc -#include <math.h> // sqrt #include <sys/types.h> /*** declarations ***/ diff --git a/source/blender/imbuf/intern/dds/DirectDrawSurface.h b/source/blender/imbuf/intern/dds/DirectDrawSurface.h index 54bd1ad2dcd..f12c45d11df 100644 --- a/source/blender/imbuf/intern/dds/DirectDrawSurface.h +++ b/source/blender/imbuf/intern/dds/DirectDrawSurface.h @@ -51,10 +51,10 @@ #ifndef __DIRECTDRAWSURFACE_H__ #define __DIRECTDRAWSURFACE_H__ -#include <Common.h> -#include <Stream.h> #include <ColorBlock.h> +#include <Common.h> #include <Image.h> +#include <Stream.h> struct DDSPixelFormat { uint size; diff --git a/source/blender/imbuf/intern/dds/FlipDXT.cpp b/source/blender/imbuf/intern/dds/FlipDXT.cpp index bfd19f40493..f5c937654b3 100644 --- a/source/blender/imbuf/intern/dds/FlipDXT.cpp +++ b/source/blender/imbuf/intern/dds/FlipDXT.cpp @@ -38,11 +38,11 @@ #include <string.h> -#include <Common.h> -#include <Stream.h> -#include <ColorBlock.h> #include <BlockDXT.h> +#include <ColorBlock.h> +#include <Common.h> #include <FlipDXT.h> +#include <Stream.h> // A function that flips a DXTC block. typedef void (*FlipBlockFunction)(uint8_t *block); diff --git a/source/blender/imbuf/intern/dds/Image.h b/source/blender/imbuf/intern/dds/Image.h index 1aa60ef48ca..2922d5cfda3 100644 --- a/source/blender/imbuf/intern/dds/Image.h +++ b/source/blender/imbuf/intern/dds/Image.h @@ -30,8 +30,8 @@ #ifndef __IMAGE_H__ #define __IMAGE_H__ -#include "Common.h" #include "Color.h" +#include "Common.h" /// 32 bit RGBA image. class Image { diff --git a/source/blender/imbuf/intern/dds/dds_api.cpp b/source/blender/imbuf/intern/dds/dds_api.cpp index 098b695b8a3..832b380bbc2 100644 --- a/source/blender/imbuf/intern/dds/dds_api.cpp +++ b/source/blender/imbuf/intern/dds/dds_api.cpp @@ -22,13 +22,13 @@ extern "C" { #include "BLI_utildefines.h" } -#include <stddef.h> -#include <dds_api.h> -#include <Stream.h> #include <DirectDrawSurface.h> #include <FlipDXT.h> -#include <stdio.h> // printf +#include <Stream.h> +#include <dds_api.h> #include <fstream> +#include <stddef.h> +#include <stdio.h> // printf #if defined(WIN32) # include "utfconv.h" @@ -36,10 +36,10 @@ extern "C" { extern "C" { -#include "imbuf.h" -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "IMB_allocimbuf.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" +#include "imbuf.h" #include "IMB_colormanagement.h" #include "IMB_colormanagement_intern.h" diff --git a/source/blender/imbuf/intern/divers.c b/source/blender/imbuf/intern/divers.c index 07bbec9e15c..e068a84aab0 100644 --- a/source/blender/imbuf/intern/divers.c +++ b/source/blender/imbuf/intern/divers.c @@ -25,10 +25,10 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "imbuf.h" -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "IMB_filter.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" +#include "imbuf.h" #include "IMB_colormanagement.h" #include "IMB_colormanagement_intern.h" diff --git a/source/blender/imbuf/intern/filetype.c b/source/blender/imbuf/intern/filetype.c index c6f8bab325b..29430036182 100644 --- a/source/blender/imbuf/intern/filetype.c +++ b/source/blender/imbuf/intern/filetype.c @@ -22,9 +22,9 @@ #include "BLI_utildefines.h" +#include "IMB_filetype.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "IMB_filetype.h" #include "IMB_colormanagement.h" diff --git a/source/blender/imbuf/intern/filter.c b/source/blender/imbuf/intern/filter.c index e6b95968498..e36088f8eac 100644 --- a/source/blender/imbuf/intern/filter.c +++ b/source/blender/imbuf/intern/filter.c @@ -24,12 +24,12 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_math_base.h" +#include "BLI_utildefines.h" -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "IMB_filter.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "imbuf.h" diff --git a/source/blender/imbuf/intern/imageprocess.c b/source/blender/imbuf/intern/imageprocess.c index 4cd47d19e62..523b57cc162 100644 --- a/source/blender/imbuf/intern/imageprocess.c +++ b/source/blender/imbuf/intern/imageprocess.c @@ -31,13 +31,13 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_task.h" #include "BLI_math.h" +#include "BLI_task.h" +#include "BLI_utildefines.h" -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "IMB_colormanagement.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include <math.h> /* Only this one is used liberally here, and in imbuf */ diff --git a/source/blender/imbuf/intern/imbuf.h b/source/blender/imbuf/intern/imbuf.h index 514b6a24cf0..912c25f2616 100644 --- a/source/blender/imbuf/intern/imbuf.h +++ b/source/blender/imbuf/intern/imbuf.h @@ -24,18 +24,18 @@ #ifndef __IMBUF_H__ #define __IMBUF_H__ +#include <stdio.h> #include <stdlib.h> #include <sys/types.h> -#include <stdio.h> #ifndef WIN32 # include <unistd.h> #endif #include <fcntl.h> -#include <sys/stat.h> -#include <string.h> #include <math.h> +#include <string.h> +#include <sys/stat.h> #ifndef WIN32 # include <sys/mman.h> diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c index 6589b784ec0..985a8e977ca 100644 --- a/source/blender/imbuf/intern/indexer.c +++ b/source/blender/imbuf/intern/indexer.c @@ -24,18 +24,18 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_endian_switch.h" -#include "BLI_path_util.h" -#include "BLI_string.h" #include "BLI_fileops.h" #include "BLI_ghash.h" +#include "BLI_path_util.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" #ifdef _WIN32 # include "BLI_winstuff.h" #endif -#include "IMB_indexer.h" #include "IMB_anim.h" +#include "IMB_indexer.h" #include "imbuf.h" #include "BKE_global.h" diff --git a/source/blender/imbuf/intern/iris.c b/source/blender/imbuf/intern/iris.c index 4b23443933a..bfcd1ec2cee 100644 --- a/source/blender/imbuf/intern/iris.c +++ b/source/blender/imbuf/intern/iris.c @@ -23,15 +23,15 @@ #include <string.h> -#include "BLI_utildefines.h" #include "BLI_fileops.h" +#include "BLI_utildefines.h" #include "MEM_guardedalloc.h" -#include "imbuf.h" -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "IMB_filetype.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" +#include "imbuf.h" #include "IMB_colormanagement.h" #include "IMB_colormanagement_intern.h" diff --git a/source/blender/imbuf/intern/jp2.c b/source/blender/imbuf/intern/jp2.c index e361df1304a..5154f50c7e8 100644 --- a/source/blender/imbuf/intern/jp2.c +++ b/source/blender/imbuf/intern/jp2.c @@ -20,12 +20,12 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_fileops.h" +#include "BLI_math.h" -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "IMB_filetype.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_colormanagement.h" #include "IMB_colormanagement_intern.h" diff --git a/source/blender/imbuf/intern/jpeg.c b/source/blender/imbuf/intern/jpeg.c index 8fa6b1722ad..fe74d9bc23f 100644 --- a/source/blender/imbuf/intern/jpeg.c +++ b/source/blender/imbuf/intern/jpeg.c @@ -22,24 +22,24 @@ */ /* This little block needed for linking to Blender... */ -#include <stdio.h> #include <setjmp.h> +#include <stdio.h> #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_string.h" #include "BLI_fileops.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" #include "BKE_idprop.h" -#include "imbuf.h" -#include "IMB_imbuf_types.h" +#include "IMB_filetype.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_metadata.h" -#include "IMB_filetype.h" -#include "jpeglib.h" +#include "imbuf.h" #include "jerror.h" +#include "jpeglib.h" #include "IMB_colormanagement.h" #include "IMB_colormanagement_intern.h" diff --git a/source/blender/imbuf/intern/metadata.c b/source/blender/imbuf/intern/metadata.c index ac31f7db791..28f09c38a96 100644 --- a/source/blender/imbuf/intern/metadata.c +++ b/source/blender/imbuf/intern/metadata.c @@ -24,15 +24,15 @@ #include <stdlib.h> #include <string.h> -#include "BLI_utildefines.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "BKE_idprop.h" #include "MEM_guardedalloc.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_metadata.h" diff --git a/source/blender/imbuf/intern/module.c b/source/blender/imbuf/intern/module.c index dc3d4cfbb62..00c53c37bb1 100644 --- a/source/blender/imbuf/intern/module.c +++ b/source/blender/imbuf/intern/module.c @@ -23,9 +23,9 @@ #include "BLI_utildefines.h" #include "IMB_allocimbuf.h" -#include "IMB_imbuf.h" -#include "IMB_filetype.h" #include "IMB_colormanagement_intern.h" +#include "IMB_filetype.h" +#include "IMB_imbuf.h" void IMB_init(void) { diff --git a/source/blender/imbuf/intern/moviecache.c b/source/blender/imbuf/intern/moviecache.c index fbe074d0fd5..f3b76288831 100644 --- a/source/blender/imbuf/intern/moviecache.c +++ b/source/blender/imbuf/intern/moviecache.c @@ -23,22 +23,22 @@ #undef DEBUG_MESSAGES -#include <stdlib.h> /* for qsort */ #include <memory.h> +#include <stdlib.h> /* for qsort */ -#include "MEM_guardedalloc.h" #include "MEM_CacheLimiterC-Api.h" +#include "MEM_guardedalloc.h" -#include "BLI_string.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_mempool.h" +#include "BLI_string.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" #include "IMB_moviecache.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #ifdef DEBUG_MESSAGES # if defined __GNUC__ diff --git a/source/blender/imbuf/intern/oiio/openimageio_api.cpp b/source/blender/imbuf/intern/oiio/openimageio_api.cpp index 4746cec41d4..6d3234771e7 100644 --- a/source/blender/imbuf/intern/oiio/openimageio_api.cpp +++ b/source/blender/imbuf/intern/oiio/openimageio_api.cpp @@ -29,20 +29,20 @@ #endif // NOTE: Keep first, BLI_path_util conflicts with OIIO's format. -#include <memory> #include "openimageio_api.h" #include <OpenImageIO/imageio.h> +#include <memory> #include "MEM_guardedalloc.h" extern "C" { #include "BLI_blenlib.h" -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "IMB_allocimbuf.h" #include "IMB_colormanagement.h" #include "IMB_colormanagement_intern.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" } OIIO_NAMESPACE_USING diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp index 9fa2c7a28c5..8f001c9031f 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp @@ -21,41 +21,41 @@ * \ingroup openexr */ -#include <stdlib.h> -#include <stdio.h> +#include <algorithm> +#include <errno.h> +#include <fstream> +#include <iostream> +#include <set> #include <stddef.h> #include <stdexcept> -#include <fstream> +#include <stdio.h> +#include <stdlib.h> #include <string> -#include <set> -#include <errno.h> -#include <algorithm> -#include <iostream> -#include <half.h> #include <Iex.h> -#include <ImfVersion.h> #include <ImathBox.h> #include <ImfArray.h> -#include <ImfIO.h> #include <ImfChannelList.h> -#include <ImfPixelType.h> -#include <ImfInputFile.h> -#include <ImfOutputFile.h> #include <ImfCompression.h> #include <ImfCompressionAttribute.h> -#include <ImfStringAttribute.h> +#include <ImfIO.h> +#include <ImfInputFile.h> +#include <ImfOutputFile.h> +#include <ImfPixelType.h> #include <ImfStandardAttributes.h> +#include <ImfStringAttribute.h> +#include <ImfVersion.h> +#include <half.h> /* multiview/multipart */ -#include <ImfMultiView.h> -#include <ImfMultiPartInputFile.h> #include <ImfInputPart.h> -#include <ImfOutputPart.h> +#include <ImfMultiPartInputFile.h> #include <ImfMultiPartOutputFile.h> -#include <ImfTiledOutputPart.h> -#include <ImfPartType.h> +#include <ImfMultiView.h> +#include <ImfOutputPart.h> #include <ImfPartHelper.h> +#include <ImfPartType.h> +#include <ImfTiledOutputPart.h> #include "DNA_scene_types.h" /* For OpenEXR compression constants */ @@ -83,9 +83,9 @@ _CRTIMP void __cdecl _invalid_parameter_noinfo(void) #include "BKE_idprop.h" #include "BKE_image.h" -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "IMB_allocimbuf.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_metadata.h" #include "openexr_multi.h" diff --git a/source/blender/imbuf/intern/png.c b/source/blender/imbuf/intern/png.c index 68504f5c0dc..d6d185ef59b 100644 --- a/source/blender/imbuf/intern/png.c +++ b/source/blender/imbuf/intern/png.c @@ -25,21 +25,21 @@ #include "png.h" -#include "BLI_utildefines.h" #include "BLI_fileops.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BKE_global.h" #include "BKE_idprop.h" #include "MEM_guardedalloc.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_allocimbuf.h" -#include "IMB_metadata.h" #include "IMB_filetype.h" +#include "IMB_metadata.h" #include "IMB_colormanagement.h" #include "IMB_colormanagement_intern.h" diff --git a/source/blender/imbuf/intern/radiance_hdr.c b/source/blender/imbuf/intern/radiance_hdr.c index 5e81b716619..46d07e74ce3 100644 --- a/source/blender/imbuf/intern/radiance_hdr.c +++ b/source/blender/imbuf/intern/radiance_hdr.c @@ -36,8 +36,8 @@ #include "imbuf.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_allocimbuf.h" #include "IMB_filetype.h" diff --git a/source/blender/imbuf/intern/readimage.c b/source/blender/imbuf/intern/readimage.c index d9f3c7ec6bb..7be2bc48a4d 100644 --- a/source/blender/imbuf/intern/readimage.c +++ b/source/blender/imbuf/intern/readimage.c @@ -23,23 +23,23 @@ */ #ifdef _WIN32 +# include "mmap_win.h" # include <io.h> # include <stddef.h> # include <sys/types.h> -# include "mmap_win.h" #endif -#include <stdlib.h> -#include "BLI_utildefines.h" -#include "BLI_string.h" -#include "BLI_path_util.h" #include "BLI_fileops.h" +#include "BLI_path_util.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" +#include <stdlib.h> -#include "imbuf.h" #include "IMB_allocimbuf.h" -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "IMB_filetype.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" +#include "imbuf.h" #include "IMB_colormanagement.h" #include "IMB_colormanagement_intern.h" diff --git a/source/blender/imbuf/intern/rectop.c b/source/blender/imbuf/intern/rectop.c index e5396b4551b..91787d64525 100644 --- a/source/blender/imbuf/intern/rectop.c +++ b/source/blender/imbuf/intern/rectop.c @@ -24,15 +24,15 @@ #include <stdlib.h> -#include "BLI_utildefines.h" -#include "BLI_rect.h" #include "BLI_math_base.h" #include "BLI_math_color.h" #include "BLI_math_color_blend.h" #include "BLI_math_vector.h" +#include "BLI_rect.h" +#include "BLI_utildefines.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_colormanagement.h" diff --git a/source/blender/imbuf/intern/rotate.c b/source/blender/imbuf/intern/rotate.c index e387901aaab..17b485b5171 100644 --- a/source/blender/imbuf/intern/rotate.c +++ b/source/blender/imbuf/intern/rotate.c @@ -26,9 +26,9 @@ #include "MEM_guardedalloc.h" -#include "imbuf.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" +#include "imbuf.h" void IMB_flipy(struct ImBuf *ibuf) { diff --git a/source/blender/imbuf/intern/scaling.c b/source/blender/imbuf/intern/scaling.c index 46ddee25b0f..95f720a9d16 100644 --- a/source/blender/imbuf/intern/scaling.c +++ b/source/blender/imbuf/intern/scaling.c @@ -22,14 +22,14 @@ * \ingroup imbuf */ -#include "BLI_utildefines.h" #include "BLI_math_color.h" #include "BLI_math_interp.h" +#include "BLI_utildefines.h" #include "MEM_guardedalloc.h" -#include "imbuf.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" +#include "imbuf.h" #include "IMB_filter.h" diff --git a/source/blender/imbuf/intern/stereoimbuf.c b/source/blender/imbuf/intern/stereoimbuf.c index 71750c9c28f..5569e119b95 100644 --- a/source/blender/imbuf/intern/stereoimbuf.c +++ b/source/blender/imbuf/intern/stereoimbuf.c @@ -27,9 +27,9 @@ #include "IMB_imbuf_types.h" #include "IMB_allocimbuf.h" +#include "IMB_colormanagement_intern.h" #include "IMB_filetype.h" #include "IMB_metadata.h" -#include "IMB_colormanagement_intern.h" #include "imbuf.h" @@ -39,8 +39,8 @@ #include "BLI_math.h" -#include "DNA_userdef_types.h" #include "DNA_scene_types.h" +#include "DNA_userdef_types.h" /* prototypes */ struct Stereo3DData; diff --git a/source/blender/imbuf/intern/targa.c b/source/blender/imbuf/intern/targa.c index 65ae8f8fa4b..9f33c7ea2b2 100644 --- a/source/blender/imbuf/intern/targa.c +++ b/source/blender/imbuf/intern/targa.c @@ -25,15 +25,15 @@ # include <io.h> #endif -#include "BLI_utildefines.h" #include "BLI_fileops.h" +#include "BLI_utildefines.h" #include "MEM_guardedalloc.h" #include "imbuf.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_filetype.h" diff --git a/source/blender/imbuf/intern/thumbs.c b/source/blender/imbuf/intern/thumbs.c index eb4b29e81c1..195a2e9fe9c 100644 --- a/source/blender/imbuf/intern/thumbs.c +++ b/source/blender/imbuf/intern/thumbs.c @@ -26,31 +26,31 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_string.h" -#include "BLI_path_util.h" #include "BLI_fileops.h" #include "BLI_ghash.h" #include "BLI_hash_md5.h" +#include "BLI_path_util.h" +#include "BLI_string.h" #include "BLI_system.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" #include BLI_SYSTEM_PID_H #include "DNA_space_types.h" /* For FILE_MAX_LIBEXTRA */ #include "BLO_readfile.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" -#include "IMB_thumbs.h" +#include "IMB_imbuf_types.h" #include "IMB_metadata.h" +#include "IMB_thumbs.h" #include <ctype.h> +#include <stdio.h> #include <string.h> -#include <time.h> -#include <sys/types.h> #include <sys/stat.h> -#include <stdio.h> +#include <sys/types.h> +#include <time.h> #ifdef WIN32 /* Need to include windows.h so _WIN32_IE is defined. */ @@ -61,10 +61,10 @@ # endif /* For SHGetSpecialFolderPath, has to be done before BLI_winstuff * because 'near' is disabled through BLI_windstuff */ -# include <shlobj.h> -# include <direct.h> /* chdir */ # include "BLI_winstuff.h" # include "utfconv.h" +# include <direct.h> /* chdir */ +# include <shlobj.h> #endif #if defined(WIN32) || defined(__APPLE__) diff --git a/source/blender/imbuf/intern/thumbs_blend.c b/source/blender/imbuf/intern/thumbs_blend.c index 283bd11dc7d..1054b3d2d6e 100644 --- a/source/blender/imbuf/intern/thumbs_blend.c +++ b/source/blender/imbuf/intern/thumbs_blend.c @@ -21,21 +21,21 @@ #include <stdlib.h> #include <string.h> -#include "BLI_utildefines.h" #include "BLI_linklist.h" #include "BLI_listbase.h" /* Needed due to import of BLO_readfile.h */ +#include "BLI_utildefines.h" #include "BLO_blend_defs.h" #include "BLO_readfile.h" -#include "BKE_idcode.h" #include "BKE_icons.h" +#include "BKE_idcode.h" #include "BKE_main.h" #include "DNA_ID.h" /* For preview images... */ -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_thumbs.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/imbuf/intern/thumbs_font.c b/source/blender/imbuf/intern/thumbs_font.c index ddb1eb62006..b402dfb35e1 100644 --- a/source/blender/imbuf/intern/thumbs_font.c +++ b/source/blender/imbuf/intern/thumbs_font.c @@ -18,13 +18,13 @@ * \ingroup imbuf */ -#include "BLI_utildefines.h" -#include "BLI_string.h" #include "BLI_fileops.h" #include "BLI_hash_md5.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_thumbs.h" diff --git a/source/blender/imbuf/intern/tiff.c b/source/blender/imbuf/intern/tiff.c index fc0a643fade..309de25db03 100644 --- a/source/blender/imbuf/intern/tiff.c +++ b/source/blender/imbuf/intern/tiff.c @@ -43,8 +43,8 @@ #include "BKE_global.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_filetype.h" diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c index a8aabf384c8..3c420f3f297 100644 --- a/source/blender/imbuf/intern/util.c +++ b/source/blender/imbuf/intern/util.c @@ -28,17 +28,17 @@ #include <stdlib.h> -#include "BLI_utildefines.h" -#include "BLI_path_util.h" #include "BLI_fileops.h" +#include "BLI_path_util.h" +#include "BLI_utildefines.h" #ifdef _WIN32 # include "BLI_winstuff.h" #endif -#include "imbuf.h" -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "IMB_filetype.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" +#include "imbuf.h" #include "IMB_anim.h" @@ -48,8 +48,8 @@ # include "BKE_global.h" /* G.debug */ # include <libavcodec/avcodec.h> -# include <libavformat/avformat.h> # include <libavdevice/avdevice.h> +# include <libavformat/avformat.h> # include <libavutil/log.h> # include "ffmpeg_compat.h" diff --git a/source/blender/imbuf/intern/writeimage.c b/source/blender/imbuf/intern/writeimage.c index ac3961faf49..9cb0436cb98 100644 --- a/source/blender/imbuf/intern/writeimage.c +++ b/source/blender/imbuf/intern/writeimage.c @@ -22,16 +22,16 @@ * \ingroup imbuf */ +#include <errno.h> #include <stdio.h> #include <stdlib.h> -#include <errno.h> -#include "BLI_utildefines.h" #include "BLI_path_util.h" +#include "BLI_utildefines.h" -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "IMB_filetype.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "IMB_colormanagement.h" #include "IMB_colormanagement_intern.h" |