[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49863] trunk/blender/source/blender/imbuf /intern: code cleanup: includes for imbuf, also remove double promotion.
Campbell Barton
ideasman42 at gmail.com
Mon Aug 13 01:28:34 CEST 2012
Revision: 49863
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49863
Author: campbellbarton
Date: 2012-08-12 23:28:33 +0000 (Sun, 12 Aug 2012)
Log Message:
-----------
code cleanup: includes for imbuf, also remove double promotion.
Modified Paths:
--------------
trunk/blender/source/blender/imbuf/intern/anim_movie.c
trunk/blender/source/blender/imbuf/intern/bmp.c
trunk/blender/source/blender/imbuf/intern/divers.c
trunk/blender/source/blender/imbuf/intern/indexer.c
trunk/blender/source/blender/imbuf/intern/iris.c
trunk/blender/source/blender/imbuf/intern/jp2.c
trunk/blender/source/blender/imbuf/intern/jpeg.c
trunk/blender/source/blender/imbuf/intern/metadata.c
trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp
trunk/blender/source/blender/imbuf/intern/png.c
trunk/blender/source/blender/imbuf/intern/readimage.c
trunk/blender/source/blender/imbuf/intern/rotate.c
trunk/blender/source/blender/imbuf/intern/scaling.c
trunk/blender/source/blender/imbuf/intern/targa.c
trunk/blender/source/blender/imbuf/intern/thumbs.c
trunk/blender/source/blender/imbuf/intern/tiff.c
trunk/blender/source/blender/imbuf/intern/util.c
Modified: trunk/blender/source/blender/imbuf/intern/anim_movie.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/anim_movie.c 2012-08-12 22:55:57 UTC (rev 49862)
+++ trunk/blender/source/blender/imbuf/intern/anim_movie.c 2012-08-12 23:28:33 UTC (rev 49863)
@@ -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"
Modified: trunk/blender/source/blender/imbuf/intern/bmp.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/bmp.c 2012-08-12 22:55:57 UTC (rev 49862)
+++ trunk/blender/source/blender/imbuf/intern/bmp.c 2012-08-12 23:28:33 UTC (rev 49863)
@@ -29,9 +29,8 @@
* \ingroup imbuf
*/
+#include "BLI_fileops.h"
-#include "BLI_blenlib.h"
-
#include "imbuf.h"
#include "IMB_imbuf_types.h"
Modified: trunk/blender/source/blender/imbuf/intern/divers.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/divers.c 2012-08-12 22:55:57 UTC (rev 49862)
+++ trunk/blender/source/blender/imbuf/intern/divers.c 2012-08-12 23:28:33 UTC (rev 49863)
@@ -31,8 +31,6 @@
* \ingroup imbuf
*/
-
-#include "BLI_blenlib.h"
#include "BLI_rand.h"
#include "BLI_math.h"
#include "BLI_utildefines.h"
Modified: trunk/blender/source/blender/imbuf/intern/indexer.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/indexer.c 2012-08-12 22:55:57 UTC (rev 49862)
+++ trunk/blender/source/blender/imbuf/intern/indexer.c 2012-08-12 23:28:33 UTC (rev 49863)
@@ -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
Modified: trunk/blender/source/blender/imbuf/intern/iris.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/iris.c 2012-08-12 22:55:57 UTC (rev 49862)
+++ trunk/blender/source/blender/imbuf/intern/iris.c 2012-08-12 23:28:33 UTC (rev 49863)
@@ -32,7 +32,8 @@
#include <string.h>
-#include "BLI_blenlib.h"
+#include "BLI_fileops.h"
+
#include "MEM_guardedalloc.h"
#include "imbuf.h"
Modified: trunk/blender/source/blender/imbuf/intern/jp2.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/jp2.c 2012-08-12 22:55:57 UTC (rev 49862)
+++ trunk/blender/source/blender/imbuf/intern/jp2.c 2012-08-12 23:28:33 UTC (rev 49863)
@@ -26,7 +26,6 @@
#include "MEM_guardedalloc.h"
-#include "BLI_blenlib.h"
#include "BLI_math.h"
#include "imbuf.h"
Modified: trunk/blender/source/blender/imbuf/intern/jpeg.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/jpeg.c 2012-08-12 22:55:57 UTC (rev 49862)
+++ trunk/blender/source/blender/imbuf/intern/jpeg.c 2012-08-12 23:28:33 UTC (rev 49863)
@@ -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"
Modified: trunk/blender/source/blender/imbuf/intern/metadata.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/metadata.c 2012-08-12 22:55:57 UTC (rev 49862)
+++ trunk/blender/source/blender/imbuf/intern/metadata.c 2012-08-12 23:28:33 UTC (rev 49863)
@@ -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"
Modified: trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp
===================================================================
--- trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp 2012-08-12 22:55:57 UTC (rev 49862)
+++ trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp 2012-08-12 23:28:33 UTC (rev 49863)
@@ -256,10 +256,10 @@
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 @@
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;
}
}
Modified: trunk/blender/source/blender/imbuf/intern/png.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/png.c 2012-08-12 22:55:57 UTC (rev 49862)
+++ trunk/blender/source/blender/imbuf/intern/png.c 2012-08-12 23:28:33 UTC (rev 49863)
@@ -33,7 +33,8 @@
#include "png.h"
-#include "BLI_blenlib.h"
+#include "BLI_fileops.h"
+
#include "BLI_math.h"
#include "MEM_guardedalloc.h"
Modified: trunk/blender/source/blender/imbuf/intern/readimage.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/readimage.c 2012-08-12 22:55:57 UTC (rev 49862)
+++ trunk/blender/source/blender/imbuf/intern/readimage.c 2012-08-12 23:28:33 UTC (rev 49863)
@@ -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"
Modified: trunk/blender/source/blender/imbuf/intern/rotate.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/rotate.c 2012-08-12 22:55:57 UTC (rev 49862)
+++ trunk/blender/source/blender/imbuf/intern/rotate.c 2012-08-12 23:28:33 UTC (rev 49863)
@@ -31,11 +31,8 @@
* \ingroup imbuf
*/
-
-#include "BLI_blenlib.h"
#include "BLI_utildefines.h"
-
#include "MEM_guardedalloc.h"
#include "imbuf.h"
Modified: trunk/blender/source/blender/imbuf/intern/scaling.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/scaling.c 2012-08-12 22:55:57 UTC (rev 49862)
+++ trunk/blender/source/blender/imbuf/intern/scaling.c 2012-08-12 23:28:33 UTC (rev 49863)
@@ -32,7 +32,6 @@
*/
-#include "BLI_blenlib.h"
#include "BLI_utildefines.h"
#include "MEM_guardedalloc.h"
Modified: trunk/blender/source/blender/imbuf/intern/targa.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/targa.c 2012-08-12 22:55:57 UTC (rev 49862)
+++ trunk/blender/source/blender/imbuf/intern/targa.c 2012-08-12 23:28:33 UTC (rev 49863)
@@ -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"
Modified: trunk/blender/source/blender/imbuf/intern/thumbs.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/thumbs.c 2012-08-12 22:55:57 UTC (rev 49862)
+++ trunk/blender/source/blender/imbuf/intern/thumbs.c 2012-08-12 23:28:33 UTC (rev 49863)
@@ -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>
Modified: trunk/blender/source/blender/imbuf/intern/tiff.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/tiff.c 2012-08-12 22:55:57 UTC (rev 49862)
+++ trunk/blender/source/blender/imbuf/intern/tiff.c 2012-08-12 23:28:33 UTC (rev 49863)
@@ -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"
Modified: trunk/blender/source/blender/imbuf/intern/util.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/util.c 2012-08-12 22:55:57 UTC (rev 49862)
+++ trunk/blender/source/blender/imbuf/intern/util.c 2012-08-12 23:28:33 UTC (rev 49863)
@@ -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"
More information about the Bf-blender-cvs
mailing list