WindowsIconReader.st
author claus
Fri, 03 Jun 1994 02:54:11 +0200
changeset 21 66b31c91177f
parent 18 5a1262eeb9d7
child 24 6bc436eb4c4a
permissions -rw-r--r--
*** empty log message ***
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
0
3f9277473954 Initial revision
claus
parents:
diff changeset
     1
"
3f9277473954 Initial revision
claus
parents:
diff changeset
     2
 COPYRIGHT (c) 1993 by Claus Gittinger
3f9277473954 Initial revision
claus
parents:
diff changeset
     3
              All Rights Reserved
3f9277473954 Initial revision
claus
parents:
diff changeset
     4
3f9277473954 Initial revision
claus
parents:
diff changeset
     5
 This software is furnished under a license and may be used
3f9277473954 Initial revision
claus
parents:
diff changeset
     6
 only in accordance with the terms of that license and with the
3f9277473954 Initial revision
claus
parents:
diff changeset
     7
 inclusion of the above copyright notice.   This software may not
3f9277473954 Initial revision
claus
parents:
diff changeset
     8
 be provided or otherwise made available to, or used by, any
3f9277473954 Initial revision
claus
parents:
diff changeset
     9
 other person.  No title to or ownership of the software is
3f9277473954 Initial revision
claus
parents:
diff changeset
    10
 hereby transferred.
3f9277473954 Initial revision
claus
parents:
diff changeset
    11
"
3f9277473954 Initial revision
claus
parents:
diff changeset
    12
3f9277473954 Initial revision
claus
parents:
diff changeset
    13
ImageReader subclass:#WindowsIconReader
3f9277473954 Initial revision
claus
parents:
diff changeset
    14
         instanceVariableNames:''
3f9277473954 Initial revision
claus
parents:
diff changeset
    15
         classVariableNames:''
3f9277473954 Initial revision
claus
parents:
diff changeset
    16
         poolDictionaries:''
3f9277473954 Initial revision
claus
parents:
diff changeset
    17
         category:'Graphics-Support'
3f9277473954 Initial revision
claus
parents:
diff changeset
    18
!
3f9277473954 Initial revision
claus
parents:
diff changeset
    19
3f9277473954 Initial revision
claus
parents:
diff changeset
    20
WindowsIconReader comment:'
21
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    21
COPYRIGHT (c) 1993 by Claus Gittinger
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    22
              All Rights Reserved
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    23
'!
0
3f9277473954 Initial revision
claus
parents:
diff changeset
    24
21
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    25
!WindowsIconReader class methodsFor:'documentation'!
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    26
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    27
copyright
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    28
"
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    29
 COPYRIGHT (c) 1993 by Claus Gittinger
0
3f9277473954 Initial revision
claus
parents:
diff changeset
    30
              All Rights Reserved
3f9277473954 Initial revision
claus
parents:
diff changeset
    31
21
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    32
 This software is furnished under a license and may be used
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    33
 only in accordance with the terms of that license and with the
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    34
 inclusion of the above copyright notice.   This software may not
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    35
 be provided or otherwise made available to, or used by, any
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    36
 other person.  No title to or ownership of the software is
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    37
 hereby transferred.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    38
"
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    39
!
0
3f9277473954 Initial revision
claus
parents:
diff changeset
    40
21
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    41
version
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    42
"
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    43
$Header: /cvs/stx/stx/libview2/WindowsIconReader.st,v 1.6 1994-06-03 00:54:08 claus Exp $
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    44
"
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    45
!
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    46
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    47
documentation
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    48
"
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    49
    this class provides methods for loading Windows and OS2 icon files..
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    50
"
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    51
! !
0
3f9277473954 Initial revision
claus
parents:
diff changeset
    52
3f9277473954 Initial revision
claus
parents:
diff changeset
    53
!WindowsIconReader methodsFor:'reading from file'!
3f9277473954 Initial revision
claus
parents:
diff changeset
    54
