From 3b14d730d9b16be01e696d8631c4b5dfb7201b8f Mon Sep 17 00:00:00 2001
From: Kent Mein <mein@cs.umn.edu>
Date: Fri, 2 May 2003 20:52:58 +0000
Subject: [PATCH] Updated the scatter program to fix some warnings. Modified
 the Makefile's call to strip so it leaves symbols for plugins...

Kent
---
 release/Makefile                   | 16 ++++++++--------
 release/plugins/sequence/scatter.c | 12 ++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/release/Makefile b/release/Makefile
index db19081f60d..89224ef7c4a 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -104,6 +104,14 @@ install: package
 #@cp -r python $(DISTDIR)/python
 #@rm -fr $(DISTDIR)/python/CVS
 
+    ifneq ($(NOSTRIP),true)
+	@echo "----> Strip blender executable"
+      ifeq ($(OS),darwin)
+	@strip -x $(OCGDIR)/bin/blender$(EXT0)/Contents/MacOS/blender
+      else
+	@strip -x $(DISTDIR)/blender$(EXT0)
+      endif
+    endif
 	@echo "----> Copy blender$(EXT0) executable"
     ifeq ($(TYPE),-static)
 	@cp $(OCGDIR)/bin/blenderstatic$(EXT0) $(DISTDIR)/blender$(EXT0)
@@ -123,14 +131,6 @@ install: package
 	@$(MAKE) -C $(DISTDIR)/plugins all  > /dev/null || exit 1;
 	@rm -fr $(DISTDIR)/plugins/CVS $(DISTDIR)/plugins/*/CVS \
              $(DISTDIR)/plugins/*/*.o
-    endif
-    ifneq ($(NOSTRIP),true)
-	@echo "----> Strip blender executable"
-      ifeq ($(OS),darwin)
-	@strip $(OCGDIR)/bin/blender$(EXT0)/Contents/MacOS/blender
-      else
-	@strip $(DISTDIR)/blender$(EXT0)
-      endif
     endif
 	@[ ! -x $(CONFIG_GUESS)/specific.sh ] || (\
 	    echo "**--> Execute specific.sh in $(CONFIG_GUESS)/" && \
diff --git a/release/plugins/sequence/scatter.c b/release/plugins/sequence/scatter.c
index cba8aeab5a8..b61b53c1a85 100644
--- a/release/plugins/sequence/scatter.c
+++ b/release/plugins/sequence/scatter.c
@@ -184,7 +184,7 @@ void plugin_seq_doit(Cast *cast, float facf0, float facf1, int sx, int sy, ImBuf
 	int x, y, lr;
 	
 	/* fill imbuf 'out' with black */
-	rectop(out, 0,0,0,0,0,32767,32767,rectfill, 0);
+	ibufrectop(out, ibuf1,0,0,0,0,32767,32767,rectfill, 0);
 
 	switch (cast->type) {
 		case 0:
@@ -223,12 +223,12 @@ void plugin_seq_doit(Cast *cast, float facf0, float facf1, int sx, int sy, ImBuf
 				break;
 		}
 		
-		rectop(out, ibuf1, 0, y, x, y, 32767, 1, rectcpy, 0);
+		ibufrectop(out, ibuf1, 0, y, x, y, 32767, 1, rectcpy, 0);
 		if (cast->wrap) {
-			rectop(out, ibuf1, 0, y, x + sx, y, 32767, 1, rectcpy, 0);
-			rectop(out, ibuf1, 0, y, x + sx + sx, y, 32767, 1, rectcpy, 0);
-			rectop(out, ibuf1, 0, y, x - sx, y, 32767, 1, rectcpy, 0);
-			rectop(out, ibuf1, 0, y, x - sx - sx, y, 32767, 1, rectcpy, 0);
+			ibufrectop(out, ibuf1, 0, y, x + sx, y, 32767, 1, rectcpy, 0);
+			ibufrectop(out, ibuf1, 0, y, x + sx + sx, y, 32767, 1, rectcpy, 0);
+			ibufrectop(out, ibuf1, 0, y, x - sx, y, 32767, 1, rectcpy, 0);
+			ibufrectop(out, ibuf1, 0, y, x - sx - sx, y, 32767, 1, rectcpy, 0);
 		}
 	}
 }