Changeset 1571


Ignore:
Timestamp:
Sep 29, 2009 10:19:44 AM (13 years ago)
Author:
gah
Message:

Fixups for bit rot: gcc-4.4.1

Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • trunk/gui/apps/driver

    r1547 r1571  
    311311        set type [$tool xml get tool.control.type]
    312312    }
     313    if { $type == "" } {
     314        set arrangement [$win.pager cget -arrangement]
     315        if { $arrangement != "side-by-side" } {
     316           set type auto
     317        }
     318    }
    313319    if { $type == "auto" || $style == "wizard" } {
    314320        # in "auto" mode, we don't need a simulate button
  • trunk/packages/vizservers/configure

    r1364 r1571  
    641641LD_RPATH
    642642CG_DIR
    643 DX_DIR
     643DX_LIB_SPEC
     644DX_INC_SPEC
    644645RP_DIR
    645646RP2_INCL_DIR
     
    1006310064
    1006410065
    10065 { $as_echo "$as_me:$LINENO: checking for DX installation" >&5
    10066 $as_echo_n "checking for DX installation... " >&6; }
    10067 DX_DIR=""
     10066{ $as_echo "$as_me:$LINENO: checking for OpenDX headers" >&5
     10067$as_echo_n "checking for OpenDX headers... " >&6; }
     10068DX_INC_DIR=""
    1006810069for dir in \
    10069  /apps/rappture \
    10070  /usr/dx \
    10071  /usr
     10070 /apps/rappture/include \
     10071 /usr/dx/include \
     10072 /usr/include
    1007210073do
    10073   if test -r "${dir}/include/dx/dx.h" ; then
    10074     DX_DIR="$dir"
     10074  if test -r "${dir}/dx/dx.h" ; then
     10075    DX_INC_DIR="$dir"
    1007510076    break
    1007610077  fi
    1007710078done
    10078 if test "x${DX_DIR}" = "x" ; then
    10079   { { $as_echo "$as_me:$LINENO: error: can't find OpenDX installation" >&5
    10080 $as_echo "$as_me: error: can't find OpenDX installation" >&2;}
     10079if test "x${DX_INC_DIR}" = "x" ; then
     10080  { { $as_echo "$as_me:$LINENO: error: can't find OpenDX include files" >&5
     10081$as_echo "$as_me: error: can't find OpenDX include files" >&2;}
    1008110082   { (exit 1); exit 1; }; }
    1008210083fi
    1008310084
    10084 if test "${DX_DIR}" = "/usr" ; then
    10085   DX_DIR=""
    10086 else
    10087   LD_RPATH="$loader_run_path:${DX_DIR}/lib"
    10088 fi
    10089 
    10090 
    10091 { $as_echo "$as_me:$LINENO: result: ${DX_DIR}" >&5
    10092 $as_echo "${DX_DIR}" >&6; }
     10085if test "${DX_INC_DIR}" = "/usr/include" ; then
     10086  DX_INC_SPEC=""
     10087else
     10088  DX_INC_SPEC="-I{DX_INC_DIR}"
     10089fi
     10090
     10091{ $as_echo "$as_me:$LINENO: result: ${DX_INC_DIR}" >&5
     10092$as_echo "${DX_INC_DIR}" >&6; }
     10093
     10094{ $as_echo "$as_me:$LINENO: checking for OpenDX libraries" >&5
     10095$as_echo_n "checking for OpenDX libraries... " >&6; }
     10096DX_LIB_DIR=""
     10097for dir in \
     10098 /apps/rappture/lib \
     10099 /usr/lib/dx/lib_linux \
     10100 /usr/dx/lib_linux \
     10101 /usr/lib
     10102do
     10103  if test -r "${dir}/libDXcallm.a" ; then
     10104    DX_LIB_DIR="$dir"
     10105    break
     10106  fi
     10107done
     10108if test "x${DX_LIB_DIR}" = "x" ; then
     10109  { { $as_echo "$as_me:$LINENO: error: can't find OpenDX libraries" >&5
     10110$as_echo "$as_me: error: can't find OpenDX libraries" >&2;}
     10111   { (exit 1); exit 1; }; }
     10112fi
     10113
     10114if test "${DX_LIB_DIR}" = "/usr" ; then
     10115  DX_LIB_SPEC=""
     10116else
     10117  DX_LIB_SPEC="-L${DX_LIB_DIR}"
     10118fi
     10119
     10120
     10121{ $as_echo "$as_me:$LINENO: result: ${DX_LIB_DIR}" >&5
     10122$as_echo "${DX_LIB_DIR}" >&6; }
    1009310123
    1009410124
  • trunk/packages/vizservers/configure.in

    r1364 r1571  
    159159AC_CHECK_HEADERS([sys/socket.h sys/time.h netinet/in.h arpa/inet.h netdb.h])
    160160
    161 AC_MSG_CHECKING([for DX installation])
    162 DX_DIR=""
    163 for dir in \
    164  /apps/rappture \
    165  /usr/dx \
    166  /usr
     161AC_MSG_CHECKING([for OpenDX headers])
     162DX_INC_DIR=""
     163for dir in \
     164 /apps/rappture/include \
     165 /usr/dx/include \
     166 /usr/include
    167167do
    168   if test -r "${dir}/include/dx/dx.h" ; then
    169     DX_DIR="$dir"
    170     break
    171   fi
    172 done
    173 if test "x${DX_DIR}" = "x" ; then
    174   AC_MSG_ERROR([can't find OpenDX installation])
    175 fi
    176 
    177 if test "${DX_DIR}" = "/usr" ; then
    178   DX_DIR=""
     168  if test -r "${dir}/dx/dx.h" ; then
     169    DX_INC_DIR="$dir"
     170    break
     171  fi
     172done
     173if test "x${DX_INC_DIR}" = "x" ; then
     174  AC_MSG_ERROR([can't find OpenDX include files])
     175fi
     176
     177if test "${DX_INC_DIR}" = "/usr/include" ; then
     178  DX_INC_SPEC=""
    179179else
    180   LD_RPATH="$loader_run_path:${DX_DIR}/lib"
    181 fi
    182 
    183 AC_SUBST(DX_DIR)
    184 AC_MSG_RESULT([${DX_DIR}])
     180  DX_INC_SPEC="-I{DX_INC_DIR}"
     181fi
     182AC_SUBST(DX_INC_SPEC)
     183AC_MSG_RESULT([${DX_INC_DIR}])
     184
     185AC_MSG_CHECKING([for OpenDX libraries])
     186DX_LIB_DIR=""
     187for dir in \
     188 /apps/rappture/lib \
     189 /usr/lib/dx/lib_linux \
     190 /usr/dx/lib_linux \
     191 /usr/lib
     192do
     193  if test -r "${dir}/libDXcallm.a" ; then
     194    DX_LIB_DIR="$dir"
     195    break
     196  fi
     197done
     198if test "x${DX_LIB_DIR}" = "x" ; then
     199  AC_MSG_ERROR([can't find OpenDX libraries])
     200fi
     201
     202if test "${DX_LIB_DIR}" = "/usr" ; then
     203  DX_LIB_SPEC=""
     204else
     205  DX_LIB_SPEC="-L${DX_LIB_DIR}"
     206fi
     207
     208AC_SUBST(DX_LIB_SPEC)
     209AC_MSG_RESULT([${DX_LIB_DIR}])
    185210
    186211AC_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

    r1529 r1571  
    12961296
    12971297    string = Tcl_GetString(objPtr);
    1298     p = strrchr(string, '%');
     1298    p = strrchr((char *)string, '%');
    12991299    if (p == NULL) {
    13001300        float value;
  • trunk/packages/vizservers/nanovis/Makefile.in

    r1489 r1571  
    3333CG_INC_SPEC     = -I$(CG_DIR)/include
    3434CG_LIB_SPEC     = -L$(CG_DIR)/lib -lCg -lCgGL
    35 DX_DIR          = @DX_DIR@
    36 DX_INC_SPEC     = -I$(DX_DIR)/include
    37 DX_LIB_SPEC     = -L$(DX_DIR)/lib_linux -lDXcallm
     35DX_INC_SPEC      = @DX_INC_SPEC@
     36DX_LIB_SPEC      = @DX_LIB_SPEC@ -lDXcallm
    3837FF_LIB_SPEC     = -lavformat -lavcodec -lavutil
    3938# might also need -lavutil
  • trunk/packages/vizservers/nanovis/RpAVTranslate.cpp

    r1508 r1571  
    293293
    294294bool
    295 AVTranslate::allocPicture(Outcome &status, int pixFmt, AVFrame **framePtrPtr)
     295AVTranslate::allocPicture(Outcome &status, PixelFormat pixFmt,
     296     AVFrame **framePtrPtr)
    296297{
    297298    status.addContext("Rappture::AVTranslate::allocPicture()");
  • trunk/packages/vizservers/nanovis/RpAVTranslate.h

    r1515 r1571  
    4646private:
    4747    bool addVideoStream(Outcome &status, CodecID codecId, AVStream **stream);
    48     bool allocPicture(Outcome &status, int pixFmt, AVFrame **pic );
     48    bool allocPicture(Outcome &status, PixelFormat pixFmt, AVFrame **pic );
    4949    bool openVideo(Outcome &status);
    5050    bool writeVideoFrame(Outcome &status);
  • trunk/packages/vizservers/nanovis/VolumeRenderer.cpp

    r1495 r1571  
    350350       
    351351    } //iterate all volumes
    352     fprintf(stderr, "total slices: %d\n", total_rendered_slices);
    353352    Trace("end loop\n");
    354353   
  • trunk/packages/vizservers/nanovis/nanovis.cpp

    r1544 r1571  
    2222#include <getopt.h>
    2323#include <iostream>
    24 #include <math.h>
     24#include <cmath>
    2525#include <memory.h>
    2626#include <signal.h>
    2727#include <sstream>
    28 #include <stdio.h>
    29 #include <stdlib.h>
     28#include <cstdio>
     29#include <cstdlib>
    3030#include <string>
    3131#include <sys/resource.h>
     
    24332433#ifdef XINETD
    24342434        path = argv[0];
    2435         p = strrchr(path, '/');
     2435        p = strrchr((char *)path, '/');
    24362436        if (p != NULL) {
    24372437            *p = '\0';
    2438             p = strrchr(path, '/');
     2438            p = strrchr((char *)path, '/');
    24392439        }
    24402440        if (p == NULL) {
  • trunk/src/core/RpEncode.cc

    r1526 r1571  
    212212    const char *cp, *endPtr;
    213213    for (cp = buf, endPtr = buf + size; cp < endPtr; cp++) {
    214         if (!_base64chars[*cp]) {
     214        if (!_base64chars[(unsigned int)*cp]) {
    215215            fprintf(stderr, "%c %d is not base64\n", *cp, *cp);
    216216            return false;
  • trunk/src/core/RpOutcome.cc

    r1566 r1571  
    1010 * ======================================================================
    1111 */
     12#include <cstdarg>
     13#include <cstdio>
     14#include <cstdlib>
    1215#include "RpOutcome.h"
    13 #include <stdarg.h>
    14 #include <stdlib.h>
    1516using namespace Rappture;
    1617
  • trunk/src/core/RpUnits.cc

    r1527 r1571  
    1515
    1616#include "RpUnits.h"
     17#include <cstdio>
    1718#include <algorithm>
    1819
Note: See TracChangeset for help on using the changeset viewer.