Changeset 28 in 3DVCSoftware for branches/0.3-poznan-univ/source/Lib/TLibRenderer/TRenSingleModel.cpp
- Timestamp:
- 24 Feb 2012, 20:22:58 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/0.3-poznan-univ/source/Lib/TLibRenderer/TRenSingleModel.cpp
r5 r28 139 139 if (m_iMode == 2) 140 140 { 141 m_piInvZLUTLeft = new Int[ 257];142 m_piInvZLUTRight = new Int[ 257];141 m_piInvZLUTLeft = new Int[SizeOfLUT+1]; 142 m_piInvZLUTRight = new Int[SizeOfLUT+1]; 143 143 } 144 144 … … 448 448 m_iLastOccludedSPosFP = xRangeLeftL( m_iLastOccludedSPos ); 449 449 xExtrapolateMarginL ( iCurSPos, iEndChangePos, iError ); 450 iMinChangedSPos = Min( iMinChangedSPos, (iEndChangePos << m_iShiftPrec) - m_ppiCurLUT[0][ RemoveBitIncrement ( Max(m_apiBaseDepthPelRow[m_iCurViewPos][iEndChangePos], m_piNewDepthData[iPosXinNewData] )) ]);450 iMinChangedSPos = Min( iMinChangedSPos, (iEndChangePos << m_iShiftPrec) - m_ppiCurLUT[0][ RemoveBitIncrementLUT( Max(m_apiBaseDepthPelRow[m_iCurViewPos][iEndChangePos], m_piNewDepthData[iPosXinNewData] )) ]); 451 451 iLastSPos = iCurSPos; 452 452 m_iLastDepth = m_iCurDepth; … … 466 466 { 467 467 // Get minimal changed sample position 468 iMinChangedSPos = Min( iMinChangedSPos, (iCurPosX << m_iShiftPrec) - m_ppiCurLUT[0][ RemoveBitIncrement ( Max(m_apiBaseDepthPelRow[m_iCurViewPos][iCurPosX], m_piNewDepthData[iPosXinNewData] )) ]);468 iMinChangedSPos = Min( iMinChangedSPos, (iCurPosX << m_iShiftPrec) - m_ppiCurLUT[0][ RemoveBitIncrementLUT( Max(m_apiBaseDepthPelRow[m_iCurViewPos][iCurPosX], m_piNewDepthData[iPosXinNewData] )) ]); 469 469 Int iCurSPos = xShiftNewData(iCurPosX,iPosXinNewData); 470 470 m_iCurDepth = m_piNewDepthData[iPosXinNewData]; … … 541 541 m_iLastOccludedSPosFP = xRangeRightR( m_iLastOccludedSPos ); 542 542 xExtrapolateMarginR ( iCurSPos, iStartChangePos, iError ); 543 iMaxChangedSPos = Max( iMaxChangedSPos, (iStartChangePos << m_iShiftPrec) - m_ppiCurLUT[0][ RemoveBitIncrement ( Max(m_apiBaseDepthPelRow[m_iCurViewPos][iStartChangePos], m_piNewDepthData[iPosXinNewData] )) ]);543 iMaxChangedSPos = Max( iMaxChangedSPos, (iStartChangePos << m_iShiftPrec) - m_ppiCurLUT[0][ RemoveBitIncrementLUT( Max(m_apiBaseDepthPelRow[m_iCurViewPos][iStartChangePos], m_piNewDepthData[iPosXinNewData] )) ]); 544 544 iLastSPos = iCurSPos; 545 545 m_iLastDepth = m_iCurDepth; … … 559 559 { 560 560 // Get minimal changed sample position 561 iMaxChangedSPos = Max( iMaxChangedSPos, (iCurPosX << m_iShiftPrec) - m_ppiCurLUT[0][ RemoveBitIncrement ( Max(m_apiBaseDepthPelRow[m_iCurViewPos][iCurPosX], m_piNewDepthData[iPosXinNewData] )) ]);561 iMaxChangedSPos = Max( iMaxChangedSPos, (iCurPosX << m_iShiftPrec) - m_ppiCurLUT[0][ RemoveBitIncrementLUT( Max(m_apiBaseDepthPelRow[m_iCurViewPos][iCurPosX], m_piNewDepthData[iPosXinNewData] )) ]); 562 562 Int iCurSPos = xShiftNewData(iCurPosX,iPosXinNewData); 563 563 m_iCurDepth = m_piNewDepthData[iPosXinNewData]; … … 948 948 AOF( iPosInNewData < m_iNewDataWidth ); 949 949 950 return (iPosX << m_iShiftPrec) - m_ppiCurLUT[0][ RemoveBitIncrement ( m_piNewDepthData[iPosInNewData] )];950 return (iPosX << m_iShiftPrec) - m_ppiCurLUT[0][ RemoveBitIncrementLUT( m_piNewDepthData[iPosInNewData] )]; 951 951 } 952 952 … … 956 956 AOT( iPosX < 0); 957 957 AOF( iPosX < m_iWidth); 958 return (iPosX << m_iShiftPrec) - m_ppiCurLUT[0][ RemoveBitIncrement ( m_apiBaseDepthPelRow[m_iCurViewPos][iPosX] )];958 return (iPosX << m_iShiftPrec) - m_ppiCurLUT[0][ RemoveBitIncrementLUT( m_apiBaseDepthPelRow[m_iCurViewPos][iPosX] )]; 959 959 } 960 960 … … 1149 1149 m_aapiSynthVideoPelRow [1][2][iTargetSPos] , 1150 1150 #endif 1151 m_piInvZLUTLeft [RemoveBitIncrement (m_iThisDepth) ],1152 m_piInvZLUTRight[RemoveBitIncrement (m_apiSynthDepthPelRow[1] [iTargetSPos])],1151 m_piInvZLUTLeft [RemoveBitIncrementLUT(m_iThisDepth) ], 1152 m_piInvZLUTRight[RemoveBitIncrementLUT(m_apiSynthDepthPelRow[1] [iTargetSPos])], 1153 1153 iFilled, 1154 1154 m_apiFilledRow [1] [iTargetSPos] , … … 1171 1171 m_aapiBaseVideoPelRow [1][2][iSourcePos ], 1172 1172 #endif 1173 m_piInvZLUTLeft [RemoveBitIncrement (m_apiSynthDepthPelRow[0] [iTargetSPos])],1174 m_piInvZLUTRight[RemoveBitIncrement (m_iThisDepth) ],1173 m_piInvZLUTLeft [RemoveBitIncrementLUT(m_apiSynthDepthPelRow[0] [iTargetSPos])], 1174 m_piInvZLUTRight[RemoveBitIncrementLUT(m_iThisDepth) ], 1175 1175 m_apiFilledRow [0] [iTargetSPos], 1176 1176 iFilled ,
Note: See TracChangeset for help on using the changeset viewer.