From bb50452422a4b4826cd21836217116a762ebbceb Mon Sep 17 00:00:00 2001
From: csBlueChip <csbluechip@gmail.com>
Date: Sun, 23 Aug 2009 14:50:26 +0000
Subject: [PATCH] Moved BlueChip's Composition demo directory to conform to the
 current standard naming convention

---
 examples/{bluechip => }/composition/blue70.png    | Bin
 examples/{bluechip => }/composition/composition.c |   1 +
 examples/{bluechip => }/composition/makefile      |   2 +-
 examples/{bluechip => }/composition/raw2c.exe     | Bin
 examples/{bluechip => }/composition/red50.png     | Bin
 5 files changed, 2 insertions(+), 1 deletion(-)
 rename examples/{bluechip => }/composition/blue70.png (100%)
 rename examples/{bluechip => }/composition/composition.c (95%)
 rename examples/{bluechip => }/composition/makefile (98%)
 rename examples/{bluechip => }/composition/raw2c.exe (100%)
 rename examples/{bluechip => }/composition/red50.png (100%)

diff --git a/examples/bluechip/composition/blue70.png b/examples/composition/blue70.png
similarity index 100%
rename from examples/bluechip/composition/blue70.png
rename to examples/composition/blue70.png
diff --git a/examples/bluechip/composition/composition.c b/examples/composition/composition.c
similarity index 95%
rename from examples/bluechip/composition/composition.c
rename to examples/composition/composition.c
index 56ffcf8..cb6e4ec 100644
--- a/examples/bluechip/composition/composition.c
+++ b/examples/composition/composition.c
@@ -22,6 +22,7 @@ THE SOFTWARE.
 
 //------------------------------------------------------------------------------
 // Test Harness for alpha composition functions
+// The composition function and this demo were both written by BlueChip
 /*
   PaintShopPro_X2 readings:
       |        | Blue-over-Red | Red-over-Blue |
diff --git a/examples/bluechip/composition/makefile b/examples/composition/makefile
similarity index 98%
rename from examples/bluechip/composition/makefile
rename to examples/composition/makefile
index b67b7be..d92543d 100644
--- a/examples/bluechip/composition/makefile
+++ b/examples/composition/makefile
@@ -73,4 +73,4 @@ run : $(DOL)
 .PRECIOUS : %.c
 %.c : %.png
 	@echo Converting resource: $<
-	@./raw2c.exe $<
+	@./raw2c.exe $< 2>null
diff --git a/examples/bluechip/composition/raw2c.exe b/examples/composition/raw2c.exe
similarity index 100%
rename from examples/bluechip/composition/raw2c.exe
rename to examples/composition/raw2c.exe
diff --git a/examples/bluechip/composition/red50.png b/examples/composition/red50.png
similarity index 100%
rename from examples/bluechip/composition/red50.png
rename to examples/composition/red50.png