Changeset 8346

Show
Ignore:
Timestamp:
05/09/08 01:17:01
Author:
jcorgan
Message:

Applied changeset r8316 on trunk to release branch.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • gnuradio/branches/releases/3.1/config/sdl.m4

    r3746 r8346  
    3434 
    3535  AC_REQUIRE([AC_CANONICAL_TARGET]) 
    36   PATH="$prefix/bin:$prefix/usr/bin:$PATH" 
    37   AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH]) 
     36  TMP_PATH="$prefix/bin:$prefix/usr/bin:$PATH" 
     37  AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$TMP_PATH]) 
    3838  min_sdl_version=ifelse([$1], ,0.11.0,$1) 
    3939  AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) 

  • gnuradio/branches/releases/3.1/gnuradio-core/src/python/gnuradio/gr/qa_wavefile.py

    r8261 r8346  
    5858        out_f = file(outfile, 'rb') 
    5959 
    60         in_data  = in_f.read(getsize(infile)) 
    61         out_data = out_f.read(getsize(outfile)) 
     60        in_data  = in_f.read() 
     61        out_data = out_f.read() 
     62        out_f.close() 
    6263        os.remove(outfile) 
    6364