Changeset 1313 in 3DVCSoftware for trunk/source/Lib/TLibRenderer/TRenModel.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/TRenModel.h (modified) (3 diffs)

trunk/source/Lib/TLibRenderer/TRenModel.h

@@ -42 +42 @@
 #include "../TLibCommon/TypeDef.h"
 
-#if H_3D_VSO
+#if NH_3D_VSO
 
 class TRenModel
@@ -75 +75 @@
   Int64 getDist          ( Int iStartPosX, Int iStartPosY, Int iWidth, Int iHeight, Int iStride, Pel* piNewData  );
 #endif
-  Void  setData          ( Int iStartPosX, Int iStartPosY, Int iWidth, Int iHeight, Int iStride, Pel* piNewData  );
+  Void  setData          ( Int iStartPosX, Int iStartPosY, Int iWidth, Int iHeight, Int iStride, const Pel* piNewData  );
 
   // Get Rendered View
@@ -157 +157 @@
 };
 
-#endif // H_3D
+#endif // NH_3D
 #endif //__TRENMODEL__