Index: metaImage.cxx
===================================================================
RCS file: /cvsroot/Insight/Insight/Utilities/MetaIO/metaImage.cxx,v
retrieving revision 1.119
diff -r1.119 metaImage.cxx
2006d2005
<   const long elementsToWrite = _indexMax[0] - _indexMin[0] + 1;
2014a2014,2030
>   // Optimize the size of the buffer to written depending on the
>   // region shape
>   // This calculate the number of continuous bytes in the file
>   // which can be written
>   METAIO_STL::streamsize bytesToWrite = 1;
>   int movingDirection = 0;
>   do 
>     {
>     bytesToWrite *= _indexMax[movingDirection] - _indexMin[movingDirection] + 1;        
>     ++movingDirection;        
>     }
>   while(movingDirection < m_NDims 
>         && _indexMin[movingDirection-1] == 0
>         && _indexMax[movingDirection-1] == m_DimSize[movingDirection-1]-1);
>   
>   bytesToWrite *= elementNumberOfBytes;
> 
2028,2029c2044,2045
<     _fstream->write( data, elementsToWrite*elementNumberOfBytes );
<     data += elementsToWrite*elementNumberOfBytes;
---
>     _fstream->write( data, bytesToWrite );
>     data += bytesToWrite;
2031,2035c2047,2048
<     if(m_NDims>1)
<       {
<       currentIndex[1]++;
<       }
<     else
---
>     // check if there is only one write needed
>     if( movingDirection >= m_NDims )
2037c2050
<       done = true;
---
>       break;
2038a2052,2053
> 
>     ++currentIndex[movingDirection];
2041c2056
<     for( int j=1; j<m_NDims; j++ )
---
>     for( int j=movingDirection; j<m_NDims; j++ )
2057c2072
<     } // end writing line by line loop
---
>     } // end writing  loop
3104,3108c3119,3123
<       METAIO_STL::streamsize readLine = _indexMax[0] - _indexMin[0] + 1;
<       int movingDirection = 1;
<       while(movingDirection < m_NDims 
<             && _indexMin[movingDirection] == 0
<             && _indexMax[movingDirection] == m_DimSize[movingDirection]-1)
---
>       // This calculate the number of continuous bytes in the file
>       // which can be read
>       METAIO_STL::streamsize readLine = 1;
>       int movingDirection = 0;
>       do 
3110,3111c3125,3126
<         readLine *= _indexMax[movingDirection] - _indexMin[movingDirection] + 1;
<         movingDirection++;
---
>         readLine *= _indexMax[movingDirection] - _indexMin[movingDirection] + 1;        
>         ++movingDirection;        
3112a3128,3130
>       while(movingDirection < m_NDims 
>             && _indexMin[movingDirection-1] == 0
>             && _indexMax[movingDirection-1] == m_DimSize[movingDirection-1]-1);
3216,3221c3234,3239
<     // region shape
<     METAIO_STL::streamsize readLine = _indexMax[0] - _indexMin[0] + 1;
<     int movingDirection = 1;
<     while(movingDirection < m_NDims 
<           && subSamplingFactor == 1 && _indexMin[movingDirection] == 0
<           && _indexMax[movingDirection] == m_DimSize[movingDirection]-1)
---
>     // region shape    
>     // This calculate the number of continuous bytes in the file
>     // which can be read
>     METAIO_STL::streamsize readLine = 1;
>     int movingDirection = 0;
>     do 
3223,3224c3241,3242
<       readLine *= _indexMax[movingDirection] - _indexMin[movingDirection] + 1;
<       movingDirection++;
---
>       readLine *= _indexMax[movingDirection] - _indexMin[movingDirection] + 1;        
>       ++movingDirection;        
3225a3244,3246
>     while(movingDirection < m_NDims 
>           && _indexMin[movingDirection-1] == 0
>           && _indexMax[movingDirection-1] == m_DimSize[movingDirection-1]-1);
3226a3248,3249
>    
>       
3301,3302c3324,3325
<       // Go forward
<       if(m_NDims == 1)
---
>       // check if there is only one read needed
>       if ( movingDirection >= m_NDims )
3307c3330,3334
<       if( movingDirection < m_NDims )
---
>       // Go forward
>       currentIndex[movingDirection] += subSamplingFactor;
>       
>       // Check if we are still in the region
>       for(i=movingDirection;i<m_NDims;i++)
3309,3312c3336
<         currentIndex[movingDirection] += subSamplingFactor;
< 
<         // Check if we are still in the region
<         for(i=1;i<m_NDims;i++)
---
>         if(currentIndex[i]>_indexMax[i])
3314c3338
<           if(currentIndex[i]>_indexMax[i])
---
>           if(i==m_NDims-1)
3316,3325c3340,3346
<             if(i==m_NDims-1)
<               {
<               done = true;
<               break;
<               }
<             else
<               {
<               currentIndex[i] = _indexMin[i];
<               currentIndex[i+1] += subSamplingFactor;
<               }
---
>             done = true;
>             break;
>             }
>           else
>             {
>             currentIndex[i] = _indexMin[i];
>             currentIndex[i+1] += subSamplingFactor;
3329,3332d3349
<       else
<         {
<         done = true;
<         }
3354d3370
<