21
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    55
fromOS2File: aFilename 
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    56
    inStream := self class streamReadingFile:aFilename.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    57
    inStream isNil ifTrue:[^ nil].
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    58
    inStream binary.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    59
    ^ self fromOS2Stream.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    60
!
0
3f9277473954 Initial revision
claus
parents:
diff changeset
    61
21
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    62
fromWindowsBMPFile: aFilename 
12
6804b4ee340c *** empty log message ***
claus
parents: 5
diff changeset
    63
    inStream := self class streamReadingFile:aFilename.
6804b4ee340c *** empty log message ***
claus
parents: 5
diff changeset
    64
    inStream isNil ifTrue:[^ nil].
21
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    65
    inStream binary.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    66
    ^ self fromWindowsBMPStream.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    67
!
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    68
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    69
fromWindowsICOFile: aFilename 
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    70
    inStream := self class streamReadingFile:aFilename.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    71
    inStream isNil ifTrue:[^ nil].
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    72
    ^ self fromWindowsICOStream.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    73
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    74
    "
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    75
     Image fromFile:'/phys/clam2//LocalLibrary/Images/WIN_icons/ibm.ico'.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    76
    "
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    77
!
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    78
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    79
fromWindowsICOStream
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    80
    | header inDepth
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    81
      rawMap rMap gMap bMap srcIndex dstIndex
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    82
      data4 mask tmp bytesPerRow nColor|
0
3f9277473954 Initial revision
claus
parents:
diff changeset
    83
3f9277473954 Initial revision
claus
parents:
diff changeset
    84
    inStream binary.
3f9277473954 Initial revision
claus
parents:
diff changeset
    85
3f9277473954 Initial revision
claus
parents:
diff changeset
    86
    "read the header"
3f9277473954 Initial revision
claus
parents:
diff changeset
    87
21
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    88
    header := ByteArray uninitializedNew:(6 + 16 + 40).
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    89
    inStream nextBytes:(6 + 16 + 40) into:header.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    90
    width := header at:(6+1).
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    91
    height := header at:(7+1).
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    92
    nColor := header at:(8+1).
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    93
    "10, 11, 12, 13, 14 ? (reserve)"
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    94
    "15, 16, 17, 18       pixel array size"
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    95
    "19, 20, 21, 22       offset        "
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    96
    "23, ... , 62         ?"
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    97
0
3f9277473954 Initial revision
claus
parents:
diff changeset
    98
    inDepth := header at:16r25.
3f9277473954 Initial revision
claus
parents:
diff changeset
    99
3f9277473954 Initial revision
claus
parents:
diff changeset
   100
    "read the colormap"
3f9277473954 Initial revision
claus
parents:
diff changeset
   101
21
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   102
    rawMap := ByteArray uninitializedNew:(16*4).
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   103
    inStream nextBytes:(16*4) into:rawMap.
0
3f9277473954 Initial revision
claus
parents:
diff changeset
   104
    rMap := Array new:16.
3f9277473954 Initial revision
claus
parents:
diff changeset
   105
    gMap := Array new:16.
3f9277473954 Initial revision
claus
parents:
diff changeset
   106
    bMap := Array new:16.
3f9277473954 Initial revision
claus
parents:
diff changeset
   107
    srcIndex := 1.
3f9277473954 Initial revision
claus
parents:
diff changeset
   108
    1 to:16 do:[:i |
21
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   109
        bMap at:i put:(rawMap at:srcIndex).
0
3f9277473954 Initial revision
claus
parents:
diff changeset
   110
        srcIndex := srcIndex + 1.
3f9277473954 Initial revision
claus
parents:
diff changeset
   111
        gMap at:i put:(rawMap at:srcIndex).
3f9277473954 Initial revision
claus
parents:
diff changeset
   112
        srcIndex := srcIndex + 1.
21
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   113
        rMap at:i put:(rawMap at:srcIndex).
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   114
        srcIndex := srcIndex + 1.
0
3f9277473954 Initial revision
claus
parents:
diff changeset
   115
        srcIndex := srcIndex + 1.
3f9277473954 Initial revision
claus
parents:
diff changeset
   116
    ].
