Changeset 2841 for trunk/packages/vizservers/nanovis/R2/src/R2IndexBuffer.cpp

Timestamp:

Mar 10, 2012, 11:31:26 PM (13 years ago)

Author:

ldelgass

Message:

Misc. cleanups. Make libs look in nanovis src dir for includes, so that libs
can use Trace.h. Trace.h now includes config.h, so the WANT_TRACE define can
be placed there. The Makefile now has the flag for enabling the pointset
code, since it also switches which objects are compiled.

File:

• trunk/packages/vizservers/nanovis/R2/src/R2IndexBuffer.cpp (modified) (1 diff)

trunk/packages/vizservers/nanovis/R2/src/R2IndexBuffer.cpp

@@ -5 +5 @@
 #include <R2/graphics/R2IndexBuffer.h>
 
-R2IndexBuffer::R2IndexBuffer(int indexCount, int* data, bool copy)
-: _indexCount(indexCount)
+R2IndexBuffer::R2IndexBuffer(int indexCount, int* data, bool copy) :
+    _indexCount(indexCount)
 {
-        if (copy)
-        {
-                _data = (int*) malloc(sizeof(int) * indexCount);
-                memcpy(_data, data, sizeof(int) * indexCount);
-        }
-        else
-        {
-                _data = data;
-        }
+    if (copy) {
+        _data = (int*)malloc(sizeof(int) * indexCount);
+        memcpy(_data, data, sizeof(int) * indexCount);
+    } else {
+        _data = data;
+    }
 }
-
 
 R2IndexBuffer::~R2IndexBuffer()
 {
-        if (_data)
-        {
-                free(_data);
-        }
+    if (_data) {
+        free(_data);
+    }
 }