Changeset 646 in 3DVCSoftware for branches/HTM-8.2-dev0-Cleanup/source/Lib/TAppCommon

Timestamp:

19 Oct 2013, 02:18:06 (11 years ago)

Author:

tech

Message:

Macro removal part 1.

Location:

branches/HTM-8.2-dev0-Cleanup/source/Lib/TAppCommon

Files:

• TAppComCamPara.cpp (modified) (7 diffs)
• TAppComCamPara.h (modified) (1 diff)

branches/HTM-8.2-dev0-Cleanup/source/Lib/TAppCommon/TAppComCamPara.cpp

@@ -615 +615 @@
 {
   UInt uiFoundLine = -1;
-#if H_3D_FIX_REN_WARNING
   if ( !xGetCameraDataRow( iView, uiFrame, uiFoundLine ) && xIsIn( m_aiSortedBaseViews, iView ))
-#else  
-  if ( !xGetCameraDataRow( iView, uiFrame, uiFoundLine ) )
-#endif
   {
     AOT( m_aadCameraParameters[ uiFoundLine ].size() < 6 );
@@ -635 +631 @@
     Int  iDummy;
 
-#if H_3D_FIX_REN_WARNING
     if( !xGetLeftRightView( iView, m_aiSortedBaseViews, iLeftView, iRightView, iDummy, iDummy ) ||
-#else
-    if( !xGetLeftRightView( iView, m_aiViewsInCfgFile, iLeftView, iRightView, iDummy, iDummy ) ||
-#endif
          xGetCameraDataRow( iLeftView,  uiFrame, uiLeftViewLine  )                             ||
          xGetCameraDataRow( iRightView, uiFrame, uiRightViewLine )
       )
     {
-#if H_3D_FIX_REN_WARNING
       std::cerr << "No left or no right base view next to view " << (Double)iView / m_dViewNumPrec << " for Frame " << uiFrame << " given in CameraParameterFile" << std::endl;
-#else
-      std::cerr << "No Left or no Right View next to View " << (Double)iView / m_dViewNumPrec << " for Frame " << uiFrame << " given in CameraParameterFile" << std::endl;
-#endif
       AOT(true);
       exit( EXIT_FAILURE );
@@ -1352 +1340 @@
       }
     }
-#if H_3D_FIX_REN_WARNING
+
     Bool bIgnoreFirst = true;     
     for( UInt uiERView = 0; uiERView < m_aiSynthViews.size() && !m_bSetupFromCoded; uiERView++ )
@@ -1371 +1359 @@
       std::cout << std::endl; 
     }
-#endif
 
     Bool bInterpolateFirst = true; 
@@ -1390 +1377 @@
         if ( bInterpolateFirst ) 
         {
-#if H_3D_FIX_REN_WARNING                        
           std::cout << "Interpolating camera parameters      for virtual view(s): " ; 
-#else
-          std::cout << "Interpolating Camera Parameters for View(s) " ; 
-#endif
             bInterpolateFirst = false; 
         }          
@@ -1498 +1481 @@
 }
 
-#if H_3D_FIX_REN_WARNING
 Bool 
   TAppComCamPara::xIsIn( std::vector<Int>& rVec, Int iElem) 
@@ -1509 +1491 @@
   return bFound;
 }
-#endif
 
 Int TAppComCamPara::getRelDistLeft( Int iSynthViewIdx, Int iLeftViewIdx, Int iRightViewIdx )

branches/HTM-8.2-dev0-Cleanup/source/Lib/TAppCommon/TAppComCamPara.h

@@ -131 +131 @@
   Void  xSetupBaseViewsFromCoded  ();
   Void  xSetupBaseViews           ( Char* pchBaseViewNumbers, UInt uiNumBaseViews );
-#if H_3D_FIX_REN_WARNING
   Bool  xIsIn                     ( std::vector<Int>& rVec, Int iNumber);
-#endif
-
 
   // functions for getting and setting scales and offsets