3f9277473954 Initial revision
claus
parents:
diff changeset
   117
3f9277473954 Initial revision
claus
parents:
diff changeset
   118
    "read the data bits"
3f9277473954 Initial revision
claus
parents:
diff changeset
   119
3
78aaa5408119 *** empty log message ***
claus
parents: 0
diff changeset
   120
    bytesPerRow := width * inDepth + 7 // 8.
78aaa5408119 *** empty log message ***
claus
parents: 0
diff changeset
   121
    data4 := ByteArray uninitializedNew:(height * bytesPerRow).
0
3f9277473954 Initial revision
claus
parents:
diff changeset
   122
    inStream nextBytes:(height * bytesPerRow) into:data4.
3f9277473954 Initial revision
claus
parents:
diff changeset
   123
3f9277473954 Initial revision
claus
parents:
diff changeset
   124
    "read mask"
3f9277473954 Initial revision
claus
parents:
diff changeset
   125
3f9277473954 Initial revision
claus
parents:
diff changeset
   126
"
3f9277473954 Initial revision
claus
parents:
diff changeset
   127
    mask := ByteArray new:(width * height / 8).
3f9277473954 Initial revision
claus
parents:
diff changeset
   128
    inStream nextBytes:(width * height / 8) into:mask.
3f9277473954 Initial revision
claus
parents:
diff changeset
   129
"
3f9277473954 Initial revision
claus
parents:
diff changeset
   130
3f9277473954 Initial revision
claus
parents:
diff changeset
   131
    "stupid: last row first"
3f9277473954 Initial revision
claus
parents:
diff changeset
   132
3
78aaa5408119 *** empty log message ***
claus
parents: 0
diff changeset
   133
    tmp := ByteArray uninitializedNew:(height * bytesPerRow).
0
3f9277473954 Initial revision
claus
parents:
diff changeset
   134
    srcIndex := 1.
3f9277473954 Initial revision
claus
parents:
diff changeset
   135
    dstIndex := (height - 1) * bytesPerRow + 1.
3f9277473954 Initial revision
claus
parents:
diff changeset
   136
    1 to:height do:[:row |
3f9277473954 Initial revision
claus
parents:
diff changeset
   137
        tmp replaceFrom:dstIndex to:(dstIndex + bytesPerRow - 1)
3f9277473954 Initial revision
claus
parents:
diff changeset
   138
                   with:data4 startingAt:srcIndex.
3f9277473954 Initial revision
claus
parents:
diff changeset
   139
        srcIndex := srcIndex + bytesPerRow.
3f9277473954 Initial revision
claus
parents:
diff changeset
   140
        dstIndex := dstIndex - bytesPerRow.
3f9277473954 Initial revision
claus
parents:
diff changeset
   141
    ].
3f9277473954 Initial revision
claus
parents:
diff changeset
   142
    data4 := tmp.
3f9277473954 Initial revision
claus
parents:
diff changeset
   143
3f9277473954 Initial revision
claus
parents:
diff changeset
   144
    "expand into bytes"
3f9277473954 Initial revision
claus
parents:
diff changeset
   145
3f9277473954 Initial revision
claus
parents:
diff changeset
   146
    data := ByteArray new:(width * height).
3f9277473954 Initial revision
claus
parents:
diff changeset
   147
    data4 expandPixels:inDepth width:width height:height
3f9277473954 Initial revision
claus
parents:
diff changeset
   148
                  into:data mapping:nil.
3f9277473954 Initial revision
claus
parents:
diff changeset
   149
3f9277473954 Initial revision
claus
parents:
diff changeset
   150
    photometric := #palette.
3f9277473954 Initial revision
claus
parents:
diff changeset
   151
    samplesPerPixel := 1.
