Changeset 67 in SHVCSoftware for branches/HM-10.0-dev-SHM/source/Lib

Timestamp:

6 Mar 2013, 03:22:49 (12 years ago)

Author:

seregin

Message:

fixing compilation error for AVC syntax

File:

• branches/HM-10.0-dev-SHM/source/Lib/TLibCommon/TComPic.cpp (modified) (1 diff)

branches/HM-10.0-dev-SHM/source/Lib/TLibCommon/TComPic.cpp

@@ -628 +628 @@
 {
 #if !REUSE_MVSCALE || !REUSE_BLKMAPPING || AVC_SYNTAX
-  Int iBWidth   = pcPicBase->getPicYuvRec()->getWidth () - pcPicBase->getPicYuvRec()->getPicCropLeftOffset() - pcPicBase->getPicYuvRec()->getPicCropRightOffset();
-  Int iBHeight  = pcPicBase->getPicYuvRec()->getHeight() - pcPicBase->getPicYuvRec()->getPicCropTopOffset() - pcPicBase->getPicYuvRec()->getPicCropBottomOffset();
-
-  Int iEWidth   = getPicYuvRec()->getWidth() -  getPicYuvRec()->getPicCropLeftOffset() - getPicYuvRec()->getPicCropRightOffset();
-  Int iEHeight  = getPicYuvRec()->getHeight() - getPicYuvRec()->getPicCropTopOffset() -  getPicYuvRec()->getPicCropBottomOffset();
+  const Window &confBL = pcPicBase->getConformanceWindow();
+  const Window &confEL = getPicYuvRec()->getConformanceWindow();
+
+  Int iBWidth   = pcPicBase->getPicYuvRec()->getWidth () - confBL.getWindowLeftOffset() - confBL.getWindowRightOffset();
+  Int iBHeight  = pcPicBase->getPicYuvRec()->getHeight() - confBL.getWindowTopOffset() - confBL.getWindowBottomOffset();
+
+  Int iEWidth   = getPicYuvRec()->getWidth() - confEL.getWindowLeftOffset() - confEL.getWindowRightOffset();
+  Int iEHeight  = getPicYuvRec()->getHeight() - confEL.getWindowTopOffset() - confEL.getWindowBottomOffset();
 #endif