WindowsIconReader.st
author Claus Gittinger <cg@exept.de>
Thu, 31 Aug 2017 15:29:24 +0200
changeset 4003 256b43a46036
parent 3999 2e26f0d49ca9
child 4012 af495a29eafa
permissions -rw-r--r--
#REFACTORING by cg class: WindowsIconReader added: #loadBMP8From:into: changed: #loadBMP4From:into: #loadBMPWidth:height:bytesPerPixel:from:into: #loadBMPWidth:height:depth:from:into:
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4003
256b43a46036 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 3999
diff changeset
     1
"{ Encoding: utf8 }"
256b43a46036 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 3999
diff changeset
     2
0
3f9277473954 Initial revision
claus
parents:
diff changeset
     3
"
3f9277473954 Initial revision
claus
parents:
diff changeset
     4
 COPYRIGHT (c) 1993 by Claus Gittinger
28
8daff0234d2e *** empty log message ***
claus
parents: 24
diff changeset
     5
	      All Rights Reserved
0
3f9277473954 Initial revision
claus
parents:
diff changeset
     6
3f9277473954 Initial revision
claus
parents:
diff changeset
     7
 This software is furnished under a license and may be used
3f9277473954 Initial revision
claus
parents:
diff changeset
     8
 only in accordance with the terms of that license and with the
3f9277473954 Initial revision
claus
parents:
diff changeset
     9
 inclusion of the above copyright notice.   This software may not
3f9277473954 Initial revision
claus
parents:
diff changeset
    10
 be provided or otherwise made available to, or used by, any
3f9277473954 Initial revision
claus
parents:
diff changeset
    11
 other person.  No title to or ownership of the software is
3f9277473954 Initial revision
claus
parents:
diff changeset
    12
 hereby transferred.
3f9277473954 Initial revision
claus
parents:
diff changeset
    13
"
1385
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
    14
"{ Package: 'stx:libview2' }"
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
    15
3568
a8900d28752b #BUGFIX
matilk
parents: 3404
diff changeset
    16
"{ NameSpace: Smalltalk }"
a8900d28752b #BUGFIX
matilk
parents: 3404
diff changeset
    17
0
3f9277473954 Initial revision
claus
parents:
diff changeset
    18
ImageReader subclass:#WindowsIconReader
3591
87336f7e44cf #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3590
diff changeset
    19
	instanceVariableNames:'compression inDepth topDown redMask greenMask blueMask alphaMask
87336f7e44cf #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3590
diff changeset
    20
		pngOrJPGImage'
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
    21
	classVariableNames:''
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
    22
	poolDictionaries:''
1745
4fa0fad2a463 code cleanup (colorMap handling)
Claus Gittinger <cg@exept.de>
parents: 1734
diff changeset
    23
	category:'Graphics-Images-Readers'
0
3f9277473954 Initial revision
claus
parents:
diff changeset
    24
!
3f9277473954 Initial revision
claus
parents:
diff changeset
    25
21
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    26
!WindowsIconReader class methodsFor:'documentation'!
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    27
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    28
copyright
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    29
"
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    30
 COPYRIGHT (c) 1993 by Claus Gittinger
28
8daff0234d2e *** empty log message ***
claus
parents: 24
diff changeset
    31
	      All Rights Reserved
0
3f9277473954 Initial revision
claus
parents:
diff changeset
    32
21
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    33
 This software is furnished under a license and may be used
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    34
 only in accordance with the terms of that license and with the
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    35
 inclusion of the above copyright notice.   This software may not
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    36
 be provided or otherwise made available to, or used by, any
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    37
 other person.  No title to or ownership of the software is
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    38
 hereby transferred.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    39
"
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    40
!
0
3f9277473954 Initial revision
claus
parents:
diff changeset
    41
21
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    42
documentation
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    43
"
3584
141dd71ce83f #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 3583
diff changeset
    44
    this class provides methods for loading Windows and OS2 icon and bmp files.
3897
0d38bd3b99ee #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3896
diff changeset
    45
3920
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
    46
    The class name *IconReader is a bad, historic choice - it was originally
3897
0d38bd3b99ee #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3896
diff changeset
    47
    written to read icons only, but evolved over time and is now also
0d38bd3b99ee #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3896
diff changeset
    48
    capable of reading/writing bmp and cursor files.
3896
58e71198a302 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3742
diff changeset
    49
    
3596
dee4584a243a #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 3595
diff changeset
    50
    The reader should support allmost all formats: Win2, Win3, Win4, Win5, WINCE and OS2.
3595
bf71946129f1 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 3594
diff changeset
    51
    (incl. PNG and JPG compression, and WINCE depth2 images)
bf71946129f1 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 3594
diff changeset
    52
    
713
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
    53
    Image writing is only supported for BMP format with depth 1,4,8 and 24 bit images.
3595
bf71946129f1 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 3594
diff changeset
    54
    
211
3eb140e89e2e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 172
diff changeset
    55
    The reader tries to figure out which version of BMP/ICO is used.
3eb140e89e2e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 172
diff changeset
    56
    It seems to be able to load most formats, but who knows ...
3eb140e89e2e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 172
diff changeset
    57
3920
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
    58
    [notice:]
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
    59
        when reading an ICO/CUR file with multiple icons in it,
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
    60
        the first image is returned as such, holding on the other images via its
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
    61
        imageFrames instvar.
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
    62
        Thus, the imageEditor will usually present the first of the images,
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
    63
        and offer a next-in-sequence button to step through them.
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
    64
        To get a collection of all images, collect the images from the sequence, as in:
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
    65
            someIcoImage imageFrames collect:#image
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
    66
            
211
3eb140e89e2e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 172
diff changeset
    67
    [See also:]
3158
b017a13ec3f5 class: WindowsIconReader
Claus Gittinger <cg@exept.de>
parents: 2812
diff changeset
    68
        Image Form Icon
b017a13ec3f5 class: WindowsIconReader
Claus Gittinger <cg@exept.de>
parents: 2812
diff changeset
    69
        BlitImageReader FaceReader GIFReader JPEGReader PBMReader PCXReader
b017a13ec3f5 class: WindowsIconReader
Claus Gittinger <cg@exept.de>
parents: 2812
diff changeset
    70
        ST80FormReader SunRasterReader TargaReader TIFFReader
3920
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
    71
        XBMReader XPMReader XWDReader MacOSXIconReader
21
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
    72
"
1385
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
    73
!
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
    74
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
    75
fileFormatDescription
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
    76
"
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
    77
    Information from http://www.daubnet.com/formats/BMP.html - no Warranty.
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
    78
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
    79
          Name           Size      Offset   Description
1385
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
    80
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
    81
      Header            14 bytes            Windows Structure: BITMAPFILEHEADER
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
    82
          Signature      2 bytes      0      'BM'
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
    83
          FileSize       4 bytes      2      File size in bytes
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
    84
          reserved       4 bytes      6      unused (=0)
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
    85
          DataOffset     4 bytes     10      File offset to Raster Data
1385
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
    86
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
    87
      InfoHeader        40 bytes            Windows Structure: BITMAPINFOHEADER
3594
695b4c2f1b83 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 3593
diff changeset
    88
        different sizes, depending on Windows-version:
695b4c2f1b83 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 3593
diff changeset
    89
                        12 - Win2.x or OS/2 1.x
695b4c2f1b83 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 3593
diff changeset
    90
                        40 - WinNT, Win3.x or later
695b4c2f1b83 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 3593
diff changeset
    91
                        52 - adds undocumented; adds r/g/b masks
695b4c2f1b83 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 3593
diff changeset
    92
                        56 - adds undocumented; adds r/g/b/a masks
695b4c2f1b83 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 3593
diff changeset
    93
                        64 - OS/2 2.x
695b4c2f1b83 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 3593
diff changeset
    94
                        108 - WinNT4.0, 95 or later
695b4c2f1b83 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 3593
diff changeset
    95
                        124 - WinNT5.0, 98 or later
695b4c2f1b83 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 3593
diff changeset
    96
      
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
    97
          Size           4 bytes     14      Size of InfoHeader =40
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
    98
          Width          4 bytes     18      Bitmap Width
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
    99
          Height         4 bytes     22      Bitmap Height
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   100
          Planes         2 bytes     26      Number of Planes (=1)
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   101
          BitCount       2 bytes     28      Bits per Pixel
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   102
                                             1 = monochrome palette. NumColors = 1
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   103
                                             4 = 4bit palletized. NumColors = 16
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   104
                                             8 = 8bit palletized. NumColors = 256
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   105
                                             16 = 16bit RGB. NumColors = 65536 (?)
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   106
                                             24 = 24bit RGB. NumColors = 16M
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   107
          Compression    4 bytes     30      Type of Compression
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   108
                                             0 = RGB            no compression
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   109
                                             1 = RLE8           8bit RLE encoding
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   110
                                             2 = RLE4           4bit RLE encoding
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   111
                                             3 = BITFIELDS      Windows V3+ only
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   112
                                             4 = JPEG           Windows V3+ only
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   113
                                             5 = PNG            Windows V3+ only
3594
695b4c2f1b83 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 3593
diff changeset
   114
                                             6 = ALPHA_BITFIELDS Windows CE only
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   115
        
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   116
                                             3 = HUFFMAN1D      OS/2 2.x-only
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   117
                                             4 = RLE24          OS/2 2.x-only
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   118
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   119
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   120
          ImageSize      4 bytes     34      (compressed) Size of Image
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   121
                                             It is valid to set this =0 if Compression = 0
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   122
          XpixelsPerM    4 bytes     38      horizontal resolution: Pixels/meter
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   123
          YpixelsPerM    4 bytes     42      vertical resolution: Pixels/meter
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   124
          ColorsUsed     4 bytes     46      Number of actually used colors
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   125
          ColorsImportant
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   126
                         4 bytes     50      Number of important colors
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   127
                                             0 = all
3594
695b4c2f1b83 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 3593
diff changeset
   128
695b4c2f1b83 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 3593
diff changeset
   129
       ColorTable        4 * NumColors bytes (3 on Win2)
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   130
                                             present only if Info.BitsPerPixel <= 8
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   131
                                             colors should be ordered by importance
1385
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   132
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   133
            Red           1 byte              Red intensity
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   134
            Green         1 byte              Green intensity
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   135
            Blue          1 byte              Blue intensity
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   136
            reserved      1 byte             unused (=0)
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   137
          repeated NumColors times
1385
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   138
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   139
       Raster Data      Info.ImageSize bytes     The pixel data
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   140
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   141
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   142
Raster Data encoding:
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   143
       Depending on the image's BitCount and on the Compression flag there are 6 different encoding schemes.
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   144
       All of them share the following:
1385
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   145
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   146
       Pixels are stored bottom-up, left-to-right. Pixel lines are padded with zeros to end on a 32bit (4byte) boundary. For
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   147
       uncompressed formats every line will have the same number of bytes. Color indices are zero based, meaning a pixel
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   148
       color of 0 represents the first color table entry, a pixel color of 255 (if there are that many) represents the 256th entry.
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   149
       For images with more than 256 colors there is no color table.
1385
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   150
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   151
Raster Data encoding for 1bit / black & white images:
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   152
       BitCount = 1 Compression = 0
1385
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   153
       Every byte holds 8 pixels, its highest order bit representing the leftmost pixel of those. There are 2 color table entries.
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   154
       Some readers will ignore them though, and assume that 0 is black and 1 is white. If you are storing black and white
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   155
       pictures you should stick to this, with any other 2 colors this is not an issue. Remember padding with zeros up to a
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   156
       32bit boundary (This can be up to 31 zeros/pixels!!)
1385
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   157
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   158
Raster Data encoding for 4bit / 16 color images:
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   159
       BitCount = 4 Compression = 0
1385
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   160
       Every byte holds 2 pixels, its high order 4 bits representing the left of those. There are 16 color table entries. These
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   161
       colors do not have to be the 16 MS-Windows standard colors. Padding each line with zeros up to a 32bit boundary
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   162
       will result in up to 28 zeros = 7 'wasted pixels'.
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   163
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   164
Raster Data encoding for 8bit / 256 color images:
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   165
       BitCount = 8 Compression = 0
1385
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   166
       Every byte holds 1 pixel. There are 256 color table entries. Padding each line with zeros up to a 32bit boundary will
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   167
       result in up to 3 bytes of zeros = 3 'wasted pixels'.
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   168
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   169
Raster Data encoding for 16bit / hicolor images:
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   170
       BitCount = 16 Compression = 0
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   171
       Every 2bytes / 16bit holds 1 pixel.
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   172
       <information missing: the 16 bit was introduced together with Video For Windows? Is it a memory-only-format?>
1385
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   173
       The pixels are no color table pointers. There are no color table entries. Padding each line with zeros up to a 16bit
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   174
       boundary will result in up to 2 zero bytes.
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   175
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   176
Raster Data encoding for 24bit / truecolor images:
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   177
       BitCount = 24 Compression = 0
1385
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   178
       Every 4bytes / 32bit holds 1 pixel. The first holds its red, the second its green, and the third its blue intensity. The
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   179
       fourth byte is reserved and should be zero. There are no color table entries. The pixels are no color table pointers. No
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   180
       zero padding necessary.
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   181
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   182
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   183
Raster Data compression for 4bit / 16 color images:
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   184
       BitCount = 4 Compression = 2
1385
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   185
       The pixel data is stored in 2bytes / 16bit chunks.  The first of these specifies the number of consecutive pixels with the
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   186
       same pair of color. The second byte defines two color indices. The resulting pixel pattern will be interleaved
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   187
       high-order 4bits and low order 4 bits (ABABA...). If the first byte is zero, the second defines an escape code. The
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   188
       End-of-Bitmap is zero padded to end on a 32bit boundary. Due to the 16bit-ness of this structure this will always be
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   189
       either two zero bytes or none.
1385
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   190
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   191
        n (byte 1) c (Byte 2)                                       Description
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   192
        >0        any      n pixels are to be drawn. The 1st, 3rd, 5th, ... pixels' color is in c's high-order 4 bits, the even
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   193
                            pixels' color is in c's low-order 4 bits. If both color indices are the same, it results in just n
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   194
                            pixels of color c
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   195
        0         0        End-of-line
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   196
        0         1        End-of-Bitmap
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   197
        0         2        Delta. The following 2 bytes define an unsigned offset in x and y direction (y being up) The
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   198
                            skipped pixels should get a color zero.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   199
        0         >=3      The following c bytes will be read as single pixel colors just as in uncompressed files. up to 12
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   200
                            bits of zeros follow, to put the file/memory pointer on a 16bit boundary again.
1385
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   201
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   202
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   203
                                      Example for 4bit RLE
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   204
        Compressed Data                           Expanded data
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   205
        03 04              0 4 0
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   206
        05 06              0 6 0 6 0
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   207
        00 06 45 56 67 00  4 5 5 6 6 7
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   208
        04 78              7 8 7 8
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   209
        00 02 05 01        Move 5 right and 1 up. (Windows docs say down, which is wrong)
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   210
        00 00              End-of-line
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   211
        09 1E              1 E 1 E 1 E 1 E 1
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   212
        00 01              EndofBitmap
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   213
        00 00              Zero padding for 32bit boundary
1385
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   214
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   215
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   216
Raster Data compression for 8bit / 256 color images:
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   217
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   218
       BitCount = 8 Compression = 1
1385
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   219
       The pixel data is stored in 2bytes / 16bit chunks.  The first of these specifies the number of consecutive pixels with the
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   220
       same color. The second byte defines their color index. If the first byte is zero, the second defines an escape code. The
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   221
       End-of-Bitmap is zero padded to end on a 32bit boundary. Due to the 16bit-ness of this structure this will always be
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   222
       either two zero bytes or none.
1385
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   223
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   224
        n (byte 1)   c (Byte 2)                                    Description
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   225
        >0       any        n pixels of color number c
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   226
        0        0          End-of-line
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   227
        0        1          End Of Bitmap
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   228
        0        2          Delta. The following 2 bytes define an unsigned offset in x and y direction (y being up) The
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   229
                            skipped pixels should get a color zero.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   230
        0        >=3        The following c bytes will be read as single pixel colors just as in uncompressed files. A zero
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   231
                            follows, if c is odd, putting the file/memory pointer on a 16bit boundary again.
1385
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   232
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   233
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   234
                                      Example for 8bit RLE
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   235
        Compressed Data                           Expanded data
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   236
        03 04              04 04 04
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   237
        05 06              06 06 06 06 06
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   238
        00 03 45 56 67 00  45 56 67
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   239
        02 78              78 78
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   240
        00 02 05 01        Move 5 right and 1 up. (Windows docs say down, which is wrong)
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   241
        00 00              End-of-line
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   242
        09 1E              1E 1E 1E 1E 1E 1E 1E 1E 1E
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   243
        00 01              End-of-bitmap
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   244
        00 00              Zero padding for 32bit boundary
