Ticket #1430: TComPicYuv.cpp.patch

source/Lib/TLibCommon/TComPicYuv.cpp

@@ -96 +96 @@
   for(UInt comp=0; comp<getNumberValidComponents(); comp++)
   {
     const ComponentID ch=ComponentID(comp);
-    m_apiPicBuf[comp] = (Pel*)xMalloc( Pel, getStride(ch) * getTotalHeight(ch));
-    m_piPicOrg[comp]  = m_apiPicBuf[comp] + (m_marginY >> getComponentScaleY(ch)) * getStride(ch) + (m_marginX >> getComponentScaleX(ch));
+    if ( m_apiPicBuf[comp] == NULL )
+    {
+      m_apiPicBuf[comp] = (Pel*)xMalloc( Pel, getStride(ch) * getTotalHeight(ch));
+      m_piPicOrg[comp]  = m_apiPicBuf[comp] + (m_marginY >> getComponentScaleY(ch)) * getStride(ch) + (m_marginX >> getComponentScaleX(ch));
+    }
   }
   // initialize pointers for unused components to NULL
   for(UInt comp=getNumberValidComponents();comp<MAX_NUM_COMPONENT; comp++)
@@ -106 +109 @@
     m_piPicOrg[comp]  = NULL;
   }
 
-  for(Int chan=0; chan<MAX_NUM_CHANNEL_TYPE; chan++)
+  for(UInt chan=0; chan<MAX_NUM_CHANNEL_TYPE; chan++)
   {
-    m_ctuOffsetInBuffer[chan]   = NULL;
-    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;
+    }
   }
 }