Index: testDeepScanLineMultipleRead.cpp
===================================================================
--- testDeepScanLineMultipleRead.cpp	(revision 51)
+++ testDeepScanLineMultipleRead.cpp	(working copy)
@@ -78,12 +78,12 @@
     int height=48;
     
     //
-    // create a deep output file of widthxheight, where each pixel has 'y' samples,
+    // create a deep output file of width x height, where each pixel has 'y' samples,
     // each with value 'x'
     //
     
-    Header header( width,height);
-    header.channels().insert("Z", Channel(FLOAT));      
+    Header header(width, height);
+    header.channels().insert("Z", Channel(FLOAT));
     header.compression()=ZIPS_COMPRESSION;
     header.setType(DEEPSCANLINE);
         
@@ -107,7 +107,7 @@
         //
         // ensure each scanline contains a different number of samples,
         // with different values. We don't care that each sample has the same
-        // value, or that each pixel on the scanline is identical
+        // value, or that each pixel on the scanline is identical.
         //
         sample_count = y;
         sample = y+100.0;
@@ -160,7 +160,7 @@
             
             if( samplecounts[i]!= row)
             {
-              cout << i << ", " << row << " error, sample counts hould be "
+              cout << i << ", " << row << " error, sample counts should be "
               << row  << ", is " << samplecounts[i]
               << endl << flush;
             }
@@ -175,7 +175,7 @@
         // set pointers to point to the correct place
         //
         int total=0;
-        for(int i=0;i<width;i++)
+        for(int i=0;i<width && false==samples.empty();i++)
         {
             sample_pointers[i] = &samples[total];
             total+=samplecounts[i];
@@ -195,7 +195,7 @@
         {
            if(samples[i]!=row+100.f)
            {
-               cout << " sample " << i << " on row " << row << " error, shuold be " 
+               cout << " sample " << i << " on row " << row << " error, should be " 
                     << 100.f+row << " got " << samples[i] << endl;
                cout << flush;
            }