3f9277473954 Initial revision
claus
parents:
diff changeset
   152
    bitsPerSample := #(8).
3f9277473954 Initial revision
claus
parents:
diff changeset
   153
    colorMap := Array with:rMap with:gMap with:bMap.
3f9277473954 Initial revision
claus
parents:
diff changeset
   154
    inStream close.
3f9277473954 Initial revision
claus
parents:
diff changeset
   155
3f9277473954 Initial revision
claus
parents:
diff changeset
   156
    "
21
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   157
     WindowsIconReader new fromWindowsICOFile:'/phys/clam2//LocalLibrary/Images/WIN_icons/ibm.ico'.
0
3f9277473954 Initial revision
claus
parents:
diff changeset
   158
    "
3f9277473954 Initial revision
claus
parents:
diff changeset
   159
!
3f9277473954 Initial revision
claus
parents:
diff changeset
   160
21
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   161
fromWindowsBMPStream 
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   162
    | fileSize header inDepth inPlanes compression
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   163
      imgSize resH resV numColor numImportantColor
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   164
      dataStart
0
3f9277473954 Initial revision
claus
parents:
diff changeset
   165
      rawMap rMap gMap bMap srcIndex dstIndex
21
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   166
      data4 mask tmp bytesPerRow fourBytesPerColorInfo|
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   167
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   168
    fileSize := inStream size.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   169
    "read the header"
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   170
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   171
    header := ByteArray uninitializedNew:16r54.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   172
    inStream nextBytes:18 into:header.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   173
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   174
    ((header at:(16r0E + 1)) == 40) ifTrue:[    "header-size"
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   175
        "
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   176
         its an Windows3.x BMP file
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   177
         or OS/2 vsn 2 BMP file
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   178
        "
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   179
        'BMP: Win3.x or OS/2 vsn 2 format' errorPrintNL.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   180
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   181
        inStream nextBytes:(40-4) into:header startingAt:19.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   182
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   183
        width := header wordAt:(16r12 + 1).  "(header at:19) + ((header at:20) * 256).   "
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   184
        height := header wordAt:(16r16 + 1). "(header at:23) + ((header at:24) * 256).   "
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   185
        inPlanes := header wordAt:(16r1A + 1).
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   186
        inDepth := header wordAt:(16r1C + 1).
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   187
        compression := header wordAt:(16r1E + 1).
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   188
        imgSize := header doubleWordAt:(16r22 + 1).
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   189
        resH := header doubleWordAt:(16r26 + 1).
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   190
        resV := header doubleWordAt:(16r2A + 1).
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   191
        numColor := header doubleWordAt:(16r2E + 1).
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   192
        numImportantColor := header doubleWordAt:(16r32 + 1).
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   193
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   194
        numColor == 0 ifTrue:[
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   195
            "
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   196
             some bmp-writers seem to leave this as zero (which is wrong)
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   197
            "
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   198
            numColor := 1 bitShift:inDepth.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   199
            'BMP: missing nColor in header - assume ' errorPrint. numColor errorPrintNL
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   200
        ].
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   201
        rawMap := ByteArray uninitializedNew:(numColor * 4).
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   202
        inStream nextBytes:(numColor * 4) into:rawMap.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   203
        fourBytesPerColorInfo := true.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   204
        dataStart := header wordAt:(16r0A + 1)
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   205
    ] ifFalse:[
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   206
        ((header at:(16r0E + 1)) == 12) ifTrue:[     "core-info header size"
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   207
            "
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   208
             its an OS/2 (vsn1.2) BMP file
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   209
            "
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   210
           'BMP: OS/2 vsn 1.2 format' errorPrintNL.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   211
            inStream nextBytes:(12-4) into:header startingAt:19.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   212
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   213
            width := header wordAt:(16r12 + 1).  "(header at:19) + ((header at:20) * 256).   "
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   214
            height := header wordAt:(16r14 + 1). "(header at:21) + ((header at:22) * 256).   "
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   215
            inPlanes := header wordAt:(16r16 + 1).
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   216
            inDepth := header wordAt:(16r18 + 1).
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   217
            numColor := 1 bitShift:inDepth.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   218
            rawMap := ByteArray uninitializedNew:(numColor * 3).
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   219
            inStream nextBytes:(numColor * 3) into:rawMap.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   220
            fourBytesPerColorInfo := false.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   221
            compression := 0.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   222
            dataStart := header wordAt:(16r0A + 1)
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   223
        ] ifFalse:[
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   224
            'BMP: unknown format' errorPrintNL.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   225
            inStream close.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   226
            ^ nil
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   227
        ].
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   228
    ].
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   229
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   230
    "read the colormap"
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   231
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   232
    rMap := Array new:numColor.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   233
    gMap := Array new:numColor.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   234
    bMap := Array new:numColor.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   235
    srcIndex := 1.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   236
    1 to:numColor do:[:i |
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   237
        bMap at:i put:(rawMap at:srcIndex).
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   238
        srcIndex := srcIndex + 1.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   239
        gMap at:i put:(rawMap at:srcIndex).
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   240
        srcIndex := srcIndex + 1.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   241
        rMap at:i put:(rawMap at:srcIndex).
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   242
        srcIndex := srcIndex + 1.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   243
        fourBytesPerColorInfo ifTrue:[
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   244
            srcIndex := srcIndex + 1.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   245
        ]
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   246
    ].
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   247
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   248
    "
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   249
     currently only normal (non-rle) bitmaps
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   250
     supported
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   251
    "
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   252
    compression ~~ 0 ifTrue:[
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   253
        'BMP compression type ' errorPrint. compression errorPrint.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   254
        'not supported' errorPrintNL.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   255
        inStream close.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   256
        ^ nil
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   257
    ].
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   258
    inPlanes ~~ 1 ifTrue:[
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   259
        'BMP only 1 plane images supported' errorPrintNL.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   260
        inStream close.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   261
        ^ nil
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   262
    ].
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   263
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   264
    "read the data bits"
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   265
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   266
    bytesPerRow := width * inDepth + 7 // 8.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   267
    data4 := ByteArray uninitializedNew:(height * bytesPerRow).
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   268
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   269
    inStream position:(dataStart + 1).
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   270
    inStream nextBytes:(height * bytesPerRow) into:data4.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   271
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   272
    "read mask"
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   273
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   274
"
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   275
    mask := ByteArray new:(width * height / 8).
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   276
    inStream nextBytes:(width * height / 8) into:mask.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   277
