PNGReader.st
author Claus Gittinger <cg@exept.de>
Fri, 17 Feb 2017 17:28:15 +0100
changeset 3904 f9baf7a194d9
parent 3903 754f50ffb404
child 3909 a275bdd921fc
permissions -rw-r--r--
#BUGFIX by cg class: PNGReader save 24bit+mask as rgba changed: #processTRNSChunkLen: #save:onStream: #writeImageDataChunk
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     1
"
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     2
 COPYRIGHT (c) 1996 by Claus Gittinger
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     3
              All Rights Reserved
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     4
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     5
 This software is furnished under a license and may be used
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     6
 only in accordance with the terms of that license and with the
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     7
 inclusion of the above copyright notice.   This software may not
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     8
 be provided or otherwise made available to, or used by, any
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     9
 other person.  No title to or ownership of the software is
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    10
 hereby transferred.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    11
"
1671
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
    12
"{ Package: 'stx:libview2' }"
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
    13
3461
eb5a53c6b5b2 class: PNGReader
Stefan Vogel <sv@exept.de>
parents: 3437
diff changeset
    14
"{ NameSpace: Smalltalk }"
eb5a53c6b5b2 class: PNGReader
Stefan Vogel <sv@exept.de>
parents: 3437
diff changeset
    15
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    16
ImageReader subclass:#PNGReader
3889
b7c261a8614d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
    17
	instanceVariableNames:'colorType bitsPerChannel depth compressionMethod filterMethod
b7c261a8614d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
    18
		interlaceMode bytesPerScanline globalDataChunk thisScanline
3900
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
    19
		prevScanline processTextChunks specialChunkHandlers
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
    20
		paletteAlphaEntries paletteIndexForMaskedPixels image'
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
    21
	classVariableNames:'Verbose ColorTypeGray ColorTypeRGB ColorTypePalette
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
    22
		ColorTypeGrayAlpha ColorTypeRGBAlpha'
3889
b7c261a8614d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
    23
	poolDictionaries:''
b7c261a8614d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
    24
	category:'Graphics-Images-Readers'
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    25
!
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    26
398
aef700d15416 new suffix-table
Claus Gittinger <cg@exept.de>
parents: 308
diff changeset
    27
!PNGReader class methodsFor:'documentation'!
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    28
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    29
copyright
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    30
"
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    31
 COPYRIGHT (c) 1996 by Claus Gittinger
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    32
              All Rights Reserved
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    33
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    34
 This software is furnished under a license and may be used
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    35
 only in accordance with the terms of that license and with the
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    36
 inclusion of the above copyright notice.   This software may not
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    37
 be provided or otherwise made available to, or used by, any
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    38
 other person.  No title to or ownership of the software is
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    39
 hereby transferred.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    40
"
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    41
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    42
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    43
!
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    44
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    45
documentation
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    46
"
3893
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
    47
    This class provides methods for loading and saving PNG pictures.
3599
9bc697bd01d9 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 3598
diff changeset
    48
    It is currenty unfinished (some interlaced image formats are unsupported, for example: grayscale+alpha)
3437
4e1cf7b6b492 class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3384
diff changeset
    49
    In the meantime, use a pngtoXXX converter for interlaced images, and read XXX.
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    50
2725
a480f3671588 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2709
diff changeset
    51
    [caveats:]
3893
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
    52
        writer can only store mask with depth24 images (for now).
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
    53
        writer only generates unfiltered non-interlaced data.
2725
a480f3671588 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2709
diff changeset
    54
        
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    55
    [See also:]
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    56
        Image Form Icon
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    57
        BlitImageReader FaceReader GIFReader JPEGReader PBMReader PCXReader 
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    58
        ST80FormReader SunRasterReader TargaReader TIFFReader WindowsIconReader 
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    59
        XBMReader XPMReader XWDReader 
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    60
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    61
    [author:]
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    62
        Claus Gittinger
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    63
"
1694
3a77d9b69cf7 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1671
diff changeset
    64
!
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    65
1694
3a77d9b69cf7 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1671
diff changeset
    66
examples
3a77d9b69cf7 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1671
diff changeset
    67
"
3a77d9b69cf7 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1671
diff changeset
    68
    PNGReader fromFile:'/home/cg/AudioExplorer_51_files/use_small.png'
2509
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
    69
    PNGReader fromFile:'\\Exeptn\tmp\images\expeccoScreenshot4020_5526507.png'
2683
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
    70
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
    71
    PNGReader fromFile:'C:\Users\cg\Desktop\croquet\cobalt-base-current-build-20090210\cobalt-base-current-build-20090210\content\models\textures\checkerboard.png'
2695
6197b6af7f4f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2683
diff changeset
    72
    PNGReader fromFile:'C:\Dokumente und Einstellungen\cg\Desktop\misc\PNGs\Delete.png'
2697
8e8223bf25af more stuff added (but still not complete)
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
    73
    PNGReader fromFile:'\\exeptn\unsaved\pd_stuff\PNGs\Delete.png'
2699
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
    74
    PNGReader fromFile:'\\exeptn\unsaved\pd_stuff\PNGs\Down.png'
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
    75
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
    76
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
    77
    |img img2 outStream png|
2725
a480f3671588 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2709
diff changeset
    78
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
    79
    img := ToolbarIconLibrary error32x32Icon.
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
    80
    outStream := WriteStream on:(ByteArray new:100).
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
    81
    PNGReader save:img onStream:outStream.
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
    82
    png := outStream contents.
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
    83
    img2 := PNGReader fromStream:(png readStream).
2708
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
    84
    self assert:(img bits = img2 bits).
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
    85
    img inspect.
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
    86
    img2 inspect.
1694
3a77d9b69cf7 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1671
diff changeset
    87
"
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    88
! !
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    89
398
aef700d15416 new suffix-table
Claus Gittinger <cg@exept.de>
parents: 308
diff changeset
    90
!PNGReader class methodsFor:'initialization'!
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    91
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    92
initialize
2699
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
    93
    "install myself in the Image classes fileFormat table for the `.png' extension."
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    94
2709
4ecfb8ae5fab *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2708
diff changeset
    95
    MIMETypes defineImageType:'image/png'  suffix:'png' reader:self.
4ecfb8ae5fab *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2708
diff changeset
    96
    "/ backward compatibility from times when png was not yet so common...
4ecfb8ae5fab *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2708
diff changeset
    97
    MIMETypes defineImageType:'image/x-png' suffix:nil reader:self.
3900
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
    98
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
    99
    ColorTypeGray := 0.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   100
    ColorTypeRGB := 2.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   101
    ColorTypePalette := 3.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   102
    ColorTypeGrayAlpha := 4.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   103
    ColorTypeRGBAlpha := 6.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   104
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   105
    "Modified: / 16-02-2017 / 19:41:40 / cg"
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   106
! !
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   107
2705
7ff2e44e44af *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2704
diff changeset
   108
!PNGReader class methodsFor:'queries'!
7ff2e44e44af *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2704
diff changeset
   109
7ff2e44e44af *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2704
diff changeset
   110
canRepresent:anImage
7ff2e44e44af *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2704
diff changeset
   111
    "return true, if anImage can be represented in my file format.
3893
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
   112
     Any image without mask is supported;
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
   113
     only depth24 images with mask are (currently)."
2705
7ff2e44e44af *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2704
diff changeset
   114
3893
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
   115
    anImage mask notNil ifTrue:[
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
   116
        "/ for now, can only write depth24 images with mask
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
   117
        ^ anImage depth == 24
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
   118
    ].    
2705
7ff2e44e44af *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2704
diff changeset
   119
    ^ true
3893
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
   120
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
   121
    "Modified (comment): / 16-02-2017 / 16:28:53 / cg"
2705
7ff2e44e44af *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2704
diff changeset
   122
! !
7ff2e44e44af *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2704
diff changeset
   123
398
aef700d15416 new suffix-table
Claus Gittinger <cg@exept.de>
parents: 308
diff changeset
   124
!PNGReader class methodsFor:'testing'!
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   125
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   126
isValidImageFile:aFileName
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   127
    "return true, if aFileName contains a PNG image"
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   128
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   129
    |inStream magic|
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   130
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   131
    inStream := self streamReadingFile:aFileName.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   132
    inStream isNil ifTrue:[^ false].
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   133
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   134
    inStream binary.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   135
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   136
    magic := ByteArray new:8.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   137
    inStream nextBytes:8 into:magic.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   138
    inStream close.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   139
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   140
    ^ (magic = #[137 80 78 71 13 10 26 10])
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   141
1694
3a77d9b69cf7 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1671
diff changeset
   142
    "
3a77d9b69cf7 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1671
diff changeset
   143
     self isValidImageFile:'/home/cg/AudioExplorer_51_files/use_small.png'
2683
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
   144
     self isValidImageFile:'C:\Users\cg\Desktop\croquet\cobalt-base-current-build-20090210\cobalt-base-current-build-20090210\content\models\textures\checkerboard.png'
2695
6197b6af7f4f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2683
diff changeset
   145
     self isValidImageFile:'C:\Dokumente und Einstellungen\cg\Desktop\misc\PNGs\Delete.png'
1694
3a77d9b69cf7 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1671
diff changeset
   146
    "
3a77d9b69cf7 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1671
diff changeset
   147
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   148
    "Modified: 21.6.1996 / 20:38:46 / cg"
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   149
! !
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   150
3900
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   151
!PNGReader methodsFor:'accessing'!
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   152
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   153
makeImage
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   154
    image isNil ifTrue:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   155
        image := super makeImage.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   156
    ].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   157
    ^ image
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   158
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   159
    "Created: / 17-02-2017 / 11:14:45 / cg"
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   160
!
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   161
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   162
pngHeader
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   163
    ^ #[137 80 78 71 13 10 26 10]
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   164
! !
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   165
3889
b7c261a8614d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
   166
!PNGReader methodsFor:'hooks'!
b7c261a8614d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
   167
b7c261a8614d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
   168
specialChunkHandlerAt:chunkType put:aHandlerBlock
b7c261a8614d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
   169
    "define a handler action, which processes unknown chunks.
b7c261a8614d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
   170
     The handler block will be called with one or two arguments:
b7c261a8614d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
   171
     the binary data of the chunk, and optionally the reader itself"
b7c261a8614d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
   172
b7c261a8614d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
   173
    specialChunkHandlers isNil ifTrue:[ 
b7c261a8614d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
   174
        specialChunkHandlers := Dictionary new
b7c261a8614d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
   175
    ].
b7c261a8614d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
   176
    specialChunkHandlers at:chunkType put:aHandlerBlock
b7c261a8614d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
   177
b7c261a8614d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
   178
    "Created: / 14-02-2017 / 11:43:33 / cg"
b7c261a8614d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
   179
! !
b7c261a8614d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
   180