1385
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   245
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   246
Portability:
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   247
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   248
       Although BMPs were invented by Microsoft for its Windows platform, a lot of programs on other platforms are capable
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   249
       of reading and writing them. Notice the Intel order in 2byte and 4-byte integer values (Least significant byte first). The
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   250
       16bit BMPs have been introduced to Windows after the others, still puzzling many applications.
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   251
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   252
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   253
Trademarks, Patents and Royalties
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   254
       To my knowledge: None.
1385
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
   255
"
21
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
   256
! !
0
3f9277473954 Initial revision
claus
parents:
diff changeset
   257
28
8daff0234d2e *** empty log message ***
claus
parents: 24
diff changeset
   258
!WindowsIconReader class methodsFor:'initialization'!
8daff0234d2e *** empty log message ***
claus
parents: 24
diff changeset
   259
8daff0234d2e *** empty log message ***
claus
parents: 24
diff changeset
   260
initialize
211
3eb140e89e2e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 172
diff changeset
   261
    "tell Image-class, that a new fileReader is present
398
aef700d15416 new suffix-table
Claus Gittinger <cg@exept.de>
parents: 387
diff changeset
   262
     for the '.bmp' and '.ico' extensions."
211
3eb140e89e2e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 172
diff changeset
   263
647
6f26c76aa0c9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 623
diff changeset
   264
    MIMETypes defineImageType:'image/x-MS-bitmap' suffix:'bmp' reader:self.
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   265
    MIMETypes defineImageType:'image/x-ms-bitmap' suffix:'bmp' reader:self.
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   266
    MIMETypes defineImageType:'image/bmp'         suffix:'bmp' reader:self.
647
6f26c76aa0c9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 623
diff changeset
   267
    MIMETypes defineImageType:nil                 suffix:'ico' reader:self.
211
3eb140e89e2e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 172
diff changeset
   268
398
aef700d15416 new suffix-table
Claus Gittinger <cg@exept.de>
parents: 387
diff changeset
   269
    "Modified: 1.2.1997 / 15:03:59 / cg"
28
8daff0234d2e *** empty log message ***
claus
parents: 24
diff changeset
   270
! !
8daff0234d2e *** empty log message ***
claus
parents: 24
diff changeset
   271
102
claus
parents: 99
diff changeset
   272
!WindowsIconReader class methodsFor:'testing'!
claus
parents: 99
diff changeset
   273
713
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
   274
canRepresent:anImage
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
   275
    "return true, if anImage can be represented in my file format.
3896
58e71198a302 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3742
diff changeset
   276
     BMP supports depth 1,4,8, 24 and 32."
713
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
   277
