PNGReader.st
author Jan Vrany <jan.vrany@fit.cvut.cz>
Mon, 23 Jan 2017 12:42:33 +0000
branchjv
changeset 3855 1db7742d33ad
parent 3854 4afd107bc911
child 4132 7e5528572373
permissions -rw-r--r--
Win32: Build libjpeg in its own directory, out-of-source-tree. This allows building both Linux and Windows from the same source tree. Useful for developmen only.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     1
"
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     2
 COPYRIGHT (c) 1996 by Claus Gittinger
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     3
              All Rights Reserved
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     4
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     5
 This software is furnished under a license and may be used
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     6
 only in accordance with the terms of that license and with the
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     7
 inclusion of the above copyright notice.   This software may not
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     8
 be provided or otherwise made available to, or used by, any
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     9
 other person.  No title to or ownership of the software is
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    10
 hereby transferred.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    11
"
1671
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
    12
"{ Package: 'stx:libview2' }"
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
    13
3461
eb5a53c6b5b2 class: PNGReader
Stefan Vogel <sv@exept.de>
parents: 3437
diff changeset
    14
"{ NameSpace: Smalltalk }"
eb5a53c6b5b2 class: PNGReader
Stefan Vogel <sv@exept.de>
parents: 3437
diff changeset
    15
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    16
ImageReader subclass:#PNGReader
3821
940aaefb5f77 #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 3819
diff changeset
    17
        instanceVariableNames:'colorType bitsPerChannel depth compressionMethod filterMethod
940aaefb5f77 #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 3819
diff changeset
    18
                interlaceMode bytesPerScanline globalDataChunk thisScanline
940aaefb5f77 #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 3819
diff changeset
    19
                prevScanline processTextChunks'
940aaefb5f77 #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 3819
diff changeset
    20
        classVariableNames:'Verbose'
940aaefb5f77 #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 3819
diff changeset
    21
        poolDictionaries:''
940aaefb5f77 #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 3819
diff changeset
    22
        category:'Graphics-Images-Readers'
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    23
!
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    24
398
aef700d15416 new suffix-table
Claus Gittinger <cg@exept.de>
parents: 308
diff changeset
    25
!PNGReader class methodsFor:'documentation'!
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    26
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    27
copyright
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    28
"
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    29
 COPYRIGHT (c) 1996 by Claus Gittinger
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    30
              All Rights Reserved
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    31
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    32
 This software is furnished under a license and may be used
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    33
 only in accordance with the terms of that license and with the
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    34
 inclusion of the above copyright notice.   This software may not
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    35
 be provided or otherwise made available to, or used by, any
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    36
 other person.  No title to or ownership of the software is
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    37
 hereby transferred.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    38
"
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    39
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    40
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    41
!
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    42
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    43
documentation
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    44
"
2725
a480f3671588 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2709
diff changeset
    45
    This class will provide methods for loading and saving PNG pictures.
3599
9bc697bd01d9 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 3598
diff changeset
    46
    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
    47
    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
    48
2725
a480f3671588 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2709
diff changeset
    49
    [caveats:]
a480f3671588 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2709
diff changeset
    50
        writer ignores any mask (for now).
3599
9bc697bd01d9 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 3598
diff changeset
    51
        writer only generates unfiltered non-interlaced data
2725
a480f3671588 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2709
diff changeset
    52
        
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    53
    [See also:]
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    54
        Image Form Icon
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    55
        BlitImageReader FaceReader GIFReader JPEGReader PBMReader PCXReader 
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    56
        ST80FormReader SunRasterReader TargaReader TIFFReader WindowsIconReader 
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    57
        XBMReader XPMReader XWDReader 
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    58
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    59
    [author:]
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    60
        Claus Gittinger
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    61
"
1694
3a77d9b69cf7 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1671
diff changeset
    62
!
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    63
1694
3a77d9b69cf7 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1671
diff changeset
    64
examples
3a77d9b69cf7 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1671
diff changeset
    65
"
3a77d9b69cf7 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1671
diff changeset
    66
    PNGReader fromFile:'/home/cg/AudioExplorer_51_files/use_small.png'
2509
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
    67
    PNGReader fromFile:'\\Exeptn\tmp\images\expeccoScreenshot4020_5526507.png'
2683
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
    68
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
    69
    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
    70
    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
    71
    PNGReader fromFile:'\\exeptn\unsaved\pd_stuff\PNGs\Delete.png'
2699
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
    72
    PNGReader fromFile:'\\exeptn\unsaved\pd_stuff\PNGs\Down.png'
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
    73
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
    74
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
    75
    |img img2 outStream png|
2725
a480f3671588 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2709
diff changeset
    76
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
    77
    img := ToolbarIconLibrary error32x32Icon.
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
    78
    outStream := WriteStream on:(ByteArray new:100).
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
    79
    PNGReader save:img onStream:outStream.
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
    80
    png := outStream contents.
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
    81
    img2 := PNGReader fromStream:(png readStream).
2708
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
    82
    self assert:(img bits = img2 bits).
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
    83
    img inspect.
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
    84
    img2 inspect.
1694
3a77d9b69cf7 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1671
diff changeset
    85
"
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    86
! !
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    87
398
aef700d15416 new suffix-table
Claus Gittinger <cg@exept.de>
parents: 308
diff changeset
    88
!PNGReader class methodsFor:'initialization'!
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    89
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    90
initialize
2699
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
    91
    "install myself in the Image classes fileFormat table for the `.png' extension."
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    92
2709
4ecfb8ae5fab *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2708
diff changeset
    93
    MIMETypes defineImageType:'image/png'  suffix:'png' reader:self.
4ecfb8ae5fab *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2708
diff changeset
    94
    "/ backward compatibility from times when png was not yet so common...
4ecfb8ae5fab *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2708
diff changeset
    95
    MIMETypes defineImageType:'image/x-png' suffix:nil reader:self.
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    96
! !
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    97
2705
7ff2e44e44af *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2704
diff changeset
    98
!PNGReader class methodsFor:'queries'!
7ff2e44e44af *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2704
diff changeset
    99
7ff2e44e44af *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2704
diff changeset
   100
canRepresent:anImage
7ff2e44e44af *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2704
diff changeset
   101
    "return true, if anImage can be represented in my file format.
7ff2e44e44af *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2704
diff changeset
   102
     Any image is supported."
7ff2e44e44af *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2704
diff changeset
   103
7ff2e44e44af *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2704
diff changeset
   104
    ^ true
7ff2e44e44af *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2704
diff changeset
   105
! !
7ff2e44e44af *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2704
diff changeset
   106
398
aef700d15416 new suffix-table
Claus Gittinger <cg@exept.de>
parents: 308
diff changeset
   107
