[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50207] trunk/blender/source/blender: fix for type mismatch with SWAP() macro.

Campbell Barton ideasman42 at gmail.com
Sat Aug 25 21:43:16 CEST 2012


Revision: 50207
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50207
Author:   campbellbarton
Date:     2012-08-25 19:43:15 +0000 (Sat, 25 Aug 2012)
Log Message:
-----------
fix for type mismatch with SWAP() macro.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/curve.c
    trunk/blender/source/blender/blenkernel/intern/mesh.c
    trunk/blender/source/blender/blenkernel/intern/sequencer.c
    trunk/blender/source/blender/editors/curve/editcurve.c
    trunk/blender/source/blender/editors/sculpt_paint/paint_image.c

Modified: trunk/blender/source/blender/blenkernel/intern/curve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/curve.c	2012-08-25 17:58:49 UTC (rev 50206)
+++ trunk/blender/source/blender/blenkernel/intern/curve.c	2012-08-25 19:43:15 UTC (rev 50207)
@@ -3094,11 +3094,11 @@
 				swapdata(bezt2->vec[0], bezt2->vec[2], 12);
 
 			SWAP(char, bezt1->h1, bezt1->h2);
-			SWAP(short, bezt1->f1, bezt1->f3);
+			SWAP(char, bezt1->f1, bezt1->f3);
 
 			if (bezt1 != bezt2) {
 				SWAP(char, bezt2->h1, bezt2->h2);
-				SWAP(short, bezt2->f1, bezt2->f3);
+				SWAP(char, bezt2->f1, bezt2->f3);
 				bezt1->alfa = -bezt1->alfa;
 				bezt2->alfa = -bezt2->alfa;
 			}

Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh.c	2012-08-25 17:58:49 UTC (rev 50206)
+++ trunk/blender/source/blender/blenkernel/intern/mesh.c	2012-08-25 19:43:15 UTC (rev 50207)
@@ -2702,13 +2702,13 @@
 #endif
 		{
 			/* sort loop indices to ensure winding is correct */
-			if (mf->v1 > mf->v2) SWAP(int, mf->v1, mf->v2);
-			if (mf->v2 > mf->v3) SWAP(int, mf->v2, mf->v3);
-			if (mf->v1 > mf->v2) SWAP(int, mf->v1, mf->v2);
+			if (mf->v1 > mf->v2) SWAP(unsigned int, mf->v1, mf->v2);
+			if (mf->v2 > mf->v3) SWAP(unsigned int, mf->v2, mf->v3);
+			if (mf->v1 > mf->v2) SWAP(unsigned int, mf->v1, mf->v2);
 
-			if (mf->v1 > mf->v2) SWAP(int, mf->v1, mf->v2);
-			if (mf->v2 > mf->v3) SWAP(int, mf->v2, mf->v3);
-			if (mf->v1 > mf->v2) SWAP(int, mf->v1, mf->v2);
+			if (mf->v1 > mf->v2) SWAP(unsigned int, mf->v1, mf->v2);
+			if (mf->v2 > mf->v3) SWAP(unsigned int, mf->v2, mf->v3);
+			if (mf->v1 > mf->v2) SWAP(unsigned int, mf->v1, mf->v2);
 		}
 
 		/* end abusing the edcode */

Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c	2012-08-25 17:58:49 UTC (rev 50206)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c	2012-08-25 19:43:15 UTC (rev 50207)
@@ -3627,8 +3627,8 @@
 	SWAP(float, seq_a->blend_opacity, seq_b->blend_opacity);
 
 
-	SWAP(void *, seq_a->prev, seq_b->prev);
-	SWAP(void *, seq_a->next, seq_b->next);
+	SWAP(Sequence *, seq_a->prev, seq_b->prev);
+	SWAP(Sequence *, seq_a->next, seq_b->next);
 	SWAP(int, seq_a->start, seq_b->start);
 	SWAP(int, seq_a->startofs, seq_b->startofs);
 	SWAP(int, seq_a->endofs, seq_b->endofs);

