Remove gcc compiler warnings from various files.

6 files changed, 17 insertions, 20 deletions

diff --git a/source/blender/imbuf/intern/cineon/cineonlib.c b/source/blender/imbuf/intern/cineon/cineonlib.c
index 91973927fab..20f4e0d4de4 100644
--- a/source/blender/imbuf/intern/cineon/cineonlib.c
+++ b/source/blender/imbuf/intern/cineon/cineonlib.c
@@ -67,12 +67,12 @@ fillCineonFileInfo(CineonFile* cineon, CineonFileInformation* fileInfo, const ch
 static void
 dumpCineonFileInfo(CineonFileInformation* fileInfo) {
 	d_printf("\n--File Information--\n");
-	d_printf("Magic: %8.8lX\n", ntohl(fileInfo->magic_num));
-	d_printf("Image Offset %ld\n", ntohl(fileInfo->image_offset));
-	d_printf("Generic Header size %ld\n", ntohl(fileInfo->gen_hdr_size));
-	d_printf("Industry Header size %ld\n", ntohl(fileInfo->ind_hdr_size));
-	d_printf("User Data size %ld\n", ntohl(fileInfo->user_data_size));
-	d_printf("File size %ld\n", ntohl(fileInfo->file_size));
+	d_printf("Magic: %8.8lX\n", (unsigned long)ntohl(fileInfo->magic_num));
+	d_printf("Image Offset %ld\n", (long)ntohl(fileInfo->image_offset));
+	d_printf("Generic Header size %ld\n", (long)ntohl(fileInfo->gen_hdr_size));
+	d_printf("Industry Header size %ld\n", (long)ntohl(fileInfo->ind_hdr_size));
+	d_printf("User Data size %ld\n", (long)ntohl(fileInfo->user_data_size));
+	d_printf("File size %ld\n", (long)ntohl(fileInfo->file_size));
 	d_printf("Version \"%s\"\n", fileInfo->vers);
 	d_printf("File name \"%s\"\n", fileInfo->file_name);
 	d_printf("Creation date \"%s\"\n", fileInfo->create_date);
@@ -112,11 +112,11 @@ dumpCineonChannelInfo(CineonChannelInformation* chan) {
 		default: d_printf(" (unknown)\n"); break;
 	}
 	d_printf("	Bits per pixel %d\n", chan->bits_per_pixel);
-	d_printf("	Pixels per line %ld\n", ntohl(chan->pixels_per_line));
-	d_printf("	Lines per image %ld\n", ntohl(chan->lines_per_image));
-	d_printf("	Ref low data %ld\n", ntohl(chan->ref_low_data));
+	d_printf("	Pixels per line %ld\n", (long)ntohl(chan->pixels_per_line));
+	d_printf("	Lines per image %ld\n", (long)ntohl(chan->lines_per_image));
+	d_printf("	Ref low data %ld\n", (long)ntohl(chan->ref_low_data));
 	d_printf("	Ref low quantity %f\n", ntohf(chan->ref_low_quantity));
-	d_printf("	Ref high data %ld\n", ntohl(chan->ref_high_data));
+	d_printf("	Ref high data %ld\n", (long)ntohl(chan->ref_high_data));
 	d_printf("	Ref high quantity %f\n", ntohf(chan->ref_high_quantity));
 }
 
@@ -231,8 +231,8 @@ dumpCineonFormatInfo(CineonFormatInformation* formatInfo) {
 	} else {
 		d_printf(" positive\n");
 	}
-	d_printf("End of line padding %ld\n", ntohl(formatInfo->line_padding));
-	d_printf("End of channel padding %ld\n", ntohl(formatInfo->channel_padding));
+	d_printf("End of line padding %ld\n", (long)ntohl(formatInfo->line_padding));
+	d_printf("End of channel padding %ld\n", (long)ntohl(formatInfo->channel_padding));
 }
 
 static void
