Changeset 1571 for trunk/packages/vizservers/nanovis

Timestamp:

Sep 29, 2009, 10:19:44 AM (15 years ago)

Author:

gah

Message:

Fixups for bit rot: gcc-4.4.1

Location:

trunk/packages/vizservers/nanovis

Files:

• FlowCmd.cpp (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• RpAVTranslate.cpp (modified) (1 diff)
• RpAVTranslate.h (modified) (1 diff)
• VolumeRenderer.cpp (modified) (1 diff)
• nanovis.cpp (modified) (2 diffs)

trunk/packages/vizservers/nanovis/FlowCmd.cpp

@@ -1296 +1296 @@
 
     string = Tcl_GetString(objPtr);
-    p = strrchr(string, '%');
+    p = strrchr((char *)string, '%');
     if (p == NULL) {
         float value;

trunk/packages/vizservers/nanovis/Makefile.in

@@ -33 +33 @@
 CG_INC_SPEC     = -I$(CG_DIR)/include
 CG_LIB_SPEC     = -L$(CG_DIR)/lib -lCg -lCgGL
-DX_DIR          = @DX_DIR@
-DX_INC_SPEC     = -I$(DX_DIR)/include
-DX_LIB_SPEC     = -L$(DX_DIR)/lib_linux -lDXcallm
+DX_INC_SPEC      = @DX_INC_SPEC@
+DX_LIB_SPEC      = @DX_LIB_SPEC@ -lDXcallm
 FF_LIB_SPEC     = -lavformat -lavcodec -lavutil
 # might also need -lavutil

trunk/packages/vizservers/nanovis/RpAVTranslate.cpp

@@ -293 +293 @@
 
 bool
-AVTranslate::allocPicture(Outcome &status, int pixFmt, AVFrame **framePtrPtr)
+AVTranslate::allocPicture(Outcome &status, PixelFormat pixFmt, 
+     AVFrame **framePtrPtr)
 {
     status.addContext("Rappture::AVTranslate::allocPicture()");

trunk/packages/vizservers/nanovis/RpAVTranslate.h

@@ -46 +46 @@
 private:
     bool addVideoStream(Outcome &status, CodecID codecId, AVStream **stream);
-    bool allocPicture(Outcome &status, int pixFmt, AVFrame **pic );
+    bool allocPicture(Outcome &status, PixelFormat pixFmt, AVFrame **pic );
     bool openVideo(Outcome &status);
     bool writeVideoFrame(Outcome &status);

trunk/packages/vizservers/nanovis/VolumeRenderer.cpp

@@ -350 +350 @@
         
     } //iterate all volumes
-    fprintf(stderr, "total slices: %d\n", total_rendered_slices); 
     Trace("end loop\n");
     

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -22 +22 @@
 #include <getopt.h>
 #include <iostream>
-#include <math.h>
+#include <cmath>
 #include <memory.h>
 #include <signal.h>
 #include <sstream>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <string>
 #include <sys/resource.h>
@@ -2433 +2433 @@
 #ifdef XINETD
         path = argv[0];
-        p = strrchr(path, '/');
+        p = strrchr((char *)path, '/');
         if (p != NULL) {
             *p = '\0';
-            p = strrchr(path, '/');
+            p = strrchr((char *)path, '/');
         }
         if (p == NULL) {