Changeset 953 for trunk/vizservers/nanovis/PointSetRenderer.cpp

Timestamp:

Mar 12, 2008, 3:48:06 PM (17 years ago)

Author:

gah

Message:

remove warnings from compile

File:

• trunk/vizservers/nanovis/PointSetRenderer.cpp (modified) (3 diffs)

trunk/vizservers/nanovis/PointSetRenderer.cpp

@@ +1 @@
+
 #include "Nv.h"
 #include <GL/gl.h>
@@ -17 +18 @@
     _shader = new PointShader();
     R2string path = R2FilePath::getInstance()->getPath("particle2.bmp");
-    if (path.getLength() == 0)
-    {
+    if (path.getLength() == 0) {
         printf("ERROR : pointset file not found - %s\n", (const char*) path);
         fflush(stdout);
@@ -28 +28 @@
 
     unsigned char* bytes = (unsigned char*) image->getImageBuffer();
-    if (bytes)
-    {
-        for (int y = 0; y < image->getHeight(); ++y)
-           for (int x = 0; x < image->getWidth(); ++x, bytes +=4)
-           {
+    if (bytes) {
+        for (unsigned int y = 0; y < image->getHeight(); ++y) {
+            for (unsigned int x = 0; x < image->getWidth(); ++x, bytes +=4) {
                 bytes[3] =  (bytes[0] == 0)? 0 : 255;
-           }
+            }
+        }
     }
 
-    if (image)
-    {
-        _pointTexture = new Texture2D(image->getWidth(), image->getHeight(), GL_UNSIGNED_BYTE, GL_LINEAR,    
-                                4, (float*) image->getImageBuffer());
-    }
-    else
-    {
+    if (image) {
+        _pointTexture = new Texture2D(image->getWidth(), image->getHeight(), 
+                                      GL_UNSIGNED_BYTE, GL_LINEAR,    
+                                      4, (float*) image->getImageBuffer());
+    } else {
         printf("fail to load image [%s]\n", "particles2.bmp");
     }
 
     delete loader;
-
     _bucketSort = new PCA::BucketSort(1024);
 }