Changeset 1313 in 3DVCSoftware for trunk/source/Lib/TLibRenderer/TRenImage.h

Timestamp:

13 Aug 2015, 17:38:13 (9 years ago)

Author:

tech

Message:

Merged 14.1-update-dev1@1312.

File:

• trunk/source/Lib/TLibRenderer/TRenImage.h (modified) (4 diffs)

trunk/source/Lib/TLibRenderer/TRenImage.h

@@ -39 +39 @@
 #include "../TLibCommon/TComPicYuv.h"
 #include "TRenImagePlane.h"
-#if H_3D
+#if NH_3D
 
 
@@ -70 +70 @@
   TRenImagePlane<T>** getPlanes() const;
 
-  Void getDataAndStrides( T**    pptData, Int*  piStrides );
-  Void getWidthAndHeight( Int*  piWidths, Int*  piHeights );
+  Void getDataAndStrides ( T**    pptData, Int*  piStrides ) const ;
+  Void getWidthAndHeight ( Int*  piWidths, Int*  piHeights ) const ;
 
   UInt getNumberOfPlanes()  const;
   UInt getNumberOfQuaterPlanes() const;
   UInt getNumberOfFullPlanes() const;
-  Bool is420() {return m_uiNumberOfFullPlanes == 1 && m_uiNumberOfQuaterPlanes == 2; };
-  Bool is444() {return m_uiNumberOfFullPlanes == 3 && m_uiNumberOfQuaterPlanes == 0; };
-  Bool is400() {return m_uiNumberOfFullPlanes == 1 && m_uiNumberOfQuaterPlanes == 0; };
+  Bool is420() const {return m_uiNumberOfFullPlanes == 1 && m_uiNumberOfQuaterPlanes == 2; };
+  Bool is444() const {return m_uiNumberOfFullPlanes == 3 && m_uiNumberOfQuaterPlanes == 0; };
+  Bool is400() const {return m_uiNumberOfFullPlanes == 1 && m_uiNumberOfQuaterPlanes == 0; };
 
   // Assign
@@ -95 +95 @@
   UInt m_uiNumberOfQuaterPlanes;
   UInt m_uiNumberOfPlanes;
+  UInt m_bitDepth;
   TRenImagePlane<T> ** m_apcPlanes;   // First Full Planes, then Quater Planes
 
@@ -100 +101 @@
 };
 
-#endif // H_3D
+#endif // NH_3D
 #endif // __TRENIMAGE__