From 353f16b2d0299b4a2052d2e3437c21f6a9b0a5ce Mon Sep 17 00:00:00 2001
From: Andrzej Kapolka <drzej.k@gmail.com>
Date: Fri, 19 Jul 2013 15:56:04 -0700
Subject: [PATCH] Style fixes.

---
 interface/src/Application.cpp | 8 ++++----
 interface/src/Webcam.cpp      | 6 ++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index f5d7a1eb19..d1fa5f1dc1 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1091,15 +1091,15 @@ static Avatar* processAvatarMessageHeader(unsigned char*& packetData, size_t& da
     // make sure the node exists
     Node* node = NodeList::getInstance()->nodeWithID(nodeID);
     if (!node || !node->getLinkedData()) {
-        return 0;
+        return NULL;
     }
     Avatar* avatar = static_cast<Avatar*>(node->getLinkedData());
-    return avatar->isInitialized() ? avatar : 0;
+    return avatar->isInitialized() ? avatar : NULL;
 }
 
 void Application::processAvatarVoxelURLMessage(unsigned char* packetData, size_t dataBytes) {
     Avatar* avatar = processAvatarMessageHeader(packetData, dataBytes);
-    if (avatar == 0) {
+    if (!avatar) {
         return;
     } 
     QUrl url = QUrl::fromEncoded(QByteArray((char*)packetData, dataBytes));
@@ -1110,7 +1110,7 @@ void Application::processAvatarVoxelURLMessage(unsigned char* packetData, size_t
 
 void Application::processAvatarFaceVideoMessage(unsigned char* packetData, size_t dataBytes) {
     Avatar* avatar = processAvatarMessageHeader(packetData, dataBytes);
-    if (avatar == 0) {
+    if (!avatar) {
         return;
     }
     avatar->getHead().getFace().processVideoMessage(packetData, dataBytes);
diff --git a/interface/src/Webcam.cpp b/interface/src/Webcam.cpp
index aac0616244..e37ca6c70e 100644
--- a/interface/src/Webcam.cpp
+++ b/interface/src/Webcam.cpp
@@ -134,7 +134,8 @@ void Webcam::renderPreview(int screenWidth, int screenHeight) {
             glVertex2f(left + facePoints[3].x * xScale, top + facePoints[3].y * yScale);
         glEnd();
         
-        char fps[30];
+        const int MAX_FPS_CHARACTERS = 30;
+        char fps[MAX_FPS_CHARACTERS];
         sprintf(fps, "FPS: %d", (int)(roundf(_frameCount * 1000000.0f / (usecTimestampNow() - _startTimestamp))));
         drawtext(left, top + PREVIEW_HEIGHT + 20, 0.10, 0, 1, 0, fps);
     }
@@ -484,7 +485,8 @@ void FrameGrabber::grabFrame() {
         // convert from 11 to 8 bits, centered about the mean face depth (if possible)
         if (_searchWindow.area() > 0) {
             const double DEPTH_OFFSET_SMOOTHING = 0.95;
-            double meanOffset = 128.0 - mean(depth(_searchWindow))[0];
+            const double EIGHT_BIT_MIDPOINT = 128.0;
+            double meanOffset = EIGHT_BIT_MIDPOINT - mean(depth(_searchWindow))[0];
             _depthOffset = (_depthOffset == 0.0) ? meanOffset : glm::mix(meanOffset, _depthOffset, DEPTH_OFFSET_SMOOTHING);
         }
         depth.convertTo(_grayDepthFrame, CV_8UC1, 1.0, _depthOffset);