Code/Editor
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
@@ -103,7 +103,6 @@ it hasn't been integrated into this code drop yet.
|
||||
** CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
*/
|
||||
#pragma warning(disable:4996)
|
||||
|
||||
class TVec
|
||||
{
|
||||
|
||||
@@ -220,5 +220,5 @@ void CImageHistogram::ComputeStatisticsForChannel(int aIndex)
|
||||
}
|
||||
}
|
||||
|
||||
m_median[aIndex] = median;
|
||||
m_median[aIndex] = static_cast<float>(median);
|
||||
}
|
||||
|
||||
@@ -79,7 +79,7 @@ libtiffDummySeekProc (thandle_t fd, toff_t off, int i)
|
||||
switch (i)
|
||||
{
|
||||
case SEEK_SET:
|
||||
memImage->offset = off;
|
||||
memImage->offset = static_cast<uint32>(off);
|
||||
break;
|
||||
|
||||
case SEEK_CUR:
|
||||
@@ -87,11 +87,11 @@ libtiffDummySeekProc (thandle_t fd, toff_t off, int i)
|
||||
break;
|
||||
|
||||
case SEEK_END:
|
||||
memImage->offset = memImage->size - off;
|
||||
memImage->offset = static_cast<uint32>(memImage->size - off);
|
||||
break;
|
||||
|
||||
default:
|
||||
memImage->offset = off;
|
||||
memImage->offset = static_cast<uint32>(off);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -262,7 +262,7 @@ bool CImageTIF::Load(const QString& fileName, CFloatImage& outImage)
|
||||
}
|
||||
}
|
||||
|
||||
uint32 linesize = TIFFScanlineSize(tif);
|
||||
uint32 linesize = static_cast<uint32>(TIFFScanlineSize(tif));
|
||||
uint8* linebuf = static_cast<uint8*>(_TIFFmalloc(linesize));
|
||||
|
||||
// We assume that a scanline has all of the samples in it. Validate the assumption.
|
||||
|
||||
@@ -106,7 +106,7 @@ bool CPakFile::UpdateFile(const char* filename, CCryMemFile& file, bool bCompres
|
||||
{
|
||||
if (m_pArchive)
|
||||
{
|
||||
int nSize = file.GetLength();
|
||||
int nSize = static_cast<int>(file.GetLength());
|
||||
|
||||
UpdateFile(filename, file.GetMemPtr(), nSize, bCompress);
|
||||
file.Close();
|
||||
|
||||
@@ -171,7 +171,7 @@ namespace Prop
|
||||
{
|
||||
// Limit step size to 1000.
|
||||
int nPrec = max(3 - int(log(m_rangeMax - m_rangeMin) / log(10.f)), 0);
|
||||
m_step = max(m_step, powf(10.f, -nPrec));
|
||||
m_step = max<float>(m_step, powf(10.f, static_cast<float>(-nPrec)));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user