Changeset 47 in flair-dev for trunk/include


Ignore:
Timestamp:
Jan 19, 2017, 3:06:46 PM (4 years ago)
Author:
Sanahuja Guillaume
Message:

m

Location:
trunk/include
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/FlairCore/Semaphore.h

    r42 r47  
    5151  *
    5252  * Lock the semaphore.
    53   *
     53  *
     54  * \param timeout The timeout, in nanoseconds.
    5455  */
    55   void GetSemaphore(void) const;
     56  bool GetSemaphore(Time timeout = TIME_INFINITE) const;
    5657
    5758  /*!
     
    6162  *
    6263  */
    63   void ReleaseSemaphore(void) const;
     64  bool ReleaseSemaphore(void) const;
    6465
    6566private:
  • trunk/include/FlairCore/cvimage.h

    r13 r47  
    3939      UYVY, /*!< UYVY 16 bits */
    4040      BGR,  /*!< BGR 24 bits */
    41       GRAY, /*!< gray 8 bits */
     41      Gray, /*!< gray 8 bits */
    4242    };
    4343    Type(uint16_t _width, uint16_t _height, Format _format)
     
    4747      size_t pixelSize;
    4848      switch (format) {
    49       case Format::GRAY:
     49      case Format::Gray:
    5050        pixelSize = 1;
    5151        break;
  • trunk/include/FlairSensorActuator/Camera.h

    r44 r47  
    9292
    9393  /*!
    94   * \brief Save picture to file
     94  * \brief Save raw picture to file
    9595  *
    9696  * \param filename filename
    9797  */
    98   void SaveToFile(std::string filename) const;
     98  void SaveRawPictureToFile(std::string filename) const;
     99       
     100        /*!
     101  * \brief Save picture to file
     102  *
     103  * \param filename filename; if ommitted, current time is used and file is saved in current directory with jpg compression
     104  */
     105  void SavePictureToFile(std::string filename="") const;
    99106
    100107  /*!
  • trunk/include/FlairVisionFilter/CvtColor.h

    r44 r47  
    3939            */
    4040            enum class Conversion_t {
    41                 BGR,/*!< BGR 24 bits */
    42                 GRAY,/*!< gray 8 bits */
     41                ToBGR,/*!< BGR 24 bits */
     42                ToGray,/*!< gray 8 bits */
    4343                } ;
    4444
  • trunk/include/FlairVisionFilter/VisionFilter.h

    r45 r47  
    1212void CloseVisionFilter(void);
    1313
    14 void saveToJpeg(IplImage* src_img,std::string filename,unsigned char compression_level=95);
     14enum class PictureFormat_t {
     15                Gray,/*!< gray 8 bits */
     16                RGB,/*!< rgb 24 bits */
     17                YUV_422ile,/*!< YUV 4:2:2 interleaved */
     18                YUV_422p,/*!< YUV 4:2:2 planer */
     19                } ;
     20                                                               
     21void saveToJpeg(IplImage* src_img,std::string filename,PictureFormat_t input_format,PictureFormat_t output_format,unsigned char compression_level=95);
Note: See TracChangeset for help on using the changeset viewer.