Changeset 45 in 3DVCSoftware for branches/0.3-poznan-univ/source/App/TAppRenderer/TAppRendererCfg.cpp

Timestamp:

28 Mar 2012, 10:04:50 (12 years ago)

Author:

poznan-univ

Message:

Linux bug fix

File:

• branches/0.3-poznan-univ/source/App/TAppRenderer/TAppRendererCfg.cpp (modified) (5 diffs)

branches/0.3-poznan-univ/source/App/TAppRenderer/TAppRendererCfg.cpp

@@ -183 +183 @@
   m_bUseSetupString = ( m_pchViewConfig != NULL ) && ( m_iRenderMode != 0);
 
+#if POZNAN_NONLINEAR_DEPTH      
+  TComNonlinearDepthModel cNonlinearDepthModel;
+  cNonlinearDepthModel.Clear();
+  cNonlinearDepthModel.Init();
+#endif
+
   if ( m_iRenderMode == 10 )
   {
@@ -188 +194 @@
       m_pchCameraParameterFile, m_pchBaseViewCameraNumbers, NULL, NULL, m_iLog2SamplingFactor+m_iShiftPrecision
 #if POZNAN_NONLINEAR_DEPTH      
-      ,1.0f 
+      ,&cNonlinearDepthModel 
 #endif
       );
@@ -211 +217 @@
       m_pchCameraParameterFile, m_pchBaseViewCameraNumbers, NULL, piaTempViews, m_iLog2SamplingFactor+m_iShiftPrecision
 #if POZNAN_NONLINEAR_DEPTH
-      , 1.0f 
+      , &cNonlinearDepthModel 
 #endif
       );
@@ -220 +226 @@
       m_pchCameraParameterFile, m_pchBaseViewCameraNumbers, m_pchSynthViewCameraNumbers, NULL, m_iLog2SamplingFactor+m_iShiftPrecision
 #if POZNAN_NONLINEAR_DEPTH
-      ,1.0f 
+      ,&cNonlinearDepthModel 
 #endif
       );
@@ -292 +298 @@
 
   xConfirmPara( m_iPreFilterSize      < 0 || m_iPreFilterSize      >  3, "PreFilterSize      must be more than or equal to 0 and less than 4" );
+#if POZNAN_ENCODE_ONLY_DISOCCLUDED_CU 
+  xConfirmPara( m_iBlendMode          < 0 || m_iBlendMode          >  4, "BlendMode          must be more than or equal to 0 and less than 5"  );
+#else
   xConfirmPara( m_iBlendMode          < 0 || m_iBlendMode          >  3, "BlendMode          must be more than or equal to 0 and less than 4"  );
+#endif
   xConfirmPara( m_iBlendZThresPerc    < 0 || m_iBlendZThresPerc    > 100,"BlendZThresPerc    must be more than or equal to 0 and less than 101"  );
   xConfirmPara( m_iBlendHoleMargin    < 0 || m_iBlendHoleMargin    >  20,"BlendHoleMargin    must be more than or equal to 0 and less than 19"  );