"
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   278
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   279
    "stupid: last row first"
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   280
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   281
    tmp := ByteArray uninitializedNew:(height * bytesPerRow).
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   282
    srcIndex := 1.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   283
    dstIndex := (height - 1) * bytesPerRow + 1.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   284
    1 to:height do:[:row |
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   285
        tmp replaceFrom:dstIndex to:(dstIndex + bytesPerRow - 1)
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   286
                   with:data4 startingAt:srcIndex.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   287
        srcIndex := srcIndex + bytesPerRow.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   288
        dstIndex := dstIndex - bytesPerRow.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   289
    ].
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   290
    data4 := tmp.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   291
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   292
    "expand into bytes"
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   293
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   294
    data := ByteArray new:(width * height).
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   295
    data4 expandPixels:inDepth width:width height:height
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   296
                  into:data mapping:nil.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   297
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   298
    photometric := #palette.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   299
    samplesPerPixel := 1.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   300
    bitsPerSample := #(8).
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   301
    colorMap := Array with:rMap with:gMap with:bMap.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   302
    inStream close.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   303
!
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   304
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   305
fromFile: aFilename 
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   306
    | fileSize header |
0
3f9277473954 Initial revision
claus
parents:
diff changeset
   307
12
6804b4ee340c *** empty log message ***
claus
parents: 5
diff changeset
   308
    inStream := self class streamReadingFile:aFilename.