3900
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   181
!PNGReader methodsFor:'reading'!
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   182
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   183
fromStream:aStream
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   184
    "read a stream containing a PNG image.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   185
     Leave the image description in instance variables
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   186
     (i.e. to get the image, ask with image)."
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   187
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   188
    |header|
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   189
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   190
    inStream := aStream.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   191
    aStream binary.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   192
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   193
    "PNG-files are always msb (network-world)"
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   194
    byteOrder := #msb.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   195
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   196
    header := ByteArray new:8.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   197
    aStream nextBytes:8 into:header.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   198
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   199
    header = (self pngHeader) ifFalse:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   200
        Logger warning:'PNGReader: not a png file (%1)' with:aStream.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   201
        Image badImageFormatQuerySignal raiseRequestErrorString:'PNGReader: not a png file'.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   202
        ^ nil
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   203
    ].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   204
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   205
    (self getIHDRChunk) ifFalse:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   206
        Logger warning:'PNGReader: required IHDR chunk missing (%1)' with:aStream.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   207
        Image badImageFormatQuerySignal raiseRequestErrorString:'PNGReader: required IHDR chunk missing'.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   208
        ^ nil
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   209
    ].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   210
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   211
    compressionMethod ~~ 0 ifTrue:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   212
        ('PNGReader: compressionMethod %s not supported.' printfWith:compressionMethod printString) infoPrintCR.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   213
        Image badImageFormatQuerySignal raiseRequestErrorString:'PNGReader: unsupported compression method'.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   214
        ^ nil
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   215
    ].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   216
    filterMethod > 0 ifTrue:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   217
        'PNGReader: invalid filterMethod' infoPrintCR.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   218
        Image badImageFormatQuerySignal raiseRequestErrorString:'PNGReader: invalid/unsupported filterMethod'.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   219
        ^ nil.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   220
    ].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   221
    interlaceMode > 1 ifTrue:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   222
        Image badImageFormatQuerySignal raiseRequestErrorString:'PNGReader: invalid/unsupported interlaceMode'.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   223
        'PNGReader: invalid interlaceMode' infoPrintCR.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   224
        ^ nil.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   225
    ].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   226
    (self setColorType:colorType) ifFalse:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   227
        ^ nil
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   228
    ].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   229
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   230
    [self getChunk] whileTrue.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   231
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   232
    bytesPerScanline := self bytesPerRow.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   233
    data := ByteArray new:(bytesPerScanline * height).
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   234
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   235
    globalDataChunk notNil ifTrue:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   236
        self processGlobalIDATChunk.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   237
        globalDataChunk := nil.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   238
    ].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   239
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   240
    photometric == #palette ifTrue:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   241
        colorMap isNil ifTrue:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   242
            Image badImageFormatQuerySignal raiseRequestErrorString:'PNGReader: palette chunk missing'.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   243
            'PNGReader: palette chunk missing.' infoPrintCR.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   244
            "/ ^ nil
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   245
        ].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   246
    ].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   247
    
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   248
    paletteAlphaEntries notNil ifTrue:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   249
        "/ this vector now provides alpha values.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   250
        "/ for now, we can only deal with 0/255 alpha values...
3903
754f50ffb404 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3900
diff changeset
   251
        self generateMaskFromPaletteAlphaEntries
3900
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   252
    ].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   253
    
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   254
    "
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   255
     PNGReader fromFile:'/home/cg/libpng-0.89c/pngtest.png'
3903
754f50ffb404 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3900
diff changeset
   256
754f50ffb404 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3900
diff changeset
   257
     Verbose := true.
754f50ffb404 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3900
diff changeset
   258
     PNGReader fromFile:(RegressionTests::ImageReaderTest packageDirectory construct:'testData/pngImages/tbbn3p08.png')
754f50ffb404 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3900
diff changeset
   259
     
3900
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   260
    "
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   261
3903
754f50ffb404 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3900
diff changeset
   262
    "Modified (comment): / 17-02-2017 / 14:16:25 / cg"
3900
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   263
! !
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   264
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   265
!PNGReader methodsFor:'reading-private'!
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   266
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   267
generateMaskFromPaletteAlphaEntries
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   268
    image isNil ifTrue:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   269
        self makeImage
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   270
    ].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   271
    
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   272
    colorType == ColorTypePalette ifTrue:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   273
        "/ if there is only one entry to care for...
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   274
        (paletteAlphaEntries occurrencesOf:0) == 1 ifTrue:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   275
            (paletteAlphaEntries conform:[:alpha | (alpha == 0) or:[alpha == 255]]) ifTrue:[
3903
754f50ffb404 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3900
diff changeset
   276
                image mask:(self class buildMaskFromColor:(paletteAlphaEntries indexOf:0)-1 for:data width:width height:height).
3900
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   277
                ^ self
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   278
            ].    
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   279
        ].    
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   280
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   281
        "/ multiple masked pixels...
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   282
        paletteAlphaEntries keysAndValuesDo:[:pixelIndex :alpha |
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   283
            alpha == 0 ifTrue:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   284
                image createMaskForPixelValue:pixelIndex
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   285
            ] ifFalse:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   286
                alpha == 255 ifTrue:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   287
                    "/ ok; already
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   288
                ] ifFalse:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   289
                    self error:'should generate an alpha image' 
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   290
                ]    
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   291
            ].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   292
        ].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   293
        ^ self.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   294
    ].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   295
    
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   296
    colorType == ColorTypeGray ifTrue:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   297
        |maskPixel|
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   298
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   299
        maskPixel := paletteAlphaEntries unsignedInt16At:1 MSB:true.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   300
        image createMaskForPixelValue:maskPixel.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   301
        ^ self 
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   302
    ].    
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   303
    colorType == ColorTypeRGB ifTrue:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   304
        |mr mg mb maskPixel|
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   305
        
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   306
        mr := paletteAlphaEntries unsignedInt16At:1 MSB:true.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   307
        mg := paletteAlphaEntries unsignedInt16At:3 MSB:true.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   308
        mb := paletteAlphaEntries unsignedInt16At:5 MSB:true.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   309
        depth <= 32 ifTrue:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   310
            "/ only use the low bits...
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   311
            mr > 255 ifTrue:[ self error:'only 8bit RGB supported'].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   312
            mg > 255 ifTrue:[ self error:'only 8bit RGB supported'].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   313
            mb > 255 ifTrue:[ self error:'only 8bit RGB supported'].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   314
            maskPixel := ((mr bitShift:16) bitOr:(mg bitShift:8)) bitOr:mb.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   315
        ] ifFalse:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   316
            maskPixel := ((mr bitShift:32) bitOr:(mg bitShift:16)) bitOr:mb.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   317
        ].   
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   318
        image createMaskForPixelValue:maskPixel.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   319
        ^ self 
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   320
    ].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   321
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   322
    "Created: / 17-02-2017 / 08:07:04 / cg"
3903
754f50ffb404 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3900
diff changeset
   323
    "Modified: / 17-02-2017 / 14:17:24 / cg"
3900
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   324
!
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   325
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   326
getChunk
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   327
    |len type crc|
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   328
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   329
    inStream atEnd ifTrue:[^ false].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   330
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   331
    len := inStream nextInt32MSB:true.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   332
    type := String new:4.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   333
    (inStream nextBytes:4 into:type) ~~ 4 ifTrue:[^ false].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   334
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   335
    Verbose == true ifTrue:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   336
        'len: ' infoPrint. len infoPrint. ' type: ' infoPrint. type infoPrintCR.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   337
    ].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   338
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   339
    type = 'IEND' ifTrue:[^ false].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   340
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   341
    (self processChunk:type len:len) ifFalse:[^ false].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   342
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   343
    crc := inStream nextInt32MSB:true.  "/ ignored - for now
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   344
    ^ true
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   345
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   346
    "Created: 21.6.1996 / 21:09:36 / cg"
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   347
    "Modified: 21.6.1996 / 21:20:26 / cg"
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   348
!
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   349
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   350
getIHDRChunk
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   351
    |len type crc|
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   352
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   353
    len := inStream nextInt32MSB:true.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   354
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   355
    type := String new:4.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   356
    inStream nextBytes:4 into:type.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   357
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   358
    type = 'IHDR' ifFalse:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   359
        Logger warning:'PNGReader: expected IHDR magic (%1)' with:inStream.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   360
        ^ false
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   361
    ].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   362
    len == 13 ifFalse:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   363
        Logger warning:'PNGReader: bad IHDR size (%1)' with:inStream.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   364
        ^ false
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   365
    ].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   366
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   367
    width := inStream nextInt32MSB:true.        
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   368
    height := inStream nextInt32MSB:true.        
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   369
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   370
    (width <= 0 or:[height <= 0]) ifTrue:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   371
        Logger warning:'PNGReader: invalid dimension(s) (%1)' with:inStream.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   372
        ^ false.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   373
    ].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   374
    self reportDimension.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   375
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   376
    bitsPerChannel := inStream nextByte.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   377
    depth := bitsPerChannel. "/ will be changed by setColorType.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   378
    colorType := inStream nextByte.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   379
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   380
    compressionMethod := inStream nextByte.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   381
    filterMethod := inStream nextByte.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   382
    interlaceMode := inStream nextByte.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   383
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   384
    Verbose == true ifTrue:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   385
        'PNGReader: IHDR:' infoPrintCR.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   386
        'PNGReader:   width: ' infoPrint. width infoPrintCR.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   387
        'PNGReader:   height: ' infoPrint. height infoPrintCR.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   388
        'PNGReader:   bitsPerChannel: ' infoPrint. bitsPerChannel infoPrintCR.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   389
        'PNGReader:   colorType: ' infoPrint. colorType infoPrintCR.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   390
        'PNGReader:   compressionMethod: ' infoPrint. compressionMethod infoPrintCR.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   391
        'PNGReader:   filterMethod: ' infoPrint. filterMethod infoPrintCR.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   392
        'PNGReader:   interlaceMode: ' infoPrint. interlaceMode infoPrintCR.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   393
    ].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   394
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   395
    crc := inStream nextInt32MSB:true.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   396
    ^ true
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   397
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   398
    "Modified: / 17-02-2017 / 11:35:20 / cg"
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   399
!
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   400
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   401
handleText:text keyword:keyword
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   402
    "/ things like exif data etc.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   403
    "/ self halt.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   404
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   405
    "/Standard keywords for text chunks:
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   406
    "/
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   407
    "/   Title            Short (one line) title or caption for image
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   408
    "/   Author           Name of image's creator
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   409
    "/   Description      Description of image (possibly long)
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   410
    "/   Copyright        Copyright notice
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   411
    "/   Creation Time    Time of original image creation
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   412
    "/   Software         Software used to create the image
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   413
    "/   Disclaimer       Legal disclaimer
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   414
    "/   Warning          Warning of nature of content
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   415
    "/   Source           Device used to create the image
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   416
    "/   Comment          Miscellaneous comment; conversion from
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   417
    "/                    GIF comment
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   418
!
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   419
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   420
setColorType:colorType
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   421
    colorType == 0 ifTrue:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   422
        photometric := #blackIs0.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   423
        samplesPerPixel := 1.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   424
        bitsPerSample := Array with:bitsPerChannel.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   425
        depth := bitsPerChannel.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   426
        ^ true.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   427
    ].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   428
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   429
    colorType == 2 ifTrue:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   430
        bitsPerChannel < 8 ifTrue:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   431
            'PNGReader: invalid colorType/depth combination' infoPrintCR.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   432
            ^ false.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   433
        ].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   434
        photometric := #rgb.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   435
        samplesPerPixel := 3.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   436
        bitsPerSample := Array with:bitsPerChannel with:bitsPerChannel with:bitsPerChannel.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   437
        depth := bitsPerChannel * 3.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   438
        ^ true.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   439
    ].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   440
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   441
    colorType == 3 ifTrue:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   442
        bitsPerChannel == 16 ifTrue:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   443
            'PNGReader: invalid colorType/depth combination' infoPrintCR.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   444
            ^ false.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   445
        ].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   446
        photometric := #palette.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   447
        samplesPerPixel := 1.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   448
        bitsPerSample := Array with:bitsPerChannel.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   449
        depth := bitsPerChannel.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   450
        ^ true.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   451
    ].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   452
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   453
    colorType == 4 ifTrue:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   454
        bitsPerChannel < 8 ifTrue:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   455
            'PNGReader: invalid colorType/depth combination' infoPrintCR.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   456
            ^ false.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   457
        ].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   458
        photometric := #blackIs0.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   459
        samplesPerPixel := 2.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   460
        bitsPerSample := Array with:bitsPerChannel with:bitsPerChannel.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   461
        depth := bitsPerChannel * 2.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   462
        ^ true.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   463
    ].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   464
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   465
    colorType == 6 ifTrue:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   466
        bitsPerChannel < 8 ifTrue:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   467
            'PNGReader: invalid colorType/depth combination' infoPrintCR.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   468
            ^ false.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   469
        ].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   470
        photometric := #rgba.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   471
        samplesPerPixel := 4.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   472
        bitsPerSample := Array with:bitsPerChannel with:bitsPerChannel with:bitsPerChannel with:bitsPerChannel.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   473
        depth := bitsPerChannel * 4.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   474
        ^ true.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   475
    ].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   476
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   477
    ('PNGReader: invalid colorType: ' , colorType printString , '.') infoPrintCR.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   478
    ^ false
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   479
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   480
    "Modified: / 16-02-2017 / 17:19:19 / cg"
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   481
! !
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   482
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   483
!PNGReader methodsFor:'reading-private chunks'!
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   484
2699
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   485
doPass: pass
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   486
    "Certain interlace passes are skipped with certain small image dimensions"
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   487
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   488
    pass = 1 ifTrue: [ ^ true ].
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   489
    ((width = 1) and: [height = 1]) ifTrue: [ ^ false ].
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   490
    pass = 2 ifTrue: [ ^ width >= 5 ].
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   491
    pass = 3 ifTrue: [ ^ height >= 5 ].
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   492
    pass = 4 ifTrue: [ ^ (width >=3 ) or: [height >= 5] ].
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   493
    pass = 5 ifTrue: [ ^ height >=3 ].
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   494
    pass = 6 ifTrue: [ ^ width >=2 ].
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   495
    pass = 7 ifTrue: [ ^ height >=2 ].
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   496
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   497
    self error:'invalid argument'.
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   498
    ^ true
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   499
!
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   500
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   501
processBKGDChunkLen:len
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   502
    inStream skip:len.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   503
    ^ true
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   504
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   505
    "Created: 21.6.1996 / 21:15:49 / cg"
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   506
!
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   507
2707
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   508
processCHRMChunkLen:len
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   509
    "cHRM Primary chromaticities chunk - currently unhandled"
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   510
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   511
    |whitePointX whitePointY redX redY greenX greenY blueX blueY|
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   512
3554
f1820748e4a9 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3461
diff changeset
   513
    whitePointX := (inStream nextInt32MSB:true) / 100000.0.
