Changeset 1246 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon/TComPicYuv.cpp

Timestamp:

14 Jul 2015, 00:26:07 (9 years ago)

Author:

seregin

Message:

port rev 4240

File:

• branches/SHM-dev/source/Lib/TLibCommon/TComPicYuv.cpp (modified) (4 diffs)

branches/SHM-dev/source/Lib/TLibCommon/TComPicYuv.cpp

@@ -133 +133 @@
 
     for (Int cuRow = 0; cuRow < numCuInHeight; cuRow++)
+    {
       for (Int cuCol = 0; cuCol < numCuInWidth; cuCol++)
+      {
         m_ctuOffsetInBuffer[chan][cuRow * numCuInWidth + cuCol] = stride * cuRow * ctuHeight + cuCol * ctuWidth;
+      }
+    }
 
     m_subCuOffsetInBuffer[chan] = new Int[(size_t)1 << (2 * uiMaxCUDepth)];
@@ -143 +147 @@
 
     for (Int buRow = 0; buRow < numSubBlockPartitions; buRow++)
+    {
       for (Int buCol = 0; buCol < numSubBlockPartitions; buCol++)
+      {
         m_subCuOffsetInBuffer[chan][(buRow << uiMaxCUDepth) + buCol] = stride  * buRow * minSubBlockHeight + buCol * minSubBlockWidth;
+      }
+    }
   }
   return;
@@ -157 +165 @@
     m_piPicOrg[chan] = NULL;
 
-    if( m_apiPicBuf[chan] ){ xFree( m_apiPicBuf[chan] );    m_apiPicBuf[chan] = NULL; }
+    if( m_apiPicBuf[chan] )
+    {
+      xFree( m_apiPicBuf[chan] );
+      m_apiPicBuf[chan] = NULL;
+    }
   }
 
   for(UInt chan=0; chan<MAX_NUM_CHANNEL_TYPE; chan++)
   {
-    if (m_ctuOffsetInBuffer[chan]) delete[] m_ctuOffsetInBuffer[chan]; m_ctuOffsetInBuffer[chan] = NULL;
-    if (m_subCuOffsetInBuffer[chan]) delete[] m_subCuOffsetInBuffer[chan]; m_subCuOffsetInBuffer[chan] = NULL;
+    if (m_ctuOffsetInBuffer[chan])
+    {
+      delete[] m_ctuOffsetInBuffer[chan];
+      m_ctuOffsetInBuffer[chan] = NULL;
+    }
+    if (m_subCuOffsetInBuffer[chan])
+    {
+      delete[] m_subCuOffsetInBuffer[chan];
+      m_subCuOffsetInBuffer[chan] = NULL;
+    }
   }
 }
@@ -186 +206 @@
 Void TComPicYuv::extendPicBorder ()
 {
-  if ( m_bIsBorderExtended ) return;
+  if ( m_bIsBorderExtended )
+  {
+    return;
+  }
 
   for(Int chan=0; chan<getNumberValidComponents(); chan++)