6804b4ee340c *** empty log message ***
claus
parents: 5
diff changeset
   309
    inStream isNil ifTrue:[^ nil].
0
3f9277473954 Initial revision
claus
parents:
diff changeset
   310
3f9277473954 Initial revision
claus
parents:
diff changeset
   311
    inStream binary.
3f9277473954 Initial revision
claus
parents:
diff changeset
   312
    fileSize := inStream size.
3f9277473954 Initial revision
claus
parents:
diff changeset
   313
21
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   314
    fileSize < 16 ifTrue:[
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   315
        inStream close.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   316
        self error:'WINREADER: short file'.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   317
        ^ nil
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   318
    ].
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   319
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   320
    header := ByteArray uninitializedNew:4.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   321
    inStream nextBytes:4 into:header.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   322
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   323
    (header startsWith:#(66 77)) ifTrue:[     "BM"
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   324
        inStream position:1.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   325
        'WINREADER: Win3.x or OS/2 vsn 2 BM format' errorPrintNL.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   326
        ^ self fromWindowsBMPStream
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   327
    ].
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   328
    (header startsWith:#(66 65)) ifTrue:[     "BA"
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   329
        inStream position:1.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   330
        'WINREADER: OS/2 vsn 2 BA format' errorPrintNL.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   331
        ^ self fromOS2Stream
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   332
    ].
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   333
    (header startsWith:#(73 67)) ifTrue:[     "IC"
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   334
        inStream position:1.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   335
        'WINREADER: OS/2 IC format' errorPrintNL.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   336
        ^ self fromOS2Stream
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   337
    ].
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   338
    (header startsWith:#(80 84)) ifTrue:[     "PT"
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   339
        inStream position:1.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   340
        'WINREADER: OS/2 PT format' errorPrintNL.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   341
        ^ self fromOS2Stream
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   342
    ].
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   343
    (header startsWith:#(0 0 1 0)) ifTrue:[
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   344
        inStream position:1.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   345
        'WINREADER: Win3.x ICO format' errorPrintNL.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   346
        ^ self fromWindowsICOStream
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   347
    ].
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   348
    self error:'WINREADER: format not supported'.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   349
    inStream close.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   350
    ^ nil
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   351
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   352
    "
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   353
     Image fromFile:'/phys/clam//LocalLibrary/Images/OS2_icons/dos.ico'
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   354
    "
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   355
!
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   356
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   357
fromOS2Stream 
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   358
    | header inDepth
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   359
      rawMap rMap gMap bMap srcIndex dstIndex
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   360
      data4 mask tmp bytesPerRow nColors nByte|
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   361
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   362
    inStream binary.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   363
0
3f9277473954 Initial revision
claus
parents:
diff changeset
   364
    "read the header"
3f9277473954 Initial revision
claus
parents:
diff changeset
   365
3
78aaa5408119 *** empty log message ***
claus
parents: 0
diff changeset
   366
    header := ByteArray uninitializedNew:8r110.
0
3f9277473954 Initial revision
claus
parents:
diff changeset
   367
    inStream nextBytes:16 into:header.
21
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   368
0
3f9277473954 Initial revision
claus
parents:
diff changeset
   369
    (header startsWith:#(73 67)) ifTrue:[
3f9277473954 Initial revision
claus
parents:
diff changeset
   370
        "IC format"
3f9277473954 Initial revision
claus
parents:
diff changeset
   371
        inStream nextBytes:10 into:header startingAt:17.
3f9277473954 Initial revision
claus
parents:
diff changeset
   372
        width := header at:7.
3f9277473954 Initial revision
claus
parents:
diff changeset
   373
        height := header at:9.
3f9277473954 Initial revision
claus
parents:
diff changeset
   374
        inDepth := 2 "header at:11". "where is it"
3f9277473954 Initial revision
claus
parents:
diff changeset
   375
    ] ifFalse:[
3f9277473954 Initial revision
claus
parents:
diff changeset
   376
        inStream nextBytes:(8r110-16) into:header startingAt:17.
3f9277473954 Initial revision
claus
parents:
diff changeset
   377
        width := header at:8r101.
3f9277473954 Initial revision
claus
parents:
diff changeset
   378
        height := header at:8r103.
3f9277473954 Initial revision
claus
parents:
diff changeset
   379
        inDepth := header at:8r107.
3f9277473954 Initial revision
claus
parents:
diff changeset
   380
    ].
