Fix compiler warning and cleanup

CMakeLists.txt

@@ -29,7 +29,6 @@ endif()
 
 set( EXTENSION_360_VIDEO OFF CACHE BOOL "If EXTENSION_360_VIDEO is on, 360Lib will be added" )
 set( EXTENSION_HDRTOOLS OFF CACHE BOOL "If EXTENSION_HDRTOOLS is on, HDRLib will be added" )
-set( EXTENSION_CABAC_TRAINING OFF CACHE BOOL "If EXTENSION_CABAC_TRAINING is on, boost will be added" )
 
 if (DEFINED ENABLE_TRACING)
   set( ENABLE_TRACING OFF CACHE BOOL "ENABLE_TRACING will be set to this value" )
@@ -121,9 +120,6 @@ if( XCODE )
 endif()
 
 # add needed subdirectories
-if ( EXTENSION_CABAC_TRAINING )
-  add_subdirectory( "source/Lib/boost" )
-endif()
 add_subdirectory( "source/Lib/CommonLib" )
 add_subdirectory( "source/Lib/CommonAnalyserLib" )
 if( EXTENSION_360_VIDEO )
@@ -146,9 +142,6 @@ add_subdirectory( "source/App/Parcat" )
 add_subdirectory( "source/App/StreamMergeApp" )
 add_subdirectory( "source/App/BitstreamExtractorApp" )
 add_subdirectory( "source/App/CabacTraining" )
-if ( EXTENSION_CABAC_TRAINING )
-  add_subdirectory( "source/App/RateEstimator" )
-endif()
 if( EXTENSION_360_VIDEO )
   add_subdirectory( "source/App/utils/360ConvertApp" )
 endif()

source/Lib/CommonLib/IntraPrediction.cpp

@@ -1446,9 +1446,9 @@ void IntraPrediction::predIntraAng( const ComponentID compId, PelBuf &piPred, co
   if (!pu.ciipPDPC)
   {
 #endif
+#if JVET_AH0209_PDP
     const uint32_t width = pu.lwidth();
     const uint32_t height = pu.lheight();
-#if JVET_AH0209_PDP
     const int sizeKey = (width << 8) + height;
     const int sizeIdx = g_size.find( sizeKey ) != g_size.end() ? g_size[sizeKey] : -1;
     auto modeIdx = g_modeGroup[uiDirMode];