Peter M. Groen / openbr

Commit d83efb062c10617fa4e07ce6160aa66198302deb

Authored by Austin Blanton
1 parent 7bf78415

Add GRAY2RGB conversion

Inline Side-by-side
Showing 1 changed file with 4 additions and 3 deletions
openbr/plugins/cvt.cpp
  View file @d83efb0
@@ -44,7 +44,8 @@ public: @@ -44,7 +44,8 @@ public:
44 Luv = CV_BGR2Luv, 44 Luv = CV_BGR2Luv,
45 RGB = CV_BGR2RGB, 45 RGB = CV_BGR2RGB,
46 XYZ = CV_BGR2XYZ, 46 XYZ = CV_BGR2XYZ,
47 - YCrCb = CV_BGR2YCrCb }; 47 + YCrCb = CV_BGR2YCrCb,
  48 + Color = CV_GRAY2BGR };
48 49
49 private: 50 private:
50 BR_PROPERTY(ColorSpace, colorSpace, Gray) 51 BR_PROPERTY(ColorSpace, colorSpace, Gray)
@@ -52,8 +53,8 @@ private: @@ -52,8 +53,8 @@ private:
52 53
53 void project(const Template &src, Template &dst) const 54 void project(const Template &src, Template &dst) const
54 { 55 {
55 - if (src.m().channels() > 1) cvtColor(src, dst, colorSpace);  
56 - else dst = src; 56 + if (src.m().channels() > 1 || colorSpace == CV_GRAY2BGR) cvtColor(src, dst, colorSpace);
  57 + else dst = src;
57 58
58 if (channel != -1) { 59 if (channel != -1) {
59 std::vector<Mat> mv; 60 std::vector<Mat> mv;