3f9277473954 Initial revision
claus
parents:
diff changeset
   381
3f9277473954 Initial revision
claus
parents:
diff changeset
   382
    "read the colormap"
3f9277473954 Initial revision
claus
parents:
diff changeset
   383
3f9277473954 Initial revision
claus
parents:
diff changeset
   384
    nColors := 1 bitShift:inDepth.
3f9277473954 Initial revision
claus
parents:
diff changeset
   385
3
78aaa5408119 *** empty log message ***
claus
parents: 0
diff changeset
   386
    rawMap := ByteArray uninitializedNew:(nColors*3).
0
3f9277473954 Initial revision
claus
parents:
diff changeset
   387
    inStream nextBytes:(nColors*3) into:rawMap.
3f9277473954 Initial revision
claus
parents:
diff changeset
   388
    rMap := Array new:nColors.
3f9277473954 Initial revision
claus
parents:
diff changeset
   389
    gMap := Array new:nColors.
3f9277473954 Initial revision
claus
parents:
diff changeset
   390
    bMap := Array new:nColors.
3f9277473954 Initial revision
claus
parents:
diff changeset
   391
    srcIndex := 1.
3f9277473954 Initial revision
claus
parents:
diff changeset
   392
    1 to:nColors do:[:i |
3f9277473954 Initial revision
claus
parents:
diff changeset
   393
        bMap at:i put:(rawMap at:srcIndex).
3f9277473954 Initial revision
claus
parents:
diff changeset
   394
        srcIndex := srcIndex + 1.
3f9277473954 Initial revision
claus
parents:
diff changeset
   395
        gMap at:i put:(rawMap at:srcIndex).
3f9277473954 Initial revision
claus
parents:
diff changeset
   396
        srcIndex := srcIndex + 1.
3f9277473954 Initial revision
claus
parents:
diff changeset
   397
        rMap at:i put:(rawMap at:srcIndex).
3f9277473954 Initial revision
claus
parents:
diff changeset
   398
        srcIndex := srcIndex + 1.
3f9277473954 Initial revision
claus
parents:
diff changeset
   399
    ].
3f9277473954 Initial revision
claus
parents:
diff changeset
   400
3f9277473954 Initial revision
claus
parents:
diff changeset
   401
    "read mask"
3f9277473954 Initial revision
claus
parents:
diff changeset
   402
3
78aaa5408119 *** empty log message ***
claus
parents: 0
diff changeset
   403
    nByte := width * height + 7 // 8.
78aaa5408119 *** empty log message ***
claus
parents: 0
diff changeset
   404
    mask := ByteArray uninitializedNew:nByte.
78aaa5408119 *** empty log message ***
claus
parents: 0
diff changeset
   405
    inStream nextBytes:nByte into:mask.
0
3f9277473954 Initial revision
claus
parents:
diff changeset
   406
3f9277473954 Initial revision
claus
parents:
diff changeset
   407
    "what is this"
3f9277473954 Initial revision
claus
parents:
diff changeset
   408
3
78aaa5408119 *** empty log message ***
claus
parents: 0
diff changeset
   409
    inStream nextBytes:nByte into:mask.
0
3f9277473954 Initial revision
claus
parents:
diff changeset
   410
3f9277473954 Initial revision
claus
parents:
diff changeset
   411
    "read the data bits"
3f9277473954 Initial revision
claus
parents:
diff changeset
   412
