--- a/.hgtags Thu Apr 23 06:49:14 2015 +0200
+++ b/.hgtags Fri Apr 24 06:44:25 2015 +0200
@@ -4,7 +4,6 @@
0581d9906df0d81447cbb2f8b87544b2f5a84170 rel5_2_8
08dc80825e691a8c1fb0a340ff07d9ee19c0ca85 expecco_2_7_0
08dc80825e691a8c1fb0a340ff07d9ee19c0ca85 expecco_2_7_0_49
-08dc80825e691a8c1fb0a340ff07d9ee19c0ca85 expecco_2_7_5
136dd7e8228a6b331b5ed87970023db7b2643ff5 stable_expecco_sel
196ff4d5d5ada3abb4d367959bcf532360d9919a expecco_2_6_1
196ff4d5d5ada3abb4d367959bcf532360d9919a expecco_2_6_2
@@ -58,6 +57,7 @@
e23fc319064dcf2ef636e31dc71840a2f44aa7f5 expecco_1_8_0rc1
e9df4227a57dd36d43cc1fb2eb64fdb10900a0cd expeccoNET_1_5_1rc1
ea33c918e116d00933bca7f7f0f45d6a3af00730 expeccoNET_1_7_0_0
+eb5a53c6b5b2f7524c835aca776a0a2e3b4bd5ac expecco_2_7_5
ebf1067a3289e238cdd38bfa97f0e4d23b77d5f9 expecco_1_7_1rc1
ebf1067a3289e238cdd38bfa97f0e4d23b77d5f9 expecco_1_7_1rc2
ebf1067a3289e238cdd38bfa97f0e4d23b77d5f9 expecco_1_7_1rc3
--- a/PNGReader.st Thu Apr 23 06:49:14 2015 +0200
+++ b/PNGReader.st Fri Apr 24 06:44:25 2015 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
"
COPYRIGHT (c) 1996 by Claus Gittinger
All Rights Reserved
@@ -11,6 +13,8 @@
"
"{ Package: 'stx:libview2' }"
+"{ NameSpace: Smalltalk }"
+
ImageReader subclass:#PNGReader
instanceVariableNames:'colorType bitsPerChannel depth compressionMethod filterMethod
interlaceMode bytesPerScanline globalDataChunk thisScanline
@@ -827,18 +831,18 @@
((photometric == #whiteIs0) or:[ (photometric == #blackIs0)]) ifTrue:[
colorType := 0.
- samplesPerPixel size > 1 ifTrue:[ colorType := colorType + 4]. "/ +alpha
+ samplesPerPixel > 1 ifTrue:[ colorType := colorType + 4]. "/ +alpha
].
(photometric == #rgb) ifTrue:[
colorType := 2.
- samplesPerPixel size > 3 ifTrue:[ colorType := colorType + 4]. "/ +alpha
+ samplesPerPixel > 3 ifTrue:[ colorType := colorType + 4]. "/ +alpha
].
(photometric == #palette) ifTrue:[
colorType := 3.
- samplesPerPixel size > 1 ifTrue:[ colorType := colorType + 4]. "/ +alpha
+ samplesPerPixel > 1 ifTrue:[ colorType := colorType + 4]. "/ +alpha
].
colorType isNil ifTrue:[
- self error:'unjandled photometric'
+ self error:'unhandled photometric'
].
self
@@ -902,11 +906,11 @@
!PNGReader class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview2/PNGReader.st,v 1.36 2014-12-22 12:00:09 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview2/PNGReader.st,v 1.37 2015-04-23 21:25:39 stefan Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libview2/PNGReader.st,v 1.36 2014-12-22 12:00:09 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview2/PNGReader.st,v 1.37 2015-04-23 21:25:39 stefan Exp $'
! !