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