Ignore:
Timestamp:
30 Mar 2012, 18:57:41 (12 years ago)
Author:
poznan-univ
Message:

some bug fix on high level syntax
fixed some compiler warning issues under windows and linux

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/0.3-poznan-univ/source/Lib/TLibDecoder/TDecTop.cpp

    r46 r48  
    169169    Int64   iTempScale      = (Int64)uiDepthValue * iScale;
    170170#endif
    171     Int64   iTestScale      = ( iTempScale + iOffset       );   // for checking accuracy of camera parameters
    172171    Int64   iShiftLuma      = ( iTempScale + iOffsetLuma   ) >> iLog2DivLuma;
    173172    Int64   iShiftChroma    = ( iTempScale + iOffsetChroma ) >> iLog2DivChroma;
     
    232231
    233232  AOF( pcSlice->getSPS()->getViewId() < MAX_NUMBER_VIEWS );
     233
    234234  if ( pcSlice->getSPS()->isDepth  () )
    235235  {
     
    238238    m_cNonlinearDepthModel = pcSlice->getSPS()->getNonlinearDepthModel();   
    239239#endif
     240#if !FLEX_CODING_ORDER //Owieczka
    240241    return;
    241   }
     242#endif
     243  }
     244#if !FLEX_CODING_ORDER //Owieczka
    242245  else
     246#endif
    243247  {
    244248#if POZNAN_NONLINEAR_DEPTH
     
    251255  Bool  bFirstSliceInView = ( pcSlice->getSPS()->getViewId()  != UInt( m_iLastViewId ) || bFirstSliceInAU );
    252256  AOT(  bFirstSliceInAU  &&   pcSlice->getSPS()->getViewId()  != 0 );
     257#if !FLEX_CODING_ORDER //Owieczka 
    253258  AOT( !bFirstSliceInAU  &&   pcSlice->getSPS()->getViewId()   < UInt( m_iLastViewId ) );
    254259  AOT( !bFirstSliceInAU  &&   pcSlice->getSPS()->getViewId()   > UInt( m_iLastViewId + 1 ) );
     260#endif
    255261  AOT( !bFirstAU         &&   pcSlice->getSPS()->getViewId()   > m_uiMaxViewId );
    256262  if ( !bFirstSliceInView )
Note: See TracChangeset for help on using the changeset viewer.