@@ -256,8 +256,8 @@ fillCineonOriginationInfo(CineonFile* cineon,
 static void
 dumpCineonOriginationInfo(CineonOriginationInformation* originInfo) {
 	d_printf("\n--Origination Information--\n");
-	d_printf("X offset %ld\n", ntohl(originInfo->x_offset));
-	d_printf("Y offset %ld\n", ntohl(originInfo->y_offset));
+	d_printf("X offset %ld\n", (long)ntohl(originInfo->x_offset));
+	d_printf("Y offset %ld\n", (long)ntohl(originInfo->y_offset));
 	d_printf("File name \"%s\"\n", originInfo->file_name);
 	d_printf("Creation date \"%s\"\n", originInfo->create_date);
 	d_printf("Creation time \"%s\"\n", originInfo->create_time);
@@ -525,7 +525,7 @@ cineonOpen(const char* filename) {
 	/* let's assume cineon files are always network order */
 	if (header.fileInfo.magic_num != ntohl(CINEON_FILE_MAGIC)) {
 		if (verbose) d_printf("Bad magic number %8.8lX in \"%s\".\n",
-			ntohl(header.fileInfo.magic_num), filename);
+			(unsigned long)ntohl(header.fileInfo.magic_num), filename);
 		cineonClose(cineon);
 		return 0;
 	}
@@ -624,7 +624,7 @@ cineonOpenFromMem(unsigned char *mem, unsigned int size) {
 
 	/* let's assume cineon files are always network order */
 	if (header.fileInfo.magic_num != ntohl(CINEON_FILE_MAGIC)) {
-		if (verbose) d_printf("Bad magic number %8.8lX in\n", ntohl(header.fileInfo.magic_num));
+		if (verbose) d_printf("Bad magic number %8.8lX in\n", (unsigned long)ntohl(header.fileInfo.magic_num));
 
 		cineonClose(cineon);
 		return 0;
diff --git a/source/blender/python/api2_2x/Camera.c b/source/blender/python/api2_2x/Camera.c
index 97cb72e4b89..64951cc38b4 100644
--- a/source/blender/python/api2_2x/Camera.c
+++ b/source/blender/python/api2_2x/Camera.c
@@ -213,7 +213,6 @@ static PyObject *M_Camera_New( PyObject * self, PyObject * args,
 	static char *kwlist[] = { "type_str", "name_str", NULL };
 	PyObject *pycam;	/* for Camera Data object wrapper in Python */
 	Camera *blcam;		/* for actual Camera Data we create in Blender */
-	char buf[21];
 
 	/* Parse the arguments passed in by the Python interpreter */
 	if( !PyArg_ParseTupleAndKeywords( args, kwords, "|ss", kwlist,
diff --git a/source/blender/python/api2_2x/Group.c b/source/blender/python/api2_2x/Group.c
index faf3fc7db73..adee39030b3 100755
--- a/source/blender/python/api2_2x/Group.c
+++ b/source/blender/python/api2_2x/Group.c
@@ -352,7 +352,6 @@ PyTypeObject Group_Type = {
 PyObject *M_Group_New( PyObject * self, PyObject * args )
 {
 	char *name = "Group";
-	char buf[21];
 	BPy_Group *py_group;	/* for Group Data object wrapper in Python */
 	struct Group *bl_group;
 	
diff --git a/source/blender/python/api2_2x/Mesh.c b/source/blender/python/api2_2x/Mesh.c
index 6963a41c483..60f297d3591 100644
--- a/source/blender/python/api2_2x/Mesh.c
+++ b/source/blender/python/api2_2x/Mesh.c
@@ -7857,7 +7857,6 @@ static PyObject *M_Mesh_New( PyObject * self_unused, PyObject * args )
 	char *name = "Mesh";
 	Mesh *mesh;
 	BPy_Mesh *obj;
-	char buf[21];
 
 	if( !PyArg_ParseTuple( args, "|s", &name ) )
 		return EXPP_ReturnPyObjError( PyExc_TypeError,
diff --git a/source/blender/python/api2_2x/NMesh.c b/source/blender/python/api2_2x/NMesh.c
index 7c752a2f4d8..9cfeffc8ab1 100644
--- a/source/blender/python/api2_2x/NMesh.c
+++ b/source/blender/python/api2_2x/NMesh.c
@@ -77,6 +77,7 @@
 #include "IDProp.h"
 #include "constant.h"
 #include "gen_utils.h"
+#include "gen_library.h"
 
 extern void countall(void);
 
diff --git a/source/blender/python/api2_2x/Text.c b/source/blender/python/api2_2x/Text.c
index d06cd963687..18532f2596f 100644
--- a/source/blender/python/api2_2x/Text.c
+++ b/source/blender/python/api2_2x/Text.c
@@ -144,7 +144,6 @@ static PyObject *Text_repr( BPy_Text * self );
 static PyObject *M_Text_New( PyObject * self, PyObject * args)
 {
 	char *name = "Text";
-	char buf[21];
 	int follow = 0;
 	Text *bl_text;		/* blender text object */
 	PyObject *py_text;	/* python wrapper */