f1820748e4a9 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3461
diff changeset
   514
    whitePointY := (inStream nextInt32MSB:true) / 100000.0.
f1820748e4a9 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3461
diff changeset
   515
    redX := (inStream nextInt32MSB:true) / 100000.0.
f1820748e4a9 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3461
diff changeset
   516
    redY := (inStream nextInt32MSB:true) / 100000.0.
f1820748e4a9 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3461
diff changeset
   517
    greenX := (inStream nextInt32MSB:true) / 100000.0.
f1820748e4a9 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3461
diff changeset
   518
    greenY := (inStream nextInt32MSB:true) / 100000.0.
f1820748e4a9 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3461
diff changeset
   519
    blueX := (inStream nextInt32MSB:true) / 100000.0.
f1820748e4a9 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3461
diff changeset
   520
    blueY := (inStream nextInt32MSB:true) / 100000.0.
2707
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   521
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   522
    Verbose == true ifTrue:[
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   523
        'PNGReader: CHRM chunk ignored:' infoPrintCR.
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   524
        'PNGReader:   whitePointX:' infoPrint. whitePointX infoPrintCR.
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   525
        'PNGReader:   whitePointY:' infoPrint. whitePointX infoPrintCR.
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   526
        'PNGReader:   redX:' infoPrint. redX infoPrintCR.
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   527
        'PNGReader:   redY:' infoPrint. redY infoPrintCR.
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   528
        'PNGReader:   greenX:' infoPrint. greenX infoPrintCR.
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   529
        'PNGReader:   greenY:' infoPrint. greenY infoPrintCR.
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   530
        'PNGReader:   blueX:' infoPrint. blueX infoPrintCR.
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   531
        'PNGReader:   blueY:' infoPrint. blueY infoPrintCR.
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   532
    ].
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   533
    ^ true
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   534
!
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   535
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   536
processChunk:type len:len
2509
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   537
    |chunk|
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   538
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   539
    type = 'IDAT' ifTrue:[
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   540
        "---since the compressed data can span multiple
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   541
        chunks, stitch them all together first. later,
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   542
        if memory is an issue, we need to figure out how
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   543
        to do this on the fly---"
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   544
        chunk := inStream next:len.
3821
940aaefb5f77 #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 3819
diff changeset
   545
        globalDataChunk isNil ifTrue:[
940aaefb5f77 #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 3819
diff changeset
   546
            globalDataChunk := ReadWriteStream on:(ByteArray new:(height * self bytesPerRow)).
940aaefb5f77 #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 3819
diff changeset
   547
        ].
940aaefb5f77 #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 3819
diff changeset
   548
        globalDataChunk nextPutAll:chunk.
2509
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   549
        ^ true
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   550
    ].
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   551
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   552
    type = 'gAMA' ifTrue:[^ self processGAMAChunkLen:len].
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   553
    type = 'sBIT' ifTrue:[^ self processSBITChunkLen:len].
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   554
    type = 'tEXt' ifTrue:[^ self processTEXTChunkLen:len].
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   555
    type = 'tIME' ifTrue:[^ self processTIMEChunkLen:len].
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   556
    type = 'bKGD' ifTrue:[^ self processBKGDChunkLen:len].
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   557
    type = 'zTXt' ifTrue:[^ self processZTXTChunkLen:len].
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   558
    type = 'PLTE' ifTrue:[^ self processPLTEChunkLen:len].
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   559
1671
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   560
    type = 'pHYs' ifTrue:[^ self processPHYSChunkLen:len].
2707
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   561
    type = 'cHRM' ifTrue:[^ self processCHRMChunkLen:len].
1671
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   562
    type = 'tRNS' ifTrue:[^ self processTRNSChunkLen:len].
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   563
    type = 'IHDR' ifTrue:[^ self processIHDRChunkLen:len].
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   564
3762
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   565
    type = 'iTXt' ifTrue:[^ self processITXTChunkLen:len].
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   566
    type = 'iCCP' ifTrue:[^ self processICCPChunkLen:len].
3900
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   567
    type = 'hIST' ifTrue:[^ self processHISTChunkLen:len].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   568
    type = 'spAL' ifTrue:[^ self processSPALChunkLen:len].
3889
b7c261a8614d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
   569
b7c261a8614d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
   570
    specialChunkHandlers notNil ifTrue:[
b7c261a8614d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
   571
        |handler chunkData|
b7c261a8614d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
   572
        
b7c261a8614d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
   573
        handler := specialChunkHandlers at:type ifAbsent:nil.
b7c261a8614d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
   574
        handler notNil ifTrue:[
b7c261a8614d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
   575
            chunkData := inStream nextBytes:len.
b7c261a8614d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
   576
            handler value:chunkData optionalArgument:self.
b7c261a8614d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
   577
            ^ true.
b7c261a8614d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
   578
        ].
b7c261a8614d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
   579
    ].
b7c261a8614d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
   580
3891
1fea387a7b01 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3890
diff changeset
   581
    type = 'niVI' ifTrue:[^ self processNIVIChunkLen:len].
1fea387a7b01 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3890
diff changeset
   582
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   583
    ('PNGReader: unrecognized chunk: ' , type , ' ignored.') infoPrintCR.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   584
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   585
    inStream skip:len.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   586
    ^ true.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   587
3889
b7c261a8614d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
   588
    "Created: / 21-06-1996 / 21:10:37 / cg"
