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