Changeset 1229 in 3DVCSoftware


Ignore:
Timestamp:
24 May 2015, 18:29:00 (9 years ago)
Author:
rwth
Message:
  • fixed some compiler warnings
Location:
branches/HTM-14.1-update-dev4-RWTH/source
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-14.1-update-dev4-RWTH/source/App/TAppEncoder/TAppEncCfg.cpp

    r1200 r1229  
    22872287
    22882288  dimBitOffset[ 0 ] = 0;
    2289   for (Int j = 1; j <= ((Int) m_dimIds.size() - m_splittingFlag ? 1 : 0); j++ )
     2289  for (Int j = 1; j <= (((Int) m_dimIds.size() - m_splittingFlag) ? 1 : 0); j++ )
    22902290  {
    22912291    dimBitOffset[ j ] = dimBitOffset[ j - 1 ] + m_dimensionIdLen[ j - 1];
  • branches/HTM-14.1-update-dev4-RWTH/source/App/TAppRenderer/TAppRendererCfg.cpp

    r1200 r1229  
    306306
    307307  Int iNumNonNULL;
    308   for (iNumNonNULL = 0; (iNumNonNULL < m_iNumberOfInputViews)  && m_pchDepthInputFileList[iNumNonNULL]; iNumNonNULL++);  xConfirmPara( iNumNonNULL < m_iNumberOfInputViews,  "Number of DepthInputFiles  must be greater than or equal to number of BaseViewNumbers" );
    309   for (iNumNonNULL = 0; (iNumNonNULL < m_iNumberOfInputViews)  && m_pchVideoInputFileList[iNumNonNULL]; iNumNonNULL++);  xConfirmPara( iNumNonNULL < m_iNumberOfInputViews,  "Number of DepthInputFiles  must be greater than or equal to number of BaseViewNumbers" );
     308  for (iNumNonNULL = 0; (iNumNonNULL < m_iNumberOfInputViews)  && m_pchDepthInputFileList[iNumNonNULL]; iNumNonNULL++)  xConfirmPara( iNumNonNULL < m_iNumberOfInputViews,  "Number of DepthInputFiles  must be greater than or equal to number of BaseViewNumbers" );
     309  for (iNumNonNULL = 0; (iNumNonNULL < m_iNumberOfInputViews)  && m_pchVideoInputFileList[iNumNonNULL]; iNumNonNULL++)  xConfirmPara( iNumNonNULL < m_iNumberOfInputViews,  "Number of DepthInputFiles  must be greater than or equal to number of BaseViewNumbers" );
    310310
    311311
    312312  if ( !m_bSweep )
    313313  {
    314   for (iNumNonNULL = 0; (iNumNonNULL < m_iNumberOfOutputViews) && m_pchSynthOutputFileList[iNumNonNULL]; iNumNonNULL++); xConfirmPara( iNumNonNULL < m_iNumberOfOutputViews, "Number of SynthOutputFiles must be greater than or equal to number of SynthViewNumbers" );
     314  for (iNumNonNULL = 0; (iNumNonNULL < m_iNumberOfOutputViews) && m_pchSynthOutputFileList[iNumNonNULL]; iNumNonNULL++)  xConfirmPara( iNumNonNULL < m_iNumberOfOutputViews, "Number of SynthOutputFiles must be greater than or equal to number of SynthViewNumbers" );
    315315  }
    316316  else
  • branches/HTM-14.1-update-dev4-RWTH/source/Lib/TAppCommon/TAppComCamPara.cpp

    r1200 r1229  
    13731373  Int  iSourceViewNum = m_aiBaseViews[ iViewIdx ];
    13741374  Double dBaseLine = 0.0;
    1375   Double dFL1, dCS1, dCP1, dZN1, dZF1;
    1376   Bool bInterpolated;
    1377   double dPos[3];
     1375  Double dFL1 = 1.0, dCS1 = 1.0, dCP1 = 1.0, dZN1 = 1.0, dZF1 = 1.0;
     1376  Bool bInterpolated = false;
     1377  double dPos[3] = {0.0, 0.0, 0.0};
    13781378
    13791379  if( m_iNumberOfBaseViews == 3 )
  • branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibCommon/TComSlice.cpp

    r1217 r1229  
    20322032Int TComVPS::scalTypeToScalIdx( ScalabilityType scalType ) const
    20332033{
    2034   assert( scalType >= 0 && scalType <= MAX_NUM_SCALABILITY_TYPES );
    2035   assert( scalType == MAX_NUM_SCALABILITY_TYPES || getScalabilityMaskFlag( scalType ) );
     2034  assert( (Int)scalType >= 0 && (Int)scalType <= MAX_NUM_SCALABILITY_TYPES );
     2035  assert( (Int)scalType == MAX_NUM_SCALABILITY_TYPES || getScalabilityMaskFlag( scalType ) );
    20362036  Int scalIdx = 0;
    20372037  for( Int curScalType = 0; curScalType < scalType; curScalType++ )
  • branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r1222 r1229  
    18401840  else
    18411841  {
    1842     vpsVui->setVpsNumVideoSignalInfoMinus1( pcVPS->getMaxLayersMinus1() - pcVPS->getVpsBaseLayerInternalFlag() ? 0 : 1 );
     1842    vpsVui->setVpsNumVideoSignalInfoMinus1( (pcVPS->getMaxLayersMinus1() - pcVPS->getVpsBaseLayerInternalFlag()) ? 0 : 1 );
    18431843  }
    18441844
  • branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibDecoder/TDecGop.h

    r1200 r1229  
    8181  TComLoopFilter*       m_pcLoopFilter;
    8282#if NH_MV
    83   TDecTop*              m_decTop;
     83  //TDecTop*              m_decTop;
    8484#endif
    8585
  • branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibDecoder/TDecSbac.cpp

    r1222 r1229  
    25462546  UInt uiSymbol = 0;
    25472547 
    2548   m_pcTDecBinIf->decodeBin( uiSymbol, m_cDBBPFlagSCModel.get( 0, 0, 0 ) );
     2548  m_pcTDecBinIf->decodeBin( uiSymbol, m_cDBBPFlagSCModel.get( 0, 0, 0 ) RExt__DECODER_DEBUG_BIT_STATISTICS_PASS_OPT_ARG(STATS__CABAC_BITS__MERGE_INDEX) );
    25492549  DTRACE_CU("dbbp_flag", uiSymbol)
    25502550  PartSize ePartSize = pcCU->getPartitionSize( uiAbsPartIdx );
  • branches/HTM-14.1-update-dev4-RWTH/source/Lib/TLibDecoder/TDecTop.h

    r1200 r1229  
    107107  UInt    m_uiBitDepthForLUT;
    108108  UInt    m_iLog2Precision;
    109   UInt    m_uiInputBitDepth;
     109  //UInt    m_uiInputBitDepth;
    110110
    111111  // look-up tables
Note: See TracChangeset for help on using the changeset viewer.