Changeset 1571 for trunk

Timestamp:

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

Author:

gah

Message:

Fixups for bit rot: gcc-4.4.1

Location:

trunk

Files:

• gui/apps/driver (modified) (1 diff)
• packages/vizservers/configure (modified) (2 diffs)
• packages/vizservers/configure.in (modified) (1 diff)
• packages/vizservers/nanovis/FlowCmd.cpp (modified) (1 diff)
• packages/vizservers/nanovis/Makefile.in (modified) (1 diff)
• packages/vizservers/nanovis/RpAVTranslate.cpp (modified) (1 diff)
• packages/vizservers/nanovis/RpAVTranslate.h (modified) (1 diff)
• packages/vizservers/nanovis/VolumeRenderer.cpp (modified) (1 diff)
• packages/vizservers/nanovis/nanovis.cpp (modified) (2 diffs)
• src/core/RpEncode.cc (modified) (1 diff)
• src/core/RpOutcome.cc (modified) (1 diff)
• src/core/RpUnits.cc (modified) (1 diff)

trunk/gui/apps/driver

@@ -311 +311 @@
         set type [$tool xml get tool.control.type]
     }
+    if { $type == "" } {
+        set arrangement [$win.pager cget -arrangement]
+        if { $arrangement != "side-by-side" } { 
+           set type auto
+        }
+    }
     if { $type == "auto" || $style == "wizard" } {
         # in "auto" mode, we don't need a simulate button

trunk/packages/vizservers/configure

@@ -641 +641 @@
 LD_RPATH
 CG_DIR
-DX_DIR
+DX_LIB_SPEC
+DX_INC_SPEC
 RP_DIR
 RP2_INCL_DIR
@@ -10063 +10064 @@
 
 
-{ $as_echo "$as_me:$LINENO: checking for DX installation" >&5
-$as_echo_n "checking for DX installation... " >&6; }
-DX_DIR=""
+{ $as_echo "$as_me:$LINENO: checking for OpenDX headers" >&5
+$as_echo_n "checking for OpenDX headers... " >&6; }
+DX_INC_DIR=""
 for dir in \
- /apps/rappture \
- /usr/dx \
- /usr
+ /apps/rappture/include \
+ /usr/dx/include \
+ /usr/include
 do
-  if test -r "${dir}/include/dx/dx.h" ; then
-    DX_DIR="$dir"
+  if test -r "${dir}/dx/dx.h" ; then
+    DX_INC_DIR="$dir"
     break
   fi
 done
-if test "x${DX_DIR}" = "x" ; then
-  { { $as_echo "$as_me:$LINENO: error: can't find OpenDX installation" >&5
-$as_echo "$as_me: error: can't find OpenDX installation" >&2;}
+if test "x${DX_INC_DIR}" = "x" ; then
+  { { $as_echo "$as_me:$LINENO: error: can't find OpenDX include files" >&5
+$as_echo "$as_me: error: can't find OpenDX include files" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-if test "${DX_DIR}" = "/usr" ; then
-  DX_DIR=""
-else
-  LD_RPATH="$loader_run_path:${DX_DIR}/lib"
-fi
-
-
-{ $as_echo "$as_me:$LINENO: result: ${DX_DIR}" >&5
-$as_echo "${DX_DIR}" >&6; }
+if test "${DX_INC_DIR}" = "/usr/include" ; then
+  DX_INC_SPEC=""
+else
+  DX_INC_SPEC="-I{DX_INC_DIR}"
+fi
+
+{ $as_echo "$as_me:$LINENO: result: ${DX_INC_DIR}" >&5
+$as_echo "${DX_INC_DIR}" >&6; }
+
+{ $as_echo "$as_me:$LINENO: checking for OpenDX libraries" >&5
+$as_echo_n "checking for OpenDX libraries... " >&6; }
+DX_LIB_DIR=""
+for dir in \
+ /apps/rappture/lib \
+ /usr/lib/dx/lib_linux \
+ /usr/dx/lib_linux \
+ /usr/lib
+do
+  if test -r "${dir}/libDXcallm.a" ; then
+    DX_LIB_DIR="$dir"
+    break
+  fi
+done
+if test "x${DX_LIB_DIR}" = "x" ; then
+  { { $as_echo "$as_me:$LINENO: error: can't find OpenDX libraries" >&5
+$as_echo "$as_me: error: can't find OpenDX libraries" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+if test "${DX_LIB_DIR}" = "/usr" ; then
+  DX_LIB_SPEC=""
+else
+  DX_LIB_SPEC="-L${DX_LIB_DIR}"
+fi
+
+
+{ $as_echo "$as_me:$LINENO: result: ${DX_LIB_DIR}" >&5
+$as_echo "${DX_LIB_DIR}" >&6; }
 
 

trunk/packages/vizservers/configure.in

@@ -159 +159 @@
 AC_CHECK_HEADERS([sys/socket.h sys/time.h netinet/in.h arpa/inet.h netdb.h])
 
-AC_MSG_CHECKING([for DX installation])
-DX_DIR=""
-for dir in \
- /apps/rappture \
- /usr/dx \
- /usr
+AC_MSG_CHECKING([for OpenDX headers])
+DX_INC_DIR=""
+for dir in \
+ /apps/rappture/include \
+ /usr/dx/include \
+ /usr/include
 do
-  if test -r "${dir}/include/dx/dx.h" ; then
-    DX_DIR="$dir"
-    break
-  fi
-done
-if test "x${DX_DIR}" = "x" ; then
-  AC_MSG_ERROR([can't find OpenDX installation])
-fi
-
-if test "${DX_DIR}" = "/usr" ; then
-  DX_DIR=""
+  if test -r "${dir}/dx/dx.h" ; then
+    DX_INC_DIR="$dir"
+    break
+  fi
+done
+if test "x${DX_INC_DIR}" = "x" ; then
+  AC_MSG_ERROR([can't find OpenDX include files])
+fi
+
+if test "${DX_INC_DIR}" = "/usr/include" ; then
+  DX_INC_SPEC=""
 else 
-  LD_RPATH="$loader_run_path:${DX_DIR}/lib"
-fi
-
-AC_SUBST(DX_DIR)
-AC_MSG_RESULT([${DX_DIR}])
+  DX_INC_SPEC="-I{DX_INC_DIR}"
+fi
+AC_SUBST(DX_INC_SPEC)
+AC_MSG_RESULT([${DX_INC_DIR}])
+
+AC_MSG_CHECKING([for OpenDX libraries])
+DX_LIB_DIR=""
+for dir in \
+ /apps/rappture/lib \
+ /usr/lib/dx/lib_linux \
+ /usr/dx/lib_linux \
+ /usr/lib
+do
+  if test -r "${dir}/libDXcallm.a" ; then
+    DX_LIB_DIR="$dir"
+    break
+  fi
+done
+if test "x${DX_LIB_DIR}" = "x" ; then
+  AC_MSG_ERROR([can't find OpenDX libraries])
+fi
+
+if test "${DX_LIB_DIR}" = "/usr" ; then
+  DX_LIB_SPEC=""
+else
+  DX_LIB_SPEC="-L${DX_LIB_DIR}"
+fi
+
+AC_SUBST(DX_LIB_SPEC)
+AC_MSG_RESULT([${DX_LIB_DIR}])
 
 AC_CHECK_HEADERS([ffmpeg/avcodec.h libavcodec/avcodec.h ffmpeg/avformat.h libavformat/avformat.h ffmpeg/avutil.h libavutil/avutil.h])

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) {

trunk/src/core/RpEncode.cc

@@ -212 +212 @@
     const char *cp, *endPtr;
     for (cp = buf, endPtr = buf + size; cp < endPtr; cp++) {
-        if (!_base64chars[*cp]) {
+        if (!_base64chars[(unsigned int)*cp]) {
             fprintf(stderr, "%c %d is not base64\n", *cp, *cp);
             return false;

trunk/src/core/RpOutcome.cc

@@ -10 +10 @@
  * ======================================================================
  */
+#include <cstdarg>
+#include <cstdio>
+#include <cstdlib>
 #include "RpOutcome.h"
-#include <stdarg.h>
-#include <stdlib.h>
 using namespace Rappture;
 

trunk/src/core/RpUnits.cc

@@ -15 +15 @@
 
 #include "RpUnits.h"
+#include <cstdio>
 #include <algorithm>