Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/freestyle/intern/stroke/ContextFunctions.cpp')
-rw-r--r--source/blender/freestyle/intern/stroke/ContextFunctions.cpp16
1 files changed, 9 insertions, 7 deletions
diff --git a/source/blender/freestyle/intern/stroke/ContextFunctions.cpp b/source/blender/freestyle/intern/stroke/ContextFunctions.cpp
index e50b5f0b242..cd37a5f893d 100644
--- a/source/blender/freestyle/intern/stroke/ContextFunctions.cpp
+++ b/source/blender/freestyle/intern/stroke/ContextFunctions.cpp
@@ -12,19 +12,21 @@
#include "../system/TimeStamp.h"
+#include "BLI_sys_types.h"
+
namespace Freestyle::ContextFunctions {
-unsigned GetTimeStampCF()
+uint GetTimeStampCF()
{
return TimeStamp::instance()->getTimeStamp();
}
-unsigned GetCanvasWidthCF()
+uint GetCanvasWidthCF()
{
return Canvas::getInstance()->width();
}
-unsigned GetCanvasHeightCF()
+uint GetCanvasHeightCF()
{
return Canvas::getInstance()->height();
}
@@ -34,24 +36,24 @@ BBox<Vec2i> GetBorderCF()
return Canvas::getInstance()->border();
}
-void LoadMapCF(const char *iFileName, const char *iMapName, unsigned iNbLevels, float iSigma)
+void LoadMapCF(const char *iFileName, const char *iMapName, uint iNbLevels, float iSigma)
{
return Canvas::getInstance()->loadMap(iFileName, iMapName, iNbLevels, iSigma);
}
-float ReadMapPixelCF(const char *iMapName, int level, unsigned x, unsigned y)
+float ReadMapPixelCF(const char *iMapName, int level, uint x, uint y)
{
Canvas *canvas = Canvas::getInstance();
return canvas->readMapPixel(iMapName, level, x, y);
}
-float ReadCompleteViewMapPixelCF(int level, unsigned x, unsigned y)
+float ReadCompleteViewMapPixelCF(int level, uint x, uint y)
{
SteerableViewMap *svm = Canvas::getInstance()->getSteerableViewMap();
return svm->readCompleteViewMapPixel(level, x, y);
}
-float ReadDirectionalViewMapPixelCF(int iOrientation, int level, unsigned x, unsigned y)
+float ReadDirectionalViewMapPixelCF(int iOrientation, int level, uint x, uint y)
{
SteerableViewMap *svm = Canvas::getInstance()->getSteerableViewMap();
return svm->readSteerableViewMapPixel(iOrientation, level, x, y);