Peter M. Groen / openbr

Commit 2e9f860640fcf36ca1dc16bef980b756efec5359

Authored by Josh Klontz
1 parent db0949e6

renamed Cvt::code to Cvt::colorSpace

Inline Side-by-side
Showing 1 changed file with 14 additions and 15 deletions
openbr/plugins/cvt.cpp
  View file @2e9f860
... ... @@ -25,35 +25,34 @@ namespace br
25 25  
26 26 /*!
27 27 * \ingroup transforms
28   - * \brief Colorspace conversion
  28 + * \brief Colorspace conversion.
29 29 * \author Josh Klontz \cite jklontz
30 30 */
31 31 class CvtTransform : public UntrainableTransform
32 32 {
33 33 Q_OBJECT
34   - Q_ENUMS(Code)
35   - Q_PROPERTY(Code code READ get_code WRITE set_code RESET reset_code STORED false)
  34 + Q_ENUMS(ColorSpace)
  35 + Q_PROPERTY(ColorSpace colorSpace READ get_colorSpace WRITE set_colorSpace RESET reset_colorSpace STORED false)
36 36 Q_PROPERTY(int channel READ get_channel WRITE set_channel RESET reset_channel STORED false)
37 37  
38 38 public:
39   - /*!< */
40   - enum Code { Gray = CV_BGR2GRAY,
41   - RGBGray = CV_RGB2GRAY,
42   - HLS = CV_BGR2HLS,
43   - HSV = CV_BGR2HSV,
44   - Lab = CV_BGR2Lab,
45   - Luv = CV_BGR2Luv,
46   - RGB = CV_BGR2RGB,
47   - XYZ = CV_BGR2XYZ,
48   - YCrCb = CV_BGR2YCrCb };
  39 + enum ColorSpace { Gray = CV_BGR2GRAY,
  40 + RGBGray = CV_RGB2GRAY,
  41 + HLS = CV_BGR2HLS,
  42 + HSV = CV_BGR2HSV,
  43 + Lab = CV_BGR2Lab,
  44 + Luv = CV_BGR2Luv,
  45 + RGB = CV_BGR2RGB,
  46 + XYZ = CV_BGR2XYZ,
  47 + YCrCb = CV_BGR2YCrCb };
49 48  
50 49 private:
51   - BR_PROPERTY(Code, code, Gray)
  50 + BR_PROPERTY(ColorSpace, colorSpace, Gray)
52 51 BR_PROPERTY(int, channel, -1)
53 52  
54 53 void project(const Template &src, Template &dst) const
55 54 {
56   - if (src.m().channels() > 1) cvtColor(src, dst, code);
  55 + if (src.m().channels() > 1) cvtColor(src, dst, colorSpace);
57 56 else dst = src;
58 57  
59 58 if (channel != -1) {
... ...