Various fixes
Former-commit-id: bc799bb6b028f94a57c30dad8563367ab8a89973 [formerly 6c3e07c34170a8df0a4465d80cdfe9e5b8e04087] Former-commit-id: e685bae1b31f698856efaf66d7bab8d96cb047f8
This commit is contained in:
@@ -385,7 +385,7 @@ namespace Nz
|
||||
}
|
||||
|
||||
/*!
|
||||
* \brief Sets the position of the cursor
|
||||
* \brief Sets the position of the cursor
|
||||
* \return true if cursor is successfully positioned
|
||||
*
|
||||
* \param pos Position of the cursor
|
||||
@@ -404,7 +404,7 @@ namespace Nz
|
||||
}
|
||||
|
||||
/*!
|
||||
* \brief Sets the position of the cursor
|
||||
* \brief Sets the position of the cursor
|
||||
* \return true if cursor is successfully positioned
|
||||
*
|
||||
* \param offset Offset according to the cursor begin position
|
||||
@@ -725,7 +725,7 @@ namespace Nz
|
||||
return true;
|
||||
else if (path.Match("\\\\*")) // Ex: \\Laptop
|
||||
return true;
|
||||
else if (path.StartsWith('\\')) // Special : '\' refering to the root
|
||||
else if (path.StartsWith('\\')) // Special : '\' referring to the root
|
||||
return true;
|
||||
else
|
||||
return false;
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
#include "..\..\..\include\Nazara\Core\StringStream.hpp"
|
||||
// Copyright (C) 2015 Jérôme Leclercq
|
||||
// This file is part of the "Nazara Engine - Core module"
|
||||
// For conditions of distribution and use, see copyright notice in Config.hpp
|
||||
|
||||
@@ -1352,6 +1352,15 @@ namespace Nz
|
||||
|
||||
void Image::Copy(UInt8* destination, const UInt8* source, PixelFormatType format, unsigned int width, unsigned int height, unsigned int depth, unsigned int dstWidth, unsigned int dstHeight, unsigned int srcWidth, unsigned int srcHeight)
|
||||
{
|
||||
#if NAZARA_UTILITY_SAFE
|
||||
if (width == 0)
|
||||
NazaraError("Width must be greater than zero");
|
||||
if (height == 0)
|
||||
NazaraError("Height must be greater than zero");
|
||||
if (depth == 0)
|
||||
NazaraError("Depth must be greater than zero");
|
||||
#endif
|
||||
|
||||
if (dstWidth == 0)
|
||||
dstWidth = width;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user