Modified: trunk/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editcurve.c	2012-08-25 17:58:49 UTC (rev 50206)
+++ trunk/blender/source/blender/editors/curve/editcurve.c	2012-08-25 19:43:15 UTC (rev 50207)
@@ -1938,7 +1938,7 @@
 				}
 				else {
 
-					if (newu == 1) SWAP(short, newu, newv);
+					if (newu == 1) SWAP(int, newu, newv);
 
 					newnu = (Nurb *)MEM_mallocN(sizeof(Nurb), "adduplicateN5");
 					memcpy(newnu, nu, sizeof(Nurb));

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_image.c	2012-08-25 17:58:49 UTC (rev 50206)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_image.c	2012-08-25 19:43:15 UTC (rev 50207)
@@ -388,7 +388,11 @@
 	char idname[MAX_ID_NAME];  /* name instead of pointer*/
 	char ibufname[IB_FILENAME_SIZE];
 
-	void *rect;
+	union {
+		float        *fp;
+		unsigned int *uint;
+		void         *pt;
+	} rect;
 	int x, y;
 
 	short source, use_float;
@@ -406,10 +410,10 @@
 	            tile->y * IMAPAINT_TILE_SIZE, IMAPAINT_TILE_SIZE, IMAPAINT_TILE_SIZE);
 
 	if (ibuf->rect_float) {
-		SWAP(void *, tmpibuf->rect_float, tile->rect);
+		SWAP(float *, tmpibuf->rect_float, tile->rect.fp);
 	}
 	else {
-		SWAP(void *, tmpibuf->rect, tile->rect);
+		SWAP(unsigned int *, tmpibuf->rect, tile->rect.uint);
 	}
 	
 	if (restore)
@@ -428,7 +432,7 @@
 		if (tile->x == x_tile && tile->y == y_tile && ima->gen_type == tile->gen_type && ima->source == tile->source)
 			if (tile->use_float == use_float)
 				if (strcmp(tile->idname, ima->id.name) == 0 && strcmp(tile->ibufname, ibuf->name) == 0)
-					return tile->rect;
+					return tile->rect.pt;
 	
 	if (*tmpibuf == NULL)
 		*tmpibuf = IMB_allocImBuf(IMAPAINT_TILE_SIZE, IMAPAINT_TILE_SIZE, 32, IB_rectfloat | IB_rect);
@@ -440,7 +444,7 @@
 
 	allocsize = IMAPAINT_TILE_SIZE * IMAPAINT_TILE_SIZE * 4;
 	allocsize *= (ibuf->rect_float) ? sizeof(float) : sizeof(char);
-	tile->rect = MEM_mapallocN(allocsize, "UndeImageTile.rect");
+	tile->rect.pt = MEM_mapallocN(allocsize, "UndeImageTile.rect");
 
 	BLI_strncpy(tile->ibufname, ibuf->name, sizeof(tile->ibufname));
 
@@ -453,7 +457,7 @@
 
 	BLI_addtail(lb, tile);
 	
-	return tile->rect;
+	return tile->rect.pt;
 }
 
 static void image_undo_restore(bContext *C, ListBase *lb)
@@ -517,7 +521,7 @@
 	UndoImageTile *tile;
 
 	for (tile = lb->first; tile; tile = tile->next)
-		MEM_freeN(tile->rect);
+		MEM_freeN(tile->rect.pt);
 }
 
 /* get active image for face depending on old/new shading system */
@@ -4545,15 +4549,15 @@
 
 		/* temporarily add float rect for cloning */
 		if (s->canvas->rect_float && !s->clonecanvas->rect_float) {
-			int profile = IB_PROFILE_NONE;
+			short profile = IB_PROFILE_NONE;
 			
 			/* Don't want to color manage, but don't disturb existing profiles */
-			SWAP(int, s->clonecanvas->profile, profile);
+			SWAP(short, s->clonecanvas->profile, profile);
 
 			IMB_float_from_rect(s->clonecanvas);
 			s->clonefreefloat = 1;
 			
-			SWAP(int, s->clonecanvas->profile, profile);
+			SWAP(short, s->clonecanvas->profile, profile);
 		}
 		else if (!s->canvas->rect_float && !s->clonecanvas->rect)
 			IMB_rect_from_float(s->clonecanvas);




More information about the Bf-blender-cvs mailing list