From b9c9ff6a1454b3d11683ec27366e0733dcfd5163 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 1 May 2015 16:49:11 -0700
Subject: [PATCH] clean up various warnings

---
 interface/src/avatar/Avatar.cpp               | 5 ++---
 libraries/audio-client/src/AudioClient.cpp    | 4 ++--
 libraries/audio-client/src/AudioNoiseGate.cpp | 4 ++--
 libraries/audio/src/AudioFilterBank.h         | 3 ++-
 libraries/render-utils/src/TextRenderer.cpp   | 4 ++--
 tools/scribe/src/TextTemplate.cpp             | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp
index 26ada89d90..e6a8fe2915 100644
--- a/interface/src/avatar/Avatar.cpp
+++ b/interface/src/avatar/Avatar.cpp
@@ -723,11 +723,10 @@ void Avatar::renderDisplayName() {
                                .arg(getReceiveRate());
     }
  
-    QByteArray ba = _displayName.toLocal8Bit();
-    const char* text = ba.data();
+    QByteArray nameUTF8 = renderedDisplayName.toLocal8Bit();
     
     glDisable(GL_POLYGON_OFFSET_FILL);
-    textRenderer(DISPLAYNAME)->draw(text_x, text_y, renderedDisplayName, color);
+    textRenderer(DISPLAYNAME)->draw(text_x, text_y, nameUTF8.data(), color);
 
     glPopMatrix();
 
diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp
index 331e62ec70..972b9e07c4 100644
--- a/libraries/audio-client/src/AudioClient.cpp
+++ b/libraries/audio-client/src/AudioClient.cpp
@@ -796,8 +796,8 @@ void AudioClient::handleAudioInput() {
                 float loudness = 0.0f;
                 
                 for (int i = 0; i < numNetworkSamples; i++) {
-                    float thisSample = fabsf(networkAudioSamples[i]);
-                    loudness += thisSample;
+                    int thisSample = std::abs(networkAudioSamples[i]);
+                    loudness += (float) thisSample;
                     
                     if (thisSample > (AudioConstants::MAX_SAMPLE_VALUE * AudioNoiseGate::CLIPPING_THRESHOLD)) {
                         _timeSinceLastClip = 0.0f;
diff --git a/libraries/audio-client/src/AudioNoiseGate.cpp b/libraries/audio-client/src/AudioNoiseGate.cpp
index 67c1e5dfcf..f775f167ae 100644
--- a/libraries/audio-client/src/AudioNoiseGate.cpp
+++ b/libraries/audio-client/src/AudioNoiseGate.cpp
@@ -53,7 +53,7 @@ void AudioNoiseGate::gateSamples(int16_t* samples, int numSamples) {
     
     
     float loudness = 0;
-    float thisSample = 0;
+    int thisSample = 0;
     int samplesOverNoiseGate = 0;
     
     const float NOISE_GATE_HEIGHT = 7.0f;
@@ -69,7 +69,7 @@ void AudioNoiseGate::gateSamples(int16_t* samples, int numSamples) {
     for (int i = 0; i < numSamples; i++) {
         measuredDcOffset += samples[i];
         samples[i] -= (int16_t) _dcOffset;
-        thisSample = fabsf(samples[i]);
+        thisSample = std::abs(samples[i]);
         
         if (thisSample >= ((float) AudioConstants::MAX_SAMPLE_VALUE * CLIPPING_THRESHOLD)) {
             _didClipInLastFrame = true;
diff --git a/libraries/audio/src/AudioFilterBank.h b/libraries/audio/src/AudioFilterBank.h
index a81c3db996..a581b79b98 100644
--- a/libraries/audio/src/AudioFilterBank.h
+++ b/libraries/audio/src/AudioFilterBank.h
@@ -121,8 +121,9 @@ public:
     }
     
     void render(const int16_t* in, int16_t* out, const uint32_t frameCount) {
-        if (!_buffer || (frameCount > _frameCount))
+        if (frameCount > _frameCount) {
             return;
+        }
 
         const int scale = (2 << ((8 * sizeof(int16_t)) - 1));
 
diff --git a/libraries/render-utils/src/TextRenderer.cpp b/libraries/render-utils/src/TextRenderer.cpp
index dbe5a027e7..f459d466f4 100644
--- a/libraries/render-utils/src/TextRenderer.cpp
+++ b/libraries/render-utils/src/TextRenderer.cpp
@@ -449,7 +449,7 @@ glm::vec2 Font::drawString(float x, float y, const QString & str,
             advance.y -= _rowHeight;
             // If we've wrapped right out of the bounds, then we're 
             // done with rendering the tokens
-            if (bounds.y > 0 && abs(advance.y) > bounds.y) {
+            if (bounds.y > 0 && std::abs(advance.y) > bounds.y) {
                 break;
             }
             continue;
@@ -464,7 +464,7 @@ glm::vec2 Font::drawString(float x, float y, const QString & str,
                 advance.y -= _rowHeight;
                 // If we've wrapped right out of the bounds, then we're 
                 // done with rendering the tokens
-                if (bounds.y > 0 && abs(advance.y) > bounds.y) {
+                if (bounds.y > 0 && std::abs(advance.y) > bounds.y) {
                     break;
                 }
             }
diff --git a/tools/scribe/src/TextTemplate.cpp b/tools/scribe/src/TextTemplate.cpp
index 752d4a37d8..f860860ae4 100755
--- a/tools/scribe/src/TextTemplate.cpp
+++ b/tools/scribe/src/TextTemplate.cpp
@@ -871,7 +871,7 @@ int TextTemplate::evalBlockGeneration(std::ostream& dst, const BlockPointer& blo
         case Command::INCLUDE: {
             TextTemplatePointer include = _config->findInclude(block->command.arguments.front().c_str());
             if (include && !include->_root->blocks.empty()) {
-                if (&include->_root) {
+                if (include->_root) {
                     generateTree(dst, include->_root, vars);
                 }
             }