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

Timestamp:

Jan 19, 2017, 3:06:46 PM (8 years ago)

Author:

Sanahuja Guillaume

Message:

m

Location:

trunk/include/FlairCore

Files:

• Semaphore.h (modified) (2 diffs)
• cvimage.h (modified) (2 diffs)

trunk/include/FlairCore/Semaphore.h

@@ -51 +51 @@
   *
   * Lock the semaphore.
-  *
+  * 
+  * \param timeout The timeout, in nanoseconds.
   */
-  void GetSemaphore(void) const;
+  bool GetSemaphore(Time timeout = TIME_INFINITE) const;
 
   /*!
@@ -61 +62 @@
   *
   */
-  void ReleaseSemaphore(void) const;
+  bool ReleaseSemaphore(void) const;
 
 private:

trunk/include/FlairCore/cvimage.h

@@ -39 +39 @@
       UYVY, /*!< UYVY 16 bits */
       BGR,  /*!< BGR 24 bits */
-      GRAY, /*!< gray 8 bits */
+      Gray, /*!< gray 8 bits */
     };
     Type(uint16_t _width, uint16_t _height, Format _format)
@@ -47 +47 @@
       size_t pixelSize;
       switch (format) {
-      case Format::GRAY:
+      case Format::Gray:
         pixelSize = 1;
         break;