Index: branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/CommonDef.h
===================================================================
--- branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/CommonDef.h	(revision 476)
+++ branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/CommonDef.h	(revision 478)
@@ -211,5 +211,4 @@
 }
 #endif
-
 template <typename T>
 __inline T gSign(const T& t)
@@ -362,4 +361,5 @@
 
 #if H_3D_IV_MERGE
+ // GT: To be checked if all of this is still necessary. 
 #define PDM_USE_FOR_IVIEW                 1
 #define PDM_USE_FOR_INTER                 2
@@ -381,5 +381,4 @@
 
 #endif
-
 #endif // end of H_3D
 //! \}
Index: branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDataCU.cpp
===================================================================
--- branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDataCU.cpp	(revision 476)
+++ branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDataCU.cpp	(revision 478)
@@ -2457,5 +2457,4 @@
   deriveLeftRightTopIdxGeneral( uiAbsPartIdx, uiPUIdx, uiPartIdxLT, uiPartIdxRT );
   deriveLeftBottomIdxGeneral  ( uiAbsPartIdx, uiPUIdx, uiPartIdxLB );
-
 #if H_3D_IV_MERGE
   Bool bNoPdmMerge   = ( m_pcSlice->getSPS()->getViewIndex() == 0 || ( m_pcSlice->getSPS()->getMultiviewMvPredMode() & PDM_USE_FOR_MERGE ) != PDM_USE_FOR_MERGE );
@@ -2603,5 +2602,4 @@
 #endif
 #endif
-
   //left
   UInt uiLeftPartIdx = 0;
@@ -2623,5 +2621,4 @@
       pcCULeft->getMvField( pcCULeft, uiLeftPartIdx, REF_PIC_LIST_1, pcMvFieldNeighbours[(iCount<<1)+1] );
     }
-
 #if H_3D_IV_MERGE 
     Bool bRemoveSpa = false; //pruning to inter-view candidates
@@ -4502,5 +4499,4 @@
 }
 #endif 
-
 #if H_3D_IV_MERGE
 Bool TComDataCU::getUnifiedMvPredCan(UInt uiPartIdx, RefPicList eRefPicList, Int iRefIdx, Int* paiPdmRefIdx, TComMv* pacPdmMv, DisInfo* pDInfo, Int* iPdm, Bool bMerge )
Index: branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDataCU.h
===================================================================
--- branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDataCU.h	(revision 476)
+++ branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDataCU.h	(revision 478)
@@ -434,5 +434,4 @@
    
 #endif
-
 #if H_3D_IV_MERGE
   Bool          getUnifiedMvPredCan       ( UInt uiPartIdx, RefPicList eRefPicList, Int iRefIdx, Int* paiPdmRefIdx, TComMv* pacPdmMv, DisInfo* pDInfo, Int* iPdm, Bool bMerge );
Index: branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDepthMapGenerator.cpp
===================================================================
--- branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDepthMapGenerator.cpp	(revision 476)
+++ branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDepthMapGenerator.cpp	(revision 478)
@@ -43,5 +43,5 @@
 #include "TComDepthMapGenerator.h"
 
-
+#if H_3D_IV_MERGE
 
 TComDepthMapGenerator::TComDepthMapGenerator()
@@ -136,6 +136,4 @@
 }
 
-
-#if H_3D_IV_MERGE
 Bool
 TComDepthMapGenerator::getPdmCandidate(TComDataCU* pcCU, UInt uiPartIdx, RefPicList eRefPicList, Int iRefIdx, Int* paiPdmRefIdx, TComMv* pacPdmMv, DisInfo* pDInfo, Int* iPdm, Bool bMerge )
Index: branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDepthMapGenerator.h
===================================================================
--- branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDepthMapGenerator.h	(revision 476)
+++ branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDepthMapGenerator.h	(revision 478)
@@ -48,5 +48,5 @@
 #include "TComSlice.h"
 
-
+#if H_3D_IV_MERGE
 
 class TComVPSAccess // would be better to have a real VPS buffer
@@ -156,5 +156,5 @@
 
 
-
+#endif
 #endif // __TCOM_DEPTH_MAP_GENERATOR__
 
Index: branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComMotionInfo.h
===================================================================
--- branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComMotionInfo.h	(revision 476)
+++ branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComMotionInfo.h	(revision 478)
@@ -105,5 +105,4 @@
   Int getHor   () const { return  m_acMv.getHor(); }
   Int getVer   () const { return  m_acMv.getVer(); }
-
 #if H_3D_IV_MERGE
   Bool operator== ( const TComMvField& rcMv ) const
Index: branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComPicYuv.cpp
===================================================================
--- branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComPicYuv.cpp	(revision 476)
+++ branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComPicYuv.cpp	(revision 478)
@@ -84,5 +84,4 @@
   m_iBaseUnitHeight = uiMaxCUHeight >> uiMaxCUDepth;
 #endif
-
   Int numCuInWidth  = m_iPicWidth  / m_iCuWidth  + (m_iPicWidth  % m_iCuWidth  != 0);
   Int numCuInHeight = m_iPicHeight / m_iCuHeight + (m_iPicHeight % m_iCuHeight != 0);
Index: branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComSlice.cpp
===================================================================
--- branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComSlice.cpp	(revision 476)
+++ branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComSlice.cpp	(revision 478)
@@ -1857,5 +1857,4 @@
   }
 }
-
 #if H_3D_IV_MERGE
 Void
@@ -1871,5 +1870,4 @@
 }
 #endif
-
 const Int TComSPS::m_winUnitX[]={1,2,2,1};
 const Int TComSPS::m_winUnitY[]={1,2,1,1};
@@ -1942,5 +1940,4 @@
   m_bDepth                = false;
 #endif
-
   if( !m_bCamParInSliceHeader )
   {
@@ -1954,5 +1951,4 @@
   }
 }
-
 #if H_3D_IV_MERGE
 Void
Index: branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComSlice.h
===================================================================
--- branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComSlice.h	(revision 476)
+++ branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComSlice.h	(revision 478)
@@ -54,5 +54,4 @@
 class TComPicLists; 
 #endif
-
 #if H_3D_IV_MERGE
 class TComDepthMapGenerator;
