Legacy cleanup, part 2 (#3659)

* Legacy cleanup, part 2

There are still things that can be removed, those will be likely done in part three:
`The Return of the Cleanup` :)

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix windows build

Somehow there were some unfixed errors from enabled warnings?
I'm unsure if I've pulled repo in unstable state, or those were somehow
missed.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
This commit is contained in:
Artur K
2021-08-30 22:40:02 +02:00
committed by GitHub
parent fa0f2a1007
commit 96a5f06ca3
116 changed files with 189 additions and 18706 deletions
-5
View File
@@ -62,11 +62,6 @@ CDynamicArray2D::~CDynamicArray2D()
}
void CDynamicArray2D::GetMemoryUsage(ICrySizer* pSizer)
{
pSizer->Add((char*)this, m_Dimension1 * m_Dimension2 * sizeof(float) + sizeof(*this));
}
void CDynamicArray2D::ScaleImage(CDynamicArray2D* pDestination)
{
////////////////////////////////////////////////////////////////////////
-2
View File
@@ -24,8 +24,6 @@ public:
virtual ~CDynamicArray2D();
//
void ScaleImage(CDynamicArray2D* pDestination);
//
void GetMemoryUsage(ICrySizer* pSizer);
float** m_Array; //
+1 -1
View File
@@ -28,7 +28,7 @@ QColor ScaleColor(const QColor& c, float aScale)
const float g = static_cast<float>(aColor.green()) * aScale;
const float b = static_cast<float>(aColor.blue()) * aScale;
return QColor(CLAMP(static_cast<int>(r), 0, 255), CLAMP(static_cast<int>(g), 0, 255), CLAMP(static_cast<int>(b), 0, 255));
return QColor(AZStd::clamp(static_cast<int>(r), 0, 255), AZStd::clamp(static_cast<int>(g), 0, 255), AZStd::clamp(static_cast<int>(b), 0, 255));
}
CAlphaBitmap::CAlphaBitmap()
+1 -1
View File
@@ -105,7 +105,7 @@ void CImageHistogram::ComputeHistogram(BYTE* pImageData, UINT aWidth, UINT aHeig
++m_count[3][a];
lumIndex = (r + b + g) / 3;
lumIndex = CLAMP(lumIndex, 0, kNumColorLevels - 1);
lumIndex = AZStd::clamp(lumIndex, 0, kNumColorLevels - 1);
++m_lumCount[lumIndex];
if (m_maxCount[0] < m_count[0][r])