diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-08-13 03:28:33 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-08-13 03:28:33 +0400 |
commit | 6324c5fed189f2f977e7571c2762f674a715a469 (patch) | |
tree | ad79006da00d9d6b253f1718a480114aeed8118e /source | |
parent | e297e6b64b61ace14c4010972d5164a816a5c3f0 (diff) |
code cleanup: includes for imbuf, also remove double promotion.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/imbuf/intern/anim_movie.c | 5 | ||||
-rw-r--r-- | source/blender/imbuf/intern/bmp.c | 3 | ||||
-rw-r--r-- | source/blender/imbuf/intern/divers.c | 2 | ||||
-rw-r--r-- | source/blender/imbuf/intern/indexer.c | 7 | ||||
-rw-r--r-- | source/blender/imbuf/intern/iris.c | 3 | ||||
-rw-r--r-- | source/blender/imbuf/intern/jp2.c | 2 | ||||
-rw-r--r-- | source/blender/imbuf/intern/jpeg.c | 3 | ||||
-rw-r--r-- | source/blender/imbuf/intern/metadata.c | 3 | ||||
-rw-r--r-- | source/blender/imbuf/intern/openexr/openexr_api.cpp | 16 | ||||
-rw-r--r-- | source/blender/imbuf/intern/png.c | 3 | ||||
-rw-r--r-- | source/blender/imbuf/intern/readimage.c | 20 | ||||
-rw-r--r-- | source/blender/imbuf/intern/rotate.c | 3 | ||||
-rw-r--r-- | source/blender/imbuf/intern/scaling.c | 1 | ||||
-rw-r--r-- | source/blender/imbuf/intern/targa.c | 6 | ||||
-rw-r--r-- | source/blender/imbuf/intern/thumbs.c | 5 | ||||
-rw-r--r-- | source/blender/imbuf/intern/tiff.c | 2 | ||||
-rw-r--r-- | source/blender/imbuf/intern/util.c | 12 |
17 files changed, 51 insertions, 45 deletions
diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c index 9367511522d..f07a18cb89c 100644 --- a/source/blender/imbuf/intern/anim_movie.c +++ b/source/blender/imbuf/intern/anim_movie.c @@ -64,8 +64,8 @@ #include <io.h> #endif -#include "BLI_blenlib.h" /* BLI_remlink BLI_file_descriptor_size BLI_addtail - * BLI_countlist BLI_stringdec */ +#include "BLI_string.h" +#include "BLI_path_util.h" #include "BLI_utildefines.h" #include "BLI_math_base.h" @@ -73,7 +73,6 @@ #include "DNA_userdef_types.h" - #include "BKE_global.h" #include "BKE_depsgraph.h" diff --git a/source/blender/imbuf/intern/bmp.c b/source/blender/imbuf/intern/bmp.c index 8734ea90cb1..eb12b219da9 100644 --- a/source/blender/imbuf/intern/bmp.c +++ b/source/blender/imbuf/intern/bmp.c @@ -29,8 +29,7 @@ * \ingroup imbuf */ - -#include "BLI_blenlib.h" +#include "BLI_fileops.h" #include "imbuf.h" diff --git a/source/blender/imbuf/intern/divers.c b/source/blender/imbuf/intern/divers.c index 54903c83835..5ba08f1dd73 100644 --- a/source/blender/imbuf/intern/divers.c +++ b/source/blender/imbuf/intern/divers.c @@ -31,8 +31,6 @@ * \ingroup imbuf */ - -#include "BLI_blenlib.h" #include "BLI_rand.h" #include "BLI_math.h" #include "BLI_utildefines.h" diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c index 9cf06b08ba4..d5ca7da7d93 100644 --- a/source/blender/imbuf/intern/indexer.c +++ b/source/blender/imbuf/intern/indexer.c @@ -22,6 +22,8 @@ * ***** END GPL LICENSE BLOCK ***** */ +#include <stdlib.h> + #include "IMB_indexer.h" #include "IMB_anim.h" #include "AVI_avi.h" @@ -29,13 +31,14 @@ #include "MEM_guardedalloc.h" #include "BLI_utildefines.h" -#include "BLI_blenlib.h" +#include "BLI_string.h" +#include "BLI_path_util.h" +#include "BLI_fileops.h" #include "BLI_math_base.h" #include "MEM_guardedalloc.h" #include "DNA_userdef_types.h" #include "BKE_global.h" -#include <stdlib.h> #ifdef WITH_FFMPEG diff --git a/source/blender/imbuf/intern/iris.c b/source/blender/imbuf/intern/iris.c index 10c6a0fd012..e76a59905cb 100644 --- a/source/blender/imbuf/intern/iris.c +++ b/source/blender/imbuf/intern/iris.c @@ -32,7 +32,8 @@ #include <string.h> -#include "BLI_blenlib.h" +#include "BLI_fileops.h" + #include "MEM_guardedalloc.h" #include "imbuf.h" diff --git a/source/blender/imbuf/intern/jp2.c b/source/blender/imbuf/intern/jp2.c index 9fb4cbae383..8be7a9ea28b 100644 --- a/source/blender/imbuf/intern/jp2.c +++ b/source/blender/imbuf/intern/jp2.c @@ -26,8 +26,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_blenlib.h" #include "BLI_math.h" +#include "BLI_fileops.h" #include "imbuf.h" diff --git a/source/blender/imbuf/intern/jpeg.c b/source/blender/imbuf/intern/jpeg.c index d49080d8741..364950b99cb 100644 --- a/source/blender/imbuf/intern/jpeg.c +++ b/source/blender/imbuf/intern/jpeg.c @@ -37,7 +37,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_blenlib.h" +#include "BLI_string.h" +#include "BLI_fileops.h" #include "imbuf.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/imbuf/intern/metadata.c b/source/blender/imbuf/intern/metadata.c index a7caae73679..1ce2053fde5 100644 --- a/source/blender/imbuf/intern/metadata.c +++ b/source/blender/imbuf/intern/metadata.c @@ -33,7 +33,8 @@ #include <stdlib.h> #include <string.h> -#include "BLI_blenlib.h" +#include "BLI_string.h" + #include "MEM_guardedalloc.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp index f5479bce570..b66a7449781 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp @@ -256,10 +256,10 @@ static int imb_save_openexr_half(struct ImBuf *ibuf, const char *name, int flags from = (unsigned char *)ibuf->rect + channels * i * width; for (int j = ibuf->x; j > 0; j--) { - to->r = (float)(from[0]) / 255.0; - to->g = (float)(from[1]) / 255.0; - to->b = (float)(from[2]) / 255.0; - to->a = (float)(channels >= 4) ? from[3] / 255.0 : 1.0f; + to->r = (float)(from[0]) / 255.0f; + to->g = (float)(from[1]) / 255.0f; + to->b = (float)(from[2]) / 255.0f; + to->a = (float)(channels >= 4) ? from[3] / 255.0f : 1.0f; to++; from += 4; } } @@ -269,10 +269,10 @@ static int imb_save_openexr_half(struct ImBuf *ibuf, const char *name, int flags from = (unsigned char *)ibuf->rect + channels * i * width; for (int j = ibuf->x; j > 0; j--) { - to->r = srgb_to_linearrgb((float)from[0] / 255.0); - to->g = srgb_to_linearrgb((float)from[1] / 255.0); - to->b = srgb_to_linearrgb((float)from[2] / 255.0); - to->a = channels >= 4 ? (float)from[3] / 255.0 : 1.0f; + to->r = srgb_to_linearrgb((float)from[0] / 255.0f); + to->g = srgb_to_linearrgb((float)from[1] / 255.0f); + to->b = srgb_to_linearrgb((float)from[2] / 255.0f); + to->a = channels >= 4 ? (float)from[3] / 255.0f : 1.0f; to++; from += 4; } } diff --git a/source/blender/imbuf/intern/png.c b/source/blender/imbuf/intern/png.c index 928eb219ea5..92cd9622849 100644 --- a/source/blender/imbuf/intern/png.c +++ b/source/blender/imbuf/intern/png.c @@ -33,7 +33,8 @@ #include "png.h" -#include "BLI_blenlib.h" +#include "BLI_fileops.h" + #include "BLI_math.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/imbuf/intern/readimage.c b/source/blender/imbuf/intern/readimage.c index cb6cc2c082b..4bde71588b7 100644 --- a/source/blender/imbuf/intern/readimage.c +++ b/source/blender/imbuf/intern/readimage.c @@ -33,16 +33,20 @@ #ifdef _WIN32 -#include <io.h> -#include <stddef.h> -#include <sys/types.h> -#include "mmap_win.h" -#define open _open -#define read _read -#define close _close +# include <io.h> +# include <stddef.h> +# include <sys/types.h> +# include "mmap_win.h" +# define open _open +# define read _read +# define close _close #endif -#include "BLI_blenlib.h" +#include <stdlib.h> +#include "BLI_string.h" +#include "BLI_path_util.h" +#include "BLI_fileops.h" + #include "BLI_utildefines.h" #include "imbuf.h" diff --git a/source/blender/imbuf/intern/rotate.c b/source/blender/imbuf/intern/rotate.c index b3fe363a266..e98757883be 100644 --- a/source/blender/imbuf/intern/rotate.c +++ b/source/blender/imbuf/intern/rotate.c @@ -31,11 +31,8 @@ * \ingroup imbuf */ - -#include "BLI_blenlib.h" #include "BLI_utildefines.h" - #include "MEM_guardedalloc.h" #include "imbuf.h" diff --git a/source/blender/imbuf/intern/scaling.c b/source/blender/imbuf/intern/scaling.c index ea1d483090c..e90269a0986 100644 --- a/source/blender/imbuf/intern/scaling.c +++ b/source/blender/imbuf/intern/scaling.c @@ -32,7 +32,6 @@ */ -#include "BLI_blenlib.h" #include "BLI_utildefines.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/imbuf/intern/targa.c b/source/blender/imbuf/intern/targa.c index 0260ed46b00..4df49386ce1 100644 --- a/source/blender/imbuf/intern/targa.c +++ b/source/blender/imbuf/intern/targa.c @@ -31,9 +31,11 @@ #ifdef WIN32 -#include <io.h> +# include <io.h> #endif -#include "BLI_blenlib.h" + +#include "BLI_fileops.h" + #include "MEM_guardedalloc.h" #include "imbuf.h" diff --git a/source/blender/imbuf/intern/thumbs.c b/source/blender/imbuf/intern/thumbs.c index 54d90ec5c56..6a234b8e29a 100644 --- a/source/blender/imbuf/intern/thumbs.c +++ b/source/blender/imbuf/intern/thumbs.c @@ -34,7 +34,9 @@ #include "MEM_guardedalloc.h" -#include "BLI_blenlib.h" +#include "BLI_string.h" +#include "BLI_path_util.h" +#include "BLI_fileops.h" #include "BLI_md5.h" #include "BKE_utildefines.h" @@ -45,7 +47,6 @@ #include "IMB_metadata.h" #include <ctype.h> -#include <stdlib.h> #include <string.h> #include <time.h> #include <sys/types.h> diff --git a/source/blender/imbuf/intern/tiff.c b/source/blender/imbuf/intern/tiff.c index cc57ffff812..985c575daaa 100644 --- a/source/blender/imbuf/intern/tiff.c +++ b/source/blender/imbuf/intern/tiff.c @@ -46,12 +46,10 @@ #include "imbuf.h" #include "BLI_math.h" -#include "BLI_string.h" #include "BLI_utildefines.h" #include "BKE_global.h" - #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c index 92c10a094d3..2b0597d64a5 100644 --- a/source/blender/imbuf/intern/util.c +++ b/source/blender/imbuf/intern/util.c @@ -33,13 +33,15 @@ #ifdef _WIN32 -#include <io.h> -#define open _open -#define read _read -#define close _close +# include <io.h> +# define open _open +# define read _read +# define close _close #endif -#include "BLI_blenlib.h" +#include <stdlib.h> + +#include "BLI_path_util.h" #include "BLI_fileops.h" #include "DNA_userdef_types.h" |