!PNGReader class methodsFor:'testing'!
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   108
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   109
isValidImageFile:aFileName
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   110
    "return true, if aFileName contains a PNG image"
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   111
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   112
    |inStream magic|
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   113
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   114
    inStream := self streamReadingFile:aFileName.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   115
    inStream isNil ifTrue:[^ false].
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   116
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   117
    inStream binary.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   118
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   119
    magic := ByteArray new:8.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   120
    inStream nextBytes:8 into:magic.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   121
    inStream close.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   122
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   123
    ^ (magic = #[137 80 78 71 13 10 26 10])
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   124
1694
3a77d9b69cf7 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1671
diff changeset
   125
    "
3a77d9b69cf7 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1671
diff changeset
   126
     self isValidImageFile:'/home/cg/AudioExplorer_51_files/use_small.png'
2683
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
   127
     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
   128
     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
   129
    "
3a77d9b69cf7 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1671
diff changeset
   130
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   131
    "Modified: 21.6.1996 / 20:38:46 / cg"
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   132
! !
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   133
2696
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
   134
!PNGReader methodsFor:'private-chunks'!
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   135
2699
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   136
doPass: pass
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   137
    "Certain interlace passes are skipped with certain small image dimensions"
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   138
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   139
    pass = 1 ifTrue: [ ^ true ].
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   140
    ((width = 1) and: [height = 1]) ifTrue: [ ^ false ].
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   141
    pass = 2 ifTrue: [ ^ width >= 5 ].
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   142
    pass = 3 ifTrue: [ ^ height >= 5 ].
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   143
    pass = 4 ifTrue: [ ^ (width >=3 ) or: [height >= 5] ].
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   144
    pass = 5 ifTrue: [ ^ height >=3 ].
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   145
    pass = 6 ifTrue: [ ^ width >=2 ].
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   146
    pass = 7 ifTrue: [ ^ height >=2 ].
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   147
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   148
    self error:'invalid argument'.
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   149
    ^ true
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   150
!
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   151
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   152
processBKGDChunkLen:len
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   153
    inStream skip:len.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   154
    ^ true
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   155
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   156
    "Created: 21.6.1996 / 21:15:49 / cg"
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   157
!
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   158
2707
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   159
processCHRMChunkLen:len
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   160
    "cHRM Primary chromaticities chunk - currently unhandled"
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   161
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   162
    |whitePointX whitePointY redX redY greenX greenY blueX blueY|
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   163
3554
f1820748e4a9 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3461
diff changeset
   164
    whitePointX := (inStream nextInt32MSB:true) / 100000.0.
f1820748e4a9 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3461
diff changeset
   165
    whitePointY := (inStream nextInt32MSB:true) / 100000.0.
f1820748e4a9 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3461
diff changeset
   166
    redX := (inStream nextInt32MSB:true) / 100000.0.
f1820748e4a9 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3461
diff changeset
   167
    redY := (inStream nextInt32MSB:true) / 100000.0.
f1820748e4a9 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3461
diff changeset
   168
    greenX := (inStream nextInt32MSB:true) / 100000.0.
f1820748e4a9 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3461
diff changeset
   169
    greenY := (inStream nextInt32MSB:true) / 100000.0.
f1820748e4a9 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3461
diff changeset
   170
    blueX := (inStream nextInt32MSB:true) / 100000.0.
f1820748e4a9 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3461
diff changeset
   171
    blueY := (inStream nextInt32MSB:true) / 100000.0.
2707
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   172
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   173
    Verbose == true ifTrue:[
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   174
        'PNGReader: CHRM chunk ignored:' infoPrintCR.
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   175
        'PNGReader:   whitePointX:' infoPrint. whitePointX infoPrintCR.
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   176
        'PNGReader:   whitePointY:' infoPrint. whitePointX infoPrintCR.
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   177
        'PNGReader:   redX:' infoPrint. redX infoPrintCR.
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   178
        'PNGReader:   redY:' infoPrint. redY infoPrintCR.
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   179
        'PNGReader:   greenX:' infoPrint. greenX infoPrintCR.
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   180
        'PNGReader:   greenY:' infoPrint. greenY infoPrintCR.
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   181
        'PNGReader:   blueX:' infoPrint. blueX infoPrintCR.
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   182
        'PNGReader:   blueY:' infoPrint. blueY infoPrintCR.
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   183
    ].
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   184
    ^ true
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   185
!
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   186
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   187
processChunk:type len:len
2509
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   188
    |chunk|
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   189
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   190
    type = 'IDAT' ifTrue:[
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   191
        "---since the compressed data can span multiple
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   192
        chunks, stitch them all together first. later,
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   193
        if memory is an issue, we need to figure out how
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   194
        to do this on the fly---"
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   195
        chunk := inStream next:len.
3821
940aaefb5f77 #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 3819
diff changeset
   196
        globalDataChunk isNil ifTrue:[
940aaefb5f77 #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 3819
diff changeset
   197
            globalDataChunk := ReadWriteStream on:(ByteArray new:(height * self bytesPerRow)).
940aaefb5f77 #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 3819
diff changeset
   198
        ].
940aaefb5f77 #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 3819
diff changeset
   199
        globalDataChunk nextPutAll:chunk.
2509
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   200
        ^ true
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   201
    ].
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   202
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   203
    type = 'gAMA' ifTrue:[^ self processGAMAChunkLen:len].
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   204
    type = 'sBIT' ifTrue:[^ self processSBITChunkLen:len].
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   205
    type = 'tEXt' ifTrue:[^ self processTEXTChunkLen:len].
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   206
    type = 'tIME' ifTrue:[^ self processTIMEChunkLen:len].
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   207
    type = 'bKGD' ifTrue:[^ self processBKGDChunkLen:len].
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   208
    type = 'zTXt' ifTrue:[^ self processZTXTChunkLen:len].
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   209
    type = 'PLTE' ifTrue:[^ self processPLTEChunkLen:len].
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   210
1671
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   211
    type = 'pHYs' ifTrue:[^ self processPHYSChunkLen:len].
2707
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   212
    type = 'cHRM' ifTrue:[^ self processCHRMChunkLen:len].
1671
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   213
    type = 'tRNS' ifTrue:[^ self processTRNSChunkLen:len].
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   214
    type = 'IHDR' ifTrue:[^ self processIHDRChunkLen:len].
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   215
3762
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   216
    type = 'iTXt' ifTrue:[^ self processITXTChunkLen:len].
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   217
    type = 'iCCP' ifTrue:[^ self processICCPChunkLen:len].
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   218
    
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   219
    ('PNGReader: unrecognized chunk: ' , type , ' ignored.') infoPrintCR.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   220
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   221
    inStream skip:len.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   222
    ^ true.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   223
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   224
    "Created: 21.6.1996 / 21:10:37 / cg"
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   225
    "Modified: 21.6.1996 / 21:22:37 / cg"
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   226
!
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   227
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   228
processGAMAChunkLen:len
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   229
    inStream skip:len.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   230
    ^ true
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   231
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   232
    "Created: 21.6.1996 / 21:10:52 / cg"
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   233
!
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   234
2509
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   235
processGlobalIDATChunk
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   236
    interlaceMode == 0 ifTrue: [
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   237
        ^ self processNonInterlacedGlobalDATA
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   238
    ]. 
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   239
    ^ self processInterlacedGlobalDATA
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   240
!
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   241
3762
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   242
processICCPChunkLen:len
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   243
    "/ ignored
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   244
    "/ inStream nextBytes:len.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   245
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   246
    inStream skip:len.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   247
    ^ true
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   248
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   249
    "Created: 21.6.1996 / 21:15:58 / cg"
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   250
!
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   251
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   252
processIDATChunkLen:len
1671
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   253
    interlaceMode == 0 ifTrue: [
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   254
        ^ self processNonInterlacedDATA:len
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   255
    ]. 
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   256
    ^ self processInterlacedDATA:len
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   257
!
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   258
3762
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   259
processIHDRChunkLen:len
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   260
    "/ ignored
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   261
    
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   262
    inStream skip:len.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   263
    ^ true
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   264
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   265
    "Created: 21.6.1996 / 21:15:58 / cg"
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   266
!
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   267
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   268
processITXTChunkLen:len
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   269
    "/ international (i.e.utf8) textual data.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   270
    
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   271
    "/ currently ignored - not needed to display png images
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   272
    "/
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   273
    "/   Keyword:             1-79 bytes (character string)
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   274
    "/   Null separator:      1 byte
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   275
    "/   Compression flag:    1 byte
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   276
    "/   Compression method:  1 byte
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   277
    "/   Language tag:        0 or more bytes (character string)
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   278
    "/   Null separator:      1 byte
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   279
    "/   Translated keyword:  0 or more bytes
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   280
    "/   Null separator:      1 byte
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   281
    "/   Text:                0 or more bytes
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   282
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   283
    "/ if needed, set processTextChunks to true somewhere...
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   284
    processTextChunks == true ifTrue:[
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   285
        |chunkData keyword text i1 i2 i3 
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   286
         compressionFlag compressionMethod languageTag
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   287
         xlatedKeyword textBytes|
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   288
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   289
        chunkData := inStream nextBytes:len.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   290
        i1 := chunkData indexOf:0.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   291
        keyword := (chunkData copyTo:i1-1) asString.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   292
        compressionFlag := chunkData at:i1+1.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   293
        compressionMethod := chunkData at:i1+2.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   294
        i2 := chunkData indexOf:0 startingAt:i1+3.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   295
        languageTag := (chunkData copyFrom:i1+3 to:i2-1) asString.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   296
        i3 := chunkData indexOf:0 startingAt:i2+1.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   297
        xlatedKeyword := (chunkData copyFrom:i2+1 to:i3-1) asString.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   298
        textBytes := chunkData copyFrom:i3+1.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   299
        compressionFlag == 0 ifTrue:[
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   300
            text := textBytes
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   301
        ] ifFalse:[
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   302
            compressionFlag == 1 ifTrue:[
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   303
                "/ for now, only zlib compression is supported...
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   304
                'zlib compression currently unsupported' infoPrintCR.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   305
            ] ifFalse:[
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   306
                'unsupported compression method' infoPrintCR.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   307
            ].    
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   308
        ].    
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   309
        text := text utf8Decoded.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   310
        self handleText:text keyword:keyword.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   311
    ] ifFalse:[    
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   312
        inStream skip:len.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   313
    ].
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   314
    ^ true
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   315
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   316
    "Created: 21.6.1996 / 21:15:58 / cg"
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   317
!
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   318
1671
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   319
processInterlacedDATA:len
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   320
    inStream skip:len.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   321
    ^ true
1671
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   322
!
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   323
2699
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   324
processInterlacedGlobalDATA
3327
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
   325
    "adam7 interlace method"
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
   326
3612
0784a518d8f4 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3611
diff changeset
   327
    | zlibReader filter 
0784a518d8f4 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3611
diff changeset
   328
      bytesPerPass startingCol colIncrement rowIncrement 
0784a518d8f4 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3611
diff changeset
   329
      startingRow 
0784a518d8f4 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3611
diff changeset
   330
      temp "filtersSeen"  
0784a518d8f4 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3611
diff changeset
   331
      cx       "{ Class: SmallInteger }"
0784a518d8f4 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3611
diff changeset
   332
      sc       "{ Class: SmallInteger }"
0784a518d8f4 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3611
diff changeset
   333
      cy       "{ Class: SmallInteger }"
0784a518d8f4 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3611
diff changeset
   334
      startRow "{ Class: SmallInteger }"
0784a518d8f4 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3611
diff changeset
   335
      w        "{ Class: SmallInteger }"
0784a518d8f4 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3611
diff changeset
   336
      h        "{ Class: SmallInteger }"
0784a518d8f4 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3611
diff changeset
   337
    |
2699
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   338
3327
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
   339
    interlaceMode == 1 ifFalse: [
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
   340
        self error:'unsupported interlaced mode'.
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
   341
        ^ self
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
   342
    ].
2699
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   343
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   344
    "/ filtersSeen := Set new.
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   345
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   346
    startingCol := #(0 4 0 2 0 1 0 ).
3327
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
   347
    startingRow := #(0 0 4 0 2 0 1 ).
2699
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   348
    colIncrement := #(8 8 4 4 2 2 1 ).
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   349
    rowIncrement := #(8 8 8 4 4 2 2 ).
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   350
3821
940aaefb5f77 #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 3819
diff changeset
   351
    globalDataChunk reset.
940aaefb5f77 #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 3819
diff changeset
   352
    zlibReader := ZipStream readOpenAsZipStreamOn:globalDataChunk suppressHeaderAndChecksum:false.
2699
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   353
    zlibReader binary.
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   354
3612
0784a518d8f4 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3611
diff changeset
   355
    h := height.
0784a518d8f4 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3611
diff changeset
   356
    w := width.
2699
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   357
    1 to: 7 do: [:pass |
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   358
        (self doPass: pass) ifTrue:[
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   359
            cx := colIncrement at: pass.
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   360
            sc := startingCol at: pass.
3327
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
   361
            cy := rowIncrement at: pass.
3612
0784a518d8f4 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3611
diff changeset
   362
            bytesPerPass := (((w - sc + cx - 1) // cx * depth) + 7) // 8.
2699
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   363
            prevScanline := ByteArray new: bytesPerPass.
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   364
            thisScanline := ByteArray new: bytesPerScanline.
3612
0784a518d8f4 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3611
diff changeset
   365
            startRow := startingRow at: pass.
0784a518d8f4 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3611
diff changeset
   366
            startRow to: h-1 by: cy do: [:y |
3343
ca3446a105d2 class: PNGReader
Stefan Vogel <sv@exept.de>
parents: 3327
diff changeset
   367
                filter := zlibReader nextByte.
2699
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   368
                "/ filtersSeen add: filter.
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   369
                (filter isNil or: [(filter between: 0 and: 4) not])
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   370
                    ifTrue: [^ self].
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   371
                zlibReader next: bytesPerPass into: thisScanline startingAt: 1.
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   372
                filter ~~ 0 ifTrue:[ self filterScanline: filter count: bytesPerPass ].
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   373
                self copyPixels:y at:sc by:cx.
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   374
                temp := prevScanline.
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   375
                prevScanline := thisScanline.
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   376
                thisScanline := temp.
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   377
            ]
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   378
        ]
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   379
    ].
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   380
    zlibReader atEnd ifFalse:[self error:'Unexpected data'].
2909
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   381
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   382
    "Modified: / 03-05-2011 / 12:03:33 / cg"
2699
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   383
!
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   384
1671
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   385
processNonInterlacedDATA:len
2701
8ca05242522e adapt to zlib changes
Claus Gittinger <cg@exept.de>
parents: 2700
diff changeset
   386
    self halt:'not used'
8ca05242522e adapt to zlib changes
Claus Gittinger <cg@exept.de>
parents: 2700
diff changeset
   387
"/
8ca05242522e adapt to zlib changes
Claus Gittinger <cg@exept.de>
parents: 2700
diff changeset
   388
"/    | zlibReader filter temp prevScanline thisScanline bytesPerScanline filtersSeen|
8ca05242522e adapt to zlib changes
Claus Gittinger <cg@exept.de>
parents: 2700
diff changeset
   389
"/
8ca05242522e adapt to zlib changes
Claus Gittinger <cg@exept.de>
parents: 2700
diff changeset
   390
"/    zlibReader := ZipStream readOpenAsZipStreamOn:inStream suppressHeaderAndChecksum:false. 
8ca05242522e adapt to zlib changes
Claus Gittinger <cg@exept.de>
parents: 2700
diff changeset
   391
"/    "/ zlibReader := ZLibReadStream on:inStream from: 1 to:len.
8ca05242522e adapt to zlib changes
Claus Gittinger <cg@exept.de>
parents: 2700
diff changeset
   392
"/
8ca05242522e adapt to zlib changes
Claus Gittinger <cg@exept.de>
parents: 2700
diff changeset
   393
"/    prevScanline := ByteArray new: self bytesPerRow.
8ca05242522e adapt to zlib changes
Claus Gittinger <cg@exept.de>
parents: 2700
diff changeset
   394
"/    thisScanline := ByteArray new: self bytesPerRow.
8ca05242522e adapt to zlib changes
Claus Gittinger <cg@exept.de>
parents: 2700
diff changeset
   395
"/    0 to: height - 1 do:[:index | 
8ca05242522e adapt to zlib changes
Claus Gittinger <cg@exept.de>
parents: 2700
diff changeset
   396
"/            filter := (zlibReader next: 1) first.
8ca05242522e adapt to zlib changes
Claus Gittinger <cg@exept.de>
parents: 2700
diff changeset
   397
"/            filtersSeen add: filter.
8ca05242522e adapt to zlib changes
Claus Gittinger <cg@exept.de>
parents: 2700
diff changeset
   398
"/            (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
   399
"/            thisScanline := zlibReader next: bytesPerScanline into: thisScanline startingAt: 1.
8ca05242522e adapt to zlib changes
Claus Gittinger <cg@exept.de>
parents: 2700
diff changeset
   400
"/            self filterScanline: filter count: bytesPerScanline.
8ca05242522e adapt to zlib changes
Claus Gittinger <cg@exept.de>
parents: 2700
diff changeset
   401
"/            self copyPixels: index.
8ca05242522e adapt to zlib changes
Claus Gittinger <cg@exept.de>
parents: 2700
diff changeset
   402
"/            temp := prevScanline.
8ca05242522e adapt to zlib changes
Claus Gittinger <cg@exept.de>
parents: 2700
diff changeset
   403
"/            prevScanline := thisScanline.
8ca05242522e adapt to zlib changes
Claus Gittinger <cg@exept.de>
parents: 2700
diff changeset
   404
"/            thisScanline := temp
8ca05242522e adapt to zlib changes
Claus Gittinger <cg@exept.de>
parents: 2700
diff changeset
   405
"/    ]
2509
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   406
!
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   407
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   408
processNonInterlacedGlobalDATA
3821
940aaefb5f77 #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 3819
diff changeset
   409
    | "data n" zlibReader filter temp "filtersSeen" i|
2696
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
   410
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
   411
    "/ filtersSeen := Set new.
2695
6197b6af7f4f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2683
diff changeset
   412
6197b6af7f4f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2683
diff changeset
   413
"/    data := ByteArray new:(self bytesPerRow * height)+1000.
6197b6af7f4f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2683
diff changeset
   414
"/    n := ZipStream uncompress: globalDataChunk into: data.
6197b6af7f4f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2683
diff changeset
   415
"/    self halt.
2509
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   416
3821
940aaefb5f77 #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 3819
diff changeset
   417
    globalDataChunk reset.
940aaefb5f77 #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 3819
diff changeset
   418
    zlibReader := ZipStream readOpenAsZipStreamOn:globalDataChunk suppressHeaderAndChecksum:false.
2696
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
   419
    zlibReader binary.
2509
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
   420
1671
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   421
    prevScanline := ByteArray new: bytesPerScanline.
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   422
    thisScanline := ByteArray new: bytesPerScanline.
2725
a480f3671588 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2709
diff changeset
   423
    0 to: height - 1 do:[:y | 
3343
ca3446a105d2 class: PNGReader
Stefan Vogel <sv@exept.de>
parents: 3327
diff changeset
   424
        filter := zlibReader nextByte.
2696
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
   425
        "/ filtersSeen add: filter.
2725
a480f3671588 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2709
diff changeset
   426
        (filter notNil and: [filter between: 0 and: 4]) ifFalse: [
3673
22cb72dfcaf9 #QUALITY by stefan
Stefan Vogel <sv@exept.de>
parents: 3612
diff changeset
   427
            'PNGReader: unsupported filter: ' infoPrint. filter infoPrintCR.
2725
a480f3671588 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2709
diff changeset
   428
            ^ self
a480f3671588 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2709
diff changeset
   429
        ].
2696
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
   430
        zlibReader next: bytesPerScanline into: thisScanline startingAt: 1.
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
   431
        filter ~~ 0 ifTrue:[ self filterScanline: filter count: bytesPerScanline ].
2725
a480f3671588 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2709
diff changeset
   432
a480f3671588 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2709
diff changeset
   433
        i := y * bytesPerScanline.
a480f3671588 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2709
diff changeset
   434
        data replaceFrom:i+1 to:(i+bytesPerScanline) with:thisScanline startingAt:1.
a480f3671588 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2709
diff changeset
   435
2695
6197b6af7f4f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2683
diff changeset
   436
        temp := prevScanline.
6197b6af7f4f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2683
diff changeset
   437
        prevScanline := thisScanline.
6197b6af7f4f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2683
diff changeset
   438
        thisScanline := temp
3505
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3461
diff changeset
   439
    ].
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3461
diff changeset
   440
    "/ Fill in mask if image contains alpha channel
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3461
diff changeset
   441
    photometric == #rgba ifTrue:[ 
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3461
diff changeset
   442
        | maskBits |
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3461
diff changeset
   443
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3461
diff changeset
   444
        mask := AlphaMask width: width height: height.
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3461
diff changeset
   445
        maskBits := ByteArray new: width * height.
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3461
diff changeset
   446
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3461
diff changeset
   447
        0 to: height - 1 do:[:y | 
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3461
diff changeset
   448
            0 to: width - 1 do:[:x |  
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3461
diff changeset
   449
                | alpha |
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3461
diff changeset
   450
3854
HG Automerge
parents: 3850 3821
diff changeset
   451
                alpha := data at: (y * bytesPerScanline) + (x * 4) + 1.
3505
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3461
diff changeset
   452
                maskBits at: (y*width) + x + 1 put: alpha
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3461
diff changeset
   453
            ]
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3461
diff changeset
   454
        ].
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3461
diff changeset
   455
        mask bits: maskBits
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3461
diff changeset
   456
    ].
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3461
diff changeset
   457
3642
79f73b8182e2 PNGReader: Remove obsolete wrong check for depth
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3619
diff changeset
   458
    "Modified: / 11-04-2016 / 08:39:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1671
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   459
!
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   460
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   461
processPHYSChunkLen:len
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   462
    "physical pixel chunk - currently unhandled"
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   463
2705
7ff2e44e44af *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2704
diff changeset
   464
    |pixelPerUnitX pixelPerUnitY unit|
7ff2e44e44af *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2704
diff changeset
   465
3554
f1820748e4a9 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3461
diff changeset
   466
    pixelPerUnitX := inStream nextInt32MSB:true.  
f1820748e4a9 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3461
diff changeset
   467
    pixelPerUnitY := inStream nextInt32MSB:true.
2705
7ff2e44e44af *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2704
diff changeset
   468
    unit := inStream nextByte.
7ff2e44e44af *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2704
diff changeset
   469
2707
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   470
    Verbose == true ifTrue:[
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   471
        'PNGReader: PHYS chunk ignored:' infoPrintCR.
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   472
        'PNGReader:   ppuX:' infoPrint. pixelPerUnitX infoPrintCR.
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   473
        'PNGReader:   ppuY:' infoPrint. pixelPerUnitY infoPrintCR.
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   474
        'PNGReader:   unit:' infoPrint. unit infoPrintCR.
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   475
    ].
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   476
2705
7ff2e44e44af *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2704
diff changeset
   477
    ^ true
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   478
!
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   479
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   480
processPLTEChunkLen:len
1671
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   481
    "read a color palette"
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
   482
2725
a480f3671588 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2709
diff changeset
   483
    |n "{ Class: SmallInteger }"
a480f3671588 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2709
diff changeset
   484
     redBytes greenBytes blueBytes|
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   485
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   486
    (len \\ 3) ~~ 0 ifTrue:[
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   487
        'PNGReader: invalid size of PLTE chunk' infoPrintCR.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   488
        ^ false
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   489
    ].
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   490
    n := len // 3.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   491
    redBytes := ByteArray new:n.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   492
    greenBytes := ByteArray new:n.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   493
    blueBytes := ByteArray new:n.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   494
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   495
    1 to:n do:[:i |
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   496
        redBytes at:i put:(inStream nextByte).
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   497
        greenBytes at:i put:(inStream nextByte).
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   498
        blueBytes at:i put:(inStream nextByte)
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   499
    ].
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   500
2725
a480f3671588 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2709
diff changeset
   501
    colorMap := MappedPalette 
a480f3671588 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2709
diff changeset
   502
                    redVector:redBytes 
a480f3671588 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2709
diff changeset
   503
                    greenVector:greenBytes 
a480f3671588 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2709
diff changeset
   504
                    blueVector:blueBytes.
a480f3671588 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2709
diff changeset
   505
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   506
    ^ true
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   507
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   508
    "Created: 21.6.1996 / 21:22:28 / cg"
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   509
    "Modified: 21.6.1996 / 21:43:01 / cg"
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   510
!
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   511
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   512
processSBITChunkLen:len
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   513
    inStream skip:len.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   514
    ^ true
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   515
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   516
    "Created: 21.6.1996 / 21:13:09 / cg"
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   517
!
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   518
3762
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   519
processTEXTChunkLen:len    
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   520
    "/ textual data in iso8859 coding.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   521
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   522
    "/ currently ignored - not needed to display png images
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   523
    "/   Keyword:        1-79 bytes (character string)
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   524
    "/   Null separator: 1 byte
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   525
    "/   Text:           n bytes (character string)
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   526
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   527
    "/ if needed, set processTextChunks to true somewhere...
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   528
    processTextChunks == true ifTrue:[
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   529
        |chunkData keyword text i|
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   530
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   531
        chunkData := inStream nextBytes:len.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   532
        i := chunkData indexOf:0.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   533
        keyword := (chunkData copyTo:i-1) asString.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   534
        text := (chunkData copyFrom:i+1) asString.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   535
        self handleText:text keyword:keyword.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   536
    ] ifFalse:[  
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   537
        inStream skip:len.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   538
    ].    
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   539
    ^ true
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   540
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   541
    "Modified: 21.6.1996 / 21:15:27 / cg"
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   542
!
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   543
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   544
processTIMEChunkLen:len
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   545
    inStream skip:len.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   546
    ^ true
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   547
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   548
    "Created: 21.6.1996 / 21:15:43 / cg"
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   549
    "Modified: 21.6.1996 / 21:20:42 / cg"
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   550
!
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   551
2707
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   552
processTRNSChunkLen:len
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   553
    inStream skip:len.
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   554
    ^ true
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   555
!
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   556
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   557
processZTXTChunkLen:len
3762
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   558
    "/ compressed text
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   559
    
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
   560
    "/ currently ignored - not needed to display png images
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   561
    inStream skip:len.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   562
    ^ true
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   563
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   564
    "Created: 21.6.1996 / 21:15:58 / cg"
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   565
! !
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   566
2696
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
   567
!PNGReader methodsFor:'private-filtering'!
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
   568
2909
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   569
filterAverage:count 
2699
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   570
    "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
   571
    
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   572
    |delta|
2699
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   573
3609
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   574
%{
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   575
    if (__isByteArray(__INST(thisScanline))
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   576
     && __isByteArray(__INST(prevScanline))
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   577
     && __isSmallInteger(__INST(depth))
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   578
     && __isSmallInteger(count)) {
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   579
        unsigned char *__thisScanline = __byteArrayVal(__INST(thisScanline));
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   580
        unsigned int __sz_this = __byteArraySize(__INST(thisScanline));
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   581
        unsigned char *__prevScanline = __byteArrayVal(__INST(prevScanline));
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   582
        unsigned int __sz_prev = __byteArraySize(__INST(prevScanline));
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   583
        INT __count = __intVal(count);
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   584
        INT __delta = __intVal(__INST(depth)) / 8;
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   585
        int __i;
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   586
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   587
        if (__delta < 1) __delta = 1;
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   588
        for (__i=0; __i<__delta; __i++) {
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   589
            __thisScanline[__i] += (__prevScanline[__i] >> 1);
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   590
        }
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   591
        for (; __i < __count; __i++) {
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   592
            __thisScanline[__i] += ((__prevScanline[__i] + __thisScanline[__i-__delta]) >> 1);
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   593
        }
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   594
        RETURN(self);
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   595
    }
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   596
%}.
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   597
1619ea562333 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3608
diff changeset
   598
    delta := depth // 8 max:1.
2909
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   599
    1 to:delta do:[:i | 
3384
0761606da988 class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3343
diff changeset
   600
        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
   601
    ].
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   602
    delta + 1 to:count do:[:i | 
3384
0761606da988 class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3343
diff changeset
   603
        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
   604
    ]
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   605
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   606
    "Modified: / 03-05-2011 / 12:14:01 / cg"
2699
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   607
!
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   608
2696
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
   609
filterHorizontal:count
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
   610
    "use the pixel to the left as a predictor"
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
   611
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
   612
    |delta|
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
   613
3608
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   614
%{
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   615
    if (__isByteArray(__INST(thisScanline))
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   616
     && __isByteArray(__INST(prevScanline))
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   617
     && __isSmallInteger(__INST(depth))
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   618
     && __isSmallInteger(count)) {
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   619
        unsigned char *__thisScanline = __byteArrayVal(__INST(thisScanline));
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   620
        unsigned int __sz_this = __byteArraySize(__INST(thisScanline));
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   621
        unsigned char *__prevScanline = __byteArrayVal(__INST(prevScanline));
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   622
        unsigned int __sz_prev = __byteArraySize(__INST(prevScanline));
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   623
        INT __count = __intVal(count);
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   624
        INT __delta = __intVal(__INST(depth)) / 8;
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   625
        int __i;
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   626
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   627
        if (__delta < 1) __delta = 1;
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   628
        for (__i = __delta; __i < __count; __i++) {
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   629
            __thisScanline[__i] = __thisScanline[__i] + __thisScanline[__i-__delta];
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   630
        }
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   631
        RETURN(self);
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   632
    }
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   633
%}.
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   634
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   635
    delta := depth // 8 max:1.
2696
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
   636
    delta+1 to:count do:[:i|
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
   637
        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
   638
    ]
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
   639
!
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
   640
2699
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   641
filterNone: count
2909
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   642
    "/ no filter - scanline is as is
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   643
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   644
    "Modified: / 03-05-2011 / 12:14:20 / cg"
2699
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   645
!
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   646
2909
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   647
filterPaeth:count 
2697
8e8223bf25af more stuff added (but still not complete)
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   648
    "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
   649
     predict the value of this pixel"
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   650
    
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   651
    |delta|
2697
8e8223bf25af more stuff added (but still not complete)
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   652
3607
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   653
%{
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   654
    if (__isByteArray(__INST(thisScanline))
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   655
     && __isByteArray(__INST(prevScanline))
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   656
     && __isSmallInteger(__INST(depth))
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   657
     && __isSmallInteger(count)) {
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   658
        unsigned char *__thisScanline = __byteArrayVal(__INST(thisScanline));
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   659
        unsigned int __sz_this = __byteArraySize(__INST(thisScanline));
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   660
        unsigned char *__prevScanline = __byteArrayVal(__INST(prevScanline));
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   661
        unsigned int __sz_prev = __byteArraySize(__INST(prevScanline));
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   662
        INT __count = __intVal(count);
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   663
        INT __delta = __intVal(__INST(depth)) / 8;
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   664
        int __i;
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   665
        
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   666
        if (__delta < 1) __delta = 1;
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   667
        for (__i=0; __i<__delta; __i++) {
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   668
            unsigned int __pix = __thisScanline[__i] + __prevScanline[__i];
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   669
            __thisScanline[__i] = __pix;
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   670
        }
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   671
        for (; __i < __count; __i++) {
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   672
            int __pCenter = __thisScanline[__i];
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   673
            int __pLeft = __thisScanline[__i - __delta];
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   674
            int __pAbove = __prevScanline[__i];
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   675
            int __pAboveLeft = __prevScanline[__i - __delta];
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   676
            int __pa, __pb, __pc;
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   677
            int __p;
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   678
            
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   679
            __pa = (__pAbove - __pAboveLeft); 
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   680
            __pa = __pa < 0 ? -__pa : __pa;
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   681
            __pb = (__pLeft - __pAboveLeft);
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   682
            __pb = __pb < 0 ? -__pb : __pb;
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   683
            __pc = __pLeft + __pAbove - __pAboveLeft - __pAboveLeft;
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   684
            __pc = __pc < 0 ? -__pc : __pc; 
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   685
            if ((__pa <= __pb) && (__pa <= __pc)) __p = __pLeft;
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   686
            else if (__pb <= __pc) __p = __pAbove;
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   687
            else __p = __pAboveLeft;
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   688
            
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   689
            __thisScanline[__i] = __pCenter + __p;
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   690
        }
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   691
        RETURN(self);
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   692
    }
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   693
%}.
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   694
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   695
    delta := depth // 8 max:1.
2909
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   696
    1 to:delta do:[:i | 
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   697
        thisScanline 
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   698
            at:i
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   699
            put:(((thisScanline at:i) + (prevScanline at:i)) bitAnd:255)
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   700
    ].
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   701
    delta + 1 to:count do:[:i | 
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   702
        thisScanline 
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   703
            at:i
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   704
            put:(((thisScanline at:i) + (self 
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   705
                            paethPredictLeft:(thisScanline at:i - delta)
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   706
                            above:(prevScanline at:i)
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   707
                            aboveLeft:(prevScanline at:i - delta))) 
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   708
                    bitAnd:255)
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   709
    ]
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   710
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   711
    "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
   712
!
8e8223bf25af more stuff added (but still not complete)
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   713
2696
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
   714
filterScanline:filterType count:count
3612
0784a518d8f4 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3611
diff changeset
   715
    filterType == 0 ifTrue:[^ self].
0784a518d8f4 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3611
diff changeset
   716
    
2696
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
   717
    self 
3612
0784a518d8f4 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3611
diff changeset
   718
        perform:(#(filterHorizontal: filterVertical: filterAverage: filterPaeth:) at:filterType)
2696
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
   719
        with:count
2909
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   720
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   721
    "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
   722
!
8e8223bf25af more stuff added (but still not complete)
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   723
2909
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   724
filterVertical:count 
2697
8e8223bf25af more stuff added (but still not complete)
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   725
    "Use the pixel above as a predictor"
2909
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   726
    
3608
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   727
%{
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   728
    if (__isByteArray(__INST(thisScanline))
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   729
     && __isByteArray(__INST(prevScanline))
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   730
     && __isSmallInteger(count)) {
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   731
        unsigned char *__thisScanline = __byteArrayVal(__INST(thisScanline));
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   732
        unsigned int __sz_this = __byteArraySize(__INST(thisScanline));
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   733
        unsigned char *__prevScanline = __byteArrayVal(__INST(prevScanline));
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   734
        unsigned int __sz_prev = __byteArraySize(__INST(prevScanline));
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   735
        INT __count = __intVal(count);
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   736
        int __i;
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   737
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   738
        for (__i=0; __i<__count; __i++) {
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   739
            unsigned int __pix = __thisScanline[__i] + __prevScanline[__i];
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   740
            __thisScanline[__i] = __pix;
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   741
        }
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   742
        RETURN(self);
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   743
    }
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   744
%}.
ffd67647a98b #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3607
diff changeset
   745
2909
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   746
    1 to:count do:[:i | 
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   747
        thisScanline 
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   748
            at:i
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   749
            put:(((thisScanline at:i) + (prevScanline at:i)) bitAnd:255)
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   750
    ]
2697
8e8223bf25af more stuff added (but still not complete)
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   751
2909
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   752
    "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
   753
!
8e8223bf25af more stuff added (but still not complete)
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   754
3607
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   755
paethPredictLeft: l above: a aboveLeft: al
2697
8e8223bf25af more stuff added (but still not complete)
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   756
    "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
   757
8e8223bf25af more stuff added (but still not complete)
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   758
    | pa pb pc |
8e8223bf25af more stuff added (but still not complete)
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   759
3607
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   760
    pa := a > al ifTrue: [a - al] ifFalse: [al - a].
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   761
    pb := l > al ifTrue: [l - al] ifFalse: [al - l].
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   762
    pc := l + a - al - al.
2697
8e8223bf25af more stuff added (but still not complete)
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   763
    pc < 0 ifTrue: [
8e8223bf25af more stuff added (but still not complete)
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   764
        pc := pc * -1
8e8223bf25af more stuff added (but still not complete)
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   765
    ].
3607
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   766
    ((pa <= pb) and: [pa <= pc]) ifTrue: [^ l].
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   767
    (pb <= pc) ifTrue: [^ a].
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
   768
    ^ al
2696
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
   769
! !
99339f07db68 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2695
diff changeset
   770
2699
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   771
!PNGReader methodsFor:'private-pixel copy'!
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   772
2909
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   773
copyPixels:y at:startX by:incX 
2704
bbcc771de65c *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2703
diff changeset
   774
    "Handle interlaced pixels of supported colorTypes"
2909
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   775
    
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   776
    |s|
2699
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   777
3598
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   778
    "/ per color type copy methods
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   779
    s := #( 
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   780
             #copyPixelsGray:at:by:         "/ 0
2909
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   781
             nil
3598
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   782
             #copyPixelsRGB:at:by:          "/ 2
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   783
             #copyPixelsIndexed:at:by:      "/ 3
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   784
             #copyPixelsGrayAlpha:at:by:    "/ 4 
2909
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   785
             nil 
3598
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   786
             #copyPixelsRGBA:at:by:         "/ 6
2909
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   787
        ) at:colorType + 1.
3437
4e1cf7b6b492 class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3384
diff changeset
   788
    self perform:s with:y with:startX with:incX
1848
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
   789
2909
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
   790
    "Modified: / 03-05-2011 / 12:02:45 / cg"
3327
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
   791
!
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
   792
3598
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   793
copyPixelsGray:y at:startX by:incX 
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   794
    "Handle interlaced pixels of supported colorTypes.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   795
     Untested code - please verify"
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   796
3611
310db973356e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3609
diff changeset
   797
    |srcIndex "{ Class: SmallInteger }"
310db973356e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3609
diff changeset
   798
     srcMask  "{ Class: SmallInteger }"
310db973356e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3609
diff changeset
   799
     nPixels  "{ Class: SmallInteger }"
310db973356e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3609
diff changeset
   800
     dstIndex "{ Class: SmallInteger }"
310db973356e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3609
diff changeset
   801
     dstMask  "{ Class: SmallInteger }"
310db973356e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3609
diff changeset
   802
     x        "{ Class: SmallInteger }"
310db973356e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3609
diff changeset
   803
     bits     "{ Class: SmallInteger }"
310db973356e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3609
diff changeset
   804
     bitMask  "{ Class: SmallInteger }"
310db973356e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3609
diff changeset
   805
     rS       "{ Class: SmallInteger }"
310db973356e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3609
diff changeset
   806
     lS       "{ Class: SmallInteger }"
310db973356e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3609
diff changeset
   807
     rowIndex "{ Class: SmallInteger }"|
3598
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   808
    
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   809
    nPixels := width // incX.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   810
    srcIndex := 0. srcMask := 0. x := startX.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   811
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   812
    depth == 1 ifTrue:[
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   813
        dstIndex := (y * bytesPerScanline) + (startX // 8) + 1.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   814
        dstMask := 16r80 >> (x \\ 8).
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   815
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   816
        1 to:nPixels do:[:cnt |
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   817
            srcMask == 0 ifTrue:[
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   818
                srcMask := 16r80.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   819
                srcIndex := srcIndex + 1.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   820
                bits := thisScanline at:srcIndex. 
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   821
            ].
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   822
            bitMask := (bits bitAnd:srcMask) == 0 ifTrue:[0] ifFalse:[dstMask].
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   823
            bitMask ~~ 0 ifTrue:[
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   824
                data at:dstIndex put:((data at:dstIndex) bitOr:bitMask).
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   825
            ].    
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   826
            x := x + incX.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   827
            dstMask := dstMask >> incX.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   828
            dstMask == 0 ifTrue:[
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   829
                dstIndex := dstIndex + 1.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   830
                dstMask := 16r80 >> (x \\ 8).
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   831
            ].
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   832
            srcMask := srcMask bitShift:-1.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   833
        ].
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   834
        ^ self.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   835
    ].
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   836
    
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   837
    depth == 2 ifTrue:[
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   838
        dstIndex := (y * bytesPerScanline) + (startX // 4) + 1.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   839
        lS := 6 - ((x \\ 4) * 2).
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   840
        rS := -1. 
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   841
        1 to:nPixels do:[:cnt |
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   842
            rS < 0 ifTrue:[
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   843
                srcIndex := srcIndex + 1.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   844
                bits := thisScanline at:srcIndex.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   845
                rS := 6.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   846
            ].
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   847
            bitMask := ((bits >> rS) bitAnd:2r11).
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   848
            bitMask ~~ 0 ifTrue:[
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   849
                bitMask := bitMask << lS.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   850
                data at:dstIndex put:((data at:dstIndex) bitOr:bitMask).
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   851
            ].    
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   852
            lS := lS - (incX * 2).
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   853
            lS < 0 ifTrue:[
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   854
                lS <= -8 ifTrue:[
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   855
                    dstIndex := dstIndex + 2.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   856
                    lS := lS + 8 + 8.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   857
                ] ifFalse:[
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   858
                    dstIndex := dstIndex + 1.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   859
                    lS := lS + 8.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   860
                ].    
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   861
            ].
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   862
            rS := rS - 2.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   863
        ].
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   864
        ^ self.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   865
    ].
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   866
    
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   867
    depth == 4 ifTrue:[
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   868
        rowIndex := (y * bytesPerScanline) + 1.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   869
        dstIndex := rowIndex + (x // 2).
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   870
        rS := -1. 
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   871
        1 to:nPixels do:[:cnt |
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   872
            rS < 0 ifTrue:[
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   873
                srcIndex := srcIndex + 1.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   874
                bits := thisScanline at:srcIndex.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   875
                rS := 4.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   876
            ].
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   877
            bitMask := ((bits >> rS) bitAnd:2r1111).
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   878
            x even ifTrue:[    
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   879
                bitMask := bitMask bitShift:4.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   880
            ].    
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   881
            data at:dstIndex put:((data at:dstIndex) bitOr:bitMask).
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   882
            x := x + incX.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   883
            dstIndex := rowIndex + (x // 2).
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   884
            rS := rS - 4.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   885
        ].
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   886
        ^ self.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   887
    ].
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   888
    
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   889
    depth == 8 ifTrue:[
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   890
        srcIndex := 1.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   891
        dstIndex := (y * bytesPerScanline) + (startX) + 1.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   892
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   893
        1 to:nPixels do:[:n |
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   894
            data at:dstIndex put:(thisScanline at:srcIndex).
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   895
            srcIndex := srcIndex + 1.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   896
            dstIndex := dstIndex + incX
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   897
        ].
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   898
        ^ self.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   899
    ].
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   900
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   901
    depth == 16 ifTrue:[
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   902
        srcIndex := 1.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   903
        dstIndex := (y * bytesPerScanline) + (startX*2) + 1.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   904
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   905
        1 to:nPixels do:[:n |
3601
05caf7f1e324 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3599
diff changeset
   906
            data unsignedInt16At:dstIndex put:(thisScanline unsignedInt16At:srcIndex).
3598
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   907
            srcIndex := srcIndex + 2.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   908
            dstIndex := dstIndex + (incX * 2)
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   909
        ].
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   910
        ^ self.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   911
    ].
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   912
    self error:'unsupported depth'.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   913
!
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   914
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   915
copyPixelsIndexed:y at:startX by:incX 
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   916
    self copyPixelsGray:y at:startX by:incX 
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   917
!
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   918
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   919
copyPixelsRGB:y at:startX by:incX 
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   920
    "Handle interlaced pixels of supported colorTypes.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   921
     Untested code - please verify"
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   922
3611
310db973356e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3609
diff changeset
   923
    |srcIndex "{ Class: SmallInteger }" 
310db973356e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3609
diff changeset
   924
     nPixels  "{ Class: SmallInteger }"
310db973356e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3609
diff changeset
   925
     dstIndex "{ Class: SmallInteger }"
310db973356e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3609
diff changeset
   926
     dstInc   "{ Class: SmallInteger }"
310db973356e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3609
diff changeset
   927
     bpp      "{ Class: SmallInteger }"|
3598
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   928
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   929
    bpp := bytesPerScanline // width.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   930
    
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   931
    "/ 1 byte per r,g,b
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   932
    srcIndex := 1.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   933
    dstIndex := (y * bytesPerScanline) + (startX * bpp) + 1.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   934
    dstInc := incX * bpp.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   935
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   936
    nPixels := width // incX.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   937
    1 to:nPixels do:[:n |
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   938
        data replaceFrom:dstIndex to:dstIndex+bpp-1 with:thisScanline startingAt:srcIndex.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   939
        srcIndex := srcIndex + bpp.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   940
        dstIndex := dstIndex + dstInc
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   941
    ].
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   942
!
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
   943
3327
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
   944
copyPixelsRGBA:y at:startX by:incX 
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
   945
    "Handle interlaced pixels of supported colorTypes.
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
   946
     Untested code - please verify"
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
   947
3611
310db973356e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3609
diff changeset
   948
    |srcIndex "{ Class: SmallInteger }"
310db973356e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3609
diff changeset
   949
     nPixels  "{ Class: SmallInteger }"
310db973356e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3609
diff changeset
   950
     dstIndex "{ Class: SmallInteger }"
310db973356e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3609
diff changeset
   951
     dstInc   "{ Class: SmallInteger }"|
3327
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
   952
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
   953
    srcIndex := 1.
3437
4e1cf7b6b492 class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3384
diff changeset
   954
    dstIndex := (y * bytesPerScanline) + (startX * 4) + 1.
4e1cf7b6b492 class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3384
diff changeset
   955
    dstInc := incX * 4.
3327
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
   956
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
   957
    nPixels := thisScanline size.
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
   958
    [srcIndex < nPixels] whileTrue:[
3437
4e1cf7b6b492 class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3384
diff changeset
   959
        data replaceFrom:dstIndex to:dstIndex+3 with:thisScanline startingAt:srcIndex.
3327
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
   960
        srcIndex := srcIndex + 4.
3437
4e1cf7b6b492 class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3384
diff changeset
   961
        dstIndex := dstIndex + dstInc
3327
4758853d1abe class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3183
diff changeset
   962
    ].
2699
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   963
! !
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   964
84b52c63e242 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2698
diff changeset
   965
!PNGReader methodsFor:'private-reading'!
2697
8e8223bf25af more stuff added (but still not complete)
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
   966
2683
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
   967
getChunk
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
   968
    |len type crc|
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
   969
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
   970
    inStream atEnd ifTrue:[^ false].
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
   971
3554
f1820748e4a9 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3461
diff changeset
   972
    len := inStream nextInt32MSB:true.
2683
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
   973
    type := String new:4.
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
   974
    (inStream nextBytes:4 into:type) ~~ 4 ifTrue:[^ false].
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
   975
2707
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   976
    Verbose == true ifTrue:[
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   977
        'len: ' infoPrint. len infoPrint. ' type: ' infoPrint. type infoPrintCR.
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   978
    ].
2683
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
   979
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
   980
    type = 'IEND' ifTrue:[^ false].
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
   981
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
   982
    (self processChunk:type len:len) ifFalse:[^ false].
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
   983
3554
f1820748e4a9 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3461
diff changeset
   984
    crc := inStream nextInt32MSB:true.  "/ ignored - for now
2683
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
   985
    ^ true
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
   986
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
   987
    "Created: 21.6.1996 / 21:09:36 / cg"
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
   988
    "Modified: 21.6.1996 / 21:20:26 / cg"
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
   989
!
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
   990
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
   991
getIHDRChunk
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
   992
    |len type crc|
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
   993
3554
f1820748e4a9 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3461
diff changeset
   994
    len := inStream nextInt32MSB:true.
2683
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
   995
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
   996
    type := String new:4.
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
   997
    inStream nextBytes:4 into:type.
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
   998
3183
434c79bbe0bf class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3100
diff changeset
   999
    type = 'IHDR' ifFalse:[self halt:'expected IHDR magic'. ^ false].
434c79bbe0bf class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 3100
diff changeset
  1000
    len == 13 ifFalse:[self halt:'unexpected IHDR length'. ^ false].
2683
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1001
3554
f1820748e4a9 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3461
diff changeset
  1002
    width := inStream nextInt32MSB:true.        
f1820748e4a9 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3461
diff changeset
  1003
    height := inStream nextInt32MSB:true.        
2683
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1004
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1005
    (width <= 0 or:[height <= 0]) ifTrue:[
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1006
        'PNGReader: invalid dimension(s)' infoPrintCR.
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1007
        ^ false.
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1008
    ].
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1009
    self reportDimension.
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1010
3607
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1011
    bitsPerChannel := inStream nextByte.
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1012
    depth := bitsPerChannel. "/ will be changed by setColorType.
2683
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1013
    colorType := inStream nextByte.
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1014
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1015
    compressionMethod := inStream nextByte.
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1016
    filterMethod := inStream nextByte.
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1017
    interlaceMode := inStream nextByte.
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1018
2707
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
  1019
    Verbose == true ifTrue:[
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
  1020
        'PNGReader: IHDR:' infoPrintCR.
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
  1021
        'PNGReader:   width: ' infoPrint. width infoPrintCR.
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
  1022
        'PNGReader:   height: ' infoPrint. height infoPrintCR.
3607
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1023
        'PNGReader:   bitsPerChannel: ' infoPrint. bitsPerChannel infoPrintCR.
2707
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
  1024
        'PNGReader:   colorType: ' infoPrint. colorType infoPrintCR.
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
  1025
        'PNGReader:   compressionMethod: ' infoPrint. compressionMethod infoPrintCR.
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
  1026
        'PNGReader:   filterMethod: ' infoPrint. filterMethod infoPrintCR.
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
  1027
        'PNGReader:   interlaceMode: ' infoPrint. interlaceMode infoPrintCR.
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
  1028
    ].
e9c5c3ab8c18 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
  1029
3554
f1820748e4a9 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3461
diff changeset
  1030
    crc := inStream nextInt32MSB:true.
2683
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1031
    ^ true
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1032
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1033
    "Modified: 21.6.1996 / 21:38:35 / cg"
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1034
!
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1035
3762
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
  1036
handleText:text keyword:keyword
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
  1037
    "/ things like exif data etc.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
  1038
    "/ self halt.
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
  1039
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
  1040
    "/Standard keywords for text chunks:
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
  1041
    "/
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
  1042
    "/   Title            Short (one line) title or caption for image
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
  1043
    "/   Author           Name of image's creator
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
  1044
    "/   Description      Description of image (possibly long)
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
  1045
    "/   Copyright        Copyright notice
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
  1046
    "/   Creation Time    Time of original image creation
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
  1047
    "/   Software         Software used to create the image
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
  1048
    "/   Disclaimer       Legal disclaimer
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
  1049
    "/   Warning          Warning of nature of content
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
  1050
    "/   Source           Device used to create the image
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
  1051
    "/   Comment          Miscellaneous comment; conversion from
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
  1052
    "/                    GIF comment
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
  1053
!
036884e46f66 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3724
diff changeset
  1054
3505
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3461
diff changeset
  1055
setColorType:pngColorType
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3461
diff changeset
  1056
    pngColorType == 0 ifTrue:[
1848
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1057
        photometric := #blackIs0.
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1058
        samplesPerPixel := 1.
3607
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1059
        bitsPerSample := Array with:bitsPerChannel.
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1060
        depth := bitsPerChannel.
1848
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1061
        ^ true.
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1062
    ].
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1063
3505
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3461
diff changeset
  1064
    pngColorType == 2 ifTrue:[
3607
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1065
        bitsPerChannel < 8 ifTrue:[
1848
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1066
            'PNGReader: invalid colorType/depth combination' infoPrintCR.
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1067
            ^ false.
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1068
        ].
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1069
        photometric := #rgb.
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1070
        samplesPerPixel := 3.
3607
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1071
        bitsPerSample := Array with:bitsPerChannel with:bitsPerChannel with:bitsPerChannel.
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1072
        depth := bitsPerChannel * 3.
1848
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1073
        ^ true.
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1074
    ].
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1075
3505
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3461
diff changeset
  1076
    pngColorType == 3 ifTrue:[
3607
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1077
        bitsPerChannel == 16 ifTrue:[
1848
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1078
            'PNGReader: invalid colorType/depth combination' infoPrintCR.
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1079
            ^ false.
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1080
        ].
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1081
        photometric := #palette.
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1082
        samplesPerPixel := 1.
3607
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1083
        bitsPerSample := Array with:bitsPerChannel.
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1084
        depth := bitsPerChannel.
1848
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1085
        ^ true.
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1086
    ].
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1087
3505
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3461
diff changeset
  1088
    pngColorType == 4 ifTrue:[
3607
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1089
        bitsPerChannel < 8 ifTrue:[
1848
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1090
            'PNGReader: invalid colorType/depth combination' infoPrintCR.
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1091
            ^ false.
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1092
        ].
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1093
        photometric := #blackIs0.
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1094
        samplesPerPixel := 2.
3607
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1095
        bitsPerSample := Array with:bitsPerChannel with:bitsPerChannel.
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1096
        depth := bitsPerChannel * 2.
1848
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1097
        ^ true.
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1098
    ].
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1099
3505
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3461
diff changeset
  1100
    pngColorType == 6 ifTrue:[
3607
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1101
        bitsPerChannel < 8 ifTrue:[
1848
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1102
            'PNGReader: invalid colorType/depth combination' infoPrintCR.
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1103
            ^ false.
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1104
        ].
3505
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3461
diff changeset
  1105
        photometric := #rgba.
1848
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1106
        samplesPerPixel := 4.
3607
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1107
        bitsPerSample := Array with:bitsPerChannel with:bitsPerChannel with:bitsPerChannel with:bitsPerChannel.
a1b3d6654923 #UI_ENHANCEMENT
Claus Gittinger <cg@exept.de>
parents: 3601
diff changeset
  1108
        depth := bitsPerChannel * 4.
1848
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1109
        ^ true.
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1110
    ].
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1111
3505
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3461
diff changeset
  1112
    ('PNGReader: invalid colorType: ' , pngColorType printString , '.') infoPrintCR.
1848
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1113
    ^ false
3505
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3461
diff changeset
  1114
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3461
diff changeset
  1115
    "Modified: / 01-09-2015 / 16:02:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1848
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1116
! !
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1117
1805
93f557cbe600 category changes
Claus Gittinger <cg@exept.de>
parents: 1759
diff changeset
  1118
!PNGReader methodsFor:'reading'!
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1119
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1120
fromStream:aStream
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1121
    "read a stream containing a PNG image.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1122
     Leave image description in instance variables."
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1123
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1124
    |header|
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1125
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1126
    inStream := aStream.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1127
    aStream binary.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1128
1671
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
  1129
    "PNG-files are always msb (network-world)"
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1130
    byteOrder := #msb.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1131
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1132
    header := ByteArray new:8.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1133
    aStream nextBytes:8 into:header.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1134
2683
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1135
    header ~= (self pngHeader) ifTrue:[
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1136
        'PNGReader: not a png file.' infoPrintCR.
3598
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1137
        Image badImageFormatQuerySignal raiseRequestErrorString:'PNGReader: not a png file'.
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1138
        ^ nil
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1139
    ].
2695
6197b6af7f4f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2683
diff changeset
  1140
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1141
    (self getIHDRChunk) ifFalse:[
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1142
        'PNGReader: required IHDR chunk missing.' infoPrintCR.
3598
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1143
        Image badImageFormatQuerySignal raiseRequestErrorString:'PNGReader: required IHDR chunk missing'.
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1144
        ^ nil
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1145
    ].
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1146
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1147
    compressionMethod ~~ 0 ifTrue:[
3598
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1148
        ('PNGReader: compressionMethod %s not supported.' printfWith:compressionMethod printString) infoPrintCR.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1149
        Image badImageFormatQuerySignal raiseRequestErrorString:'PNGReader: unsupported compression method'.
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1150
        ^ nil
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1151
    ].
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1152
    filterMethod > 0 ifTrue:[
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1153
        'PNGReader: invalid filterMethod' infoPrintCR.
3598
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1154
        Image badImageFormatQuerySignal raiseRequestErrorString:'PNGReader: invalid/unsupported filterMethod'.
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1155
        ^ nil.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1156
    ].
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1157
    interlaceMode > 1 ifTrue:[
3598
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1158
        Image badImageFormatQuerySignal raiseRequestErrorString:'PNGReader: invalid/unsupported interlaceMode'.
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1159
        'PNGReader: invalid interlaceMode' infoPrintCR.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1160
        ^ nil.
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1161
    ].
1671
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
  1162
    (self setColorType:colorType) ifFalse:[
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1163
        ^ nil
1671
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
  1164
    ].
2706
3c2c631f9d16 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2705
diff changeset
  1165
1671
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
  1166
    [self getChunk] whileTrue.
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1167
3598
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1168
    bytesPerScanline := self bytesPerRow.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1169
    data := ByteArray new:(bytesPerScanline * height).
2697
8e8223bf25af more stuff added (but still not complete)
Claus Gittinger <cg@exept.de>
parents: 2696
diff changeset
  1170
2509
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
  1171
    globalDataChunk notNil ifTrue:[
3343
ca3446a105d2 class: PNGReader
Stefan Vogel <sv@exept.de>
parents: 3327
diff changeset
  1172
        self processGlobalIDATChunk.
ca3446a105d2 class: PNGReader
Stefan Vogel <sv@exept.de>
parents: 3327
diff changeset
  1173
        globalDataChunk := nil.
2509
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
  1174
    ].
866b56cabe7e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
  1175
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1176
    photometric == #palette ifTrue:[
2725
a480f3671588 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2709
diff changeset
  1177
        colorMap isNil ifTrue:[
3598
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1178
            Image badImageFormatQuerySignal raiseRequestErrorString:'PNGReader: palette chunk missing'.
bdd7048a0f2e #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3554
diff changeset
  1179
            'PNGReader: palette chunk missing.' infoPrintCR.
2725
a480f3671588 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2709
diff changeset
  1180
            "/ ^ nil
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1181
        ].
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1182
    ].
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1183
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1184
    "
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1185
     PNGReader fromFile:'/home/cg/libpng-0.89c/pngtest.png'
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1186
    "
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1187
2910
d5171b9245e6 comment/format in: #fromStream:
Claus Gittinger <cg@exept.de>
parents: 2909
diff changeset
  1188
    "Modified: / 03-05-2011 / 12:17:34 / cg"
1805
93f557cbe600 category changes
Claus Gittinger <cg@exept.de>
parents: 1759
diff changeset
  1189
! !
93f557cbe600 category changes
Claus Gittinger <cg@exept.de>
parents: 1759
diff changeset
  1190
2683
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1191
!PNGReader methodsFor:'writing to file'!
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1192
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1193
pngHeader
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1194
    ^ #[137 80 78 71 13 10 26 10]
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1195
!
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1196
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1197
save:image onStream:aStream
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1198
    "save image in PNG-file-format onto aStream"
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1199
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1200
    outStream := aStream.
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1201
    outStream binary.
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1202
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1203
    byteOrder := #msb.
2683
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1204
    width := image width.
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1205
    height := image height.
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1206
    photometric := image photometric.
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1207
    samplesPerPixel := image samplesPerPixel.
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1208
    bitsPerSample := image bitsPerSample.
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1209
    colorMap := image colorMap.
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1210
    data := image bits.
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1211
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1212
    outStream nextPutAll:(self pngHeader).
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1213
    self writeIHDRChunk.
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1214
    photometric == #palette ifTrue: [self writePaletteChunk].
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1215
    self writeImageDataChunk.
2683
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1216
    self writeEndChunk
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1217
!
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1218
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1219
writeChunk:chunkTypeChars size:len with:aBlock
2708
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1220
    |crc realOutStream chunkBytes|
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1221
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1222
    realOutStream := outStream.
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1223
    outStream := WriteStream on:(ByteArray new:len).
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1224
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1225
    outStream nextPutBytes:4 from:chunkTypeChars startingAt:1.
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1226
    aBlock value.
2708
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1227
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1228
    chunkBytes := outStream contents.
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1229
    crc := CRC32Stream hashValueOf:chunkBytes.
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1230
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1231
    outStream := realOutStream.
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1232
3554
f1820748e4a9 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3461
diff changeset
  1233
    realOutStream nextPutInt32:len MSB:true.
2708
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1234
    realOutStream nextPutAll:chunkBytes.
3554
f1820748e4a9 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3461
diff changeset
  1235
    realOutStream nextPutInt32:crc MSB:true.
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1236
!
2683
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1237
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1238
writeEndChunk
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1239
    self 
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1240
        writeChunk: 'IEND'
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1241
        size: 0
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1242
        with:[ ]
2683
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1243
!
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1244
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1245
writeFileHeader
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1246
    outStream nextPutAll:(self pngHeader)
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1247
!
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1248
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1249
writeIHDRChunk
3100
0c82f117bb45 class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 2910
diff changeset
  1250
    ((photometric == #whiteIs0) or:[ (photometric == #blackIs0)]) ifTrue:[
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1251
        colorType := 0.
3461
eb5a53c6b5b2 class: PNGReader
Stefan Vogel <sv@exept.de>
parents: 3437
diff changeset
  1252
        samplesPerPixel > 1 ifTrue:[ colorType := colorType + 4].  "/ +alpha
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1253
    ].
3724
4a753c4710c9 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3673
diff changeset
  1254
    ((photometric == #rgb) or:[(photometric == #rgba)]) ifTrue:[
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1255
        colorType := 2.
3461
eb5a53c6b5b2 class: PNGReader
Stefan Vogel <sv@exept.de>
parents: 3437
diff changeset
  1256
        samplesPerPixel > 3 ifTrue:[ colorType := colorType + 4].  "/ +alpha
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1257
    ].
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1258
    (photometric == #palette) ifTrue:[
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1259
        colorType := 3.
3461
eb5a53c6b5b2 class: PNGReader
Stefan Vogel <sv@exept.de>
parents: 3437
diff changeset
  1260
        samplesPerPixel > 1 ifTrue:[ colorType := colorType + 4].  "/ +alpha
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1261
    ].
3100
0c82f117bb45 class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 2910
diff changeset
  1262
    colorType isNil ifTrue:[
3461
eb5a53c6b5b2 class: PNGReader
Stefan Vogel <sv@exept.de>
parents: 3437
diff changeset
  1263
        self error:'unhandled photometric'
3100
0c82f117bb45 class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 2910
diff changeset
  1264
    ].
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1265
2683
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1266
    self 
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1267
        writeChunk: 'IHDR'
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1268
        size: 13
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1269
        with:[ 
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1270
            self writeLong:width.
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1271
            self writeLong:height.
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1272
            outStream nextPut: 8.  "Assume that all colors are 24bit"     "/ depth
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1273
            outStream nextPut: colorType.  
2683
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1274
            outStream nextPut: 0.  "Compression"
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1275
            outStream nextPut: 0.  "Filter method"
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1276
            outStream nextPut: 0   "Non-interlaced"
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1277
        ]
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1278
!
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1279
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1280
writeImageDataChunk
3821
940aaefb5f77 #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 3819
diff changeset
  1281
    |compressedByteStream compressedBytes zlibWriter idx|
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1282
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1283
    bytesPerScanline := self bytesPerRow.
3821
940aaefb5f77 #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 3819
diff changeset
  1284
    
940aaefb5f77 #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 3819
diff changeset
  1285
    compressedByteStream := WriteStream on:(ByteArray new:(bytesPerScanline*height)).
940aaefb5f77 #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 3819
diff changeset
  1286
    zlibWriter := ZipStream writeOpenAsZipStreamOn:compressedByteStream suppressHeaderAndChecksum:false.
940aaefb5f77 #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 3819
diff changeset
  1287
    zlibWriter binary.
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1288
2708
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1289
    idx := 1.
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1290
    0 to:height-1 do:[:y |
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1291
        |row|
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1292
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1293
        row := data copyFrom:idx to:(idx+bytesPerScanline-1).
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1294
        zlibWriter nextPutAll:#[0].       "/ no filter
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1295
        zlibWriter nextPutAll:row.
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1296
        idx := idx + bytesPerScanline.
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1297
    ].
2708
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1298
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1299
    zlibWriter close.
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1300
    compressedBytes := compressedByteStream contents.
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1301
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1302
    self 
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1303
        writeChunk: 'IDAT'
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1304
        size:(compressedBytes size)
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1305
        with:[ 
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1306
            outStream nextPutAll:compressedBytes
c206c9e9bd61 more for writing
Claus Gittinger <cg@exept.de>
parents: 2707
diff changeset
  1307
        ]
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1308
!
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1309
2683
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1310
writePaletteChunk
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1311
    self 
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1312
        writeChunk: 'PLTE'
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1313
        size: 3 * colorMap size
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1314
        with:[
2703
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1315
            colorMap do:[:color | 
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1316
                outStream
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1317
                    nextPut: color redByte;
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1318
                    nextPut: color greenByte;
ebf1067a3289 unfinished writing
Claus Gittinger <cg@exept.de>
parents: 2702
diff changeset
  1319
                    nextPut: color blueByte
2683
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1320
            ]
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1321
        ]
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1322
! !
8c7880d9cedb preps for writing
Claus Gittinger <cg@exept.de>
parents: 2509
diff changeset
  1323
398
aef700d15416 new suffix-table
Claus Gittinger <cg@exept.de>
parents: 308
diff changeset
  1324
!PNGReader class methodsFor:'documentation'!
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1325
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1326
version
3554
f1820748e4a9 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3461
diff changeset
  1327
    ^ '$Header$'
2909
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1328
!
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1329
3f9856162142 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2725
diff changeset
  1330
version_CVS
3554
f1820748e4a9 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3461
diff changeset
  1331
    ^ '$Header$'
3505
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3461
diff changeset
  1332
!
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3461
diff changeset
  1333
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3461
diff changeset
  1334
version_HG
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3461
diff changeset
  1335
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3461
diff changeset
  1336
    ^ '$Changeset: <not expanded> $'
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1337
! !
1671
6fbb20a4af3a more but still unfinished
Claus Gittinger <cg@exept.de>
parents: 647
diff changeset
  1338
3100
0c82f117bb45 class: PNGReader
Claus Gittinger <cg@exept.de>
parents: 2910
diff changeset
  1339
308
ba8b8191d8b6 intitial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1340
PNGReader initialize!