changeset 428:70accfa6692f

merged
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Tue, 05 Nov 2013 23:42:28 -0500
parents 1e3c7fe21a38 (diff) 334e1151828b (current diff)
children 2be846d36dec
files
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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];}