Merge branch 'test_correction_nn_intra' into 'VTM-11.0_nnvc'

Revert the changes in the file source/Lib/CommonLib/IntraPrediction.cpp from commit 158c60c9 (solving #87) while removing the unused variable.

Closes #88

See merge request jvet-ahg-nnvc/VVCSoftware_VTM!202

source/Lib/CommonLib/IntraPrediction.cpp

@@ -1082,10 +1082,20 @@ void IntraPrediction::collectContext(const CompArea& area,const CodingUnit& cu,c
   const int totalAboveUnits{static_cast<int>(pairSizesCtxBorders.second)/unitWidth};
   const int totalLeftUnits{static_cast<int>(pairSizesCtxBorders.first)/unitHeight};
   const int totalUnits{totalAboveUnits + totalLeftUnits + 1};
+  const int numAboveUnits{tuWidth/unitWidth};
+  const int numLeftUnits{tuHeight/unitHeight};
+  const int numAboveRightUnits{totalAboveUnits - numAboveUnits};
+  const int numLeftBelowUnits{totalLeftUnits - numLeftUnits};
   const Position posLT(area);
+  const Position posRT(area.topRight());
+  const Position posLB(area.bottomLeft());
   bool arrayNeighborFlags[4*MAX_NUM_PART_IDXS_IN_CTU_WIDTH + 1];
   memset(arrayNeighborFlags,0,totalUnits);
   arrayNeighborFlags[totalLeftUnits] = isAboveLeftAvailable(cu,chType,posLT);
+  isAboveAvailable(cu,chType,posLT,numAboveUnits,unitWidth,arrayNeighborFlags + totalLeftUnits + 1);
+  isAboveRightAvailable(cu,chType,posRT,numAboveRightUnits,unitWidth,arrayNeighborFlags + totalLeftUnits + 1 + numAboveUnits);
+  isLeftAvailable(cu, chType,posLT,numLeftUnits,unitHeight,arrayNeighborFlags + totalLeftUnits - 1);
+  isBelowLeftAvailable(cu,chType,posLB,numLeftBelowUnits,unitHeight,arrayNeighborFlags + totalLeftUnits - 1 - numLeftUnits);
   int error_code{0};
 #if JVET_AB0149_ACTIVATE_WRITER_BLOCK_STATS
   if (isComputedHeightWidthMasks)