Skip to content

Commit e56a6f8

Browse files
Dutchman101Dutchman101
committed
Revert "Improve buffer management"
This reverts commit c5c0b3f.
1 parent 0d49449 commit e56a6f8

File tree

14 files changed

+67
-338
lines changed

14 files changed

+67
-338
lines changed

‎Client/core/CFileFormatJpeg.cpp‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,13 @@ bool JpegDecode(const void* pData, uint uiDataSize, CBuffer* pOutBuffer, uint& u
8282

8383
if (pOutBuffer)
8484
{
85-
if (!pOutBuffer->SetSize(uiWidth * uiHeight * 4))
86-
return false;
85+
pOutBuffer->SetSize(uiWidth * uiHeight * 4);
8786
char* pOutData = pOutBuffer->GetData();
8887

8988
/* Process data */
9089
JSAMPROW row_pointer[1];
9190
CBuffer rowBuffer;
92-
if (!rowBuffer.SetSize(uiWidth * 3))
93-
return false;
91+
rowBuffer.SetSize(uiWidth * 3);
9492
char* pRowTemp = rowBuffer.GetData();
9593

9694
while (cinfo.output_scanline < cinfo.output_height)
@@ -155,8 +153,7 @@ bool JpegEncode(uint uiWidth, uint uiHeight, uint uiQuality, const void* pData,
155153

156154
/* Process data */
157155
CBuffer rowBuffer;
158-
if (!rowBuffer.SetSize(uiWidth * 3))
159-
return false;
156+
rowBuffer.SetSize(uiWidth * 3);
160157
char* pRowTemp = rowBuffer.GetData();
161158

162159
JSAMPROW row_pointer[1];

‎Client/core/CFileFormatPng.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,7 @@ bool PngDecode(const void* pData, uint uiDataSize, CBuffer* pOutBuffer, uint& ui
192192

193193
if (pOutBuffer)
194194
{
195-
if (!pOutBuffer->SetSize(width * height * 4))
196-
return false;
195+
pOutBuffer->SetSize(width * height * 4);
197196

198197
switch (colorType)
199198
{

‎Client/core/Graphics/CGraphics.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2586,8 +2586,6 @@ bool CGraphics::CopyDataFromSurface(IDirect3DSurface9* pSurface, CBuffer& outBuf
25862586
uint uiLineWidthBytes = SurfDesc.Width * CRenderItemManager::GetBitsPerPixel(SurfDesc.Format) / 8;
25872587

25882588
outBuffer.SetSize(uiLineWidthBytes * SurfDesc.Height);
2589-
if (outBuffer.GetSize() != uiLineWidthBytes * SurfDesc.Height)
2590-
return false;
25912589
char* pOutData = outBuffer.GetData();
25922590

25932591
if (uiLineWidthBytes == uiSurfPitch)

‎Client/core/Graphics/CPixelsManager.cpp‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,7 @@ bool CPixelsManager::GetTexturePixels(IDirect3DBaseTexture9* pD3DBaseTexture, CP
140140
// If not allowed, return dummy data
141141
uint uiPixelsWidth = 32;
142142
uint uiPixelsHeight = 32;
143-
if (!outPixels.SetSize(uiPixelsWidth * uiPixelsHeight * XRGB_BYTES_PER_PIXEL + SIZEOF_PLAIN_TAIL))
144-
return false;
143+
outPixels.SetSize(uiPixelsWidth * uiPixelsHeight * XRGB_BYTES_PER_PIXEL + SIZEOF_PLAIN_TAIL);
145144
memset(outPixels.GetData(), 0xEF, outPixels.GetSize());
146145
bResult = SetPlainDimensions(outPixels, uiPixelsWidth, uiPixelsHeight);
147146
}
@@ -531,8 +530,7 @@ bool CPixelsManager::D3DXGetSurfacePixels(IDirect3DSurface9* pD3DSurface, CPixel
531530
{
532531
if (!FAILED(D3DXSaveSurfaceToFileInMemory(&dxBuffer, dxFileFormat, pD3DSurface, NULL, pRect)))
533532
{
534-
if (!outPixels.SetSize(dxBuffer->GetBufferSize()))
535-
return false;
533+
outPixels.SetSize(dxBuffer->GetBufferSize());
536534
char* pPixelsData = outPixels.GetData();
537535
memcpy(pPixelsData, dxBuffer->GetBufferPointer(), outPixels.GetSize());
538536
return true;
@@ -572,8 +570,7 @@ bool CPixelsManager::D3DXGetSurfacePixels(IDirect3DSurface9* pD3DSurface, CPixel
572570
// Extract pixels from converted texture
573571
if (!FAILED(D3DXSaveTextureToFileInMemory(&dxBuffer, dxFileFormat, pD3DTempTexture, NULL)))
574572
{
575-
if (!outPixels.SetSize(dxBuffer->GetBufferSize()))
576-
return false;
573+
outPixels.SetSize(dxBuffer->GetBufferSize());
577574
char* pPixelsData = outPixels.GetData();
578575
memcpy(pPixelsData, dxBuffer->GetBufferPointer(), outPixels.GetSize());
579576
return true;
@@ -818,8 +815,7 @@ bool CPixelsManager::ChangePixelsFormat(const CPixels& oldPixels, CPixels& newPi
818815
uint uiWidth, uiHeight;
819816
if (JpegDecode(oldPixels.GetData(), oldPixels.GetSize(), &newPixels.buffer, uiWidth, uiHeight))
820817
{
821-
if (!newPixels.buffer.SetSize(uiWidth * uiHeight * 4 + SIZEOF_PLAIN_TAIL))
822-
return false;
818+
newPixels.buffer.SetSize(uiWidth * uiHeight * 4 + SIZEOF_PLAIN_TAIL);
823819
return SetPlainDimensions(newPixels, uiWidth, uiHeight);
824820
}
825821
}
@@ -828,8 +824,7 @@ bool CPixelsManager::ChangePixelsFormat(const CPixels& oldPixels, CPixels& newPi
828824
uint uiWidth, uiHeight;
829825
if (PngDecode(oldPixels.GetData(), oldPixels.GetSize(), &newPixels.buffer, uiWidth, uiHeight))
830826
{
831-
if (!newPixels.buffer.SetSize(uiWidth * uiHeight * 4 + SIZEOF_PLAIN_TAIL))
832-
return false;
827+
newPixels.buffer.SetSize(uiWidth * uiHeight * 4 + SIZEOF_PLAIN_TAIL);
833828
return SetPlainDimensions(newPixels, uiWidth, uiHeight);
834829
}
835830
}

‎Client/core/Graphics/CPixelsManager_VolumeTexture.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -427,8 +427,7 @@ bool CPixelsManager::D3DXGetVolumePixels(IDirect3DVolumeTexture9* pD3DVolumeText
427427
// Extract pixels from converted texture
428428
if (!FAILED(D3DXSaveTextureToFileInMemory(&dxBuffer, dxFileFormat, pD3DTempTexture, NULL)))
429429
{
430-
if (!outPixels.SetSize(dxBuffer->GetBufferSize()))
431-
return false;
430+
outPixels.SetSize(dxBuffer->GetBufferSize());
432431
char* pPixelsData = outPixels.GetData();
433432
memcpy(pPixelsData, dxBuffer->GetBufferPointer(), outPixels.GetSize());
434433
return true;
@@ -437,8 +436,7 @@ bool CPixelsManager::D3DXGetVolumePixels(IDirect3DVolumeTexture9* pD3DVolumeText
437436
else
438437
{
439438
// Use source pixels buffer
440-
if (!outPixels.SetSize(dxBuffer->GetBufferSize()))
441-
return false;
439+
outPixels.SetSize(dxBuffer->GetBufferSize());
442440
char* pPixelsData = outPixels.GetData();
443441
memcpy(pPixelsData, dxBuffer->GetBufferPointer(), outPixels.GetSize());
444442
return true;

‎Client/core/Graphics/CRenderItem.RenderTarget.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,6 @@ bool CRenderTargetItem::ReadPixels(CBuffer& outBuffer, SString& strOutError)
246246
uint ulScreenHeight = Desc.Height;
247247
uint ulLineBytes = ulScreenWidth * 4;
248248
outBuffer.SetSize(ulLineBytes * ulScreenHeight);
249-
if (outBuffer.GetSize() != ulLineBytes * ulScreenHeight)
250-
return false;
251249
char* pDest = outBuffer.GetData();
252250

253251
// Copy lines into a buffer

‎Client/mods/deathmatch/logic/CScriptFile.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,7 @@ void CScriptFile::DoResourceFileCheck()
245245

246246
// Read data
247247
CBuffer buffer;
248-
if (!buffer.SetSize(lSize))
249-
return;
248+
buffer.SetSize(lSize);
250249
m_pFile->FSeek(0, SEEK_SET);
251250
m_pFile->FRead(buffer.GetData(), buffer.GetSize());
252251

‎Client/multiplayer_sa/CMultiplayerSA.cpp‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5637,15 +5637,8 @@ void CMultiplayerSA::SetAltWaterOrderEnabled(bool bEnable)
56375637
{
56385638
// Save memory before we blat it
56395639
CBufferWriteStream stream(savedMem);
5640-
for (const auto& memory : memoryList)
5641-
stream.WriteBytes((void*)memory.dwAddress, memory.uiSize);
5642-
5643-
// Verify all memory was saved
5644-
uint uiExpectedSize = 0;
5645-
for (const auto& memory : memoryList)
5646-
uiExpectedSize += memory.uiSize;
5647-
if (savedMem.GetSize() != uiExpectedSize)
5648-
return;
5640+
for (uint i = 0; i < NUMELMS(memoryList); i++)
5641+
stream.WriteBytes((void*)memoryList[i].dwAddress, memoryList[i].uiSize);
56495642

56505643
// Add hooks and things
56515644
// Always render water after other entities (otherwise underwater LODs and trees are rendered

‎Client/sdk/core/CPixelsManagerInterface.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ class CPixels
3535
const char* GetData() const { return externalData.pData ? externalData.pData : buffer.GetData(); }
3636
uint GetSize() const { return externalData.pData ? externalData.uiSize : buffer.GetSize(); }
3737

38-
bool SetSize(uint uiSize)
38+
void SetSize(uint uiSize)
3939
{
4040
dassert(externalData.pData == NULL || buffer.GetSize() == 0);
4141
if (externalData.pData)
4242
{
4343
buffer = CBuffer(externalData.pData, externalData.uiSize);
4444
externalData = SCharStringRef();
4545
}
46-
return buffer.SetSize(uiSize);
46+
buffer.SetSize(uiSize);
4747
}
4848

4949
// Only one can be in use at a time

‎Server/mods/deathmatch/logic/packets/CPlayerScreenShotPacket.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ bool CPlayerScreenShotPacket::Read(NetBitStreamInterface& BitStream)
5555
if (!BitStream.Read(usNumBytes))
5656
return false;
5757

58-
if (!m_buffer.SetSize(usNumBytes))
59-
return false;
58+
m_buffer.SetSize(usNumBytes);
6059
if (!BitStream.Read(m_buffer.GetData(), m_buffer.GetSize()))
6160
return false;
6261

0 commit comments

Comments
 (0)