# HG changeset patch
# User Nicolas Saunier <nicolas.saunier@polymtl.ca>
# Date 1383712948 18000
# Node ID 70accfa6692fcf8ea9bbb66f244eb2335d46e6e9
# Parent  1e3c7fe21a38f4b98e1d5daf2ed5ec1273552d1a# Parent  334e1151828b89c05c9ef4dff07a2d37e53107c2
merged

diff -r 334e1151828b -r 70accfa6692f c/cvutils.cpp
--- a/c/cvutils.cpp	Thu Oct 31 16:59:34 2013 -0400
+++ b/c/cvutils.cpp	Tue Nov 05 23:42:28 2013 -0500
@@ -87,14 +87,15 @@
 				Colors::white(), 
 				Colors::black()};
 
+// Blue, Green, Red
 Scalar Colors::black(void) { return Scalar(0,0,0);}
-Scalar Colors::red(void) { return Scalar(255,0,0);}
+Scalar Colors::blue(void) { return Scalar(255,0,0);}
 Scalar Colors::green(void) { return Scalar(0,255,0);}
-Scalar Colors::blue(void) { return Scalar(0,0,255);}
+Scalar Colors::red(void) { return Scalar(0,0,255);}
 Scalar Colors::white(void) { return Scalar(255,255,255);}
 Scalar Colors::magenta(void) { return Scalar(255,0,255);}
-Scalar Colors::cyan(void) { return Scalar(0,255,255);}
-Scalar Colors::yellow(void) { return Scalar(255,255,0);}
+Scalar Colors::yellow(void) { return Scalar(0,255,255);}
+Scalar Colors::cyan(void) { return Scalar(255,255,0);}
 
 Scalar Colors::color3(const int& num) { return Colors::color[num%3];}
 Scalar Colors::color8(const int& num) { return Colors::color[num%Colors::nColors];}