3900
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   589
    "Modified: / 17-02-2017 / 11:32:06 / cg"
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   590
!
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   591
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   592
processGAMAChunkLen:len
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   593
    inStream skip:len.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   594
    ^ true
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   595
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   596
    "Created: 21.6.1996 / 21:10:52 / cg"
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   597
!
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   598
2509
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   599
processGlobalIDATChunk
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   600
    interlaceMode == 0 ifTrue: [
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   601
        ^ self processNonInterlacedGlobalDATA
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   602
    ]. 
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   603
    ^ self processInterlacedGlobalDATA
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   604
!
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   605
3900
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   606
processHISTChunkLen:len
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   607
    "/ ignored
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   608
    "/ inStream nextBytes:len.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   609
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   610
    inStream skip:len.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   611
    ^ true
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   612
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   613
    "Created: / 17-02-2017 / 11:31:36 / cg"
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   614
!
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   615
3762
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   616
processICCPChunkLen:len
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   617
    "/ ignored
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   618
    "/ inStream nextBytes:len.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   619
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   620
    inStream skip:len.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   621
    ^ true
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   622
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   623
    "Created: 21.6.1996 / 21:15:58 / cg"
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   624
!
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   625
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   626
processIDATChunkLen:len
1671
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   627
    interlaceMode == 0 ifTrue: [
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   628
        ^ self processNonInterlacedDATA:len
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   629
    ]. 
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   630
    ^ self processInterlacedDATA:len
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   631
!
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   632
3762
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   633
processIHDRChunkLen:len
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   634
    "/ ignored
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   635
    
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   636
    inStream skip:len.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   637
    ^ true
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   638
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   639
    "Created: 21.6.1996 / 21:15:58 / cg"
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   640
!
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   641
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   642
processITXTChunkLen:len
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   643
    "/ international (i.e.utf8) textual data.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   644
    
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   645
    "/ currently ignored - not needed to display png images
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   646
    "/
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   647
    "/   Keyword:             1-79 bytes (character string)
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   648
    "/   Null separator:      1 byte
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   649
    "/   Compression flag:    1 byte
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   650
    "/   Compression method:  1 byte
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   651
    "/   Language tag:        0 or more bytes (character string)
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   652
    "/   Null separator:      1 byte
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   653
    "/   Translated keyword:  0 or more bytes
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   654
    "/   Null separator:      1 byte
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   655
    "/   Text:                0 or more bytes
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   656
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   657
    "/ if needed, set processTextChunks to true somewhere...
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   658
    processTextChunks == true ifTrue:[
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   659
        |chunkData keyword text i1 i2 i3 
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   660
         compressionFlag compressionMethod languageTag
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   661
         xlatedKeyword textBytes|
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   662
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   663
        chunkData := inStream nextBytes:len.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   664
        i1 := chunkData indexOf:0.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   665
        keyword := (chunkData copyTo:i1-1) asString.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   666
        compressionFlag := chunkData at:i1+1.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   667
        compressionMethod := chunkData at:i1+2.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   668
        i2 := chunkData indexOf:0 startingAt:i1+3.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   669
        languageTag := (chunkData copyFrom:i1+3 to:i2-1) asString.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   670
        i3 := chunkData indexOf:0 startingAt:i2+1.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   671
        xlatedKeyword := (chunkData copyFrom:i2+1 to:i3-1) asString.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   672
        textBytes := chunkData copyFrom:i3+1.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   673
        compressionFlag == 0 ifTrue:[
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   674
            text := textBytes
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   675
        ] ifFalse:[
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   676
            compressionFlag == 1 ifTrue:[
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   677
                "/ for now, only zlib compression is supported...
3900
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   678
                "/ ... no - not even that is
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   679
                Logger warning:'PNG: zlib compressed text currently unsupported'.
3762
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   680
            ] ifFalse:[
3900
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   681
                Logger warning:'PNG: unsupported text compression method'.
3762
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   682
            ].    
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   683
        ].    
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   684
        text := text utf8Decoded.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   685
        self handleText:text keyword:keyword.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   686
    ] ifFalse:[    
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   687
        inStream skip:len.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   688
    ].
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   689
    ^ true
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   690
3900
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   691
    "Created: / 21-06-1996 / 21:15:58 / cg"
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   692
    "Modified: / 16-02-2017 / 19:51:21 / cg"
3762
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   693
!
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   694
1671
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   695
processInterlacedDATA:len
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   696
    inStream skip:len.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   697
    ^ true
1671
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   698
!
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   699
2699
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   700
processInterlacedGlobalDATA
3327
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
   701
    "adam7 interlace method"
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
   702
3612
0784a518d8f4 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3611
diff changeset
   703
    | zlibReader filter 
0784a518d8f4 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3611
diff changeset
   704
      bytesPerPass startingCol colIncrement rowIncrement 
0784a518d8f4 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3611
diff changeset
   705
      startingRow 
0784a518d8f4 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3611
diff changeset
   706
      temp "filtersSeen"  
0784a518d8f4 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3611
diff changeset
   707
      cx       "{ Class: SmallInteger }"
0784a518d8f4 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3611
diff changeset
   708
      sc       "{ Class: SmallInteger }"
0784a518d8f4 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3611
diff changeset
   709
      cy       "{ Class: SmallInteger }"
0784a518d8f4 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3611
diff changeset
   710
      startRow "{ Class: SmallInteger }"
0784a518d8f4 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3611
diff changeset
   711
      w        "{ Class: SmallInteger }"
0784a518d8f4 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3611
diff changeset
   712
      h        "{ Class: SmallInteger }"
0784a518d8f4 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3611
diff changeset
   713
    |
2699
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   714
3327
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
   715
    interlaceMode == 1 ifFalse: [
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
   716
        self error:'unsupported interlaced mode'.
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
   717
        ^ self
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
   718
    ].
2699
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   719
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   720
    "/ filtersSeen := Set new.
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   721
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   722
    startingCol := #(0 4 0 2 0 1 0 ).
3327
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
   723
    startingRow := #(0 0 4 0 2 0 1 ).
2699
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   724
    colIncrement := #(8 8 4 4 2 2 1 ).
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   725
    rowIncrement := #(8 8 8 4 4 2 2 ).
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   726
3821
940aaefb5f77 #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 3819
diff changeset
   727
    globalDataChunk reset.
940aaefb5f77 #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 3819
diff changeset
   728
    zlibReader := ZipStream readOpenAsZipStreamOn:globalDataChunk suppressHeaderAndChecksum:false.
2699
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   729
    zlibReader binary.
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   730
3612
0784a518d8f4 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3611
diff changeset
   731
    h := height.
0784a518d8f4 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3611
diff changeset
   732
    w := width.
