diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2017-10-13 15:01:23 +0200 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2017-10-13 15:01:23 +0200 |
commit | 887dd41c5d67c30bd1e9631920d8fc1c3dd1a3f0 (patch) | |
tree | e5962fa5ef14b85b49c3d92752829e4645547efb /pose-widget | |
parent | 13f01510132abd3cf08e5a913721d0702c20664f (diff) |
compat/macros: fix "restrict" name clash
Diffstat (limited to 'pose-widget')
-rw-r--r-- | pose-widget/pose-widget.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pose-widget/pose-widget.cpp b/pose-widget/pose-widget.cpp index 3424095d..3e5f4ec3 100644 --- a/pose-widget/pose-widget.cpp +++ b/pose-widget/pose-widget.cpp @@ -267,7 +267,7 @@ void pose_transform::project_quad_texture() } // rotation of (0, 90, 0) makes it numerically unstable - if (std::fabs(dir) < 1e-3) + if (std::fabs(dir) < 1e-3f) { lock_guard l(mtx2); image.swap(image2); @@ -282,8 +282,8 @@ void pose_transform::project_quad_texture() const unsigned orig_pitch = tex.bytesPerLine(); const unsigned dest_pitch = image.bytesPerLine(); - const unsigned char* restrict orig = tex.constBits(); - unsigned char* restrict dest = image.bits(); + const unsigned char* restrict_ptr orig = tex.constBits(); + unsigned char* restrict_ptr dest = image.bits(); const int orig_depth = tex.depth() / 8; const int dest_depth = image.depth() / 8; |