3
78aaa5408119 *** empty log message ***
claus
parents: 0
diff changeset
   413
    bytesPerRow := width * inDepth + 7 // 8.
78aaa5408119 *** empty log message ***
claus
parents: 0
diff changeset
   414
    data4 := ByteArray uninitializedNew:(height * bytesPerRow).
0
3f9277473954 Initial revision
claus
parents:
diff changeset
   415
    inStream nextBytes:(height * bytesPerRow) into:data4.
3f9277473954 Initial revision
claus
parents:
diff changeset
   416
3f9277473954 Initial revision
claus
parents:
diff changeset
   417
    "stupid: last row first"
3f9277473954 Initial revision
claus
parents:
diff changeset
   418
3f9277473954 Initial revision
claus
parents:
diff changeset
   419
    tmp := ByteArray new:(height * bytesPerRow).
3f9277473954 Initial revision
claus
parents:
diff changeset
   420
    srcIndex := 1.
3f9277473954 Initial revision
claus
parents:
diff changeset
   421
    dstIndex := (height - 1) * bytesPerRow + 1.
3f9277473954 Initial revision
claus
parents:
diff changeset
   422
    1 to:height do:[:row |
3f9277473954 Initial revision
claus
parents:
diff changeset
   423
        tmp replaceFrom:dstIndex to:(dstIndex + bytesPerRow - 1)
3f9277473954 Initial revision
claus
parents:
diff changeset
   424
                   with:data4 startingAt:srcIndex.
3f9277473954 Initial revision
claus
parents:
diff changeset
   425
        srcIndex := srcIndex + bytesPerRow.
3f9277473954 Initial revision
claus
parents:
diff changeset
   426
        dstIndex := dstIndex - bytesPerRow.
3f9277473954 Initial revision
claus
parents:
diff changeset
   427
    ].
3f9277473954 Initial revision
claus
parents:
diff changeset
   428
    data4 := tmp.
3f9277473954 Initial revision
claus
parents:
diff changeset
   429
3f9277473954 Initial revision
claus
parents:
diff changeset
   430
    "expand into bytes"
3f9277473954 Initial revision
claus
parents:
diff changeset
   431
3f9277473954 Initial revision
claus
parents:
diff changeset
   432
    data := ByteArray new:(width * height).
3f9277473954 Initial revision
claus
parents:
diff changeset
   433
    data4 expandPixels:inDepth width:width height:height
3f9277473954 Initial revision
claus
parents:
diff changeset
   434
                  into:data mapping:nil.
3f9277473954 Initial revision
claus
parents:
diff changeset
   435
3f9277473954 Initial revision
claus
parents:
diff changeset
   436
    photometric := #palette.
3f9277473954 Initial revision
claus
parents:
diff changeset
   437
    samplesPerPixel := 1.
3f9277473954 Initial revision
claus
parents:
diff changeset
   438
    bitsPerSample := #(8).
3f9277473954 Initial revision
claus
parents:
diff changeset
   439
    colorMap := Array with:rMap with:gMap with:bMap.
3f9277473954 Initial revision
claus
parents:
diff changeset
   440
    inStream close.
3f9277473954 Initial revision
claus
parents:
diff changeset
   441
3f9277473954 Initial revision
claus
parents:
diff changeset
   442
    "
3f9277473954 Initial revision
claus
parents:
diff changeset
   443
     |i f|
3f9277473954 Initial revision
claus
parents:
diff changeset
   444
     i := Image fromFile:'/LocalLibrary/Images/OS2/dos3.ico'.
3f9277473954 Initial revision
claus
parents:
diff changeset
   445
     f := i asFormOn:Display.
18
5a1262eeb9d7 *** empty log message ***
claus
parents: 12
diff changeset
   446
     v displayOpaqueForm:(f magnifyBy:2@2) x:5 y:5
0
3f9277473954 Initial revision
claus
parents:
diff changeset
   447
    "
3f9277473954 Initial revision
claus
parents:
diff changeset
   448
! !