Changeset 47 in flair-dev for trunk/include/FlairCore


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

m

Location:
trunk/include/FlairCore
Files:
2 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;
Note: See TracChangeset for help on using the changeset viewer.