Changeset 124 in flair-src for trunk/lib/FlairCore/src

Timestamp:

Jan 12, 2017, 10:39:23 AM (8 years ago)

Author:

Sanahuja Guillaume

Message:

modifs jpeg

Location:

trunk/lib/FlairCore/src

Files:

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

trunk/lib/FlairCore/src/cvimage.cpp

@@ -36 +36 @@
       img = cvCreateImage(cvSize(width, height), IPL_DEPTH_8U, 3);
       break;
-    case Type::Format::GRAY:
+    case Type::Format::Gray:
       img = cvCreateImage(cvSize(width, height), IPL_DEPTH_8U, 1);
       break;
@@ -55 +55 @@
       img = cvCreateImageHeader(cvSize(width, height), IPL_DEPTH_8U, 3);
       break;
-    case Type::Format::GRAY:
+    case Type::Format::Gray:
       img = cvCreateImageHeader(cvSize(width, height), IPL_DEPTH_8U, 1);
       break;

trunk/lib/FlairCore/src/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;