Changeset 13 in 3DVCSoftware for branches/0.2-poznan-univ


Ignore:
Timestamp:
7 Feb 2012, 02:04:12 (12 years ago)
Author:
poznan-univ
Message:

SVN merge bug Fix

Location:
branches/0.2-poznan-univ/source
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/0.2-poznan-univ/source/App/TAppCommon/TAppComCamPara.cpp

    r12 r13  
    13651365}
    13661366
    1367   xReadCameraParameterFile( pchCfgFileName );
    1368 
    1369   m_bSetupFromCoded         = ( m_aadCameraParameters[ 0 ].size() == 2 );
    1370 
    1371   if ( m_bSetupFromCoded )
    1372   {
    1373     std::cout << "Detected decoded camera parameter file. Overwriting base view settings from cfg file. " << std::endl;
    1374     xSetupBaseViewsFromCoded();
    1375   }
    1376   else
    1377   {
    1378     xSetupBaseViews( pchBaseViewNumbers, uiNumBaseViews );
    1379   }
    1380 
    1381   //===== set derived parameters =====
    1382   xGetViewOrderIndices( m_aiBaseId2SortedId, m_aiViewOrderIndex );
    1383   m_bCamParsVaryOverTime = xGetCamParsChangeFlag();
    1384 
    1385 
    1386   //===== create arrays =====
    1387   xCreateLUTs   ( (UInt)m_iNumberOfBaseViews, (UInt)m_iNumberOfBaseViews,  m_adBaseViewShiftLUT,  m_aiBaseViewShiftLUT,  m_adBaseViewShiftParameter,  m_aiBaseViewShiftParameter  );
    1388   xCreateLUTs   ( (UInt)m_iNumberOfBaseViews, (UInt)m_iNumberOfSynthViews, m_adSynthViewShiftLUT, m_aiSynthViewShiftLUT, m_adSynthViewShiftParameter, m_aiSynthViewShiftParameter );
    1389   xCreate2dArray( (UInt)m_iNumberOfBaseViews, (UInt)m_iNumberOfBaseViews,  m_aaiCodedScale           );
    1390   xCreate2dArray( (UInt)m_iNumberOfBaseViews, (UInt)m_iNumberOfBaseViews,  m_aaiCodedOffset          );
    1391   xCreate2dArray( (UInt)m_iNumberOfBaseViews, (UInt)m_iNumberOfBaseViews,  m_aaiScaleAndOffsetSet    );
    1392   xInit2dArray  ( (UInt)m_iNumberOfBaseViews, (UInt)m_iNumberOfBaseViews,  m_aaiScaleAndOffsetSet, 0 );
    1393 
    1394   xCreate2dArray( (UInt)m_iNumberOfBaseViews, (UInt)m_iNumberOfBaseViews,  m_aaiPdmScaleNomDelta     );
    1395   xCreate2dArray( (UInt)m_iNumberOfBaseViews, (UInt)m_iNumberOfBaseViews,  m_aaiPdmOffset            );
    1396 
    1397   //===== init disparity to virtual depth conversion parameters =====
    1398   xSetPdmConversionParams();
    1399 
    1400   //===== init arrays for first frame =====
    1401   xSetShiftParametersAndLUT( m_uiFirstFrameId );
    1402 }
    1403 #endif//*/
    1404 
    14051367Void
    14061368TAppComCamPara::check( Bool bCheckViewRange, Bool bCheckFrameRange )
  • branches/0.2-poznan-univ/source/App/TAppEncoder/TAppEncTop.cpp

    r12 r13  
    12781278  {
    12791279    iCurPoc = m_acTEncTopList[ iCoddedViewIdx ]->getNextFrameId();
    1280   if (!(m_acTEncTopList[ iCoddedViewIdx ]->currentPocWillBeCoded())) return;
    1281 
     1280    if (!(m_acTEncTopList[ iCoddedViewIdx ]->currentPocWillBeCoded())) return;
     1281  }
    12821282  Int iNumberOfReferenceViews = 0;
    12831283  UInt iSynthViewIdx;
  • branches/0.2-poznan-univ/source/Lib/TLibCommon/TypeDef.h

    r12 r13  
    9292#endif
    9393
    94 #endif
    95 
    9694// ---------------------------------------
    9795
Note: See TracChangeset for help on using the changeset viewer.