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/scene_graph/SceneHash.cpp')
-rw-r--r--source/blender/freestyle/intern/scene_graph/SceneHash.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/freestyle/intern/scene_graph/SceneHash.cpp b/source/blender/freestyle/intern/scene_graph/SceneHash.cpp
index af41421fa72..3e6c8f924a1 100644
--- a/source/blender/freestyle/intern/scene_graph/SceneHash.cpp
+++ b/source/blender/freestyle/intern/scene_graph/SceneHash.cpp
@@ -20,22 +20,22 @@ string SceneHash::toString()
void SceneHash::visitNodeViewLayer(NodeViewLayer &node)
{
struct RenderData *r = &node.scene().r;
- adler32((unsigned char *)&r->xsch, sizeof(r->xsch)); // resolution_x
- adler32((unsigned char *)&r->ysch, sizeof(r->ysch)); // resolution_y
- adler32((unsigned char *)&r->size, sizeof(r->size)); // resolution_percentage
+ adler32((uchar *)&r->xsch, sizeof(r->xsch)); // resolution_x
+ adler32((uchar *)&r->ysch, sizeof(r->ysch)); // resolution_y
+ adler32((uchar *)&r->size, sizeof(r->size)); // resolution_percentage
struct FreestyleConfig *config = &node.sceneLayer().freestyle_config;
- adler32((unsigned char *)&config->flags, sizeof(config->flags));
- adler32((unsigned char *)&config->crease_angle, sizeof(config->crease_angle));
- adler32((unsigned char *)&config->sphere_radius, sizeof(config->sphere_radius));
- adler32((unsigned char *)&config->dkr_epsilon, sizeof(config->dkr_epsilon));
+ adler32((uchar *)&config->flags, sizeof(config->flags));
+ adler32((uchar *)&config->crease_angle, sizeof(config->crease_angle));
+ adler32((uchar *)&config->sphere_radius, sizeof(config->sphere_radius));
+ adler32((uchar *)&config->dkr_epsilon, sizeof(config->dkr_epsilon));
}
void SceneHash::visitNodeCamera(NodeCamera &cam)
{
double *proj = cam.projectionMatrix();
for (int i = 0; i < 16; i++) {
- adler32((unsigned char *)&proj[i], sizeof(double));
+ adler32((uchar *)&proj[i], sizeof(double));
}
}
@@ -45,13 +45,13 @@ void SceneHash::visitIndexedFaceSet(IndexedFaceSet &ifs)
const unsigned n = ifs.vsize();
for (unsigned i = 0; i < n; i++) {
- adler32((unsigned char *)&v[i], sizeof(v[i]));
+ adler32((uchar *)&v[i], sizeof(v[i]));
}
}
static const int MOD_ADLER = 65521;
-void SceneHash::adler32(const unsigned char *data, int size)
+void SceneHash::adler32(const uchar *data, int size)
{
uint32_t sum1 = _sum & 0xffff;
uint32_t sum2 = (_sum >> 16) & 0xffff;