From dfb545a77cb1b46b846e3025d0362bec917b67a2 Mon Sep 17 00:00:00 2001
From: Ken Hughes <khughes@pacific.edu>
Date: Mon, 3 Apr 2006 20:31:10 +0000
Subject: Fix some warning for unsigned vs signed comparisons.

---
 source/blender/blenkernel/intern/image.c       |  5 +++--
 source/blender/blenkernel/intern/mesh.c        |  3 ++-
 source/blender/blenkernel/intern/text.c        | 11 +++++------
 source/blender/blenkernel/intern/writeffmpeg.c |  2 +-
 source/blender/blenloader/intern/readfile.c    |  2 +-
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 9f19735da5b..cb29c3ed2be 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -75,7 +75,7 @@
 
 void free_image_buffers(Image *ima)
 {
-	int a;
+	unsigned int a;
 
 	if(ima->ibuf) {
 		if (ima->ibuf->userdata) {
@@ -615,7 +615,8 @@ static void de_interlace_st(struct ImBuf *ibuf)	/* standard fields */
 void ima_ibuf_is_nul(Tex *tex, Image *ima)
 {
 	void (*de_interlacefunc)(struct ImBuf *ibuf);
-	int a, fra, dur;
+	unsigned int a;
+	int	fra, dur;
 	char str[FILE_MAXDIR+FILE_MAXFILE], *cp;
 	
 	if(ima==0) return;
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index c1718e0e859..d928addcb55 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -1096,7 +1096,8 @@ UvVertMap *make_uv_vert_map(struct MFace *mface, struct TFace *tface, unsigned i
 	UvMapVert *buf;
 	MFace *mf;
 	TFace *tf;
-	int a, i, totuv, nverts;
+	unsigned int a;
+	int	i, totuv, nverts;
 
 	totuv = 0;
 
diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index 2633bbd2779..d40da84e211 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -1438,7 +1438,7 @@ static void txt_undo_add_op(Text *text, int op)
 
 static void txt_undo_add_block(Text *text, int op, char *buf)
 {
-	unsigned int length;
+	int length;
 	
 	length= strlen(buf);
 	
@@ -1532,8 +1532,8 @@ static void txt_undo_add_charop(Text *text, int op, char c)
 
 void txt_do_undo(Text *text)
 {
-	int op= text->undo_buf[text->undo_pos], i;
-	unsigned int linep;
+	int op= text->undo_buf[text->undo_pos];
+	unsigned int linep, i;
 	unsigned short charp;
 	TextLine *holdl;
 	int holdc, holdln;
@@ -1641,7 +1641,7 @@ void txt_do_undo(Text *text)
 			linep= (linep<<8)+text->undo_buf[text->undo_pos]; text->undo_pos--;
 
 			buf= MEM_mallocN(linep+1, "dblock buffer");
-			for (i=0; i < (int)linep; i++){
+			for (i=0; i < linep; i++){
 				buf[(linep-1)-i]= text->undo_buf[text->undo_pos]; 
 				text->undo_pos--;
 			}
@@ -1753,10 +1753,9 @@ void txt_do_undo(Text *text)
 void txt_do_redo(Text *text)
 {
 	char op;
-	unsigned int linep;
+	unsigned int linep, i;
 	unsigned short charp;
 	char *buf;
-	int i;
 	
 	text->undo_pos++;	
 	op= text->undo_buf[text->undo_pos];
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
index d84ba18618c..bbeb0e06156 100644
--- a/source/blender/blenkernel/intern/writeffmpeg.c
+++ b/source/blender/blenkernel/intern/writeffmpeg.c
@@ -190,7 +190,7 @@ AVOutputFormat* ffmpeg_get_format(int format)
 /* Get the correct file extension for the requested format */
 void file_extension(int format, char* string) 
 {
-	int i;
+	unsigned int i;
 	AVOutputFormat* f;
 	const char* ext;
 	f= ffmpeg_get_format(format);
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index aff8c07c990..34921569b37 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -817,7 +817,7 @@ static int fd_read_from_memfile(FileData *filedata, void *buffer, int size)
 	
 	if(size==0) return 0;
 	
-	if(seek != filedata->seek) {
+	if(seek != (unsigned int)filedata->seek) {
 		chunk= filedata->memfile->chunks.first;
 		seek= 0;
 		
-- 
cgit v1.2.3