Changeset 476 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/TDecGop.h
- Timestamp:
- 18 Jun 2013, 05:16:27 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/TDecGop.h
r324 r476 51 51 #include "TLibCommon/TComSampleAdaptiveOffset.h" 52 52 53 #if H_3D_IV_MERGE 54 #include "TLibCommon/TComDepthMapGenerator.h" 55 #endif 56 53 57 #include "TDecEntropy.h" 54 58 #include "TDecSlice.h" … … 79 83 TComLoopFilter* m_pcLoopFilter; 80 84 85 #if H_3D_IV_MERGE 86 TComDepthMapGenerator* m_pcDepthMapGenerator; 87 #endif 88 81 89 TComSampleAdaptiveOffset* m_pcSAO; 82 90 Double m_dDecTime; … … 98 106 TComLoopFilter* pcLoopFilter, 99 107 TComSampleAdaptiveOffset* pcSAO 108 #if H_3D_IV_MERGE 109 ,TComDepthMapGenerator* pcDepthMapGenerator 110 #endif 100 111 ); 101 112 Void create ();
Note: See TracChangeset for help on using the changeset viewer.