Cleanup: use 'u' prefixed integer types for brevity & cast style

To use function style cast '(unsigned char)x' can't be replaced by
'unsigned char(x)'.

4 files changed, 19 insertions, 19 deletions

diff --git a/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp
index d02ff6990a5..c3559fe6e15 100644
--- a/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp
+++ b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp
@@ -68,7 +68,7 @@ IndexedFaceSet::IndexedFaceSet(float *iVertices,
     _FrsMaterials = nullptr;
     if (iMaterials) {
       _FrsMaterials = new FrsMaterial *[_MSize];
-      for (unsigned int i = 0; i < _MSize; ++i) {
+      for (uint i = 0; i < _MSize; ++i) {
         _FrsMaterials[i] = new FrsMaterial(*(iMaterials[i]));
       }
     }
@@ -161,7 +161,7 @@ IndexedFaceSet::IndexedFaceSet(const IndexedFaceSet &iBrother) : Rep(iBrother)
   _MSize = iBrother.msize();
   if (_MSize) {
     _FrsMaterials = new FrsMaterial *[_MSize];
-    for (unsigned int i = 0; i < _MSize; ++i) {
+    for (uint i = 0; i < _MSize; ++i) {
       _FrsMaterials[i] = new FrsMaterial(*(iBrother._FrsMaterials[i]));
     }
   }
@@ -224,7 +224,7 @@ IndexedFaceSet::~IndexedFaceSet()
   }
 
   if (nullptr != _FrsMaterials) {
-    for (unsigned int i = 0; i < _MSize; ++i) {
+    for (uint i = 0; i < _MSize; ++i) {
       delete _FrsMaterials[i];
     }
     delete[] _FrsMaterials;
@@ -290,7 +290,7 @@ void IndexedFaceSet::ComputeBBox()
   // parse all the coordinates to find the Xmax, YMax, ZMax
   float *v = _Vertices;
 
-  for (unsigned int i = 0; i < (_VSize / 3); ++i) {
+  for (uint i = 0; i < (_VSize / 3); ++i) {
     if (*v > XMax) {
       XMax = *v;
     }
diff --git a/source/blender/freestyle/intern/scene_graph/NodeTransform.cpp b/source/blender/freestyle/intern/scene_graph/NodeTransform.cpp
index 31101e988e5..97fa07df4c9 100644
--- a/source/blender/freestyle/intern/scene_graph/NodeTransform.cpp
+++ b/source/blender/freestyle/intern/scene_graph/NodeTransform.cpp
@@ -122,7 +122,7 @@ void NodeTransform::AddBBox(const BBox<Vec3r> &iBBox)
 
   // Computes the transform iBBox
   HVec3r tbox[8];
-  unsigned int i;
+  uint i;
   for (i = 0; i < 8; i++) {
     tbox[i] = _Matrix * box[i];
   }
@@ -130,7 +130,7 @@ void NodeTransform::AddBBox(const BBox<Vec3r> &iBBox)
   Vec3r newMin(tbox[0]);
   Vec3r newMax(tbox[0]);
   for (i = 0; i < 8; i++) {
-    for (unsigned int j = 0; j < 3; j++) {
+    for (uint j = 0; j < 3; j++) {
       if (newMin[j] > tbox[i][j]) {
         newMin[j] = tbox[i][j];
       }
@@ -147,9 +147,9 @@ void NodeTransform::AddBBox(const BBox<Vec3r> &iBBox)
 
 bool NodeTransform::isScaled(const Matrix44r &M)
 {
-  for (unsigned int j = 0; j < 3; j++) {
+  for (uint j = 0; j < 3; j++) {
     real norm = 0;
-    for (unsigned int i = 0; i < 3; i++) {
+    for (uint i = 0; i < 3; i++) {
       norm += M(i, j) * M(i, j);
     }
     if ((norm > 1.01) || (norm < 0.99)) {
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;
diff --git a/source/blender/freestyle/intern/scene_graph/ScenePrettyPrinter.cpp b/source/blender/freestyle/intern/scene_graph/ScenePrettyPrinter.cpp
index 623b6b0e2bf..5ac41b6f234 100644
--- a/source/blender/freestyle/intern/scene_graph/ScenePrettyPrinter.cpp
+++ b/source/blender/freestyle/intern/scene_graph/ScenePrettyPrinter.cpp
@@ -77,7 +77,7 @@ void ScenePrettyPrinter::visitIndexedFaceSet(IndexedFaceSet &ifs)
 
   _ofs << _space << "IndexedFaceSet" << endl;
   const float *p = vertices;
-  for (unsigned int i = 0; i < vsize / 3; i++) {
+  for (uint i = 0; i < vsize / 3; i++) {
     _ofs << _space << "  " << setw(3) << setfill('0') << i << ": " << p[0] << ", " << p[1] << ", "
          << p[2] << endl;
     p += 3;