3726
37f44a063d46 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3640
diff changeset
   278
    (#(1 4 8 24 32) includes:anImage depth) ifTrue:[^true].
3571
a830f0388ef6 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3568
diff changeset
   279
    ('WindwsIconReader [info]: image depth is not 1,4,8 or 24.') infoPrintCR.
a830f0388ef6 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3568
diff changeset
   280
    ^ false
713
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
   281
3896
58e71198a302 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3742
diff changeset
   282
    "Created: / 17-10-1997 / 20:18:23 / cg"
58e71198a302 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3742
diff changeset
   283
    "Modified (comment): / 17-02-2017 / 08:55:32 / cg"
713
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
   284
!
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
   285
102
claus
parents: 99
diff changeset
   286
isValidImageFile:aFileName
claus
parents: 99
diff changeset
   287
    "return true, if aFileName contains a valid windows bitmap-file image"
claus
parents: 99
diff changeset
   288
claus
parents: 99
diff changeset
   289
    |inStream header ok|
claus
parents: 99
diff changeset
   290
claus
parents: 99
diff changeset
   291
    inStream := self streamReadingFile:aFileName.
claus
parents: 99
diff changeset
   292
    inStream isNil ifTrue:[^ false].
claus
parents: 99
diff changeset
   293
claus
parents: 99
diff changeset
   294
    inStream binary.
104
claus
parents: 103
diff changeset
   295
    ok := false.
692
e6af4c70e066 size is going to be eliminated from the stream
Claus Gittinger <cg@exept.de>
parents: 678
diff changeset
   296
    inStream fileSize > 16 ifTrue:[
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   297
	header := ByteArray uninitializedNew:4.
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   298
	inStream nextBytes:4 into:header.
102
claus
parents: 99
diff changeset
   299
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   300
	(header startsWith:#(66 77)) ifTrue:[     "BM"
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   301
	    ok := true.
104
claus
parents: 103
diff changeset
   302
"/            'WINREADER: Win3.x or OS/2 vsn 2 BM format' infoPrintNL.
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   303
	].
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   304
	(header startsWith:#(66 65)) ifTrue:[     "BA"
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   305
	    ok := true.
104
claus
parents: 103
diff changeset
   306
"/            'WINREADER: OS/2 vsn 2 BA format' infoPrintNL.
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   307
	].
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   308
	(header startsWith:#(73 67)) ifTrue:[     "IC"
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   309
	    ok := true.
104
claus
parents: 103
diff changeset
   310
"/            'WINREADER: OS/2 IC format' infoPrintNL.
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   311
	].
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   312
	(header startsWith:#(80 84)) ifTrue:[     "PT"
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   313
	    ok := true.
104
claus
parents: 103
diff changeset
   314
"/            'WINREADER: OS/2 PT format' infoPrintNL.
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   315
	].
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   316
	(header startsWith:#(0 0 1 0)) ifTrue:[
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   317
	    ok := true.
104
claus
parents: 103
diff changeset
   318
"/            'WINREADER: Win3.x ICO format' infoPrintNL.
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   319
	].
102
claus
parents: 99
diff changeset
   320
    ].
104
claus
parents: 103
diff changeset
   321
    inStream close.
claus
parents: 103
diff changeset
   322
    ^ ok
102
claus
parents: 99
diff changeset
   323
claus
parents: 99
diff changeset
   324
    "
claus
parents: 99
diff changeset
   325
     WindowsIconReader isValidImageFile:'/phys/clam2/LocalLibrary/Images/OS2_icons/dos.ico'
claus
parents: 99
diff changeset
   326
    "
claus
parents: 99
diff changeset
   327
claus
parents: 99
diff changeset
   328
    "Created: 17.9.1995 / 17:14:20 / claus"
claus
parents: 99
diff changeset
   329
! !
claus
parents: 99
diff changeset
   330
3591
87336f7e44cf #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3590
diff changeset
   331
!WindowsIconReader methodsFor:'accessing'!
87336f7e44cf #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3590
diff changeset
   332
87336f7e44cf #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3590
diff changeset
   333
image
87336f7e44cf #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3590
diff changeset
   334
    pngOrJPGImage notNil ifTrue:[^ pngOrJPGImage].
87336f7e44cf #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3590
diff changeset
   335
    ^ super image
87336f7e44cf #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3590
diff changeset
   336
! !
87336f7e44cf #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3590
diff changeset
   337
103
claus
parents: 102
diff changeset
   338
!WindowsIconReader methodsFor:'private'!
claus
parents: 102
diff changeset
   339
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   340
bitsPerPixel
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   341
    ^ inDepth
3584
141dd71ce83f #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 3583
diff changeset
   342
!
141dd71ce83f #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 3583
diff changeset
   343
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   344
convertPixels
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   345
    "/ figure out, how pixels should be processed,
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   346
    "/ according to the order of r/g/b components and masks
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   347
    "/ bring the pixels to a standard format:
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   348
    "/  rgb888/rgba8888 if possible and useful
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   349
    "/ 
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   350
    |swapAction redShift greenShift blueShift alphaShift pixelAction
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   351
     numRedBits numGreenBits numBlueBits numAlphaBits needPixelProcessing|
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   352
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   353
    inDepth == 1 ifTrue:[
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   354
        colorMap isNil ifTrue:[
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   355
            photometric := #blackIs0
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   356
        ] ifFalse:[
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   357
            photometric := #palette.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   358
            colorMap size == 2 ifTrue:[
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   359
                ((colorMap at:1) = (Color white)
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   360
                and:[(colorMap at:2) = (Color black)]) ifTrue:[
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   361
                    photometric := #whiteIs0.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   362
                    colorMap := nil.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   363
                ] ifFalse:[
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   364
                    ((colorMap at:1) = (Color black)
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   365
                    and:[(colorMap at:2) = (Color white)]) ifTrue:[
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   366
                        photometric := #blackIs0.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   367
                        colorMap := nil.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   368
                    ]
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   369
                ].                    
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   370
            ].
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   371
        ].
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   372
        samplesPerPixel := 1.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   373
        bitsPerSample := Array with:inDepth.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   374
        ^ self.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   375
    ].
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   376
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   377
    ((inDepth > 8) and:[redMask notNil]) ifTrue:[
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   378
        numRedBits   := redMask bitCount.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   379
        numGreenBits := greenMask bitCount.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   380
        numBlueBits  := blueMask bitCount.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   381
        numAlphaBits := alphaMask bitCount.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   382
        redShift := redMask lowBit - 1.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   383
        greenShift  := greenMask lowBit - 1.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   384
        blueShift  := blueMask lowBit - 1.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   385
        alphaShift := alphaMask lowBit - 1.
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   386
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   387
        alphaMask == 0 ifTrue:[
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   388
            photometric := #rgb.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   389
            samplesPerPixel := 3
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   390
        ] ifFalse:[    
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   391
            photometric := #rgba.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   392
            samplesPerPixel := 4
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   393
        ].
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   394
        needPixelProcessing := false.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   395
        
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   396
        inDepth == 16 ifTrue:[
3590
104bc11d3845 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3589
diff changeset
   397
            alphaMask == 0 ifTrue:[
104bc11d3845 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3589
diff changeset
   398
                bitsPerSample := {numRedBits. numGreenBits. numBlueBits}.
104bc11d3845 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3589
diff changeset
   399
                colorMap := FixedPalette
104bc11d3845 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3589
diff changeset
   400
                                redShift:redShift redMask:(redMask >> redShift)
104bc11d3845 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3589
diff changeset
   401
                                greenShift:greenShift greenMask:(greenMask >> greenShift)
104bc11d3845 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3589
diff changeset
   402
                                blueShift:blueShift blueMask:(blueMask >> blueShift).
104bc11d3845 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3589
diff changeset
   403
                photometric := #palette.
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   404
            ] ifFalse:[
3590
104bc11d3845 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3589
diff changeset
   405
                bitsPerSample := {numRedBits. numGreenBits. numBlueBits. numAlphaBits }.
104bc11d3845 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3589
diff changeset
   406
                colorMap := FixedPaletteWithAlpha
104bc11d3845 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3589
diff changeset
   407
                                redShift:redShift redMask:(redMask >> redShift)
104bc11d3845 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3589
diff changeset
   408
                                greenShift:greenShift greenMask:(greenMask >> greenShift)
104bc11d3845 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3589
diff changeset
   409
                                blueShift:blueShift blueMask:(blueMask >> blueShift).
104bc11d3845 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3589
diff changeset
   410
                colorMap alphaShift:alphaShift alphaMask:(alphaMask >> alphaShift).                
104bc11d3845 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3589
diff changeset
   411
                photometric := #palette.
104bc11d3845 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3589
diff changeset
   412
            ].
104bc11d3845 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3589
diff changeset
   413
            swapAction := [:bytes | data swapBytes].                
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   414
        ].    
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   415
        inDepth == 24 ifTrue:[
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   416
            (redShift ~~ 0
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   417
                or:[ greenShift ~~ 8
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   418
                or:[ blueShift ~~ 16
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   419
                or:[ numRedBits ~~ 8
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   420
                or:[ numGreenBits ~~ 8
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   421
                or:[ numBlueBits ~~ 8
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   422
                or:[ alphaMask ~~ 0]]]]]]
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   423
            ) ifTrue:[ 
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   424
                (redShift == 16 
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   425
                    and:[greenShift == 8
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   426
                    and:[blueShift == 0
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   427
                    and:[numRedBits == 8
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   428
                    and:[numGreenBits == 8
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   429
                    and:[numBlueBits == 8
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   430
                    and:[alphaMask == 0]]]]]]
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   431
                ) ifTrue:[
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   432
                    "/ common case: swap r and b
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   433
                    swapAction := [:data | self swapBytesFromRGB_to_BGR].
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   434
                ] ifFalse:[    
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   435
                    needPixelProcessing := true
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   436
                ].    
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   437
            ].    
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   438
            bitsPerSample := #(8 8 8).
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   439
            photometric := #rgb.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   440
        ].    
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   441
        inDepth == 32 ifTrue:[
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   442
            (redShift ~~ 0
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   443
                or:[ greenShift ~~ 8
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   444
                or:[ redShift ~~ 16
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   445
                or:[ numRedBits ~~ 8
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   446
                or:[ numGreenBits ~~ 8
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   447
                or:[ numBlueBits ~~ 8
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   448
                or:[ alphaMask ~~ 0 and:[ alphaShift ~~ 24]]]]]]]
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   449
            ) ifTrue:[ 
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   450
                (redShift == 16 
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   451
                    and:[greenShift == 8
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   452
                    and:[blueShift == 0
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   453
                    and:[alphaShift == 24
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   454
                    and:[numRedBits == 8
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   455
                    and:[numGreenBits == 8
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   456
                    and:[numBlueBits == 8
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   457
                    and:[numAlphaBits == 8]]]]]]]
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   458
                ) ifTrue:[
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   459
                    "/ common case: swap r and b
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   460
                    swapAction := [:data | self swapBytesFromRGBA_to_BGRA].
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   461
                ] ifFalse:[    
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   462
                    needPixelProcessing := true
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   463
                ].    
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   464
            ].    
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   465
            bitsPerSample := #(8 8 8 8).
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   466
            photometric := #rgba.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   467
        ].
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   468
        
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   469
        needPixelProcessing ifTrue:[ 
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   470
            alphaMask == 0 ifTrue:[
3590
104bc11d3845 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3589
diff changeset
   471
                pixelAction := [:v |
104bc11d3845 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3589
diff changeset
   472
                                |r g b|
104bc11d3845 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3589
diff changeset
   473
                                r := (v bitAnd:redMask) >> redShift.
104bc11d3845 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3589
diff changeset
   474
                                g := (v bitAnd:greenMask) >> greenShift.
104bc11d3845 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3589
diff changeset
   475
                                b := (v bitAnd:blueMask) >> blueShift.
104bc11d3845 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3589
diff changeset
   476
                                (((b bitShift:8) bitOr:g) bitShift:8) bitOr:r
104bc11d3845 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3589
diff changeset
   477
                               ].
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   478
            ] ifFalse:[    
3590
104bc11d3845 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3589
diff changeset
   479
                pixelAction := [:v |
104bc11d3845 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3589
diff changeset
   480
                                |r g b a|
104bc11d3845 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3589
diff changeset
   481
                                r := (v bitAnd:redMask) >> redShift.
104bc11d3845 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3589
diff changeset
   482
                                g := (v bitAnd:greenMask) >> greenShift.
104bc11d3845 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3589
diff changeset
   483
                                b := (v bitAnd:blueMask) >> blueShift.
104bc11d3845 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3589
diff changeset
   484
                                a := (v bitAnd:alphaMask) >> alphaShift.
104bc11d3845 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3589
diff changeset
   485
                                (((((a bitShift:8) bitOr:b) bitShift:8) bitOr:g) bitShift:8) bitOr:r
104bc11d3845 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3589
diff changeset
   486
                               ].
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   487
            ].
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   488
        ].    
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   489
    ] ifFalse:[
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   490
        inDepth <= 8 ifTrue:[
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   491
            photometric := #palette.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   492
        ] ifFalse:[    
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   493
            inDepth == 16 ifTrue:[
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   494
                bitsPerSample := #(5 5 5).
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   495
                colorMap := FixedPalette
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   496
                                redShift:10 redMask:16r1f
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   497
                                greenShift:5 greenMask:16r1f
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   498
                                blueShift:0 blueMask:16r1F.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   499
                photometric := #palette.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   500
                swapAction := [:bytes | data swapBytes].                
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   501
            ].    
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   502
            inDepth == 24 ifTrue:[
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   503
                bitsPerSample := #(8 8 8).
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   504
                photometric := #rgb.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   505
                swapAction := [:data | self swapBytesFromRGB_to_BGR].
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   506
            ].    
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   507
            inDepth == 32 ifTrue:[
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   508
                bitsPerSample := #(8 8 8 8).
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   509
                photometric := #rgba.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   510
                swapAction := [:data | self swapBytesFromRGBA_to_BGRA].
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   511
            ].    
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   512
        ].    
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   513
    ].    
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   514
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   515
    "/ Depth32Image keeps its data r/g/b/a; BMP has it b/g/r/a (sigh)
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   516
    pixelAction notNil ifTrue:[
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   517
        inDepth == 16 ifTrue:[
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   518
            swapAction := 
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   519
                [:byteArray | 
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   520
                    |idx rowIdx oldValue newValue bpr|
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   521
                    rowIdx := 1.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   522
                    bpr := self bytesPerRow.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   523
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   524
                    1 to:height do:[:y |
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   525
                        idx := rowIdx.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   526
                        1 to:width do:[:x |
3602
1b88866d2807 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3596
diff changeset
   527
                            oldValue := data unsignedInt16At:idx MSB:false.
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   528
                            newValue := pixelAction value:oldValue.
3602
1b88866d2807 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3596
diff changeset
   529
                            data unsignedInt16At:idx put:newValue MSB:true.
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   530
                            idx := idx + 2.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   531
                        ].    
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   532
                        rowIdx := rowIdx + bpr.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   533
                    ]
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   534
               ].                 
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   535
        ].    
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   536
        inDepth == 24 ifTrue:[
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   537
            swapAction := 
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   538
                [:byteArray | 
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   539
                    |idx rowIdx oldValue newValue bpr|
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   540
                    rowIdx := 1.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   541
                    bpr := self bytesPerRow.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   542
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   543
                    1 to:height do:[:y |
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   544
                        idx := rowIdx.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   545
                        1 to:width do:[:x |
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   546
                            oldValue := data unsignedIntegerAt:idx length:3 bigEndian:false.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   547
                            newValue := pixelAction value:oldValue.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   548
                            data unsignedIntegerAt:idx put:newValue length:3 bigEndian:true.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   549
                            idx := idx + 3.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   550
                        ].    
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   551
                        rowIdx := rowIdx + bpr.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   552
                    ]
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   553
               ].                 
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   554
        ].    
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   555
        inDepth == 32 ifTrue:[
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   556
            swapAction := 
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   557
                [:byteArray | 
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   558
                    |idx rowIdx oldValue newValue bpr|
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   559
                    rowIdx := 1.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   560
                    bpr := self bytesPerRow.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   561
                    
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   562
                    1 to:height do:[:y |
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   563
                        idx := rowIdx.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   564
                        1 to:width do:[:x |
3604
5d4d8906ade6 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3602
diff changeset
   565
                            oldValue := data unsignedInt32At:idx MSB:false.
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   566
                            newValue := pixelAction value:oldValue.
3604
5d4d8906ade6 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3602
diff changeset
   567
                            data unsignedInt32At:idx put:newValue MSB:false.
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   568
                            idx := idx + 4.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   569
                        ].    
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   570
                        rowIdx := rowIdx + bpr.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   571
                    ]
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   572
               ].                 
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   573
        ].
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   574
    ].
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   575
    swapAction notNil ifTrue:[
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   576
        swapAction value:data
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   577
    ].
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   578
!
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   579
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   580
loadBMP1From:aStream into:aByteArray
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   581
    "load bmp-1 bit per pixel imagedata."
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   582
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   583
    compression == 0 ifFalse:[
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   584
	^ false
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   585
    ].
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   586
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   587
    ^ self loadUncompressedFrom:aStream into:aByteArray
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   588
!
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   589
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   590
loadBMP2From:aStream into:aByteArray
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   591
    "load bmp-2 bit per pixel imagedata."
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   592
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   593
    compression == 0 ifFalse:[
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   594
	^ false
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   595
    ].
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   596
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   597
    ^ self loadUncompressedFrom:aStream into:aByteArray
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   598
!
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   599
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   600
loadBMP4From:aStream into:aByteArray
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   601
    "load bmp-4 bit per pixel imagedata."
211
3eb140e89e2e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 172
diff changeset
   602
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   603
    compression == 0 ifTrue:[
4003
256b43a46036 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 3999
diff changeset
   604
        ^ self loadUncompressedFrom:aStream into:aByteArray
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   605
    ].
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   606
    compression == 2 ifTrue:[
4003
256b43a46036 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 3999
diff changeset
   607
        [
256b43a46036 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 3999
diff changeset
   608
            ^ self loadRLECompressedBMP4From:aStream into:aByteArray
256b43a46036 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 3999
diff changeset
   609
        ] on:Error do:[:ex |
256b43a46036 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 3999
diff changeset
   610
            self fileFormatError:'Error during RLE decompression: %1' with:ex description.
256b43a46036 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 3999
diff changeset
   611
            ^ false.
256b43a46036 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 3999
diff changeset
   612
        ]
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   613
    ].
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   614
4003
256b43a46036 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 3999
diff changeset
   615
    self fileFormatError:'unsupported compression: %1' with:compression.
256b43a46036 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 3999
diff changeset
   616
    ^ false
256b43a46036 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 3999
diff changeset
   617
!
256b43a46036 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 3999
diff changeset
   618
256b43a46036 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 3999
diff changeset
   619
loadBMP8From:aStream into:aByteArray
256b43a46036 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 3999
diff changeset
   620
    "load bmp-8 bit per pixel imagedata."
256b43a46036 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 3999
diff changeset
   621
256b43a46036 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 3999
diff changeset
   622
    compression == 0 ifTrue:[
256b43a46036 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 3999
diff changeset
   623
        ^ self loadUncompressedFrom:aStream into:aByteArray.
256b43a46036 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 3999
diff changeset
   624
    ].
256b43a46036 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 3999
diff changeset
   625
    compression == 1 ifTrue:[
256b43a46036 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 3999
diff changeset
   626
        [
256b43a46036 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 3999
diff changeset
   627
            ^ self loadRLECompressedBMP8From:aStream into:aByteArray.
256b43a46036 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 3999
diff changeset
   628
        ] on:Error do:[:ex |
256b43a46036 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 3999
diff changeset
   629
            self fileFormatError:'error during RLE decompression: %1' with:ex description.
256b43a46036 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 3999
diff changeset
   630
            ^ false.
256b43a46036 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 3999
diff changeset
   631
        ]
256b43a46036 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 3999
diff changeset
   632
    ].
256b43a46036 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 3999
diff changeset
   633
256b43a46036 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 3999
diff changeset
   634
    self fileFormatError:'unsupported compression: %1' with:compression.
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   635
    ^ false
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   636
!
160
ee4d64b12c94 handle depth 24 rgb BMP files
Claus Gittinger <cg@exept.de>
parents: 114
diff changeset
   637
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   638
loadBMPWidth:w height:h bytesPerPixel:bpp from:aStream into:aByteArray
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   639
    "load bmp-16/24/32 bit per pixel imagedata."
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   640
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   641
    |dstIdx fileBytesPerRow imgBytesPerRow skip align lineDelta|
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   642
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   643
    align := 4.
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   644
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   645
    ((compression == 0) or:[compression == 3]) ifFalse:[
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   646
        "/ 'BMPReader: unsupported compression: ' infoPrint. compression infoPrintCR. 
4003
256b43a46036 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 3999
diff changeset
   647
        self fileFormatError:'unsupported compression: %1' with:compression.
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   648
        ^ false.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   649
    ].
160
ee4d64b12c94 handle depth 24 rgb BMP files
Claus Gittinger <cg@exept.de>
parents: 114
diff changeset
   650
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   651
    imgBytesPerRow := w * bpp.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   652
    fileBytesPerRow := imgBytesPerRow.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   653
    (fileBytesPerRow bitAnd:(align-1)) ~~ 0 ifTrue:[
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   654
        fileBytesPerRow := (fileBytesPerRow bitAnd:((align-1) bitInvert)) + align.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   655
    ].
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   656
    
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   657
    topDown ifTrue:[
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   658
        dstIdx := 1.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   659
        lineDelta := imgBytesPerRow
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   660
    ] ifFalse:[
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   661
        dstIdx := imgBytesPerRow * (h - 1) + 1.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   662
        lineDelta := imgBytesPerRow negated
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   663
    ].
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   664
    
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   665
    (lineDelta == fileBytesPerRow) ifTrue:[
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   666
        (aStream nextBytes:(fileBytesPerRow*h) into:aByteArray startingAt:dstIdx) == (fileBytesPerRow*h) ifFalse:[
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   667
            ^ false
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   668
        ].
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   669
    ] ifFalse:[    
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   670
        skip := fileBytesPerRow - imgBytesPerRow.
3578
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   671
        1 to:h do:[:row |
3920
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
   672
            |nRead|
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
   673
            
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
   674
            nRead := aStream nextBytes:imgBytesPerRow into:aByteArray startingAt:dstIdx.
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
   675
            nRead == imgBytesPerRow ifFalse:[
3578
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   676
                ^ false
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   677
            ].
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   678
            skip ~~ 0 ifTrue:[ aStream skip:skip ].
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   679
            dstIdx := dstIdx + lineDelta.
3578
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   680
        ].
160
ee4d64b12c94 handle depth 24 rgb BMP files
Claus Gittinger <cg@exept.de>
parents: 114
diff changeset
   681
    ].
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   682
    ^ true
3920
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
   683
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
   684
    "Modified: / 22-02-2017 / 16:20:50 / cg"
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   685
!
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   686
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   687
loadBMPWidth:w height:h depth:d from:aStream into:aByteArray
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   688
    "helper: load a BMP image"
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   689
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   690
    d == 8 ifTrue:[
4003
256b43a46036 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 3999
diff changeset
   691
        ^ self loadBMP8From:aStream into:aByteArray
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   692
    ].
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   693
    d == 4 ifTrue:[
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   694
        ^ self loadBMP4From:aStream into:aByteArray
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   695
    ].
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   696
    d == 2 ifTrue:[
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   697
        ^ self loadBMP2From:aStream into:aByteArray
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   698
    ].
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   699
    d == 1 ifTrue:[
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   700
        ^ self loadBMP1From:aStream into:aByteArray
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   701
    ].
3920
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
   702
    
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
   703
    ((d == 16) or:[ (d == 24) or:[ (d == 32) ]]) ifTrue:[
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   704
        (self loadBMPWidth:w height:h bytesPerPixel:(d // 8) from:aStream into:aByteArray) ifFalse:[
2756
e8bf6a023191 halt in: #loadBMPWidth:height:depth:from:into:
Claus Gittinger <cg@exept.de>
parents: 2578
diff changeset
   705
            ^ false
e8bf6a023191 halt in: #loadBMPWidth:height:depth:from:into:
Claus Gittinger <cg@exept.de>
parents: 2578
diff changeset
   706
        ].
e8bf6a023191 halt in: #loadBMPWidth:height:depth:from:into:
Claus Gittinger <cg@exept.de>
parents: 2578
diff changeset
   707
        ^ true
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   708
    ].
4003
256b43a46036 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 3999
diff changeset
   709
256b43a46036 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 3999
diff changeset
   710
    self fileFormatError:'unsupported depth: %1' with:d.
819
e358c08e45ea common error reporter
Claus Gittinger <cg@exept.de>
parents: 713
diff changeset
   711
    ^ false
103
claus
parents: 102
diff changeset
   712
3920
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
   713
    "Created: / 17-09-1995 / 18:48:11 / claus"
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
   714
    "Modified: / 03-02-1998 / 20:21:16 / cg"
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
   715
    "Modified (format): / 22-02-2017 / 17:04:56 / cg"
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   716
!
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   717
3578
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   718
loadRLECompressedBMP4From:aStream into:aByteArray
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   719
    "load bmp-rle-4 pixel imagedata"
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   720
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   721
    |bytesPerRow x y dstIndex lineStartIndex cnt pair clr1 clr2 code nbyte byte bytes byteIdx rev|
3578
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   722
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   723
    bytesPerRow := self bytesPerRow.
3578
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   724
    x := 0.
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   725
    
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   726
    topDown ifTrue:[
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   727
        y := 0.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   728
        lineStartIndex := 1.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   729
    ] ifFalse:[
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   730
        y := height - 1.
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   731
        lineStartIndex := (y * bytesPerRow) + 1.
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   732
    ].
3578
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   733
    dstIndex := lineStartIndex.
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   734
    "/ data atAllPut:16rBB.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   735
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   736
    [ y between:0 and:height-1 ] whileTrue:[
3578
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   737
        cnt := aStream nextByte.
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   738
        pair := aStream nextByte.
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   739
        cnt ~~ 0 ifTrue:[
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   740
            ((x between:0 and:width-1) and:[y between:0 and:height-1]) ifFalse:[
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   741
                self breakPoint:#cg.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   742
                self fileFormatError:('invalid delta').
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   743
            ].    
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   744
            "/ Transcript printf:'RUN y: %d x: %d cnt: %d pair: %02x\n' with:y with:x with:cnt with:pair.
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   745
            x even ifTrue:[
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   746
                (cnt >= 2) ifTrue:[
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   747
                    nbyte := cnt // 2.
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   748
                    aByteArray from:dstIndex to:(dstIndex+nbyte-1) put:pair.
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   749
                    dstIndex := dstIndex + nbyte.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   750
                ].
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   751
                cnt odd ifTrue:[
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   752
                    "/ got odd count
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   753
                    byte := aByteArray at:dstIndex.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   754
                    aByteArray at:dstIndex put:((byte bitAnd:16r0F) bitOr:(pair bitAnd:16rF0)).
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   755
                    "/ self halt.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   756
                ].    
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   757
            ] ifFalse:[
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   758
                clr1 := pair bitShift:-4. "/ left bit
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   759
                clr2 := pair bitAnd:16rF. "/ right bit
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   760
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   761
                "/ the first odd-x halfbyte
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   762
                byte := aByteArray at:dstIndex.
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   763
                aByteArray at:dstIndex put:((byte bitAnd:16rF0) bitOr:clr1).
3578
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   764
                dstIndex := dstIndex + 1.
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   765
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   766
                nbyte := (cnt-1) // 2.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   767
                nbyte > 0 ifTrue:[
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   768
                    rev := (clr2 << 4) bitOr:clr1.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   769
                    aByteArray from:dstIndex to:(dstIndex+nbyte-1) put:rev.
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   770
                    dstIndex := dstIndex + nbyte.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   771
                ].
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   772
                cnt even ifTrue:[
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   773
                    "/ the final odd-x halfbyte
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   774
                    byte := aByteArray at:dstIndex.
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   775
                    aByteArray at:dstIndex put:((byte bitAnd:16r0F) bitOr:(clr2 bitShift:4)).
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   776
                ].    
3578
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   777
            ].
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   778
            x := x + cnt.
3578
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   779
        ] ifFalse:[
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   780
            "/ cnt == 0: escape codes */
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   781
            code := pair.
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   782
            code == 0 ifTrue:[
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   783
                "/ end of line
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   784
                "/ Transcript printf:'EOL\n'.
3578
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   785
                x := 0.
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   786
                topDown ifTrue:[
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   787
                    y := y + 1.
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   788
                    lineStartIndex := lineStartIndex + bytesPerRow.
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   789
                ] ifFalse:[    
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   790
                    y := y - 1.
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   791
                    lineStartIndex := lineStartIndex - bytesPerRow.
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   792
                ].    
3578
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   793
                dstIndex := lineStartIndex.
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   794
            ] ifFalse:[
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   795
                code == 1 ifTrue:[
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   796
                    "/ Transcript printf:'END\n'.
3578
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   797
                    "/ end of pic
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   798
                    ^ true
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   799
                ].
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   800
                code == 2 ifTrue:[
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   801
                    "/ delta
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   802
                    x := x + aStream nextSignedByte.
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   803
                    y := y - aStream nextSignedByte.
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   804
                    "/ Transcript printf:'MOVE y: %d x: %d\n' with:y with:x with:code.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   805
                    lineStartIndex := (y * bytesPerRow) + 1.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   806
                    dstIndex := lineStartIndex + (x//2).
3578
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   807
                ] ifFalse:[
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   808
                    "/ absolute; cnt pixels coming
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   809
                    ((x between:0 and:width-1) and:[y between:0 and:height-1]) ifFalse:[
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   810
                        self breakPoint:#cg.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   811
                        self fileFormatError:('invalid delta').
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   812
                    ].    
3578
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   813
                    cnt := code.
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   814
                    nbyte := (cnt+1) // 2.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   815
                    bytes := aStream nextBytes:nbyte.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   816
                    "/ odd byte count - padd
3578
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   817
                    nbyte odd ifTrue:[
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   818
                        aStream skip:1.
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   819
                    ].
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   820
                    x + cnt > width ifTrue:[self halt].
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   821
                    byteIdx := 1.
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   822
                    "/ Transcript printf:'PIXELS: %d x: %d count: %d nbyte: %d\n' with:y with:x with:cnt with:nbyte.
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   823
                    x even ifTrue:[
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   824
                        nbyte := cnt // 2.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   825
                        aByteArray replaceFrom:dstIndex to:(dstIndex+nbyte-1) with:bytes startingAt:byteIdx.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   826
                        byteIdx := byteIdx + nbyte.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   827
                        dstIndex := dstIndex + nbyte.
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   828
                        cnt odd ifTrue:[
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   829
                            "/ the last half-byte
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   830
                            pair := bytes at:byteIdx.
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   831
                            byte := aByteArray at:dstIndex.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   832
                            aByteArray at:dstIndex put:((byte bitAnd:16r0F) bitOr:(pair bitAnd:16rF0)).
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   833
                            "/ self halt.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   834
                        ].
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   835
                    ] ifFalse:[
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   836
                        nbyte := (cnt // 2).
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   837
                        [nbyte > 0] whileTrue:[
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   838
                            pair := bytes at:byteIdx. byteIdx := byteIdx + 1.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   839
                            byte := aByteArray at:dstIndex.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   840
                            aByteArray at:dstIndex put:((byte bitAnd:16rF0) bitOr:((pair bitShift:-4) bitAnd:16r0F)).
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   841
                            dstIndex := dstIndex + 1.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   842
                            byte := aByteArray at:dstIndex.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   843
                            aByteArray at:dstIndex put:((byte bitAnd:16r0F) bitOr:((pair bitShift:4) bitAnd:16rF0)).
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   844
                            nbyte := nbyte - 1.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   845
                        ].
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   846
                        cnt odd ifTrue:[
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   847
                            pair := bytes at:byteIdx. byteIdx := byteIdx + 1.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   848
                            byte := aByteArray at:dstIndex.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   849
                            aByteArray at:dstIndex put:((byte bitAnd:16rF0) bitOr:((pair bitShift:-4) bitAnd:16r0F)).
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   850
                            dstIndex := dstIndex + 1.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   851
                        ].    
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   852
                    ].    
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   853
                    x := x + cnt. 
3578
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   854
                ].
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   855
            ].
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   856
        ].
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   857
    ].
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   858
    ^ true.
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   859
!
6bd3a34492f9 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3571
diff changeset
   860
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   861
loadRLECompressedBMP8From:aStream into:aByteArray
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   862
    "load bmp-8 bit per pixel imagedata"
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   863
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   864
    |bytesPerRowInData x y dstIndex lineStartIndex cnt clr code n|
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   865
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   866
    bytesPerRowInData := self bytesPerRow.
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   867
    x := 0.
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   868
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   869
    topDown ifTrue:[
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   870
        y := 0.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   871
        lineStartIndex := 1.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   872
    ] ifFalse:[
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   873
        y := height - 1.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   874
        lineStartIndex := (y * bytesPerRowInData) + 1.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   875
    ].    
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   876
    dstIndex := lineStartIndex.
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   877
    
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   878
    [ y between:0 and:height-1 ] whileTrue:[
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   879
        cnt := aStream nextByte.
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   880
        clr := aStream nextByte.
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   881
        cnt ~~ 0 ifTrue:[
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   882
            aByteArray from:dstIndex to:dstIndex+cnt-1 put:clr.
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   883
            x := x + cnt.
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   884
            dstIndex := dstIndex + cnt.
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   885
        ] ifFalse:[
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   886
            "/ cnt == 0: escape codes */
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   887
            code := clr.
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   888
            code == 0 ifTrue:[
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   889
                "/ end of line
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   890
                x := 0.
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   891
                topDown ifTrue:[
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   892
                    y := y + 1.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   893
                    lineStartIndex := lineStartIndex + bytesPerRowInData.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   894
                ] ifFalse:[    
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   895
                    y := y - 1.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   896
                    lineStartIndex := lineStartIndex - bytesPerRowInData.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   897
                ].
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   898
                dstIndex := lineStartIndex.
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   899
            ] ifFalse:[
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   900
                code == 1 ifTrue:[
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   901
                    "/ end of pic
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   902
                    ^ true
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   903
                ].
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   904
                code == 2 ifTrue:[
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   905
                    "/ delta
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   906
                    x := x + aStream nextSignedByte.
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   907
                    y := y - aStream nextSignedByte.
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   908
                    lineStartIndex := (y * bytesPerRowInData) + 1.
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   909
                    dstIndex := lineStartIndex + x.
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   910
                ] ifFalse:[
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   911
                    "/ absolute; cnt pixels coming
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   912
                    cnt := code.
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   913
                    n := aStream nextBytes:cnt into:aByteArray startingAt:dstIndex.
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   914
                    n ~~ cnt ifTrue:[^ false].
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   915
                    x := x + cnt.
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   916
                    dstIndex := dstIndex + cnt.
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   917
                    "/ odd count - padd
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   918
                    cnt odd ifTrue:[
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   919
                        aStream skip:1.
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   920
                    ].
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   921
                ].
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   922
            ].
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   923
        ].
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   924
    ].
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   925
    ^ true.
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   926
!
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   927
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   928
loadUncompressedFrom:aStream into:aByteArray
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   929
    "load bmp-1,2,4 and 8 bit per pixel imagedata."
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   930
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   931
    |bytesPerRowInStream bytesPerRowInData skip n
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   932
     dstIndex  "{ Class: SmallInteger }" 
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   933
     lineDelta "{ Class: SmallInteger }" 
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   934
     nRows     "{ Class: SmallInteger }" |
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   935
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   936
    compression == 0 ifFalse:[
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   937
        ^ false
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   938
    ].
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   939
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   940
    bytesPerRowInStream := Image bytesPerRowForWidth:width depth:inDepth padding:32.
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   941
    bytesPerRowInData := self bytesPerRow.
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   942
    skip := bytesPerRowInStream - bytesPerRowInData.
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   943
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   944
    topDown ifTrue:[
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   945
        dstIndex := 1.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   946
        lineDelta := bytesPerRowInData.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   947
    ] ifFalse:[    
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   948
        "/ bottom row first...
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   949
        dstIndex := (height - 1) * bytesPerRowInData + 1.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   950
        lineDelta := bytesPerRowInData negated.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   951
    ].
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   952
    nRows := height.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   953
    
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   954
    1 to:nRows do:[:row |
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   955
        n := aStream nextBytes:bytesPerRowInData into:aByteArray startingAt:dstIndex.
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   956
        n ~~ bytesPerRowInData ifTrue:[^ false].
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   957
        skip ~~ 0 ifTrue:[aStream skip:skip].
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
   958
        dstIndex := dstIndex + lineDelta.
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   959
    ].
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   960
    ^ true.
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   961
!
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
   962
1848
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
   963
readColorMap:nColors numBytesPerColor:nRawBytesPerColor from:aStream
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
   964
    "read the colormap; notice: its in BGR order (sigh)."
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
   965
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   966
    |rawMap rMap gMap bMap
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   967
     srcIndex  "{ Class: SmallInteger }"|
1848
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
   968
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
   969
    rawMap := ByteArray uninitializedNew:(nColors*nRawBytesPerColor).
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
   970
    aStream nextBytes:(nColors*nRawBytesPerColor) into:rawMap.
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
   971
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
   972
    rMap := ByteArray new:nColors.
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
   973
    gMap := ByteArray new:nColors.
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
   974
    bMap := ByteArray new:nColors.
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
   975
    srcIndex := 1.
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
   976
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
   977
    "/ stupid: this is a BGR-ordered map (otherwise, could use #rgbBytesVector:-message)
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
   978
    "/ also, there might be a fourth byte (alpha ?) which is (currently) skipped.
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
   979
    1 to:nColors do:[:i |
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   980
        bMap at:i put:(rawMap at:srcIndex).
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   981
        gMap at:i put:(rawMap at:srcIndex+1).
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   982
        rMap at:i put:(rawMap at:srcIndex+2).
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   983
        srcIndex := srcIndex + nRawBytesPerColor.
1848
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
   984
    ].
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
   985
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
   986
    ^ MappedPalette
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   987
        redVector:rMap
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   988
        greenVector:gMap
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   989
        blueVector:bMap.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   990
!
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   991
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   992
swapBytesFromRGBA_to_BGRA
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   993
    |idx bytesPerRow|
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   994
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   995
    "/ Depth32Image keeps its data r/g/b/a; BMP has it b/g/r/a (sigh)
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   996
    idx := 1.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   997
    bytesPerRow := self bytesPerRow.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   998
    1 to:height do:[:y |
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
   999
        self class swap:width pixelsFromRGB_to_BGR_in:data startingAt:idx bytesPerPixel:4.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1000
        idx := idx + bytesPerRow.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1001
    ].
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1002
!
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1003
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1004
swapBytesFromRGB_to_BGR
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1005
    |idx bytesPerRow|
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1006
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1007
    "/ Depth24Image keeps its data r/g/b; BMP has it b/g/r (sigh)
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1008
    idx := 1.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1009
    bytesPerRow := self bytesPerRow.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1010
    1 to:height do:[:y |
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1011
        self class swap:width pixelsFromRGB_to_BGR_in:data startingAt:idx bytesPerPixel:3.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1012
        idx := idx + bytesPerRow.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1013
    ].
1848
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1014
! !
864ca2cd4e71 category
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
  1015
1805
93f557cbe600 category changes
Claus Gittinger <cg@exept.de>
parents: 1790
diff changeset
  1016
!WindowsIconReader methodsFor:'reading'!
0
3f9277473954 Initial revision
claus
parents:
diff changeset
  1017
211
3eb140e89e2e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 172
diff changeset
  1018
fromOS2File:aFilename
3eb140e89e2e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 172
diff changeset
  1019
    "read an image from an OS/2 BMP file"
3eb140e89e2e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 172
diff changeset
  1020
41
66edc847b9c8 *** empty log message ***
claus
parents: 36
diff changeset
  1021
    |reader stream|
66edc847b9c8 *** empty log message ***
claus
parents: 36
diff changeset
  1022
1790
41f36b5a29c3 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1759
diff changeset
  1023
    stream := self class streamReadingFile:aFilename.
41
66edc847b9c8 *** empty log message ***
claus
parents: 36
diff changeset
  1024
    stream isNil ifTrue:[^ nil].
2333
a93f1f5392bd from*Stream: methods return the image
Claus Gittinger <cg@exept.de>
parents: 2034
diff changeset
  1025
    reader := self class new.
a93f1f5392bd from*Stream: methods return the image
Claus Gittinger <cg@exept.de>
parents: 2034
diff changeset
  1026
    reader fromOS2Stream:stream.
41
66edc847b9c8 *** empty log message ***
claus
parents: 36
diff changeset
  1027
    stream close.
2333
a93f1f5392bd from*Stream: methods return the image
Claus Gittinger <cg@exept.de>
parents: 2034
diff changeset
  1028
    ^ reader image
211
3eb140e89e2e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 172
diff changeset
  1029
2333
a93f1f5392bd from*Stream: methods return the image
Claus Gittinger <cg@exept.de>
parents: 2034
diff changeset
  1030
    "Modified: / 30-05-2007 / 16:52:50 / cg"
21
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
  1031
!
0
3f9277473954 Initial revision
claus
parents:
diff changeset
  1032
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1033
fromOS2Stream:aStream
211
3eb140e89e2e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 172
diff changeset
  1034
    "read an image from an OS/2 BMP stream"
3eb140e89e2e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 172
diff changeset
  1035
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
  1036
    ^ self fromOS2Stream:aStream alreadyRead:nil
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
  1037
!
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
  1038
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
  1039
fromOS2Stream:aStream alreadyRead:bytesAlreadyRead
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
  1040
    "read an image from an OS/2 BMP stream"
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
  1041
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
  1042
    |header inBytesPerRow mask bytesPerRow nColors nByte|
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1043
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1044
    inStream := aStream.
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1045
    aStream binary.
2031
c8527bd15f50 .ico stuff - ongoing work
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
  1046
    byteOrder := #lsb.
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1047
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1048
    "read the header"
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1049
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1050
    header := ByteArray uninitializedNew:8r110.
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
  1051
    bytesAlreadyRead size > 0 ifTrue:[
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1052
        header replaceFrom:1 with:bytesAlreadyRead
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
  1053
    ].
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
  1054
    aStream nextBytes:(16-bytesAlreadyRead size) into:header startingAt:(1+bytesAlreadyRead size).
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1055
445
899af8ff2a5d checkin from browser
Claus Gittinger <cg@exept.de>
parents: 430
diff changeset
  1056
    (header startsWith:#(73 67)) ifTrue:[         "IC"
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1057
        "IC format"
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1058
        aStream nextBytes:10 into:header startingAt:17.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1059
        width := header at:7.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1060
        height := header at:9.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1061
        inDepth := 2 "header at:11". "where is it"
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1062
    ] ifFalse:[
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1063
        (header startsWith:#(67 73)) ifTrue:[     "CI"
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1064
            ^ self fileFormatError:'unsupported format: CI'.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1065
        ] ifFalse:[
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1066
            aStream nextBytes:(8r110-16) into:header startingAt:17.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1067
            width := header at:8r101.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1068
            height := header at:8r103.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1069
            inDepth := header at:8r107.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1070
        ]
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1071
    ].
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1072
1846
d29322944b05 dimensionReport
Claus Gittinger <cg@exept.de>
parents: 1805
diff changeset
  1073
    self reportDimension.
d29322944b05 dimensionReport
Claus Gittinger <cg@exept.de>
parents: 1805
diff changeset
  1074
1745
4fa0fad2a463 code cleanup (colorMap handling)
Claus Gittinger <cg@exept.de>
parents: 1734
diff changeset
  1075
    "read the colormap; notice: its in BGR order (sigh)"
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1076
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1077
    nColors := 1 bitShift:inDepth.
1745
4fa0fad2a463 code cleanup (colorMap handling)
Claus Gittinger <cg@exept.de>
parents: 1734
diff changeset
  1078
    colorMap := self readColorMap:nColors numBytesPerColor:3 from:aStream.
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1079
1745
4fa0fad2a463 code cleanup (colorMap handling)
Claus Gittinger <cg@exept.de>
parents: 1734
diff changeset
  1080
    "read the mask"
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1081
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
  1082
    nByte := ((width * height) + 7) // 8.
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1083
    mask := ByteArray uninitializedNew:nByte.
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1084
    aStream nextBytes:nByte into:mask.
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1085
1745
4fa0fad2a463 code cleanup (colorMap handling)
Claus Gittinger <cg@exept.de>
parents: 1734
diff changeset
  1086
    "what is this ?"
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1087
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1088
    aStream nextBytes:nByte into:mask.
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1089
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1090
"/    "read the data bits"
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1091
"/
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1092
"/    bytesPerRow := width * inDepth + 7 // 8.
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1093
"/    data4 := ByteArray uninitializedNew:(height * bytesPerRow).
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1094
"/    inDepth == 8 ifTrue:[
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1095
"/    ].
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1096
"/    aStream nextBytes:(height * bytesPerRow) into:data4.
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1097
"/
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1098
"/    "stupid: last row first"
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1099
"/
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1100
"/    tmp := ByteArray new:(height * bytesPerRow).
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1101
"/    srcIndex := 1.
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1102
"/    dstIndex := (height - 1) * bytesPerRow + 1.
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1103
"/    1 to:height do:[:row |
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1104
"/        tmp replaceFrom:dstIndex to:(dstIndex + bytesPerRow - 1)
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1105
"/                   with:data4 startingAt:srcIndex.
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1106
"/        srcIndex := srcIndex + bytesPerRow.
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1107
"/        dstIndex := dstIndex - bytesPerRow.
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1108
"/    ].
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1109
"/    data4 := tmp.
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1110
"/
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1111
"/    "expand into bytes"
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1112
"/
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1113
"/    data := ByteArray new:(width * height).
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1114
"/    data4 expandPixels:inDepth width:width height:height
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1115
"/                  into:data mapping:nil.
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1116
"/
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1117
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
  1118
    bytesPerRow := ((width * inDepth) + 7) // 8.
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1119
    "/ bmp data is always 32bit aligned; if required,
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1120
    inBytesPerRow := ((bytesPerRow + 3) // 4) * 4.
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1121
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1122
    data := ByteArray uninitializedNew:(height * width "bytesPerRow").
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
  1123
    compression := 0.
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
  1124
    (self loadBMPWidth:width height:height depth:inDepth from:aStream into:data) ifFalse:[
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1125
        ^ nil
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1126
    ].
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1127
    photometric := #palette.
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1128
    samplesPerPixel := 1.
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1129
    bitsPerSample := #(8).
2333
a93f1f5392bd from*Stream: methods return the image
Claus Gittinger <cg@exept.de>
parents: 2034
diff changeset
  1130
    ^ self image
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1131
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1132
    "
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1133
     |i f|
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1134
     i := Image fromFile:'/LocalLibrary/Images/OS2/dos3.ico'.
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1135
     f := i asFormOn:Display.
3742
634868214786 #OTHER by mawalch
mawalch
parents: 3726
diff changeset
  1136
     v displayOpaqueForm:(f magnifiedBy:2@2) x:5 y:5
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1137
    "
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1138
2333
a93f1f5392bd from*Stream: methods return the image
Claus Gittinger <cg@exept.de>
parents: 2034
diff changeset
  1139
    "Modified: / 17-09-1995 / 18:49:24 / claus"
a93f1f5392bd from*Stream: methods return the image
Claus Gittinger <cg@exept.de>
parents: 2034
diff changeset
  1140
    "Modified: / 30-05-2007 / 16:53:24 / cg"
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1141
!
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1142
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
  1143
fromStream:aStream
211
3eb140e89e2e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 172
diff changeset
  1144
    "figure out which format the stream contains
3eb140e89e2e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 172
diff changeset
  1145
     (there are various different bmp/ico formats around)
3eb140e89e2e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 172
diff changeset
  1146
     and read the image."
3eb140e89e2e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 172
diff changeset
  1147
3eb140e89e2e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 172
diff changeset
  1148
    |fileSize header|
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1149
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1150
    inStream := aStream.
2031
c8527bd15f50 .ico stuff - ongoing work
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
  1151
    byteOrder := #lsb.
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1152
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1153
    aStream binary.
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1154
    aStream signalAtEnd:true.
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
  1155
    aStream isFileStream ifTrue:[
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1156
        fileSize := aStream fileSize.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1157
        fileSize < 16 ifTrue:[
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1158
            ^ self fileFormatError:'short/corrupted file'.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1159
        ].
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1160
    ].
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1161
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1162
    EndOfStreamError handle:[:ex |
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1163
        ^ self fileFormatError:'unexpected EOF while reading (short/corrupted file)'.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1164
    ] do:[    
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1165
        header := ByteArray uninitializedNew:4.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1166
        aStream nextBytes:4 into:header.
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1167
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1168
        (header startsWith:#(66 77)) ifTrue:[     "BM"
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1169
            "/ 'WinIconReader [info]: Win3.x or OS/2 vsn 2 BM format' infoPrintNL.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1170
            ^ self fromWindowsBMPStream:aStream alreadyRead:header
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1171
        ].
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1172
        (header startsWith:#(66 65)) ifTrue:[     "BA"
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1173
            "/ 'WinIconReader [info]: OS/2 vsn 2 BA format' infoPrintNL.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1174
            ^ self fromOS2Stream:aStream alreadyRead:header
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1175
        ].
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1176
        (header startsWith:#(67 73)) ifTrue:[     "CI"
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1177
            "/ 'WinIconReader [info]: OS/2 vsn 2 BA format' infoPrintNL.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1178
            "/ ^ self fromOS2Stream:aStream
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1179
            ^ self fileFormatError:'OS/2 CI format not supported'.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1180
        ].
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1181
        (header startsWith:#(73 67)) ifTrue:[     "IC"
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1182
            "/ 'WinIconReader [info]: OS/2 IC format' infoPrintNL.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1183
            ^ self fromOS2Stream:aStream alreadyRead:header
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1184
        ].
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1185
        (header startsWith:#(80 84)) ifTrue:[     "PT"
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1186
            "/ 'WinIconReader [info]: OS/2 PT format' infoPrintNL.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1187
            ^ self fromOS2Stream:aStream alreadyRead:header
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1188
        ].
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1189
        (header startsWith:#(16r53 16r5A)) ifTrue:[     "SZ"
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1190
            "/ 'WinIconReader [info]: OS/2 SZ format' infoPrintNL.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1191
            "/ ^ self fromOS2Stream:aStream
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1192
            ^ self fileFormatError:'OS/2 SZ format not supported'.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1193
        ].
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1194
        (header startsWith:#(0 0 1 0)) ifTrue:[
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1195
            "/ 'WinIconReader [info]: Win3.x ICO format' infoPrintNL.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1196
            ^ self fromWindowsICOStream:aStream alreadyRead:header
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1197
        ].
3920
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1198
        (header startsWith:#(0 0 2 0)) ifTrue:[
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1199
            "/ 'WinIconReader [info]: Win3.x CUR format' infoPrintNL.
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1200
            ^ self fromWindowsICOStream:aStream alreadyRead:header
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1201
        ].
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1202
    ].
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1203
    
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1204
    ^ self fileFormatError:('format not supported: %02x %02x' printfWith:(header at:1) with:(header at:2))
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1205
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1206
    "
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1207
     Image fromFile:'/phys/clam//LocalLibrary/Images/OS2_icons/dos.ico'
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1208
    "
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1209
3920
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1210
    "Modified: / 17-09-1995 / 18:59:07 / claus"
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1211
    "Modified: / 22-02-2017 / 18:12:21 / cg"
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1212
!
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1213
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
  1214
fromWindowsBMPFile: aFilename
211
3eb140e89e2e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 172
diff changeset
  1215
    "read an image from a windows BMP file"
3eb140e89e2e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 172
diff changeset
  1216
41
66edc847b9c8 *** empty log message ***
claus
parents: 36
diff changeset
  1217
    |reader stream|
66edc847b9c8 *** empty log message ***
claus
parents: 36
diff changeset
  1218
66edc847b9c8 *** empty log message ***
claus
parents: 36
diff changeset
  1219
    stream := self class streamReadingFile:aFilename.
66edc847b9c8 *** empty log message ***
claus
parents: 36
diff changeset
  1220
    stream isNil ifTrue:[^ nil].
2333
a93f1f5392bd from*Stream: methods return the image
Claus Gittinger <cg@exept.de>
parents: 2034
diff changeset
  1221
    reader := self class new.
a93f1f5392bd from*Stream: methods return the image
Claus Gittinger <cg@exept.de>
parents: 2034
diff changeset
  1222
    reader fromWindowsBMPStream:stream.
41
66edc847b9c8 *** empty log message ***
claus
parents: 36
diff changeset
  1223
    stream close.
2333
a93f1f5392bd from*Stream: methods return the image
Claus Gittinger <cg@exept.de>
parents: 2034
diff changeset
  1224
    ^ reader image.
211
3eb140e89e2e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 172
diff changeset
  1225
2333
a93f1f5392bd from*Stream: methods return the image
Claus Gittinger <cg@exept.de>
parents: 2034
diff changeset
  1226
    "Modified: / 30-05-2007 / 16:53:48 / cg"
21
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
  1227
!
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
  1228
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
  1229
fromWindowsBMPStream:aStream
211
3eb140e89e2e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 172
diff changeset
  1230
    "read an image from a windows BMP stream"
3eb140e89e2e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 172
diff changeset
  1231
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
  1232
    ^ self fromWindowsBMPStream:aStream alreadyRead:nil
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
  1233
!
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
  1234
3920
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1235
fromWindowsBMPStream:aStream alreadyRead:fileHeaerBytesAlreadyRead
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
  1236
    "read an image from a windows BMP stream"
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
  1237
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1238
    | fileHeader bitmapHeader iSize inPlanes
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1239
      imgSize resH resV numColor numImportantColor
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1240
      dataStart 
1745
4fa0fad2a463 code cleanup (colorMap handling)
Claus Gittinger <cg@exept.de>
parents: 1734
diff changeset
  1241
      bytesPerRow numBytesPerColorInColormap|
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1242
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1243
    inStream := aStream.
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1244
    aStream binary.
2031
c8527bd15f50 .ico stuff - ongoing work
Claus Gittinger <cg@exept.de>
parents: 1848
diff changeset
  1245
    byteOrder := #lsb.
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1246
    topDown := false.
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1247
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1248
    "read the header"
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1249
3920
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1250
    fileHeaerBytesAlreadyRead size >= 16 ifTrue:[
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1251
        "/ used when coming from an ICO file.
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1252
        fileHeader := nil.
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1253
    ] ifFalse:[    
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1254
        fileHeader := ByteArray new:14.    
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1255
        fileHeaerBytesAlreadyRead size > 0 ifTrue:[
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1256
            fileHeader replaceFrom:1 with:fileHeaerBytesAlreadyRead
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1257
        ].
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1258
        aStream nextBytes:(14-fileHeaerBytesAlreadyRead size) into:fileHeader startingAt:(1+fileHeaerBytesAlreadyRead size).
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1259
        dataStart := fileHeader unsignedInt32At:(10 + 1) MSB:false.
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
  1260
    ].
3920
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1261
    
3640
8a96d595df32 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 3604
diff changeset
  1262
    iSize := aStream nextUnsignedInt32MSB:false.
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1263
    iSize > 124 ifTrue:[
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1264
        ^ self fileFormatError:'unknown format'.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1265
    ].
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1266
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1267
    bitmapHeader := ByteArray new:iSize+16. "/ reserve to allow masks to be read with iSize=40 
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1268
    aStream nextBytes:(iSize-4) into:bitmapHeader startingAt:(1+4).
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1269
3593
cba067f384d3 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3592
diff changeset
  1270
    alphaMask := 0.
cba067f384d3 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3592
diff changeset
  1271
3592
6a70bc638877 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3591
diff changeset
  1272
    ((iSize == 40) or:[iSize == 52 or:[iSize == 56 or:[iSize == 108 or:[iSize == 124]]]]) ifTrue:[    "header-size"
3579
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1273
        "/
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1274
        "/ a Windows3.x BMP file (40)
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1275
        "/ a Windows4.x BMP file (108)
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1276
        "/ a Windows5.x BMP file (124)
3579
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1277
        "/
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1278
        "/ 'WinIconReader [info]: Win3.x/Win4.x/Win5.x format' infoPrintCR.
3920
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1279
        fileHeader isNil ifTrue:[
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1280
            self assert:(bitmapHeader unsignedInt32At:(4 + 1) MSB:false) == width.
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1281
            self assert:(bitmapHeader signedInt32At:(8 + 1) MSB:false) == (height*2).
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1282
        ] ifFalse:[    
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1283
            width := bitmapHeader unsignedInt32At:(4 + 1) MSB:false.
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1284
            height := bitmapHeader signedInt32At:(8 + 1) MSB:false.
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1285
        ].
3602
1b88866d2807 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3596
diff changeset
  1286
        inPlanes := bitmapHeader unsignedInt16At:(12 + 1) MSB:false.
1b88866d2807 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3596
diff changeset
  1287
        inDepth := bitmapHeader unsignedInt16At:(14 + 1) MSB:false.
3604
5d4d8906ade6 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3602
diff changeset
  1288
        compression := bitmapHeader unsignedInt32At:(16 + 1) MSB:false.
5d4d8906ade6 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3602
diff changeset
  1289
        imgSize := bitmapHeader unsignedInt32At:(20 + 1) MSB:false.
5d4d8906ade6 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3602
diff changeset
  1290
        resH := bitmapHeader unsignedInt32At:(24 + 1) MSB:false.
5d4d8906ade6 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3602
diff changeset
  1291
        resV := bitmapHeader unsignedInt32At:(28 + 1) MSB:false.
5d4d8906ade6 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3602
diff changeset
  1292
        numColor := bitmapHeader unsignedInt32At:(32 + 1) MSB:false.
5d4d8906ade6 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3602
diff changeset
  1293
        numImportantColor := bitmapHeader unsignedInt32At:(36 + 1) MSB:false.
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1294
        
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1295
        (compression > 3) ifTrue:[
3593
cba067f384d3 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3592
diff changeset
  1296
            compression == 4 ifTrue:[
cba067f384d3 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3592
diff changeset
  1297
                "/ JPG in data
cba067f384d3 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3592
diff changeset
  1298
                aStream position:dataStart.
cba067f384d3 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3592
diff changeset
  1299
                pngOrJPGImage := JPEGReader fromStream:aStream.
cba067f384d3 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3592
diff changeset
  1300
                ^ pngOrJPGImage
cba067f384d3 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3592
diff changeset
  1301
            ].    
3591
87336f7e44cf #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3590
diff changeset
  1302
            compression == 5 ifTrue:[
87336f7e44cf #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3590
diff changeset
  1303
                "/ PNG in data
87336f7e44cf #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3590
diff changeset
  1304
                aStream position:dataStart.
87336f7e44cf #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3590
diff changeset
  1305
                pngOrJPGImage := PNGReader fromStream:aStream.
87336f7e44cf #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3590
diff changeset
  1306
                ^ pngOrJPGImage
87336f7e44cf #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3590
diff changeset
  1307
            ].    
3593
cba067f384d3 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3592
diff changeset
  1308
            compression == 6 ifTrue:[
cba067f384d3 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3592
diff changeset
  1309
                "/ very seldom - alphamask compression
cba067f384d3 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3592
diff changeset
  1310
            ] ifFalse:[    
cba067f384d3 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3592
diff changeset
  1311
                ^ self fileFormatError:'unhandled compression'.
3591
87336f7e44cf #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3590
diff changeset
  1312
            ].    
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1313
        ].
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1314
        
3593
cba067f384d3 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3592
diff changeset
  1315
        (iSize == 40 and:[(compression == 3) or:[compression == 6]]) ifTrue:[
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1316
            "/ masks are not counted in header (sigh)
3593
cba067f384d3 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3592
diff changeset
  1317
            compression == 6 ifTrue:[
cba067f384d3 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3592
diff changeset
  1318
                aStream next:4*4 into:bitmapHeader startingAt:iSize+1.
3604
5d4d8906ade6 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3602
diff changeset
  1319
                alphaMask := bitmapHeader unsignedInt32At:(52 + 1) MSB:false.
3593
cba067f384d3 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3592
diff changeset
  1320
                compression := 3.
cba067f384d3 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3592
diff changeset
  1321
            ] ifFalse:[        
cba067f384d3 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3592
diff changeset
  1322
                aStream next:4*3 into:bitmapHeader startingAt:iSize+1.
cba067f384d3 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3592
diff changeset
  1323
            ].    
3604
5d4d8906ade6 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3602
diff changeset
  1324
            redMask := bitmapHeader unsignedInt32At:(40 + 1) MSB:false.
5d4d8906ade6 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3602
diff changeset
  1325
            greenMask := bitmapHeader unsignedInt32At:(44 + 1) MSB:false.
5d4d8906ade6 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3602
diff changeset
  1326
            blueMask := bitmapHeader unsignedInt32At:(48 + 1) MSB:false.
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1327
        ] ifFalse:[        
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1328
            iSize > 40 ifTrue:[
3592
6a70bc638877 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3591
diff changeset
  1329
                "/ masks are counted in header (sigh)
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1330
                ((compression == 3) or:[iSize == 108]) ifTrue:[
3592
6a70bc638877 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3591
diff changeset
  1331
                    iSize >= 52 ifTrue:[
3604
5d4d8906ade6 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3602
diff changeset
  1332
                        redMask := bitmapHeader unsignedInt32At:(40 + 1) MSB:false.
5d4d8906ade6 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3602
diff changeset
  1333
                        greenMask := bitmapHeader unsignedInt32At:(44 + 1) MSB:false.
5d4d8906ade6 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3602
diff changeset
  1334
                        blueMask := bitmapHeader unsignedInt32At:(48 + 1) MSB:false.
3592
6a70bc638877 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3591
diff changeset
  1335
                        iSize >= 56 ifTrue:[
3604
5d4d8906ade6 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3602
diff changeset
  1336
                            alphaMask := bitmapHeader unsignedInt32At:(52 + 1) MSB:false.
3592
6a70bc638877 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3591
diff changeset
  1337
                        ].
6a70bc638877 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3591
diff changeset
  1338
                    ].
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1339
                ].
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1340
            ].
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1341
        ].
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1342
        
3579
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1343
        numColor == 0 ifTrue:[
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1344
            "if 0 and depth is 8 or smaller, then the colormap has the size for the depth"
3579
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1345
            inDepth <= 8 ifTrue:[
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1346
                numColor := 1 bitShift:inDepth.
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1347
            ]
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1348
        ].
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1349
3579
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1350
        numBytesPerColorInColormap := 4.
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1351
    ] ifFalse:[
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1352
        ((iSize == 12) or:[ (iSize == 16) or:[iSize == 64]]) ifTrue:[
3579
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1353
            "/
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1354
            "/ its a Win2.x or OS/2 BMP file
3579
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1355
            "/
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1356
            "/ 'WinIconReader [info]: Win2.x or OS/2 format' infoPrintCR.
1745
4fa0fad2a463 code cleanup (colorMap handling)
Claus Gittinger <cg@exept.de>
parents: 1734
diff changeset
  1357
3579
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1358
            numBytesPerColorInColormap := 3.
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
  1359
3594
695b4c2f1b83 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 3593
diff changeset
  1360
            iSize == 64 ifTrue:[
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1361
                "/
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1362
                "/ its an OS/2 (vsn2) BMP file
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1363
                "/
3604
5d4d8906ade6 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3602
diff changeset
  1364
                width := bitmapHeader unsignedInt32At:(4 + 1) MSB:false.
5d4d8906ade6 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3602
diff changeset
  1365
                height := bitmapHeader signedInt32At:(8 + 1) MSB:false.
3602
1b88866d2807 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3596
diff changeset
  1366
                inPlanes := bitmapHeader unsignedInt16At:(12 + 1) MSB:false.
1b88866d2807 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3596
diff changeset
  1367
                inDepth := bitmapHeader unsignedInt16At:(14 + 1) MSB:false.
3604
5d4d8906ade6 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3602
diff changeset
  1368
                compression := bitmapHeader unsignedInt32At:(16 + 1) MSB:false.
5d4d8906ade6 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3602
diff changeset
  1369
                numColor := bitmapHeader unsignedInt32At:(32 + 1) MSB:false.
5d4d8906ade6 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3602
diff changeset
  1370
                numImportantColor := bitmapHeader unsignedInt32At:(36 + 1) MSB:false.
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1371
                (compression > 2) ifTrue:[
3594
695b4c2f1b83 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 3593
diff changeset
  1372
                    "/ 3 = HUFFMAN; 4 = RLE24
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1373
                    ^ self fileFormatError:'unhandled OS2 compression'.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1374
                ].
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1375
                numColor == 0 ifTrue:[
3988
1bc80a8c7566 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3931
diff changeset
  1376
                    "/ self halt.
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1377
                    "if 0 and depth is 8 or smaller, then the colormap has the size for the depth"
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1378
                    inDepth <= 8 ifTrue:[
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1379
                        numColor := 1 bitShift:inDepth.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1380
                    ].    
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1381
                ].    
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1382
                numBytesPerColorInColormap := 4.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1383
            ] ifFalse:[    
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1384
                iSize == 16 ifTrue:[
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1385
                    "/ an OS2 bitmap with large dimensions
3604
5d4d8906ade6 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3602
diff changeset
  1386
                    width := bitmapHeader unsignedInt32At:(4 + 1) MSB:false.
5d4d8906ade6 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3602
diff changeset
  1387
                    height := bitmapHeader signedInt32At:(8 + 1) MSB:false.
3602
1b88866d2807 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3596
diff changeset
  1388
                    inPlanes := bitmapHeader unsignedInt16At:(12 + 1) MSB:false.
1b88866d2807 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3596
diff changeset
  1389
                    inDepth := bitmapHeader unsignedInt16At:(14 + 1) MSB:false.
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1390
                    numBytesPerColorInColormap := 4.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1391
                ] ifFalse:[
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1392
                    "/ size == 12:
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1393
                    "/ a Win2.x bitmap
3602
1b88866d2807 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3596
diff changeset
  1394
                    width := bitmapHeader unsignedInt16At:(4 + 1) MSB:false.
3604
5d4d8906ade6 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3602
diff changeset
  1395
                    height := bitmapHeader signedInt16At:(6 + 1) MSB:false.
3602
1b88866d2807 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3596
diff changeset
  1396
                    inPlanes := bitmapHeader unsignedInt16At:(8 + 1) MSB:false.
1b88866d2807 #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 3596
diff changeset
  1397
                    inDepth := bitmapHeader unsignedInt16At:(10 + 1) MSB:false.
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1398
                ].
3579
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1399
                compression := 0.
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1400
                inDepth <= 8 ifTrue:[
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1401
                    numColor := 1 bitShift:inDepth.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1402
                ].    
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1403
            ].
3579
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1404
        ] ifFalse:[
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1405
            ^ self fileFormatError:'unknown format'.
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1406
        ].
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1407
    ].
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1408
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1409
    topDown := false.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1410
    height < 0 ifTrue:[
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1411
        height := height negated.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1412
        topDown := true.
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1413
    ].    
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1414
    ((width > 10000) or:[height > 10000]) ifTrue:[
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1415
        ^ self fileFormatError:'unreasonable width or height'.
3579
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1416
    ].
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1417
    
1846
d29322944b05 dimensionReport
Claus Gittinger <cg@exept.de>
parents: 1805
diff changeset
  1418
    self reportDimension.
d29322944b05 dimensionReport
Claus Gittinger <cg@exept.de>
parents: 1805
diff changeset
  1419
3999
2e26f0d49ca9 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3988
diff changeset
  1420
    numColor := numColor ? 0.
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1421
    numColor ~~ 0 ifTrue:[
3579
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1422
        "read the colormap - notice: its in BGR order (sigh)"
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1423
3581
cbd1af2f743b #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3579
diff changeset
  1424
        numColor > 4096 ifTrue:[
cbd1af2f743b #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3579
diff changeset
  1425
            "/ colormap only allowed up to 12bit
3579
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1426
            ^ self fileFormatError:'unreasonable colormap size'.
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1427
        ]. 
3590
104bc11d3845 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3589
diff changeset
  1428
"/        (dataStart - inStream position) ~= (numBytesPerColorInColormap*numColor) ifTrue:[
104bc11d3845 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3589
diff changeset
  1429
"/            self halt
104bc11d3845 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3589
diff changeset
  1430
"/        ].    
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1431
        
3579
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1432
        colorMap := self
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1433
                        readColorMap:numColor
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1434
                        numBytesPerColor:numBytesPerColorInColormap
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1435
                        from:aStream.
1745
4fa0fad2a463 code cleanup (colorMap handling)
Claus Gittinger <cg@exept.de>
parents: 1734
diff changeset
  1436
3579
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1437
        numColor > (1 bitShift:inDepth) ifTrue:[
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1438
            'funny number of colors in image' infoPrintCR.
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1439
            numColor := 1 bitShift:inDepth.
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1440
            colorMap := colorMap copyTo:numColor.
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1441
        ].
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1442
    ].
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1443
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1444
    "/ check for valid compression
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1445
    compression ~~ 0 ifTrue:[
3579
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1446
        "/ some compression
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1447
        compression == 1 ifTrue:[
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1448
            "/ RLE8 - must be depth-8
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1449
            inDepth ~~ 8 ifTrue:[
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1450
                ^ self fileFormatError:'RLE8 compression only supported with depth8 images'.
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1451
            ].
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1452
        ].
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1453
        compression == 2 ifTrue:[
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1454
            "/ RLE4 - must be depth-4
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1455
            inDepth ~~ 4 ifTrue:[
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1456
                ^ self fileFormatError:'RLE4 compression only supported with depth4 images'.
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1457
            ].
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1458
        ].
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1459
        compression == 3 ifTrue:[
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1460
            "/ BITFIELDS - must be depth-16 or 32
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1461
            (inDepth < 16) ifTrue:[
3579
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1462
                ^ self fileFormatError:'BITFIELDS compression only supported with depth16/32 images'.
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1463
            ].
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1464
        ].
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1465
        compression >= 4 ifTrue:[
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1466
             ^ self fileFormatError:'unsupported compression'.
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1467
        ].
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1468
    ].
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1469
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1470
    inPlanes ~~ 1 ifTrue:[
3579
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1471
        ^ self fileFormatError:'only 1 plane images supported'.
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1472
    ].
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1473
565
03b84a590f49 fixed os2 bmp reading
Claus Gittinger <cg@exept.de>
parents: 518
diff changeset
  1474
    dataStart notNil ifTrue:[
3590
104bc11d3845 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3589
diff changeset
  1475
        "/ (dataStart - inStream position) ~~ 0 ifTrue:[self halt].
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1476
        
3579
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1477
        aStream position:dataStart.
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
  1478
    ].
3581
cbd1af2f743b #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3579
diff changeset
  1479
    
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1480
    inDepth == 24 ifTrue:[
3931
4291708939e9 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3920
diff changeset
  1481
        bytesPerRow := width * 3.
4291708939e9 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3920
diff changeset
  1482
        samplesPerPixel := 3.
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1483
    ] ifFalse:[
3579
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1484
        inDepth == 16 ifTrue:[
3931
4291708939e9 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3920
diff changeset
  1485
            bytesPerRow := width * 2.
4291708939e9 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3920
diff changeset
  1486
            samplesPerPixel := 3.
3579
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1487
        ] ifFalse:[
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1488
            inDepth == 32 ifTrue:[
3931
4291708939e9 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3920
diff changeset
  1489
                bytesPerRow := width * 4.
4291708939e9 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3920
diff changeset
  1490
                samplesPerPixel := 4.
3579
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1491
            ] ifFalse:[
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1492
                bitsPerSample := Array with:inDepth.
3931
4291708939e9 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3920
diff changeset
  1493
                bytesPerRow := self bytesPerRow.
4291708939e9 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3920
diff changeset
  1494
                samplesPerPixel := 1.
3579
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1495
            ].
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1496
        ].
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1497
    ].
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1498
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1499
    data := ByteArray uninitializedNew:(height * bytesPerRow).
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1500
    "/ when compressed, there may be holes, which need to be filled with zeros
3593
cba067f384d3 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3592
diff changeset
  1501
    ((compression ~~ 0) and:[compression ~~ 3]) ifTrue:[
3583
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1502
        data atAllPut:0
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1503
    ].
ccf4b1d2548a #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3581
diff changeset
  1504
    
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1505
    "/ read & possibly decompress
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1506
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
  1507
    (self loadBMPWidth:width height:height depth:inDepth from:aStream into:data) ifFalse:[
3579
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1508
        self fileFormatError:('read/decompression error').
94a3b7222275 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3578
diff changeset
  1509
        ^ nil
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1510
    ].
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1511
3589
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1512
    self convertPixels.
ef1e5b12715f #FEATURE
Claus Gittinger <cg@exept.de>
parents: 3584
diff changeset
  1513
    
2333
a93f1f5392bd from*Stream: methods return the image
Claus Gittinger <cg@exept.de>
parents: 2034
diff changeset
  1514
    ^ self image
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1515
2333
a93f1f5392bd from*Stream: methods return the image
Claus Gittinger <cg@exept.de>
parents: 2034
diff changeset
  1516
    "Modified: / 17-09-1995 / 18:48:46 / claus"
3999
2e26f0d49ca9 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3988
diff changeset
  1517
    "Modified: / 29-08-2017 / 23:12:59 / cg"
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1518
!
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  1519
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
  1520
fromWindowsICOFile:aFilename
211
3eb140e89e2e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 172
diff changeset
  1521
    "read an image from a windows ICO file"
3eb140e89e2e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 172
diff changeset
  1522
41
66edc847b9c8 *** empty log message ***
claus
parents: 36
diff changeset
  1523
    |reader stream|
66edc847b9c8 *** empty log message ***
claus
parents: 36
diff changeset
  1524
66edc847b9c8 *** empty log message ***
claus
parents: 36
diff changeset
  1525
    stream := self class streamReadingFile:aFilename.
66edc847b9c8 *** empty log message ***
claus
parents: 36
diff changeset
  1526
    stream isNil ifTrue:[^ nil].
3896
58e71198a302 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3742
diff changeset
  1527
    
2333
a93f1f5392bd from*Stream: methods return the image
Claus Gittinger <cg@exept.de>
parents: 2034
diff changeset
  1528
    reader := self class new.
a93f1f5392bd from*Stream: methods return the image
Claus Gittinger <cg@exept.de>
parents: 2034
diff changeset
  1529
    reader fromWindowsICOStream:stream.
41
66edc847b9c8 *** empty log message ***
claus
parents: 36
diff changeset
  1530
    stream close.
2333
a93f1f5392bd from*Stream: methods return the image
Claus Gittinger <cg@exept.de>
parents: 2034
diff changeset
  1531
    ^ reader image.
21
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
  1532
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
  1533
    "
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
  1534
     Image fromFile:'/phys/clam2//LocalLibrary/Images/WIN_icons/ibm.ico'.
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
  1535
    "
211
3eb140e89e2e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 172
diff changeset
  1536
2333
a93f1f5392bd from*Stream: methods return the image
Claus Gittinger <cg@exept.de>
parents: 2034
diff changeset
  1537
    "Modified: / 30-05-2007 / 16:57:52 / cg"
3896
58e71198a302 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 3742
diff changeset
  1538
    "Modified (format): / 17-02-2017 / 08:52:31 / cg"
21
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
  1539
!
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
  1540
41
66edc847b9c8 *** empty log message ***
claus
parents: 36
diff changeset
  1541
fromWindowsICOStream:aStream
211
3eb140e89e2e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 172
diff changeset
  1542
    "read an image from a windows ICO stream"
3eb140e89e2e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 172
diff changeset
  1543
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
  1544
    ^ self fromWindowsICOStream:aStream alreadyRead:nil
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
  1545
!
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
  1546
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
  1547
fromWindowsICOStream:aStream alreadyRead:bytesAlreadyRead
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
  1548
    "read an image from a windows ICO stream"
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
  1549
3920
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1550
    |header nImages images|
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1551
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1552
    inStream := aStream.
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1553
    aStream binary.
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1554
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1555
    "read the ICO/CUR header"
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1556
    header := ByteArray uninitializedNew:6.
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1557
    bytesAlreadyRead notEmptyOrNil ifTrue:[
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1558
        header replaceFrom:1 with:bytesAlreadyRead
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1559
    ].
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1560
    aStream nextBytes:((6)-bytesAlreadyRead size) into:header startingAt:(1+bytesAlreadyRead size).
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1561
    (header startsWith:#[0 0 1 0]) ifFalse:[
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1562
        (header startsWith:#[0 0 2 0]) ifFalse:[
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1563
            self fileFormatError:'not an ICO/CUR file'.
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1564
        ].    
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1565
    ]. 
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1566
    
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1567
    nImages := header unsignedInt16At:4+1 MSB:false.
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1568
    images := ImageSequence new.
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1569
    1 to:nImages do:[:each |
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1570
        |img|
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1571
        
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1572
        img := self readSingleImageFromWindowsICOStream:aStream.
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1573
        img imageSequence:images.
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1574
        images add:(ImageFrame new image:img).
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1575
    ].
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1576
    imageSequence := images.
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1577
    ^ images first image.
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1578
    
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1579
    "
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1580
     WindowsIconReader new fromWindowsICOFile:'~/work/exept/expecco/application/expecco.ico'
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1581
    "
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1582
    "
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1583
     |icons|
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1584
     
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1585
     icons := WindowsIconReader new fromWindowsICOFile:'~/work/exept/expecco/application/expecco.ico'
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1586
     MacOSXIconReader save:icons onFile:'~/work/exept/expecco/application/expecco.icns'.
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1587
    "
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1588
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1589
    "Modified (comment): / 22-02-2017 / 18:14:12 / cg"
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1590
!
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1591
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1592
old_fromWindowsICOStream:aStream alreadyRead:bytesAlreadyRead
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1593
    "read an image from a windows ICO stream"
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1594
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
  1595
    |header
2034
Claus Gittinger <cg@exept.de>
parents: 2031
diff changeset
  1596
     srcIndex dstIndex
Claus Gittinger <cg@exept.de>
parents: 2031
diff changeset
  1597
     rawData tmp bytesPerRow nColor cmapSize|
0
3f9277473954 Initial revision
claus
parents:
diff changeset
  1598
41
66edc847b9c8 *** empty log message ***
claus
parents: 36
diff changeset
  1599
    inStream := aStream.
66edc847b9c8 *** empty log message ***
claus
parents: 36
diff changeset
  1600
    aStream binary.
0
3f9277473954 Initial revision
claus
parents:
diff changeset
  1601
3f9277473954 Initial revision
claus
parents:
diff changeset
  1602
    "read the header"
3f9277473954 Initial revision
claus
parents:
diff changeset
  1603
2034
Claus Gittinger <cg@exept.de>
parents: 2031
diff changeset
  1604
    header := ByteArray uninitializedNew:(6 + 16 + 40).
3404
703c3b400e7d class: WindowsIconReader
Claus Gittinger <cg@exept.de>
parents: 3213
diff changeset
  1605
    bytesAlreadyRead notEmptyOrNil ifTrue:[
703c3b400e7d class: WindowsIconReader
Claus Gittinger <cg@exept.de>
parents: 3213
diff changeset
  1606
        header replaceFrom:1 with:bytesAlreadyRead
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
  1607
    ].
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
  1608
    aStream nextBytes:((6 + 16 + 40)-bytesAlreadyRead size) into:header startingAt:(1+bytesAlreadyRead size).
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
  1609
21
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
  1610
    width := header at:(6+1).
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
  1611
    height := header at:(7+1).
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
  1612
    nColor := header at:(8+1).
430
50b841f4851d commentary
Claus Gittinger <cg@exept.de>
parents: 398
diff changeset
  1613
    "/ reserved := header at:(9+1).
2034
Claus Gittinger <cg@exept.de>
parents: 2031
diff changeset
  1614
    "/ nPlanes := header wordAt:(10+1).
Claus Gittinger <cg@exept.de>
parents: 2031
diff changeset
  1615
    "/ nBitsPerPel := header wordAt:(12+1).
Claus Gittinger <cg@exept.de>
parents: 2031
diff changeset
  1616
    "/ nBytesInResource := header doubleWordAt:(14+1).
Claus Gittinger <cg@exept.de>
parents: 2031
diff changeset
  1617
    "/ ordinal := header wordAt:(18+1).
Claus Gittinger <cg@exept.de>
parents: 2031
diff changeset
  1618
    "21, 22               ?"
Claus Gittinger <cg@exept.de>
parents: 2031
diff changeset
  1619
    "23, ... , 62         ?"
21
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
  1620
2034
Claus Gittinger <cg@exept.de>
parents: 2031
diff changeset
  1621
    inDepth := header at:16r25.
Claus Gittinger <cg@exept.de>
parents: 2031
diff changeset
  1622
    "/ mhmh - some depth4 icons seem to have a 0 in the depth field ...
Claus Gittinger <cg@exept.de>
parents: 2031
diff changeset
  1623
    inDepth == 0 ifTrue:[
3404
703c3b400e7d class: WindowsIconReader
Claus Gittinger <cg@exept.de>
parents: 3213
diff changeset
  1624
        inDepth := 4
1386
2d02a4fba456 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1385
diff changeset
  1625
    ].
3404
703c3b400e7d class: WindowsIconReader
Claus Gittinger <cg@exept.de>
parents: 3213
diff changeset
  1626
    (#(4 8 32) includes:inDepth) ifFalse:[
703c3b400e7d class: WindowsIconReader
Claus Gittinger <cg@exept.de>
parents: 3213
diff changeset
  1627
        "/ only tested for depth 4/8 images.
703c3b400e7d class: WindowsIconReader
Claus Gittinger <cg@exept.de>
parents: 3213
diff changeset
  1628
        ^ self fileFormatError:'only depth 4/8/32 ico-images supported (depth is ' , inDepth printString , ')'.
1569
3954e576ff38 support depth 8 ico files
Claus Gittinger <cg@exept.de>
parents: 1507
diff changeset
  1629
"/        self halt:'only depth 4 ico-images supported (depth is ' , inDepth printString , ')'.
1171
d848c46349ab sorry: only depth4 images are handled.
Claus Gittinger <cg@exept.de>
parents: 1168
diff changeset
  1630
    ].
1846
d29322944b05 dimensionReport
Claus Gittinger <cg@exept.de>
parents: 1805
diff changeset
  1631
    self reportDimension.
0
3f9277473954 Initial revision
claus
parents:
diff changeset
  1632
3404
703c3b400e7d class: WindowsIconReader
Claus Gittinger <cg@exept.de>
parents: 3213
diff changeset
  1633
    nColor > 0 ifTrue:[
703c3b400e7d class: WindowsIconReader
Claus Gittinger <cg@exept.de>
parents: 3213
diff changeset
  1634
        "read the colormap"
703c3b400e7d class: WindowsIconReader
Claus Gittinger <cg@exept.de>
parents: 3213
diff changeset
  1635
        cmapSize := (1 bitShift:inDepth).
2034
Claus Gittinger <cg@exept.de>
parents: 2031
diff changeset
  1636
3404
703c3b400e7d class: WindowsIconReader
Claus Gittinger <cg@exept.de>
parents: 3213
diff changeset
  1637
        colorMap := self readColorMap:cmapSize numBytesPerColor:4 from:aStream.
703c3b400e7d class: WindowsIconReader
Claus Gittinger <cg@exept.de>
parents: 3213
diff changeset
  1638
    ].
0
3f9277473954 Initial revision
claus
parents:
diff changeset
  1639
2034
Claus Gittinger <cg@exept.de>
parents: 2031
diff changeset
  1640
    "read the data bits"
0
3f9277473954 Initial revision
claus
parents:
diff changeset
  1641
2571
ae60c0d0452d many fixes
Claus Gittinger <cg@exept.de>
parents: 2333
diff changeset
  1642
    bytesPerRow := ((width * inDepth) + 7) // 8.
1569
3954e576ff38 support depth 8 ico files
Claus Gittinger <cg@exept.de>
parents: 1507
diff changeset
  1643
    rawData := ByteArray uninitializedNew:(height * bytesPerRow).
3954e576ff38 support depth 8 ico files
Claus Gittinger <cg@exept.de>
parents: 1507
diff changeset
  1644
    aStream nextBytes:(height * bytesPerRow) into:rawData.
0
3f9277473954 Initial revision
claus
parents:
diff changeset
  1645
3f9277473954 Initial revision
claus
parents:
diff changeset
  1646
    "read mask"
2034
Claus Gittinger <cg@exept.de>
parents: 2031
diff changeset
  1647
0
3f9277473954 Initial revision
claus
parents:
diff changeset
  1648
"
3f9277473954 Initial revision
claus
parents:
diff changeset
  1649
    mask := ByteArray new:(width * height / 8).
41
66edc847b9c8 *** empty log message ***
claus
parents: 36
diff changeset
  1650
    aStream nextBytes:(width * height / 8) into:mask.
0
3f9277473954 Initial revision
claus
parents:
diff changeset
  1651
"
3f9277473954 Initial revision
claus
parents:
diff changeset
  1652
3f9277473954 Initial revision
claus
parents:
diff changeset
  1653
    "stupid: last row first"
3f9277473954 Initial revision
claus
parents:
diff changeset
  1654
3
78aaa5408119 *** empty log message ***
claus
parents: 0
diff changeset
  1655
    tmp := ByteArray uninitializedNew:(height * bytesPerRow).
0
3f9277473954 Initial revision
claus
parents:
diff changeset
  1656
    srcIndex := 1.
3f9277473954 Initial revision
claus
parents:
diff changeset
  1657
    dstIndex := (height - 1) * bytesPerRow + 1.
3f9277473954 Initial revision
claus
parents:
diff changeset
  1658
    1 to:height do:[:row |
3404
703c3b400e7d class: WindowsIconReader
Claus Gittinger <cg@exept.de>
parents: 3213
diff changeset
  1659
        tmp replaceFrom:dstIndex to:(dstIndex + bytesPerRow - 1)
703c3b400e7d class: WindowsIconReader
Claus Gittinger <cg@exept.de>
parents: 3213
diff changeset
  1660
                   with:rawData startingAt:srcIndex.
703c3b400e7d class: WindowsIconReader
Claus Gittinger <cg@exept.de>
parents: 3213
diff changeset
  1661
        srcIndex := srcIndex + bytesPerRow.
703c3b400e7d class: WindowsIconReader
Claus Gittinger <cg@exept.de>
parents: 3213
diff changeset
  1662
        dstIndex := dstIndex - bytesPerRow.
0
3f9277473954 Initial revision
claus
parents:
diff changeset
  1663
    ].
3568
a8900d28752b #BUGFIX
matilk
parents: 3404
diff changeset
  1664
a8900d28752b #BUGFIX
matilk
parents: 3404
diff changeset
  1665
    inDepth == 32 ifTrue:[
a8900d28752b #BUGFIX
matilk
parents: 3404
diff changeset
  1666
        srcIndex := 1.
a8900d28752b #BUGFIX
matilk
parents: 3404
diff changeset
  1667
        1 to:height do:[:row |
a8900d28752b #BUGFIX
matilk
parents: 3404
diff changeset
  1668
            1 to:width do:[:row |
a8900d28752b #BUGFIX
matilk
parents: 3404
diff changeset
  1669
                |b1 b2 b3 b4|
a8900d28752b #BUGFIX
matilk
parents: 3404
diff changeset
  1670
                b1 := tmp at:srcIndex.
a8900d28752b #BUGFIX
matilk
parents: 3404
diff changeset
  1671
                b2 := tmp at:srcIndex+1.
a8900d28752b #BUGFIX
matilk
parents: 3404
diff changeset
  1672
                b3 := tmp at:srcIndex+2.
a8900d28752b #BUGFIX
matilk
parents: 3404
diff changeset
  1673
                b4 := tmp at:srcIndex+3.
a8900d28752b #BUGFIX
matilk
parents: 3404
diff changeset
  1674
                tmp at:srcIndex put:b3.
a8900d28752b #BUGFIX
matilk
parents: 3404
diff changeset
  1675
                tmp at:srcIndex+2 put:b1.
a8900d28752b #BUGFIX
matilk
parents: 3404
diff changeset
  1676
                
a8900d28752b #BUGFIX
matilk
parents: 3404
diff changeset
  1677
                srcIndex := srcIndex + 4.
a8900d28752b #BUGFIX
matilk
parents: 3404
diff changeset
  1678
            ].
a8900d28752b #BUGFIX
matilk
parents: 3404
diff changeset
  1679
        ].
a8900d28752b #BUGFIX
matilk
parents: 3404
diff changeset
  1680
    ].
a8900d28752b #BUGFIX
matilk
parents: 3404
diff changeset
  1681
1569
3954e576ff38 support depth 8 ico files
Claus Gittinger <cg@exept.de>
parents: 1507
diff changeset
  1682
    rawData := tmp.
0
3f9277473954 Initial revision
claus
parents:
diff changeset
  1683
3404
703c3b400e7d class: WindowsIconReader
Claus Gittinger <cg@exept.de>
parents: 3213
diff changeset
  1684
    nColor > 0 ifTrue:[
703c3b400e7d class: WindowsIconReader
Claus Gittinger <cg@exept.de>
parents: 3213
diff changeset
  1685
        photometric := #palette.
703c3b400e7d class: WindowsIconReader
Claus Gittinger <cg@exept.de>
parents: 3213
diff changeset
  1686
        samplesPerPixel := 1.
703c3b400e7d class: WindowsIconReader
Claus Gittinger <cg@exept.de>
parents: 3213
diff changeset
  1687
        bitsPerSample := (Array with:inDepth).
703c3b400e7d class: WindowsIconReader
Claus Gittinger <cg@exept.de>
parents: 3213
diff changeset
  1688
    ] ifFalse:[
703c3b400e7d class: WindowsIconReader
Claus Gittinger <cg@exept.de>
parents: 3213
diff changeset
  1689
        inDepth == 32 ifTrue:[
703c3b400e7d class: WindowsIconReader
Claus Gittinger <cg@exept.de>
parents: 3213
diff changeset
  1690
            photometric := #rgba.
703c3b400e7d class: WindowsIconReader
Claus Gittinger <cg@exept.de>
parents: 3213
diff changeset
  1691
            samplesPerPixel := 4.
703c3b400e7d class: WindowsIconReader
Claus Gittinger <cg@exept.de>
parents: 3213
diff changeset
  1692
            bitsPerSample := #(8 8 8 8).
703c3b400e7d class: WindowsIconReader
Claus Gittinger <cg@exept.de>
parents: 3213
diff changeset
  1693
        ] ifFalse:[
703c3b400e7d class: WindowsIconReader
Claus Gittinger <cg@exept.de>
parents: 3213
diff changeset
  1694
            ^ self fileFormatError:'unsupported image depth: ' , inDepth printString.
703c3b400e7d class: WindowsIconReader
Claus Gittinger <cg@exept.de>
parents: 3213
diff changeset
  1695
        ]
703c3b400e7d class: WindowsIconReader
Claus Gittinger <cg@exept.de>
parents: 3213
diff changeset
  1696
    ].
298
cd59c474524a return .ico files as Depth4Images (not Depth8)
Claus Gittinger <cg@exept.de>
parents: 259
diff changeset
  1697
3404
703c3b400e7d class: WindowsIconReader
Claus Gittinger <cg@exept.de>
parents: 3213
diff changeset
  1698
    data := rawData.
2333
a93f1f5392bd from*Stream: methods return the image
Claus Gittinger <cg@exept.de>
parents: 2034
diff changeset
  1699
    ^ self image
298
cd59c474524a return .ico files as Depth4Images (not Depth8)
Claus Gittinger <cg@exept.de>
parents: 259
diff changeset
  1700
0
3f9277473954 Initial revision
claus
parents:
diff changeset
  1701
    "
21
66b31c91177f *** empty log message ***
claus
parents: 18
diff changeset
  1702
     WindowsIconReader new fromWindowsICOFile:'/phys/clam2//LocalLibrary/Images/WIN_icons/ibm.ico'.
0
3f9277473954 Initial revision
claus
parents:
diff changeset
  1703
    "
211
3eb140e89e2e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 172
diff changeset
  1704
3920
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1705
    "Created: / 22-02-2017 / 15:19:49 / cg"
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1706
!
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1707
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1708
readSingleImageFromWindowsICOStream:aStream 
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1709
    "read one image from a windows ICO stream"
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1710
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1711
    |icondirEntryHeader nBytes fileOffset savedPosition nColor nPlanes nBitsPerPixel img|
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1712
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1713
    inStream := aStream.
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1714
    aStream binary.
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1715
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1716
    "read the icondirEntryHeader"
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1717
    icondirEntryHeader := aStream nextBytes:16.
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1718
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1719
    width := icondirEntryHeader at:0+1.
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1720
    width == 0 ifTrue:[ width := 256].
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1721
    height := icondirEntryHeader at:1+1.
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1722
    height == 0 ifTrue:[ height := 256].
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1723
    nColor := icondirEntryHeader at:2+1. "/ 0 if not a palette image
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1724
    "/ reserved := icondirEntryHeader at:3+1.
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1725
    nPlanes := icondirEntryHeader unsignedInt16At:4+1 MSB:false.
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1726
    nBitsPerPixel := icondirEntryHeader unsignedInt16At:6+1 MSB:false.
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1727
    nBytes := icondirEntryHeader unsignedInt32At:(8+1) MSB:false.
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1728
    fileOffset := icondirEntryHeader unsignedInt32At:(12+1) MSB:false.
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1729
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1730
    savedPosition := aStream position.
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1731
    aStream position:fileOffset.
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1732
    (aStream nextBytes:(PNGReader pngHeader size)) = PNGReader pngHeader ifTrue:[
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1733
        "/ PNG incl bitmapFileHeader
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1734
        aStream position:fileOffset.
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1735
        img := PNGReader fromStream:aStream.
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1736
    ] ifFalse:[
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1737
        "/ BMP without bitmapFileHeader
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1738
        aStream position:fileOffset.
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1739
        img := self fromWindowsBMPStream:aStream alreadyRead:icondirEntryHeader.
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1740
    ].
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1741
    aStream position:savedPosition.
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1742
    
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1743
    ^ img
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1744
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1745
    "
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1746
     WindowsIconReader new fromWindowsICOFile:'/phys/clam2//LocalLibrary/Images/WIN_icons/ibm.ico'.
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1747
    "
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1748
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1749
    "Created: / 22-02-2017 / 15:22:09 / cg"
1bbb4d6fff20 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 3897
diff changeset
  1750
    "Modified (comment): / 22-02-2017 / 17:42:48 / cg"
1805
93f557cbe600 category changes
Claus Gittinger <cg@exept.de>
parents: 1790
diff changeset
  1751
! !
93f557cbe600 category changes
Claus Gittinger <cg@exept.de>
parents: 1790
diff changeset
  1752
93f557cbe600 category changes
Claus Gittinger <cg@exept.de>
parents: 1790
diff changeset
  1753
!WindowsIconReader methodsFor:'writing'!
713
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1754
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1755
save:image onFile:aFileName
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1756
    "save image as BMP file on aFileName.
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1757
     Only depth 1,4,8 and 24 images can be represented in this format."
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1758
1168
590e5660f69e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
  1759
    aFileName asFilename suffix asLowercase = 'ico' ifTrue:[
590e5660f69e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
  1760
"/        (image depth == 4
590e5660f69e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
  1761
"/        and:[image width == 32
590e5660f69e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
  1762
"/        and:[image height == 32]]) ifTrue:[
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
  1763
	    ^ self saveICO:image onFile:aFileName.
1168
590e5660f69e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
  1764
"/        ]
590e5660f69e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
  1765
    ].
713
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1766
    self saveBMP:image onFile:aFileName.
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1767
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1768
    "Modified: 17.10.1997 / 20:16:53 / cg"
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1769
!
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1770
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
  1771
saveBMP:image onFile:fileName
713
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1772
    "save image as BMP file on aFileName.
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1773
     Only depth 1,4,8 and 24 images can be represented in this format."
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1774
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
  1775
    |depth bhSize biSize biClrUsed biSizeImage bfOffBits rowBytes imgBytesPerRow 
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
  1776
     bits srcIndex row|
713
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1777
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1778
    depth := image depth.
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1779
    width := image width.
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1780
    height := image height.
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1781
3726
37f44a063d46 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3640
diff changeset
  1782
    (#(1 4 8 24 32) includes:depth) ifFalse:[
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
  1783
        ^ Image cannotRepresentImageSignal
713
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1784
            raiseWith:image
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1785
            errorString:('BMP format only supports depths 1,4,8 and 24').
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1786
    ].
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1787
    image mask notNil ifTrue:[
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1788
        Image informationLostQuerySignal
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1789
            raiseWith:image
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1790
            errorString:('BMP format does not support an imageMask').
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1791
    ].
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1792
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1793
    bhSize := 14.  "# bytes in file header"
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
  1794
    biSize := 40.  "info header size in bytes"
1734
290f382d40e9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1569
diff changeset
  1795
    biClrUsed := (depth >= 24) ifTrue:[0] ifFalse:[1 bitShift: depth].  "No. color table entries"
713
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1796
    bfOffBits := biSize + bhSize + (4*biClrUsed).
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1797
    "/ bmp aligns rows on a longword boundary
3726
37f44a063d46 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3640
diff changeset
  1798
    rowBytes := (((depth min:32) * width + 31) // 32) * 4.
713
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1799
    biSizeImage := height * rowBytes.
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1800
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1801
    outStream := fileName asFilename writeStream.
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1802
    outStream binary.
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1803
    byteOrder := #lsb.
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1804
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1805
    "Write the file header"
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
  1806
    self writeShort:19778.  "bfType = BM"
713
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1807
    self writeLong:(bfOffBits + biSizeImage).  "Entire file size in bytes"
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
  1808
    self writeLong:0.  "bfReserved"
713
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1809
    self writeLong:bfOffBits.  "Offset of bitmap data from start of hdr (and file)"
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1810
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1811
    "Write the bitmap info header"
3213
f89acb58aa7e class: WindowsIconReader
Stefan Vogel <sv@exept.de>
parents: 3158
diff changeset
  1812
    outStream position: bhSize.
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
  1813
    self writeLong:biSize.  "info header size in bytes"
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
  1814
    self writeLong:width.  "biWidth"
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
  1815
    self writeLong:height.  "biHeight"
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
  1816
    self writeShort:1.  "biPlanes"
3726
37f44a063d46 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3640
diff changeset
  1817
    self writeShort:(depth min:32).  "biBitCount"
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
  1818
    self writeLong:0.  "biCompression"
713
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1819
    self writeLong:biSizeImage.  "size of image section in bytes"
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
  1820
    self writeLong:2800.  "biXPelsPerMeter"
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
  1821
    self writeLong:2800.  "biYPelsPerMeter"
713
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1822
    self writeLong:biClrUsed.
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
  1823
    self writeLong:0.  "biClrImportant"
713
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1824
    1 to:biClrUsed do:[:i |  "Color map"
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1825
        |clr r g b|
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1826
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1827
        clr := image colorFromValue:i-1.
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1828
        clr isNil ifTrue:[
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1829
            r := g := b := 0.
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1830
        ] ifFalse:[
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1831
            r := clr redByte.
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1832
            g := clr greenByte.
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1833
            b := clr blueByte.
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1834
        ].
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1835
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1836
        "/ put B,G,R
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1837
        outStream nextPut:b.
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1838
        outStream nextPut:g.
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1839
        outStream nextPut:r.
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1840
        outStream nextPut:0.
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1841
    ].
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1842
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1843
    imgBytesPerRow := image bytesPerRow.
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
  1844
    bits := image bits.
713
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1845
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1846
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1847
    "/ sorry, must extract rows individually
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1848
    "/ (even if alignment is correct),
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1849
    "/ since BMP saves rows bottom-to-top
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1850
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1851
    row := ByteArray new:rowBytes.
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1852
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1853
    srcIndex := 1 + (height * imgBytesPerRow).
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1854
    1 to:height do:[:i |
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1855
        srcIndex := srcIndex - imgBytesPerRow.
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
  1856
        row replaceFrom:1 to:imgBytesPerRow with:bits startingAt:srcIndex.
3726
37f44a063d46 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3640
diff changeset
  1857
        depth >= 24 ifTrue:[
1507
9bae072abf64 fixed bmp saving 24bit image (red & blue channels exchanged)
Claus Gittinger <cg@exept.de>
parents: 1386
diff changeset
  1858
            "/ stupid must swap red & blue bytes
3726
37f44a063d46 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3640
diff changeset
  1859
            depth >= 32 ifTrue:[
37f44a063d46 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3640
diff changeset
  1860
                self class swap:row size bytesFromRGBA_to_BGRA_in:row startingAt:1.
37f44a063d46 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3640
diff changeset
  1861
            ] ifFalse:[
37f44a063d46 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3640
diff changeset
  1862
                self class swap:row size bytesFromRGB_to_BGR_in:row startingAt:1.
37f44a063d46 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 3640
diff changeset
  1863
            ]
1507
9bae072abf64 fixed bmp saving 24bit image (red & blue channels exchanged)
Claus Gittinger <cg@exept.de>
parents: 1386
diff changeset
  1864
        ].
713
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1865
        outStream nextPutAll:row.
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1866
    ].
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1867
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1868
    outStream close.
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1869
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1870
    "
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1871
     |i|
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1872
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1873
     i := Image fromFile:'bitmaps/SBrowser.xbm'.
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1874
     WindowsIconReader save:i onFile:'test.bmp'.
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1875
    "
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
  1876
713
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1877
    "
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
  1878
     |i i2|
713
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1879
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
  1880
     i := Image fromFile:'../../goodies/bitmaps/gifImages/garfield.gif'.
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
  1881
     i inspect.
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
  1882
     WindowsIconReader save:i onFile:'garfield.bmp'.
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
  1883
     i2 := Image fromFile:'garfield.bmp'.
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
  1884
     i2 inspect.
713
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1885
    "
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1886
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1887
    "Modified: 21.10.1997 / 05:02:02 / cg"
1167
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1888
!
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1889
2578
7d49dc8ecb63 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2571
diff changeset
  1890
saveICO:image onFile:fileName
1167
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1891
    "save image as ICO file on aFileName.
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1892
     Only depth 4 images of size 32x32 can be represented in this format."
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1893
1233
6587cabeab10 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1171
diff changeset
  1894
    |depth biSizeImage rowBytes imgBytesPerRow data srcIndex row|
1167
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1895
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1896
    depth := image depth.
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1897
    width := image width.
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1898
    height := image height.
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1899
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1900
    depth ~~ 4 ifTrue:[
2812
5d7701d5e48b changed: #saveICO:onFile:
Claus Gittinger <cg@exept.de>
parents: 2756
diff changeset
  1901
        ^ Image cannotRepresentImageSignal
5d7701d5e48b changed: #saveICO:onFile:
Claus Gittinger <cg@exept.de>
parents: 2756
diff changeset
  1902
            raiseWith:image
5d7701d5e48b changed: #saveICO:onFile:
Claus Gittinger <cg@exept.de>
parents: 2756
diff changeset
  1903
            errorString:('ICO format only supports depths 4').
1167
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1904
    ].
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1905
    (width ~~ 32 or:[height ~~ 32]) ifTrue:[
2812
5d7701d5e48b changed: #saveICO:onFile:
Claus Gittinger <cg@exept.de>
parents: 2756
diff changeset
  1906
        ^ Image cannotRepresentImageSignal
5d7701d5e48b changed: #saveICO:onFile:
Claus Gittinger <cg@exept.de>
parents: 2756
diff changeset
  1907
            raiseWith:image
5d7701d5e48b changed: #saveICO:onFile:
Claus Gittinger <cg@exept.de>
parents: 2756
diff changeset
  1908
            errorString:('ICO format (currently) only supports 32x32 bitmaps').
1167
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1909
    ].
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1910
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1911
    "/ align rows on a longword boundary
2812
5d7701d5e48b changed: #saveICO:onFile:
Claus Gittinger <cg@exept.de>
parents: 2756
diff changeset
  1912
    rowBytes := ((depth * width + 31) // 32) * 4.
1167
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1913
    biSizeImage := height * rowBytes.
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1914
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1915
    outStream := fileName asFilename writeStream.
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1916
    outStream binary.
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1917
    byteOrder := #lsb.
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1918
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1919
    "Write the file header"
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1920
    outStream nextPutAll:#[0 0 1 0].    "/ ICO magic
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1921
    self writeShort:1.             "/ # of images in file
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1922
    outStream nextPut:image width.      "/
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1923
    outStream nextPut:image height.     "/
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1924
    outStream nextPut:(1 bitShift:image depth). "/ # of colors
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1925
    outStream nextPutAll:#[0 0 0 0 0 ]. "/ reserved
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1926
    self writeLong:16rE802.              "/ size pixels
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1927
    self writeLong:16r26.                "/ offset in file
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1928
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1929
    "/ 40 bytes - unknown format
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1930
    outStream nextPutAll:(ByteArray new:40).
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1931
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1932
    "/ 16-entry RGB map
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1933
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1934
    1 to:16 do:[:i |  "Color map"
2812
5d7701d5e48b changed: #saveICO:onFile:
Claus Gittinger <cg@exept.de>
parents: 2756
diff changeset
  1935
        |clr r g b|
1167
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1936
2812
5d7701d5e48b changed: #saveICO:onFile:
Claus Gittinger <cg@exept.de>
parents: 2756
diff changeset
  1937
        clr := image colorFromValue:i-1.
5d7701d5e48b changed: #saveICO:onFile:
Claus Gittinger <cg@exept.de>
parents: 2756
diff changeset
  1938
        clr isNil ifTrue:[
5d7701d5e48b changed: #saveICO:onFile:
Claus Gittinger <cg@exept.de>
parents: 2756
diff changeset
  1939
            r := g := b := 0.
5d7701d5e48b changed: #saveICO:onFile:
Claus Gittinger <cg@exept.de>
parents: 2756
diff changeset
  1940
        ] ifFalse:[
5d7701d5e48b changed: #saveICO:onFile:
Claus Gittinger <cg@exept.de>
parents: 2756
diff changeset
  1941
            r := clr redByte.
5d7701d5e48b changed: #saveICO:onFile:
Claus Gittinger <cg@exept.de>
parents: 2756
diff changeset
  1942
            g := clr greenByte.
5d7701d5e48b changed: #saveICO:onFile:
Claus Gittinger <cg@exept.de>
parents: 2756
diff changeset
  1943
            b := clr blueByte.
5d7701d5e48b changed: #saveICO:onFile:
Claus Gittinger <cg@exept.de>
parents: 2756
diff changeset
  1944
        ].
1167
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1945
2812
5d7701d5e48b changed: #saveICO:onFile:
Claus Gittinger <cg@exept.de>
parents: 2756
diff changeset
  1946
        "/ put B,G,R
5d7701d5e48b changed: #saveICO:onFile:
Claus Gittinger <cg@exept.de>
parents: 2756
diff changeset
  1947
        outStream nextPut:b.
5d7701d5e48b changed: #saveICO:onFile:
Claus Gittinger <cg@exept.de>
parents: 2756
diff changeset
  1948
        outStream nextPut:g.
5d7701d5e48b changed: #saveICO:onFile:
Claus Gittinger <cg@exept.de>
parents: 2756
diff changeset
  1949
        outStream nextPut:r.
5d7701d5e48b changed: #saveICO:onFile:
Claus Gittinger <cg@exept.de>
parents: 2756
diff changeset
  1950
        outStream nextPut:0.
1167
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1951
    ].
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1952
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1953
    imgBytesPerRow := image bytesPerRow.
2812
5d7701d5e48b changed: #saveICO:onFile:
Claus Gittinger <cg@exept.de>
parents: 2756
diff changeset
  1954
    data := image bits.
1167
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1955
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1956
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1957
    "/ sorry, must extract rows individually
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1958
    "/ (even if alignment is correct),
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1959
    "/ since ICO saves rows bottom-to-top
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1960
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1961
    row := ByteArray new:rowBytes.
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1962
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1963
    srcIndex := 1 + (height * imgBytesPerRow).
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1964
    1 to:height do:[:i |
2812
5d7701d5e48b changed: #saveICO:onFile:
Claus Gittinger <cg@exept.de>
parents: 2756
diff changeset
  1965
        srcIndex := srcIndex - imgBytesPerRow.
5d7701d5e48b changed: #saveICO:onFile:
Claus Gittinger <cg@exept.de>
parents: 2756
diff changeset
  1966
        row replaceFrom:1 to:imgBytesPerRow with:data startingAt:srcIndex.
5d7701d5e48b changed: #saveICO:onFile:
Claus Gittinger <cg@exept.de>
parents: 2756
diff changeset
  1967
        outStream nextPutAll:row.
1167
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1968
    ].
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1969
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1970
    "/ the mask ...
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1971
    image mask isNil ifTrue:[
2812
5d7701d5e48b changed: #saveICO:onFile:
Claus Gittinger <cg@exept.de>
parents: 2756
diff changeset
  1972
        outStream next:128 put:16rFF
1167
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1973
    ] ifFalse:[
2812
5d7701d5e48b changed: #saveICO:onFile:
Claus Gittinger <cg@exept.de>
parents: 2756
diff changeset
  1974
        imgBytesPerRow := image mask bytesPerRow.
5d7701d5e48b changed: #saveICO:onFile:
Claus Gittinger <cg@exept.de>
parents: 2756
diff changeset
  1975
        data := image mask data.
5d7701d5e48b changed: #saveICO:onFile:
Claus Gittinger <cg@exept.de>
parents: 2756
diff changeset
  1976
        row := ByteArray new:4.
1167
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1977
2812
5d7701d5e48b changed: #saveICO:onFile:
Claus Gittinger <cg@exept.de>
parents: 2756
diff changeset
  1978
        srcIndex := 1 + (height * imgBytesPerRow).
5d7701d5e48b changed: #saveICO:onFile:
Claus Gittinger <cg@exept.de>
parents: 2756
diff changeset
  1979
        1 to:height do:[:i |
5d7701d5e48b changed: #saveICO:onFile:
Claus Gittinger <cg@exept.de>
parents: 2756
diff changeset
  1980
            srcIndex := srcIndex - imgBytesPerRow.
5d7701d5e48b changed: #saveICO:onFile:
Claus Gittinger <cg@exept.de>
parents: 2756
diff changeset
  1981
            row replaceFrom:1 to:imgBytesPerRow with:data startingAt:srcIndex.
5d7701d5e48b changed: #saveICO:onFile:
Claus Gittinger <cg@exept.de>
parents: 2756
diff changeset
  1982
            outStream nextPutAll:row.
5d7701d5e48b changed: #saveICO:onFile:
Claus Gittinger <cg@exept.de>
parents: 2756
diff changeset
  1983
        ].
1167
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1984
    ].
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1985
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1986
    outStream close.
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1987
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1988
    "
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1989
     |i|
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1990
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1991
     i := Image fromFile:'bitmaps/xpmBitmaps/SmalltalkX_clr.xpm'.
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1992
     i := Depth4Image fromImage:i.
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1993
     i := i magnifiedTo:32@32.
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1994
     WindowsIconReader new saveICO:i onFile:'test.ico'.
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1995
    "
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1996
78084516ae7c first attempt in saving ICO files.
Claus Gittinger <cg@exept.de>
parents: 1073
diff changeset
  1997
    "Modified: 21.10.1997 / 05:02:02 / cg"
713
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1998
! !
548898fdd1dc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 692
diff changeset
  1999
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  2000
!WindowsIconReader class methodsFor:'documentation'!
0
3f9277473954 Initial revision
claus
parents:
diff changeset
  2001
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  2002
version
3568
a8900d28752b #BUGFIX
matilk
parents: 3404
diff changeset
  2003
    ^ '$Header$'
2756
e8bf6a023191 halt in: #loadBMPWidth:height:depth:from:into:
Claus Gittinger <cg@exept.de>
parents: 2578
diff changeset
  2004
!
e8bf6a023191 halt in: #loadBMPWidth:height:depth:from:into:
Claus Gittinger <cg@exept.de>
parents: 2578
diff changeset
  2005
e8bf6a023191 halt in: #loadBMPWidth:height:depth:from:into:
Claus Gittinger <cg@exept.de>
parents: 2578
diff changeset
  2006
version_CVS
3568
a8900d28752b #BUGFIX
matilk
parents: 3404
diff changeset
  2007
    ^ '$Header$'
0
3f9277473954 Initial revision
claus
parents:
diff changeset
  2008
! !
1734
290f382d40e9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1569
diff changeset
  2009
3158
b017a13ec3f5 class: WindowsIconReader
Claus Gittinger <cg@exept.de>
parents: 2812
diff changeset
  2010
172
ee7d84977c86 use inforPrint instead of errorPrint (these are not fatal errors)
Claus Gittinger <cg@exept.de>
parents: 161
diff changeset
  2011
WindowsIconReader initialize!