Merge jv
authorHG Automerge
Wed, 18 Jan 2017 10:05:30 +0000
branchjv
changeset 3850 3e765b203652
parent 3818 6219e6bc162a (current diff)
parent 3820 057cf3cc3b1c (diff)
child 3854 4afd107bc911
Merge
PNGReader.st
--- a/.hgtags	Sat Jan 07 17:09:43 2017 +0000
+++ b/.hgtags	Wed Jan 18 10:05:30 2017 +0000
@@ -2,6 +2,8 @@
 053d437c248a6e2a158ee441898eea967bc2b9f9 expecco_2_2_5
 0570acbd78e3bc004055ef97ea3030553379c1f6 rel4_1_3_1
 0581d9906df0d81447cbb2f8b87544b2f5a84170 rel5_2_8
+0d86e16ad36e82cfb71ac7838ccd7ce86cc958ac expecco_2_10_0
+0d86e16ad36e82cfb71ac7838ccd7ce86cc958ac expecco_2_11_0
 136dd7e8228a6b331b5ed87970023db7b2643ff5 stable_expecco_sel
 155ab23de4e5793974c9eb7278915d2ae8f5ecfa expecco_ALM_1_9_7
 1e1ffdd308980263a8cc89ea3391685087458cf4 expecco_2_7_5
@@ -45,7 +47,6 @@
 ac1655bd31bb0ca9ee4994b9260b6b02e8d21967 rel3_4_1_1
 ac1655bd31bb0ca9ee4994b9260b6b02e8d21967 rel3_4_1_2
 af9c31ac2fc17558cb46373c4628d208f893224a stx_6_2_2
-b3ca52c3e77f79e3982d2a2f933a24b5b8939250 expecco_2_10_0
 b42670756688f64ba6cc6a3c5d6024d89256bc24 expecco_1_7_0b3
 b4e4fadd90dac00b10fe69ba6cb1998dd9c3e7a5 expecco_2_6_1
 b4e4fadd90dac00b10fe69ba6cb1998dd9c3e7a5 expecco_2_6_2
--- a/PNGReader.st	Sat Jan 07 17:09:43 2017 +0000
+++ b/PNGReader.st	Wed Jan 18 10:05:30 2017 +0000
@@ -348,7 +348,9 @@
     colIncrement := #(8 8 4 4 2 2 1 ).
     rowIncrement := #(8 8 8 4 4 2 2 ).
 
-    zlibReader := ZipStream readOpenAsZipStreamOn:(globalDataChunk readStream) suppressHeaderAndChecksum:false.
+    zlibReader := ZipStream 
+                    readOpenAsZipStreamOn:(globalDataChunk readStream) 
+                    suppressHeaderAndChecksum:false.
     zlibReader binary.
 
     h := height.
@@ -413,7 +415,9 @@
 "/    n := ZipStream uncompress: globalDataChunk into: data.
 "/    self halt.
 
-    zlibReader := ZipStream readOpenAsZipStreamOn:(globalDataChunk readStream) suppressHeaderAndChecksum:false.
+    zlibReader := ZipStream 
+                    readOpenAsZipStreamOn:(globalDataChunk readStream) 
+                    suppressHeaderAndChecksum:false.
     zlibReader binary.
     bytesPerRow := self bytesPerRow.
 
@@ -1280,7 +1284,9 @@
     |compressedByteStream compressedBytes zlibWriter bytesPerScanline idx|
 
     compressedByteStream := WriteStream on:(ByteArray new:100).
-    zlibWriter := ZipStream writeOpenAsZipStreamOn:compressedByteStream suppressHeaderAndChecksum:false.
+    zlibWriter := ZipStream 
+                    writeOpenAsZipStreamOn:compressedByteStream 
+                    suppressHeaderAndChecksum:false.
     zlibWriter binary.
 
     bytesPerScanline := self bytesPerRow.