Changeset 338 in flair-src for trunk/lib/FlairSensorActuator/src/Camera.h
- Timestamp:
- Oct 17, 2019, 2:49:35 PM (5 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
-
Property svn:mergeinfo
set to
/branches/sanscv merged eligible
-
Property svn:mergeinfo
set to
-
trunk/lib/FlairSensorActuator/src/Camera.h
r137 r338 16 16 #include <IODevice.h> 17 17 #include <stdint.h> 18 #include < cvimage.h>18 #include <Image.h> 19 19 20 20 namespace flair { … … 51 51 */ 52 52 Camera(std::string name, uint16_t width, 53 uint16_t height, core:: cvimage::Type::Format format);53 uint16_t height, core::Image::Type::Format format); 54 54 55 55 /*! … … 75 75 * \param image image to display 76 76 */ 77 void UseDefaultPlot(const core:: cvimage *image);77 void UseDefaultPlot(const core::Image *image); 78 78 79 79 /*! … … 126 126 * \return the output matrix 127 127 */ 128 core:: cvimage *Output(void);128 core::Image *Output(void); 129 129 130 130 core::DataType const &GetOutputDataType() const; … … 159 159 gui::GroupBox *GetGroupBox(void) const; 160 160 161 core:: cvimage *output;161 core::Image *output; 162 162 163 163 private:
Note:
See TracChangeset
for help on using the changeset viewer.