[segyio] 200/376: fixup! Read/write sub traces and speed up depth reading.

[Jørgen Kvalsvik]

This is an automated email from the git hooks/post-receive script.

jokva-guest pushed a commit to branch debian
in repository segyio.

commit 1ff2f4969c650548809b9ac4c557ea55cabccc27
Author: Jørgen Kvalsvik <jokva at statoil.com>
Date:   Fri Feb 17 10:37:09 2017 +0100

    fixup! Read/write sub traces and speed up depth reading.
---
 lib/src/segy.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/lib/src/segy.c b/lib/src/segy.c
index b4ccf53..83e8838 100644
--- a/lib/src/segy.c
+++ b/lib/src/segy.c
@@ -1098,11 +1098,10 @@ static inline int subtr_seek( segy_file* fp,
      * Optimistically assume that indices are correct by the time they're given
      * to subtr_seek.
      */
-    assert( fst > lst || fst < 0 );
+    assert( lst >= fst && fst >= 0 );
     assert( sizeof( float ) == 4 );
-    assert( (lst - fst) * sizeof( float ) <= trace_bsize );
+    assert( (lst - fst) * sizeof( float ) <= (size_t)trace_bsize );
 
-    int err;
     // skip the trace header and skip everything before fst.
     trace0 += (fst * sizeof( float )) + SEGY_TRACE_HEADER_SIZE;
     return segy_seek( fp, traceno, trace0, trace_bsize );
@@ -1129,9 +1128,6 @@ int segy_readsubtr( segy_file* fp,
     int err = subtr_seek( fp, traceno, fst, lst, trace0, trace_bsize );
     if( err != SEGY_OK ) return err;
 
-    assert( trace_bsize >= 0 );
-    const size_t bsize = (size_t) trace_bsize;
-
     if( fp->addr ) {
         memcpy( buf, fp->cur, sizeof( float ) * ( lst - fst ) );
         return SEGY_OK;
@@ -1164,9 +1160,6 @@ int segy_writesubtr( segy_file* fp,
     int err = subtr_seek( fp, traceno, fst, lst, trace0, trace_bsize );
     if( err != SEGY_OK ) return err;
 
-    assert( trace_bsize >= 0 );
-    const size_t bsize = (size_t) trace_bsize;
-
     if( fp->addr ) {
         memcpy( fp->cur, buf, sizeof( float ) * ( lst - fst ) );
         return SEGY_OK;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/segyio.git