2699
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   733
    1 to: 7 do: [:pass |
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   734
        (self doPass: pass) ifTrue:[
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   735
            cx := colIncrement at: pass.
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   736
            sc := startingCol at: pass.
3327
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
   737
            cy := rowIncrement at: pass.
3612
0784a518d8f4 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3611
diff changeset
   738
            bytesPerPass := (((w - sc + cx - 1) // cx * depth) + 7) // 8.
2699
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   739
            prevScanline := ByteArray new: bytesPerPass.
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   740
            thisScanline := ByteArray new: bytesPerScanline.
3612
0784a518d8f4 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3611
diff changeset
   741
            startRow := startingRow at: pass.
0784a518d8f4 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3611
diff changeset
   742
            startRow to: h-1 by: cy do: [:y |
3343
ca3446a105d2 class: PNGReader
Stefan Vogel <sv@exept.de>
parents: 3327
diff changeset
   743
                filter := zlibReader nextByte.
2699
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   744
                "/ filtersSeen add: filter.
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   745
                (filter isNil or: [(filter between: 0 and: 4) not])
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   746
                    ifTrue: [^ self].
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   747
                zlibReader next: bytesPerPass into: thisScanline startingAt: 1.
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   748
                filter ~~ 0 ifTrue:[ self filterScanline: filter count: bytesPerPass ].
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   749
                self copyPixels:y at:sc by:cx.
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   750
                temp := prevScanline.
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   751
                prevScanline := thisScanline.
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   752
                thisScanline := temp.
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   753
            ]
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   754
        ]
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   755
    ].
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   756
    zlibReader atEnd ifFalse:[self error:'Unexpected data'].
2909
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   757
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   758
    "Modified: / 03-05-2011 / 12:03:33 / cg"
2699
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   759
!
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   760
3890
37131d0d77c6 #UI_ENHANCEMENT by cg
Claus Gittinger <cg@exept.de>
parents: 3889
diff changeset
   761
processNIVIChunkLen:len    
3889
b7c261a8614d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
   762
    "/ this cunk contains a labView vi.
b7c261a8614d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
   763
    "/ ignored for now...
3890
37131d0d77c6 #UI_ENHANCEMENT by cg
Claus Gittinger <cg@exept.de>
parents: 3889
diff changeset
   764
    "/ ...to read it (using the expecco importer),
37131d0d77c6 #UI_ENHANCEMENT by cg
Claus Gittinger <cg@exept.de>
parents: 3889
diff changeset
   765
    "/ create a reader with a chunkHook and extract it there.
3891
1fea387a7b01 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3890
diff changeset
   766
    Logger info:('PNG: skip niVI chunk').
3890
37131d0d77c6 #UI_ENHANCEMENT by cg
Claus Gittinger <cg@exept.de>
parents: 3889
diff changeset
   767
    inStream skip:len.
37131d0d77c6 #UI_ENHANCEMENT by cg
Claus Gittinger <cg@exept.de>
parents: 3889
diff changeset
   768
    ^ true.
3889
b7c261a8614d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
   769
b7c261a8614d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
   770
    "Created: / 14-02-2017 / 08:57:29 / cg"
3891
1fea387a7b01 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3890
diff changeset
   771
    "Modified: / 14-02-2017 / 22:36:34 / cg"
3889
b7c261a8614d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
   772
!
b7c261a8614d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3821
diff changeset
   773
1671
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   774
processNonInterlacedDATA:len
2701
8ca05242522e adapt to zlib changes
Claus Gittinger <cg@exept.de>
parents: 2700
diff changeset
   775
    self halt:'not used'
8ca05242522e adapt to zlib changes
Claus Gittinger <cg@exept.de>
parents: 2700
diff changeset
   776
"/
8ca05242522e adapt to zlib changes
Claus Gittinger <cg@exept.de>
parents: 2700
diff changeset
   777
"/    | zlibReader filter temp prevScanline thisScanline bytesPerScanline filtersSeen|
8ca05242522e adapt to zlib changes
Claus Gittinger <cg@exept.de>
parents: 2700
diff changeset
   778
"/
8ca05242522e adapt to zlib changes
Claus Gittinger <cg@exept.de>
parents: 2700
diff changeset
   779
"/    zlibReader := ZipStream readOpenAsZipStreamOn:inStream suppressHeaderAndChecksum:false. 
8ca05242522e adapt to zlib changes
Claus Gittinger <cg@exept.de>
parents: 2700
diff changeset
   780
"/    "/ zlibReader := ZLibReadStream on:inStream from: 1 to:len.
8ca05242522e adapt to zlib changes
Claus Gittinger <cg@exept.de>
parents: 2700
diff changeset
   781
"/
8ca05242522e adapt to zlib changes
Claus Gittinger <cg@exept.de>
parents: 2700
diff changeset
   782
"/    prevScanline := ByteArray new: self bytesPerRow.
8ca05242522e adapt to zlib changes
Claus Gittinger <cg@exept.de>
parents: 2700
diff changeset
   783
"/    thisScanline := ByteArray new: self bytesPerRow.
8ca05242522e adapt to zlib changes
Claus Gittinger <cg@exept.de>
parents: 2700
diff changeset
   784
"/    0 to: height - 1 do:[:index | 
8ca05242522e adapt to zlib changes
Claus Gittinger <cg@exept.de>
parents: 2700
diff changeset
   785
"/            filter := (zlibReader next: 1) first.
8ca05242522e adapt to zlib changes
Claus Gittinger <cg@exept.de>
parents: 2700
diff changeset
   786
"/            filtersSeen add: filter.
8ca05242522e adapt to zlib changes
Claus Gittinger <cg@exept.de>
parents: 2700
diff changeset
   787
"/            (filter isNil or: [(filter between: 0 and: 4) not]) ifTrue: [^self].
8ca05242522e adapt to zlib changes
Claus Gittinger <cg@exept.de>
parents: 2700
diff changeset
   788
"/            thisScanline := zlibReader next: bytesPerScanline into: thisScanline startingAt: 1.
8ca05242522e adapt to zlib changes
Claus Gittinger <cg@exept.de>
parents: 2700
diff changeset
   789
"/            self filterScanline: filter count: bytesPerScanline.
8ca05242522e adapt to zlib changes
Claus Gittinger <cg@exept.de>
parents: 2700
diff changeset
   790
"/            self copyPixels: index.
8ca05242522e adapt to zlib changes
Claus Gittinger <cg@exept.de>
parents: 2700
diff changeset
   791
"/            temp := prevScanline.
8ca05242522e adapt to zlib changes
Claus Gittinger <cg@exept.de>
parents: 2700
diff changeset
   792
"/            prevScanline := thisScanline.
8ca05242522e adapt to zlib changes
Claus Gittinger <cg@exept.de>
parents: 2700
diff changeset
   793
"/            thisScanline := temp
8ca05242522e adapt to zlib changes
Claus Gittinger <cg@exept.de>
parents: 2700
diff changeset
   794
"/    ]
2509
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   795
!
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   796
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   797
processNonInterlacedGlobalDATA
3821
940aaefb5f77 #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 3819
diff changeset
   798
    | "data n" zlibReader filter temp "filtersSeen" i|
2696
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
   799
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
   800
    "/ filtersSeen := Set new.
2695
6197b6af7f4f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2683
diff changeset
   801
6197b6af7f4f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2683
diff changeset
   802
"/    data := ByteArray new:(self bytesPerRow * height)+1000.
6197b6af7f4f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2683
diff changeset
   803
"/    n := ZipStream uncompress: globalDataChunk into: data.
6197b6af7f4f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2683
diff changeset
   804
"/    self halt.
2509
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   805
3821
940aaefb5f77 #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 3819
diff changeset
   806
    globalDataChunk reset.
940aaefb5f77 #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 3819
diff changeset
   807
    zlibReader := ZipStream readOpenAsZipStreamOn:globalDataChunk suppressHeaderAndChecksum:false.
2696
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
   808
    zlibReader binary.
2509
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   809
1671
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   810
    prevScanline := ByteArray new: bytesPerScanline.
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   811
    thisScanline := ByteArray new: bytesPerScanline.
2725
a480f3671588 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2709
diff changeset
   812
    0 to: height - 1 do:[:y | 
3343
ca3446a105d2 class: PNGReader
Stefan Vogel <sv@exept.de>
parents: 3327
diff changeset
   813
        filter := zlibReader nextByte.
3893
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
   814
        zlibReader next: bytesPerScanline into: thisScanline startingAt: 1.
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
   815
        filter ~~ 0 ifTrue:[ 
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
   816
            "/ filtersSeen add: filter.
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
   817
            (filter notNil and: [filter between: 0 and: 4]) ifFalse: [
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
   818
                'PNGReader: unsupported filter: ' infoPrint. filter infoPrintCR.
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
   819
                ^ self
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
   820
            ].
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
   821
            self filterScanline: filter count: bytesPerScanline 
2725
a480f3671588 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2709
diff changeset
   822
        ].
a480f3671588 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2709
diff changeset
   823
a480f3671588 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2709
diff changeset
   824
        i := y * bytesPerScanline.
a480f3671588 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2709
diff changeset
   825
        data replaceFrom:i+1 to:(i+bytesPerScanline) with:thisScanline startingAt:1.
a480f3671588 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2709
diff changeset
   826
2695
6197b6af7f4f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2683
diff changeset
   827
        temp := prevScanline.
6197b6af7f4f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2683
diff changeset
   828
        prevScanline := thisScanline.
6197b6af7f4f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2683
diff changeset
   829
        thisScanline := temp
6197b6af7f4f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2683
diff changeset
   830
    ]
3893
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
   831
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
   832
    "Modified: / 16-02-2017 / 16:45:52 / cg"
1671
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   833
!
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   834
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   835
processPHYSChunkLen:len
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   836
    "physical pixel chunk - currently unhandled"
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   837
2705
7ff2e44e44af *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2704
diff changeset
   838
    |pixelPerUnitX pixelPerUnitY unit|
7ff2e44e44af *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2704
diff changeset
   839
3554
f1820748e4a9 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3461
diff changeset
   840
    pixelPerUnitX := inStream nextInt32MSB:true.  
f1820748e4a9 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3461
diff changeset
   841
    pixelPerUnitY := inStream nextInt32MSB:true.
2705
7ff2e44e44af *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2704
diff changeset
   842
    unit := inStream nextByte.
7ff2e44e44af *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2704
diff changeset
   843
2707
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   844
    Verbose == true ifTrue:[
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   845
        'PNGReader: PHYS chunk ignored:' infoPrintCR.
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   846
        'PNGReader:   ppuX:' infoPrint. pixelPerUnitX infoPrintCR.
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   847
        'PNGReader:   ppuY:' infoPrint. pixelPerUnitY infoPrintCR.
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   848
        'PNGReader:   unit:' infoPrint. unit infoPrintCR.
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   849
    ].
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   850
2705
7ff2e44e44af *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2704
diff changeset
   851
    ^ true
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   852
!
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   853
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   854
processPLTEChunkLen:len
1671
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   855
    "read a color palette"
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   856
2725
a480f3671588 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2709
diff changeset
   857
    |n "{ Class: SmallInteger }"
a480f3671588 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2709
diff changeset
   858
     redBytes greenBytes blueBytes|
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   859
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   860
    (len \\ 3) ~~ 0 ifTrue:[
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   861
        'PNGReader: invalid size of PLTE chunk' infoPrintCR.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   862
        ^ false
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   863
    ].
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   864
    n := len // 3.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   865
    redBytes := ByteArray new:n.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   866
    greenBytes := ByteArray new:n.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   867
    blueBytes := ByteArray new:n.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   868
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   869
    1 to:n do:[:i |
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   870
        redBytes at:i put:(inStream nextByte).
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   871
        greenBytes at:i put:(inStream nextByte).
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   872
        blueBytes at:i put:(inStream nextByte)
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   873
    ].
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   874
2725
a480f3671588 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2709
diff changeset
   875
    colorMap := MappedPalette 
a480f3671588 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2709
diff changeset
   876
                    redVector:redBytes 
a480f3671588 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2709
diff changeset
   877
                    greenVector:greenBytes 
a480f3671588 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2709
diff changeset
   878
                    blueVector:blueBytes.
a480f3671588 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2709
diff changeset
   879
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   880
    ^ true
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   881
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   882
    "Created: 21.6.1996 / 21:22:28 / cg"
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   883
    "Modified: 21.6.1996 / 21:43:01 / cg"
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   884
!
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   885
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   886
processSBITChunkLen:len
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   887
    inStream skip:len.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   888
    ^ true
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   889
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   890
    "Created: 21.6.1996 / 21:13:09 / cg"
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   891
!
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   892
3900
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   893
processSPALChunkLen:len
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   894
    "/ ignored
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   895
    "/ inStream nextBytes:len.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   896
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   897
    inStream skip:len.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   898
    ^ true
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   899
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   900
    "Created: / 17-02-2017 / 11:31:40 / cg"
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   901
!
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   902
3762
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   903
processTEXTChunkLen:len    
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   904
    "/ textual data in iso8859 coding.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   905
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   906
    "/ currently ignored - not needed to display png images
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   907
    "/   Keyword:        1-79 bytes (character string)
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   908
    "/   Null separator: 1 byte
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   909
    "/   Text:           n bytes (character string)
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   910
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   911
    "/ if needed, set processTextChunks to true somewhere...
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   912
    processTextChunks == true ifTrue:[
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   913
        |chunkData keyword text i|
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   914
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   915
        chunkData := inStream nextBytes:len.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   916
        i := chunkData indexOf:0.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   917
        keyword := (chunkData copyTo:i-1) asString.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   918
        text := (chunkData copyFrom:i+1) asString.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   919
        self handleText:text keyword:keyword.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   920
    ] ifFalse:[  
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   921
        inStream skip:len.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   922
    ].    
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   923
    ^ true
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   924
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   925
    "Modified: 21.6.1996 / 21:15:27 / cg"
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   926
!
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   927
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   928
processTIMEChunkLen:len
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   929
    inStream skip:len.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   930
    ^ true
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   931
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   932
    "Created: 21.6.1996 / 21:15:43 / cg"
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   933
    "Modified: 21.6.1996 / 21:20:42 / cg"
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   934
!
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   935
2707
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   936
processTRNSChunkLen:len
3900
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   937
    paletteAlphaEntries := inStream nextBytes:len.
3904
f9baf7a194d9 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3903
diff changeset
   938
    
f9baf7a194d9 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3903
diff changeset
   939
    colorType == ColorTypeRGB ifTrue:[
f9baf7a194d9 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3903
diff changeset
   940
        len ~~ 3 ifTrue:[
f9baf7a194d9 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3903
diff changeset
   941
            Logger warning:'PNG: bad trns chunk size'.
f9baf7a194d9 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3903
diff changeset
   942
            paletteAlphaEntries := nil.
f9baf7a194d9 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3903
diff changeset
   943
        ].
f9baf7a194d9 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3903
diff changeset
   944
        ^ true
f9baf7a194d9 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3903
diff changeset
   945
    ].    
f9baf7a194d9 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3903
diff changeset
   946
    colorType == ColorTypePalette ifTrue:[
f9baf7a194d9 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3903
diff changeset
   947
        len ~~ 1 ifTrue:[
f9baf7a194d9 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3903
diff changeset
   948
            Logger warning:'PNG: bad trns chunk size'.
f9baf7a194d9 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3903
diff changeset
   949
            paletteAlphaEntries := nil.
f9baf7a194d9 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3903
diff changeset
   950
        ].
f9baf7a194d9 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3903
diff changeset
   951
        ^ true
f9baf7a194d9 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3903
diff changeset
   952
    ].        
f9baf7a194d9 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3903
diff changeset
   953
    colorType == ColorTypeGray ifTrue:[
f9baf7a194d9 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3903
diff changeset
   954
        len ~~ 2 ifTrue:[
f9baf7a194d9 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3903
diff changeset
   955
            Logger warning:'PNG: bad trns chunk size'.
f9baf7a194d9 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3903
diff changeset
   956
            paletteAlphaEntries := nil.
f9baf7a194d9 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3903
diff changeset
   957
        ].
f9baf7a194d9 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3903
diff changeset
   958
        ^ true
f9baf7a194d9 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3903
diff changeset
   959
    ].        
f9baf7a194d9 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3903
diff changeset
   960
    paletteAlphaEntries := nil.
2707
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   961
    ^ true
3900
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   962
3904
f9baf7a194d9 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3903
diff changeset
   963
    "Modified (format): / 17-02-2017 / 16:57:27 / cg"
2707
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   964
!
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   965
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   966
processZTXTChunkLen:len
3762
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   967
    "/ compressed text
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   968
    
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   969
    "/ currently ignored - not needed to display png images
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   970
    inStream skip:len.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   971
    ^ true
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   972
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   973
    "Created: 21.6.1996 / 21:15:58 / cg"
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   974
! !
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   975
3900
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
   976
!PNGReader methodsFor:'reading-private filtering'!
2696
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
   977
2909
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   978
filterAverage:count 
2699
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   979
    "Use the average of the pixel to the left and the pixel above as a predictor"
2909
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   980
    
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   981
    |delta|
2699
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   982
3609
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   983
%{
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   984
    if (__isByteArray(__INST(thisScanline))
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   985
     && __isByteArray(__INST(prevScanline))
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   986
     && __isSmallInteger(__INST(depth))
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   987
     && __isSmallInteger(count)) {
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   988
        unsigned char *__thisScanline = __byteArrayVal(__INST(thisScanline));
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   989
        unsigned int __sz_this = __byteArraySize(__INST(thisScanline));
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   990
        unsigned char *__prevScanline = __byteArrayVal(__INST(prevScanline));
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   991
        unsigned int __sz_prev = __byteArraySize(__INST(prevScanline));
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   992
        INT __count = __intVal(count);
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   993
        INT __delta = __intVal(__INST(depth)) / 8;
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   994
        int __i;
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   995
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   996
        if (__delta < 1) __delta = 1;
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   997
        for (__i=0; __i<__delta; __i++) {
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   998
            __thisScanline[__i] += (__prevScanline[__i] >> 1);
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   999
        }
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
  1000
        for (; __i < __count; __i++) {
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
  1001
            __thisScanline[__i] += ((__prevScanline[__i] + __thisScanline[__i-__delta]) >> 1);
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
  1002
        }
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
  1003
        RETURN(self);
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
  1004
    }
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
  1005
%}.
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
  1006
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
  1007
    delta := depth // 8 max:1.
2909
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1008
    1 to:delta do:[:i | 
3384
0761606da988 class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3343
diff changeset
  1009
        thisScanline at:i put:((thisScanline at:i) + ((prevScanline at:i) // 2) bitAnd:255)
2909
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1010
    ].
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1011
    delta + 1 to:count do:[:i | 
3384
0761606da988 class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3343
diff changeset
  1012
        thisScanline at:i put:((thisScanline at:i) + (((prevScanline at:i) + (thisScanline at:i - delta)) // 2) bitAnd:255)
2909
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1013
    ]
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1014
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1015
    "Modified: / 03-05-2011 / 12:14:01 / cg"
2699
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
  1016
!
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
  1017
2696
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
  1018
filterHorizontal:count
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
  1019
    "use the pixel to the left as a predictor"
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
  1020
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
  1021
    |delta|
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
  1022
3608
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1023
%{
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1024
    if (__isByteArray(__INST(thisScanline))
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1025
     && __isByteArray(__INST(prevScanline))
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1026
     && __isSmallInteger(__INST(depth))
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1027
     && __isSmallInteger(count)) {
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1028
        unsigned char *__thisScanline = __byteArrayVal(__INST(thisScanline));
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1029
        unsigned int __sz_this = __byteArraySize(__INST(thisScanline));
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1030
        unsigned char *__prevScanline = __byteArrayVal(__INST(prevScanline));
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1031
        unsigned int __sz_prev = __byteArraySize(__INST(prevScanline));
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1032
        INT __count = __intVal(count);
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1033
        INT __delta = __intVal(__INST(depth)) / 8;
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1034
        int __i;
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1035
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1036
        if (__delta < 1) __delta = 1;
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1037
        for (__i = __delta; __i < __count; __i++) {
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1038
            __thisScanline[__i] = __thisScanline[__i] + __thisScanline[__i-__delta];
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1039
        }
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1040
        RETURN(self);
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1041
    }
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1042
%}.
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1043
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1044
    delta := depth // 8 max:1.
2696
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
  1045
    delta+1 to:count do:[:i|
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
  1046
        thisScanline at:i put:(((thisScanline at:i)+ (thisScanline at:i-delta)) bitAnd:255) 
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
  1047
    ]
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
  1048
!
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
  1049
2699
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
  1050
filterNone: count
2909
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1051
    "/ no filter - scanline is as is
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1052
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1053
    "Modified: / 03-05-2011 / 12:14:20 / cg"
2699
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
  1054
!
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
  1055
2909
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1056
filterPaeth:count 
2697
8e8223bf25af more stuff added (but still not complete)
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
  1057
    "Select one of (the pixel to the left, the pixel above and the pixel to above left) to
2909
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1058
     predict the value of this pixel"
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1059
    
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1060
    |delta|
2697
8e8223bf25af more stuff added (but still not complete)
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
  1061
3607
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1062
%{
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1063
    if (__isByteArray(__INST(thisScanline))
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1064
     && __isByteArray(__INST(prevScanline))
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1065
     && __isSmallInteger(__INST(depth))
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1066
     && __isSmallInteger(count)) {
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1067
        unsigned char *__thisScanline = __byteArrayVal(__INST(thisScanline));
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1068
        unsigned int __sz_this = __byteArraySize(__INST(thisScanline));
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1069
        unsigned char *__prevScanline = __byteArrayVal(__INST(prevScanline));
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1070
        unsigned int __sz_prev = __byteArraySize(__INST(prevScanline));
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1071
        INT __count = __intVal(count);
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1072
        INT __delta = __intVal(__INST(depth)) / 8;
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1073
        int __i;
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1074
        
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1075
        if (__delta < 1) __delta = 1;
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1076
        for (__i=0; __i<__delta; __i++) {
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1077
            unsigned int __pix = __thisScanline[__i] + __prevScanline[__i];
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1078
            __thisScanline[__i] = __pix;
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1079
        }
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1080
        for (; __i < __count; __i++) {
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1081
            int __pCenter = __thisScanline[__i];
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1082
            int __pLeft = __thisScanline[__i - __delta];
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1083
            int __pAbove = __prevScanline[__i];
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1084
            int __pAboveLeft = __prevScanline[__i - __delta];
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1085
            int __pa, __pb, __pc;
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1086
            int __p;
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1087
            
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1088
            __pa = (__pAbove - __pAboveLeft); 
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1089
            __pa = __pa < 0 ? -__pa : __pa;
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1090
            __pb = (__pLeft - __pAboveLeft);
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1091
            __pb = __pb < 0 ? -__pb : __pb;
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1092
            __pc = __pLeft + __pAbove - __pAboveLeft - __pAboveLeft;
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1093
            __pc = __pc < 0 ? -__pc : __pc; 
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1094
            if ((__pa <= __pb) && (__pa <= __pc)) __p = __pLeft;
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1095
            else if (__pb <= __pc) __p = __pAbove;
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1096
            else __p = __pAboveLeft;
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1097
            
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1098
            __thisScanline[__i] = __pCenter + __p;
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1099
        }
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1100
        RETURN(self);
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1101
    }
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1102
%}.
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1103
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1104
    delta := depth // 8 max:1.
2909
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1105
    1 to:delta do:[:i | 
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1106
        thisScanline 
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1107
            at:i
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1108
            put:(((thisScanline at:i) + (prevScanline at:i)) bitAnd:255)
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1109
    ].
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1110
    delta + 1 to:count do:[:i | 
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1111
        thisScanline 
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1112
            at:i
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1113
            put:(((thisScanline at:i) + (self 
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1114
                            paethPredictLeft:(thisScanline at:i - delta)
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1115
                            above:(prevScanline at:i)
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1116
                            aboveLeft:(prevScanline at:i - delta))) 
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1117
                    bitAnd:255)
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1118
    ]
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1119
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1120
    "Modified: / 03-05-2011 / 12:14:43 / cg"
2697
8e8223bf25af more stuff added (but still not complete)
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
  1121
!
8e8223bf25af more stuff added (but still not complete)
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
  1122
2696
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
  1123
filterScanline:filterType count:count
3612
0784a518d8f4 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3611
diff changeset
  1124
    filterType == 0 ifTrue:[^ self].
0784a518d8f4 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3611
diff changeset
  1125
    
2696
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
  1126
    self 
3612
0784a518d8f4 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3611
diff changeset
  1127
        perform:(#(filterHorizontal: filterVertical: filterAverage: filterPaeth:) at:filterType)
2696
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
  1128
        with:count
2909
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1129
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1130
    "Modified: / 03-05-2011 / 12:13:31 / cg"
2697
8e8223bf25af more stuff added (but still not complete)
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
  1131
!
8e8223bf25af more stuff added (but still not complete)
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
  1132
2909
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1133
filterVertical:count 
2697
8e8223bf25af more stuff added (but still not complete)
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
  1134
    "Use the pixel above as a predictor"
2909
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1135
    
3608
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1136
%{
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1137
    if (__isByteArray(__INST(thisScanline))
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1138
     && __isByteArray(__INST(prevScanline))
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1139
     && __isSmallInteger(count)) {
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1140
        unsigned char *__thisScanline = __byteArrayVal(__INST(thisScanline));
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1141
        unsigned int __sz_this = __byteArraySize(__INST(thisScanline));
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1142
        unsigned char *__prevScanline = __byteArrayVal(__INST(prevScanline));
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1143
        unsigned int __sz_prev = __byteArraySize(__INST(prevScanline));
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1144
        INT __count = __intVal(count);
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1145
        int __i;
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1146
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1147
        for (__i=0; __i<__count; __i++) {
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1148
            unsigned int __pix = __thisScanline[__i] + __prevScanline[__i];
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1149
            __thisScanline[__i] = __pix;
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1150
        }
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1151
        RETURN(self);
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1152
    }
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1153
%}.
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
  1154
2909
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1155
    1 to:count do:[:i | 
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1156
        thisScanline 
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1157
            at:i
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1158
            put:(((thisScanline at:i) + (prevScanline at:i)) bitAnd:255)
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1159
    ]
2697
8e8223bf25af more stuff added (but still not complete)
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
  1160
2909
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1161
    "Modified: / 03-05-2011 / 12:14:34 / cg"
2697
8e8223bf25af more stuff added (but still not complete)
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
  1162
!
8e8223bf25af more stuff added (but still not complete)
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
  1163
3607
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1164
paethPredictLeft: l above: a aboveLeft: al
2697
8e8223bf25af more stuff added (but still not complete)
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
  1165
    "Predicts the value of a pixel based on nearby pixels, based on Paeth (GG II, 1991)"
8e8223bf25af more stuff added (but still not complete)
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
  1166
8e8223bf25af more stuff added (but still not complete)
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
  1167
    | pa pb pc |
8e8223bf25af more stuff added (but still not complete)
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
  1168
3607
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1169
    pa := a > al ifTrue: [a - al] ifFalse: [al - a].
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1170
    pb := l > al ifTrue: [l - al] ifFalse: [al - l].
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1171
    pc := l + a - al - al.
2697
8e8223bf25af more stuff added (but still not complete)
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
  1172
    pc < 0 ifTrue: [
8e8223bf25af more stuff added (but still not complete)
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
  1173
        pc := pc * -1
8e8223bf25af more stuff added (but still not complete)
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
  1174
    ].
3607
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1175
    ((pa <= pb) and: [pa <= pc]) ifTrue: [^ l].
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1176
    (pb <= pc) ifTrue: [^ a].
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1177
    ^ al
2696
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
  1178
! !
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
  1179
3900
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1180
!PNGReader methodsFor:'reading-private pixel copy'!
2699
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
  1181
2909
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1182
copyPixels:y at:startX by:incX 
2704
bbcc771de65c *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2703
diff changeset
  1183
    "Handle interlaced pixels of supported colorTypes"
2909
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1184
    
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1185
    |s|
2699
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
  1186
3598
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1187
    "/ per color type copy methods
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1188
    s := #( 
3900
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1189
             #copyPixelsGray:at:by:         "/ 0 = ColorTypeGray
2909
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1190
             nil
3900
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1191
             #copyPixelsRGB:at:by:          "/ 2 = ColorTypeRGB
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1192
             #copyPixelsIndexed:at:by:      "/ 3 = ColorTypePalette
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1193
             #copyPixelsGrayAlpha:at:by:    "/ 4 = ColorTypeGrayAlpha
2909
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1194
             nil 
3900
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1195
             #copyPixelsRGBA:at:by:         "/ 6 = ColorTypeRGBA
2909
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1196
        ) at:colorType + 1.
3437
4e1cf7b6b492 class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3384
diff changeset
  1197
    self perform:s with:y with:startX with:incX
1848
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1198
2909
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1199
    "Modified: / 03-05-2011 / 12:02:45 / cg"
3900
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1200
    "Modified (comment): / 16-02-2017 / 19:42:47 / cg"
3327
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
  1201
!
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
  1202
3598
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1203
copyPixelsGray:y at:startX by:incX 
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1204
    "Handle interlaced pixels of supported colorTypes.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1205
     Untested code - please verify"
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1206
3611
310db973356e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3609
diff changeset
  1207
    |srcIndex "{ Class: SmallInteger }"
310db973356e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3609
diff changeset
  1208
     srcMask  "{ Class: SmallInteger }"
310db973356e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3609
diff changeset
  1209
     nPixels  "{ Class: SmallInteger }"
310db973356e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3609
diff changeset
  1210
     dstIndex "{ Class: SmallInteger }"
310db973356e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3609
diff changeset
  1211
     dstMask  "{ Class: SmallInteger }"
310db973356e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3609
diff changeset
  1212
     x        "{ Class: SmallInteger }"
310db973356e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3609
diff changeset
  1213
     bits     "{ Class: SmallInteger }"
310db973356e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3609
diff changeset
  1214
     bitMask  "{ Class: SmallInteger }"
310db973356e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3609
diff changeset
  1215
     rS       "{ Class: SmallInteger }"
310db973356e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3609
diff changeset
  1216
     lS       "{ Class: SmallInteger }"
310db973356e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3609
diff changeset
  1217
     rowIndex "{ Class: SmallInteger }"|
3598
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1218
    
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1219
    nPixels := width // incX.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1220
    srcIndex := 0. srcMask := 0. x := startX.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1221
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1222
    depth == 1 ifTrue:[
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1223
        dstIndex := (y * bytesPerScanline) + (startX // 8) + 1.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1224
        dstMask := 16r80 >> (x \\ 8).
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1225
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1226
        1 to:nPixels do:[:cnt |
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1227
            srcMask == 0 ifTrue:[
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1228
                srcMask := 16r80.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1229
                srcIndex := srcIndex + 1.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1230
                bits := thisScanline at:srcIndex. 
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1231
            ].
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1232
            bitMask := (bits bitAnd:srcMask) == 0 ifTrue:[0] ifFalse:[dstMask].
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1233
            bitMask ~~ 0 ifTrue:[
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1234
                data at:dstIndex put:((data at:dstIndex) bitOr:bitMask).
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1235
            ].    
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1236
            x := x + incX.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1237
            dstMask := dstMask >> incX.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1238
            dstMask == 0 ifTrue:[
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1239
                dstIndex := dstIndex + 1.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1240
                dstMask := 16r80 >> (x \\ 8).
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1241
            ].
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1242
            srcMask := srcMask bitShift:-1.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1243
        ].
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1244
        ^ self.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1245
    ].
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1246
    
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1247
    depth == 2 ifTrue:[
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1248
        dstIndex := (y * bytesPerScanline) + (startX // 4) + 1.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1249
        lS := 6 - ((x \\ 4) * 2).
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1250
        rS := -1. 
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1251
        1 to:nPixels do:[:cnt |
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1252
            rS < 0 ifTrue:[
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1253
                srcIndex := srcIndex + 1.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1254
                bits := thisScanline at:srcIndex.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1255
                rS := 6.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1256
            ].
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1257
            bitMask := ((bits >> rS) bitAnd:2r11).
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1258
            bitMask ~~ 0 ifTrue:[
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1259
                bitMask := bitMask << lS.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1260
                data at:dstIndex put:((data at:dstIndex) bitOr:bitMask).
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1261
            ].    
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1262
            lS := lS - (incX * 2).
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1263
            lS < 0 ifTrue:[
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1264
                lS <= -8 ifTrue:[
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1265
                    dstIndex := dstIndex + 2.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1266
                    lS := lS + 8 + 8.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1267
                ] ifFalse:[
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1268
                    dstIndex := dstIndex + 1.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1269
                    lS := lS + 8.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1270
                ].    
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1271
            ].
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1272
            rS := rS - 2.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1273
        ].
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1274
        ^ self.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1275
    ].
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1276
    
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1277
    depth == 4 ifTrue:[
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1278
        rowIndex := (y * bytesPerScanline) + 1.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1279
        dstIndex := rowIndex + (x // 2).
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1280
        rS := -1. 
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1281
        1 to:nPixels do:[:cnt |
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1282
            rS < 0 ifTrue:[
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1283
                srcIndex := srcIndex + 1.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1284
                bits := thisScanline at:srcIndex.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1285
                rS := 4.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1286
            ].
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1287
            bitMask := ((bits >> rS) bitAnd:2r1111).
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1288
            x even ifTrue:[    
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1289
                bitMask := bitMask bitShift:4.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1290
            ].    
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1291
            data at:dstIndex put:((data at:dstIndex) bitOr:bitMask).
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1292
            x := x + incX.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1293
            dstIndex := rowIndex + (x // 2).
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1294
            rS := rS - 4.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1295
        ].
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1296
        ^ self.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1297
    ].
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1298
    
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1299
    depth == 8 ifTrue:[
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1300
        srcIndex := 1.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1301
        dstIndex := (y * bytesPerScanline) + (startX) + 1.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1302
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1303
        1 to:nPixels do:[:n |
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1304
            data at:dstIndex put:(thisScanline at:srcIndex).
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1305
            srcIndex := srcIndex + 1.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1306
            dstIndex := dstIndex + incX
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1307
        ].
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1308
        ^ self.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1309
    ].
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1310
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1311
    depth == 16 ifTrue:[
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1312
        srcIndex := 1.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1313
        dstIndex := (y * bytesPerScanline) + (startX*2) + 1.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1314
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1315
        1 to:nPixels do:[:n |
3601
05caf7f1e324 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3599
diff changeset
  1316
            data unsignedInt16At:dstIndex put:(thisScanline unsignedInt16At:srcIndex).
3598
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1317
            srcIndex := srcIndex + 2.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1318
            dstIndex := dstIndex + (incX * 2)
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1319
        ].
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1320
        ^ self.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1321
    ].
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1322
    self error:'unsupported depth'.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1323
!
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1324
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1325
copyPixelsIndexed:y at:startX by:incX 
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1326
    self copyPixelsGray:y at:startX by:incX 
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1327
!
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1328
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1329
copyPixelsRGB:y at:startX by:incX 
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1330
    "Handle interlaced pixels of supported colorTypes.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1331
     Untested code - please verify"
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1332
3611
310db973356e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3609
diff changeset
  1333
    |srcIndex "{ Class: SmallInteger }" 
310db973356e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3609
diff changeset
  1334
     nPixels  "{ Class: SmallInteger }"
310db973356e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3609
diff changeset
  1335
     dstIndex "{ Class: SmallInteger }"
310db973356e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3609
diff changeset
  1336
     dstInc   "{ Class: SmallInteger }"
310db973356e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3609
diff changeset
  1337
     bpp      "{ Class: SmallInteger }"|
3598
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1338
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1339
    bpp := bytesPerScanline // width.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1340
    
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1341
    "/ 1 byte per r,g,b
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1342
    srcIndex := 1.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1343
    dstIndex := (y * bytesPerScanline) + (startX * bpp) + 1.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1344
    dstInc := incX * bpp.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1345
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1346
    nPixels := width // incX.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1347
    1 to:nPixels do:[:n |
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1348
        data replaceFrom:dstIndex to:dstIndex+bpp-1 with:thisScanline startingAt:srcIndex.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1349
        srcIndex := srcIndex + bpp.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1350
        dstIndex := dstIndex + dstInc
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1351
    ].
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1352
!
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1353
3327
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
  1354
copyPixelsRGBA:y at:startX by:incX 
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
  1355
    "Handle interlaced pixels of supported colorTypes.
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
  1356
     Untested code - please verify"
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
  1357
3611
310db973356e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3609
diff changeset
  1358
    |srcIndex "{ Class: SmallInteger }"
310db973356e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3609
diff changeset
  1359
     nPixels  "{ Class: SmallInteger }"
310db973356e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3609
diff changeset
  1360
     dstIndex "{ Class: SmallInteger }"
310db973356e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3609
diff changeset
  1361
     dstInc   "{ Class: SmallInteger }"|
3327
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
  1362
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
  1363
    srcIndex := 1.
3437
4e1cf7b6b492 class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3384
diff changeset
  1364
    dstIndex := (y * bytesPerScanline) + (startX * 4) + 1.
4e1cf7b6b492 class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3384
diff changeset
  1365
    dstInc := incX * 4.
3327
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
  1366
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
  1367
    nPixels := thisScanline size.
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
  1368
    [srcIndex < nPixels] whileTrue:[
3437
4e1cf7b6b492 class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3384
diff changeset
  1369
        data replaceFrom:dstIndex to:dstIndex+3 with:thisScanline startingAt:srcIndex.
3327
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
  1370
        srcIndex := srcIndex + 4.
3437
4e1cf7b6b492 class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3384
diff changeset
  1371
        dstIndex := dstIndex + dstInc
3327
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
  1372
    ].
2699
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
  1373
! !
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
  1374
3900
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1375
!PNGReader methodsFor:'writing'!
2683
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1376
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1377
save:image onStream:aStream
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1378
    "save image in PNG-file-format onto aStream"
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1379
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1380
    outStream := aStream.
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1381
    outStream binary.
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1382
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1383
    byteOrder := #msb.
2683
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1384
    width := image width.
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1385
    height := image height.
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1386
    photometric := image photometric.
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1387
    samplesPerPixel := image samplesPerPixel.
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1388
    bitsPerSample := image bitsPerSample.
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1389
    colorMap := image colorMap.
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1390
    data := image bits.
3893
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1391
    mask := image mask.
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1392
    depth := self bitsPerPixel.
3900
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1393
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1394
    outStream nextPutAll:(self pngHeader).
3893
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1395
    
3900
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1396
    image mask notNil ifTrue:[
3904
f9baf7a194d9 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3903
diff changeset
  1397
        ((photometric ~~ #rgb) and:[(photometric ~~ #rgba)]) ifTrue: [
3900
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1398
            image maskedPixelsAre0 ifTrue:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1399
                paletteIndexForMaskedPixels := 0
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1400
            ] ifFalse:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1401
                self determinePaletteIndexForMaskedPixels
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1402
            ]
3904
f9baf7a194d9 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3903
diff changeset
  1403
        ] ifFalse:[
f9baf7a194d9 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3903
diff changeset
  1404
            photometric := #rgba.
f9baf7a194d9 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3903
diff changeset
  1405
        ].    
3900
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1406
    ].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1407
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1408
    self writeIHDRChunk.
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1409
    photometric == #palette ifTrue: [self writePaletteChunk].
3900
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1410
    paletteIndexForMaskedPixels notNil ifTrue: [self writeTRNSChunk].
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1411
    self writeImageDataChunk.
2683
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1412
    self writeEndChunk
3893
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1413
3904
f9baf7a194d9 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3903
diff changeset
  1414
    "Modified: / 17-02-2017 / 17:27:52 / cg"
3900
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1415
! !
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1416
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1417
!PNGReader methodsFor:'writing-private'!
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1418
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1419
determinePaletteIndexForMaskedPixels
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1420
    "/ if all masked pixels are 0, and 0 is not used elsewhere in the image,
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1421
    "/ write it as such.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1422
    "/ Otherwise, find an unallocated palette index, and assign masked pixels to it.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1423
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1424
    |usedPixels freePixels pixelIdx|
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1425
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1426
    colorMap size < 256 ifTrue:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1427
        paletteIndexForMaskedPixels := colorMap size.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1428
    ] ifFalse:[    
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1429
        usedPixels := data usedValues.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1430
        usedPixels size == 256 ifTrue:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1431
            self error:'cannot represent image (no palette slot for mask)'
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1432
        ].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1433
        freePixels := (0 to:255) asSet removeAllFoundIn:usedPixels.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1434
        paletteIndexForMaskedPixels := freePixels first.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1435
    ].    
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1436
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1437
    "/ rewrite data: wherever masked, change pixel to paletteIndexForMaskedPixels
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1438
    
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1439
    data := data copy.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1440
    pixelIdx := 1.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1441
    0 to:height-1 do:[:y |
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1442
        0 to:width-1 do:[:x |
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1443
            (mask pixelAtX:x y:y) == 0 ifTrue:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1444
                data at:pixelIdx put:paletteIndexForMaskedPixels.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1445
            ].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1446
            pixelIdx := pixelIdx + 1
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1447
        ]
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1448
    ].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1449
    
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1450
    "       
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1451
     PNGReader save:(ToolbarIconLibrary systemBrowserIcon) onFile:'/tmp/icon.png'
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1452
     ImageEditor openOnFile:'/tmp/icon.png'
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1453
    "
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1454
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1455
    "Created: / 16-02-2017 / 19:59:39 / cg"
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1456
    "Modified: / 17-02-2017 / 09:25:57 / cg"
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1457
! !
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1458
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1459
!PNGReader methodsFor:'writing-private chunks'!
2683
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1460
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1461
writeChunk:chunkTypeChars size:len with:aBlock
2708
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1462
    |crc realOutStream chunkBytes|
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1463
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1464
    realOutStream := outStream.
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1465
    outStream := WriteStream on:(ByteArray new:len).
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1466
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1467
    outStream nextPutBytes:4 from:chunkTypeChars startingAt:1.
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1468
    aBlock value.
2708
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1469
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1470
    chunkBytes := outStream contents.
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1471
    crc := CRC32Stream hashValueOf:chunkBytes.
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1472
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1473
    outStream := realOutStream.
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1474
3554
f1820748e4a9 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3461
diff changeset
  1475
    realOutStream nextPutInt32:len MSB:true.
2708
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1476
    realOutStream nextPutAll:chunkBytes.
3554
f1820748e4a9 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3461
diff changeset
  1477
    realOutStream nextPutInt32:crc MSB:true.
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1478
!
2683
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1479
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1480
writeEndChunk
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1481
    self 
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1482
        writeChunk: 'IEND'
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1483
        size: 0
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1484
        with:[ ]
2683
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1485
!
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1486
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1487
writeIHDRChunk
3893
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1488
    |hasMask|
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1489
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1490
    hasMask := 0.
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1491
    
3100
0c82f117bb45 class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 2910
diff changeset
  1492
    ((photometric == #whiteIs0) or:[ (photometric == #blackIs0)]) ifTrue:[
3900
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1493
        colorType := ColorTypeGray.
3893
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1494
        hasMask := (samplesPerPixel > 1)
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1495
    ].
3900
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1496
    (photometric == #rgb) ifTrue:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1497
        colorType := ColorTypeRGB.
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1498
        hasMask := (samplesPerPixel > 3)
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1499
    ].
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1500
    (photometric == #rgba) ifTrue:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1501
        colorType := ColorTypeRGBAlpha.
3893
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1502
        hasMask := (samplesPerPixel > 3)
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1503
    ].
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1504
    (photometric == #palette) ifTrue:[
3900
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1505
        colorType := ColorTypePalette.
3893
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1506
        hasMask := (samplesPerPixel > 1)
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1507
    ].
3100
0c82f117bb45 class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 2910
diff changeset
  1508
    colorType isNil ifTrue:[
3461
eb5a53c6b5b2 class: PNGReader
Stefan Vogel <sv@exept.de>
parents: 3437
diff changeset
  1509
        self error:'unhandled photometric'
3100
0c82f117bb45 class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 2910
diff changeset
  1510
    ].
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1511
3893
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1512
    mask notNil ifTrue:[
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1513
        hasMask := true.
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1514
    ].
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1515
    hasMask ifTrue:[
3900
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1516
        "/ make it grayAlpha / rgba
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1517
        ((colorType == ColorTypeGray) or:[colorType == ColorTypeGray]) ifTrue:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1518
            colorType := colorType bitOr:4.  "/ +alpha
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1519
        ].
3893
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1520
    ].
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1521
    
2683
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1522
    self 
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1523
        writeChunk: 'IHDR'
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1524
        size: 13
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1525
        with:[ 
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1526
            self writeLong:width.
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1527
            self writeLong:height.
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1528
            outStream nextPut: 8.  "Assume that all colors are 24bit"     "/ depth
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1529
            outStream nextPut: colorType.  
2683
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1530
            outStream nextPut: 0.  "Compression"
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1531
            outStream nextPut: 0.  "Filter method"
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1532
            outStream nextPut: 0   "Non-interlaced"
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1533
        ]
3893
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1534
3900
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1535
    "Modified (format): / 16-02-2017 / 21:24:22 / cg"
2683
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1536
!
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1537
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1538
writeImageDataChunk
3893
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1539
    |compressedByteStream compressedBytes zlibWriter idx 
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1540
     row32|
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1541
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1542
    bytesPerScanline := self bytesPerRow.
3821
940aaefb5f77 #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 3819
diff changeset
  1543
    
940aaefb5f77 #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 3819
diff changeset
  1544
    compressedByteStream := WriteStream on:(ByteArray new:(bytesPerScanline*height)).
940aaefb5f77 #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 3819
diff changeset
  1545
    zlibWriter := ZipStream writeOpenAsZipStreamOn:compressedByteStream suppressHeaderAndChecksum:false.
940aaefb5f77 #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 3819
diff changeset
  1546
    zlibWriter binary.
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1547
3900
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1548
    (mask notNil and:[photometric ~~ #palette]) ifTrue:[
3893
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1549
        "/ on-the-fly expand mask into the alpha channel.
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1550
        
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1551
        "/ for now - only support depth24 + mask
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1552
        self assert:(depth == 24).
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1553
        row32 := ByteArray new:(4 * width).
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1554
        self assert:(bytesPerScanline == (3 * width)).
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1555
        
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1556
        idx := 1.
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1557
        0 to:height-1 do:[:y |
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1558
            |dstIdx maskRow|
2708
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1559
3893
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1560
            "/ expand rgb to rgba
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1561
            maskRow := mask rowAt:y.
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1562
            
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1563
            dstIdx := 1.
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1564
            1 to:width do:[:x |
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1565
                row32 at:dstIdx put:(data at:idx).
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1566
                row32 at:dstIdx+1 put:(data at:idx+1).
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1567
                row32 at:dstIdx+2 put:(data at:idx+2).
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1568
                row32 at:dstIdx+3 put:((maskRow at:x) == 0 ifTrue:[0] ifFalse:[16rFF]).
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1569
                idx := idx + 3.
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1570
                dstIdx := dstIdx + 4.
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1571
            ].
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1572
            
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1573
            zlibWriter nextPutAll:#[0].       "/ no filter
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1574
            zlibWriter nextPutAll:row32.
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1575
        ].
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1576
    ] ifFalse:[
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1577
        idx := 1.
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1578
        0 to:height-1 do:[:y |
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1579
            |row|
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1580
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1581
            row := data copyFrom:idx to:(idx+bytesPerScanline-1).
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1582
            zlibWriter nextPutAll:#[0].       "/ no filter
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1583
            zlibWriter nextPutAll:row.
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1584
            idx := idx + bytesPerScanline.
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1585
        ].
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1586
    ].
2708
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1587
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1588
    zlibWriter close.
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1589
    compressedBytes := compressedByteStream contents.
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1590
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1591
    self 
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1592
        writeChunk: 'IDAT'
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1593
        size:(compressedBytes size)
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1594
        with:[ 
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1595
            outStream nextPutAll:compressedBytes
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1596
        ]
3893
f485ae4fced3 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3891
diff changeset
  1597
3904
f9baf7a194d9 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3903
diff changeset
  1598
    "Modified: / 17-02-2017 / 17:02:16 / cg"
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1599
!
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1600
2683
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1601
writePaletteChunk
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1602
    self 
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1603
        writeChunk: 'PLTE'
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1604
        size: 3 * colorMap size
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1605
        with:[
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1606
            colorMap do:[:color | 
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1607
                outStream
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1608
                    nextPut: color redByte;
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1609
                    nextPut: color greenByte;
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1610
                    nextPut: color blueByte
2683
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1611
            ]
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1612
        ]
3900
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1613
!
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1614
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1615
writeTRNSChunk
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1616
    self 
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1617
        writeChunk: 'tRNS'
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1618
        size: 1
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1619
        with:[
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1620
            outStream nextPut: paletteIndexForMaskedPixels
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1621
        ]
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1622
a95276d36ce8 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3893
diff changeset
  1623
    "Created: / 16-02-2017 / 19:58:06 / cg"
2683
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1624
! !
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1625
398
aef700d15416 new suffix-table
Claus Gittinger <cg@exept.de>
parents: 308
diff changeset
  1626
!PNGReader class methodsFor:'documentation'!
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1627
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1628
version
3554
f1820748e4a9 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3461
diff changeset
  1629
    ^ '$Header$'
2909
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1630
!
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1631
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1632
version_CVS
3554
f1820748e4a9 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3461
diff changeset
  1633
    ^ '$Header$'
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1634
! !
1671
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
  1635
3100
0c82f117bb45 class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 2910
diff changeset
  1636
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1637
PNGReader initialize!