hg/stx-libview: comparison Depth32Image.st

equal deleted inserted replaced

-:4989d91f99ac
+:800a52cd955b
 "retrieve a pixel at x/y; return a pixelValue.
 The interpretation of the returned value depends on the photometric
 and the colormap. See also Image>>atX:y:)
 Pixels start at x=0 , y=0 for upper left pixel, end at
 x = width-1, y=height-1 for lower right pixel.
-The pixel value contains r/g/b/a in msb order (i.e. r at high, a at low bits)"
+With rgba photometric, the pixel value contains r/g/b/a in msb order (i.e. r at high, a at low bits);
+with argb, alpha is in the high byte"
 |pixelIndex "{ Class: SmallInteger }"|
 %{  /* NOCONTEXT */
 OBJ b = __INST(bytes);
 _idx = ((__intVal(w) * __intVal(y)) + __intVal(x))*4;
 if (((unsigned)(_idx+3)) < __byteArraySize(b)) {
 unsigned char *pPix = &(__ByteArrayInstPtr(b)->ba_element[_idx]);
 unsigned int _pix;
-unsigned int _r, _g, _b, _a;
+#ifdef __MSBFIRST__
-if (_INST(photometric) == @symbol(rgba)) {
+_pix = ((int *)pPix)[0];
-_r = pPix[0];
+#else
-_g = pPix[1];
+_pix = pPix[0] << 24;
-_b = pPix[2];
+_pix |= pPix[1] << 16;
-_a = pPix[3];
+_pix |= pPix[2] << 8;
-} else if (_INST(photometric) == @symbol(argb)) {
+_pix |= pPix[3];
-_a = pPix[0];
+#endif
-_r = pPix[1];
-_g = pPix[2];
-_b = pPix[3];
-} else {
-_r = pPix[0];
-_g = pPix[1];
-_b = pPix[2];
-_a = 0;
-}
-_pix = (((((_a<<8)+_r)<<8)+_g)<<8)+_b;
 #if __POINTER_SIZE__ == 8
 RETURN( __MKSMALLINT(_pix) );
 #else
 RETURN( __MKUINT(_pix) );
 #endif
 pixelFunction notNil ifTrue:[^ pixelFunction value:x value:y].
 pixelIndex := 1 + (((width * y) + x) * 4).
 "left pixel in high bits"
-^ bytes unsignedInt32At:pixelIndex MSB:false "true".
+^ bytes unsignedInt32At:pixelIndex MSB:true.
 "Created: / 24-04-1997 / 19:00:28 / cg"
-"Modified: / 21-02-2017 / 01:54:28 / cg"
+"Modified: / 21-02-2017 / 17:21:44 / cg"
 !
 pixelAtX:x y:y put:aPixelValue
 "set the pixel at x/y to aPixelValue.
-The interpretation of the pixelValue depends on the photometric
+The interpretation of the pixelValue depends on the photometric.
-and the colormap. (see also: Image>>atX:y:put:)
 Pixels start at x=0 , y=0 for upper left pixel, end at
 x = width-1, y=height-1 for lower right pixel"
 |pixelIndex "{ Class: SmallInteger }"|
 pixelIndex := 1 + (((width * y) + x) * 4).
 bytes isNil ifTrue:[
 self createPixelStore
 ].
-"/ pixelValue is aarrggbb
+bytes unsignedInt32At:pixelIndex put:aPixelValue MSB:true.
-photometric == #rgba ifTrue:[
-bytes at:pixelIndex put:((aPixelValue bitShift:-16) bitAnd:16rFF).
-bytes at:pixelIndex+1 put:((aPixelValue bitShift:-8) bitAnd:16rFF).
-bytes at:pixelIndex+2 put:((aPixelValue) bitAnd:16rFF).
-bytes at:pixelIndex+3 put:((aPixelValue bitShift:-24) bitAnd:16rFF).
-^ self
-].
-photometric == #rgb ifTrue:[
-bytes at:pixelIndex put:((aPixelValue bitShift:-16) bitAnd:16rFF).
-bytes at:pixelIndex+1 put:((aPixelValue bitShift:-8) bitAnd:16rFF).
-bytes at:pixelIndex+2 put:((aPixelValue) bitAnd:16rFF).
-bytes at:pixelIndex+3 put:0.
-^ self
-].
-photometric == #argb ifTrue:[
-bytes unsignedInt32At:pixelIndex put:aPixelValue MSB:false. "/ true
-^ self
-].
 "Created: / 24-04-1997 / 19:00:28 / cg"
-"Modified: / 21-02-2017 / 01:58:42 / cg"
+"Modified: / 21-02-2017 / 14:59:35 / cg"
 !
 rowAt:y putAll:pixelArray startingAt:startIndex
 "store a single rows bits from bits in the pixelArray argument;
 Return the pixelArray.
 Notice: row coordinate starts at 0."
-|bytes dstIdx pixel
+|bytes pixel
+dstIdx "{ Class: SmallInteger }"
 w "{ Class: SmallInteger }"|
 bytes := self bits.
 dstIdx := (y * self bytesPerRow) + 1.
 w := width - 1.
 0 to:w do:[:col |
 pixel := pixelArray at:(startIndex + col).
-bytes unsignedInt32At:dstIdx put:pixel MSB:false. "/ true.
+bytes unsignedInt32At:dstIdx put:pixel MSB:true.
 dstIdx := dstIdx + 4.
 ].
 ^ pixelArray
-"Modified: / 21-02-2017 / 01:47:58 / cg"
+"Modified (comment): / 21-02-2017 / 15:03:24 / cg"
 ! !
 !Depth32Image methodsFor:'converting rgb images'!
 computeAlphaValuesFromMask:aMaskImage
 "convert a mask into alpha values;
-masked pixels get an alpha value of 0,
+masked pixels get an alpha value of 0, unmasked of 255"
-unmasked of 255"
 |alphaMask|
-alphaMask := self alphaMaskForPixelValue.
+alphaMask := (self alphaMaskForPixelValue bitShift:self alphaShiftForPixelValue).
 self
 valuesFromX:0 y:0 toX:(width-1) y:(height-1)
 do:[:x :y :pixelValue |
 (aMaskImage pixelAtX:x y:y) ~~ 0 ifTrue:[
 self pixelAtX:x y:y put:(pixelValue bitOr:alphaMask).
 self pixelAtX:x y:y put:(pixelValue bitClear:alphaMask).
 ].
 ].
 photometric := #rgba
-"Modified (format): / 16-02-2017 / 17:33:10 / cg"
+"Modified: / 21-02-2017 / 16:41:02 / cg"
 !
 rgbImageAsTrueColorFormOn:aDevice
 "return a truecolor form from the rgba or argb-picture."
 ! !
 !Depth32Image methodsFor:'image manipulations'!
 negative
-|bytes index newImage newBytes nBytes r g b|
+|bytes
+index "{ Class: SmallInteger }"
+newImage newBytes nBytes r g b a|
 photometric ~~ #rgb ifTrue:[
 ^ super negative.
 ].
 bytes := self bits.
 newBytes at:index put:(255-g).
 index := index + 1.
 b := bytes at:index.
 newBytes at:index put:(255-b).
 index := index + 1.
-b := bytes at:index.
+a := bytes at:index.
-newBytes at:index put:b.
+newBytes at:index put:a.
 index := index + 1.
 ].
 ^ newImage
+"Modified (comment): / 21-02-2017 / 17:09:03 / cg"
 ! !
 !Depth32Image methodsFor:'initialization'!
 initialize
 ^ (self alphaBitsOf:pixel) * (100.0 / 255.0)
 !
 alphaMaskForPixelValue
-"return the mask used with translation from pixelValues to alphaBits"
+"return the mask used with translation from pixelValues to alphaBits.
+Determines the number of bits of alpha"
 ^ 16rFF
+"Modified (comment): / 21-02-2017 / 16:37:31 / cg"
 !
 alphaShiftForPixelValue
-"return the shift amount used with translation from pixelValues to alphaBits"
+"return the shift amount used with translation from pixelValues to alphaBits.
+That is the number of bits to shift the alpha value into the pixel value."
 photometric == #rgba ifTrue:[
+"/ alpha in low byte
 "r,g,b,a"
 ^ 0
 ].
 photometric == #argb ifTrue:[
+"/ alpha in high byte
 "a,r,g,b"
-^ -24.
+^ 24.
 ].
 photometric == #rgb ifTrue:[
-"r,g,b, a"
+"r,g,b - no alpha"
-Logger warning:'oops - image has depth 32, but photometric is #rgb'.
+"/ Logger warning:'oops - image has depth 32, but photometric is #rgb'.
 ^ 0.
 ].
 self error:'unsupported photometric: ',(photometric printString)
-"Modified (format): / 16-02-2017 / 17:16:25 / cg"
+"Modified (format): / 21-02-2017 / 16:42:42 / cg"
 !
 bitsPerPixel
 "return the number of bits per pixel"
 blueBitsOf:pixel
 "given a pixel-value, return the blue component as byteValue (0..255)"
 ((photometric == #rgba) or:[photometric == #rgb]) ifTrue:[
-"r,g,b,a"
+"r,g,b,a or r,g,b,0"
 ^ (pixel bitShift:-8) bitAnd:16rFF.
 ].
 photometric == #argb ifTrue:[
 "a,r,g,b"
 ^ pixel bitAnd:16rFF.
 ].
 self error:'unsupported photometric'
+"Modified: / 21-02-2017 / 16:45:12 / cg"
 !
 blueComponentOf:pixel
 "given a pixel-value, return the blue component in percent (0..100)"
 !
 blueShiftForPixelValue
 "return the shift amount used with translation from pixelValues to blueBits"
-photometric == #rgba ifTrue:[
+((photometric == #rgba) or:[photometric == #rgb]) ifTrue:[
-"r,g,b,a"
+"r,g,b,a or r,g,b,0"
 ^ -8
 ].
 photometric == #argb ifTrue:[
 "a,r,g,b"
 ^ 0.
 ].
 self error:'unsupported photometric'
+"Modified: / 21-02-2017 / 17:03:36 / cg"
 !
 bytesPerRow
 "return the number of bytes in one scanline of the image"
 greenBitsOf:pixel
 "given a pixel-value, return the green component as byteValue (0..255)"
 ((photometric == #rgba) or:[photometric == #rgb]) ifTrue:[
-"r,g,b,a"
+"r,g,b,a or r,g,b,0"
 ^ (pixel bitShift:-16) bitAnd:16rFF.
 ].
 photometric == #argb ifTrue:[
 "a,r,g,b"
 ^ (pixel bitShift:-8) bitAnd:16rFF.
 ].
 self error:'unsupported photometric'
+"Modified (format): / 21-02-2017 / 16:44:50 / cg"
 !
 greenComponentOf:pixel
 "given a pixel-value, return the green component in percent (0..100)"
 !
 greenShiftForPixelValue
 "return the shift amount used with translation from pixelValues to greenBits"
-photometric == #rgba ifTrue:[
+((photometric == #rgba) or:[photometric == #rgb]) ifTrue:[
-"r,g,b,a"
+"r,g,b,a or r,g,b,0"
 ^ -16
 ].
 photometric == #argb ifTrue:[
 "a,r,g,b"
 ^ -8.
 ].
 self error:'unsupported photometric'
+"Modified: / 21-02-2017 / 17:03:47 / cg"
 !
 hasAlphaChannel
-^ true
+"could be #rgb in 32 bits..."
+^ (photometric == #argb) or:[photometric == #rgba]
+"Modified: / 21-02-2017 / 15:00:17 / cg"
 !
 redBitsOf:pixel
 "given a pixel-value, return the red component as byteValue (0..255)"
 ((photometric == #rgba) or:[photometric == #rgb]) ifTrue:[
-"r,g,b,a"
+"r,g,b,a or r,g,b,0"
 ^ (pixel bitShift:-24) bitAnd:16rFF.
 ].
 photometric == #argb ifTrue:[
 "a,r,g,b"
 ^ (pixel bitShift:-16) bitAnd:16rFF.
 ].
 self error:'unsupported photometric'
+"Modified (format): / 21-02-2017 / 16:45:18 / cg"
 !
 redComponentOf:pixel
 "given a pixel-value, return the red component in percent (0..100)"
 !
 redShiftForPixelValue
 "return the shift amount used with translation from pixelValues to redBits"
-photometric == #rgba ifTrue:[
+((photometric == #rgba) or:[photometric == #rgb]) ifTrue:[
-"r,g,b,a"
+"r,g,b,a or r,g,b,0"
 ^ -24
 ].
 photometric == #argb ifTrue:[
 "a,r,g,b"
 ^ -16.
 ].
 self error:'unsupported photometric'
+"Modified: / 21-02-2017 / 17:04:04 / cg"
 !
 rgbFromValue:pixelValue
 "given a pixel value, return the corresponding 24bit rgbValue (rrggbb, red is MSB)."
-^ pixelValue rightShift:8     "lsb is alpha channel"
+((photometric == #rgba) or:[photometric == #rgb]) ifTrue:[
+^ pixelValue rightShift:8     "lsb is alpha channel"
+].
+(photometric == #argb) ifTrue:[
+^ pixelValue bitAnd:16rFFFFFF  "msb is alpha channel"
+].
+self error:'unsupported photometric'
+"Modified: / 21-02-2017 / 17:05:13 / cg"
 !
 samplesPerPixel
 "return the number of samples per pixel in the image."
 samplesPerPixel notNil ifTrue:[^ samplesPerPixel].
 ^ 4
 !
 valueFromRedBits:redBits greenBits:greenBits blueBits:blueBits
-^ (((((redBits bitShift:8) bitOr:greenBits) bitShift:8) bitOr:blueBits) bitShift:8) bitOr:255
+((photometric == #rgba) or:[photometric == #rgb]) ifTrue:[
+"/ alpha in low byte
+^ (((((redBits bitShift:8) bitOr:greenBits) bitShift:8) bitOr:blueBits) bitShift:8) bitOr:16rFF
+].
+(photometric == #argb) ifTrue:[
+"/ alpha in high byte
+^ (((((redBits bitShift:8) bitOr:greenBits) bitShift:8) bitOr:blueBits)) bitOr:16rFF000000
+].
+self error:'unsupported photometric'
+"Modified: / 21-02-2017 / 17:07:11 / cg"
 ! !
 !Depth32Image class methodsFor:'documentation'!
 version

changeset 7922	800a52cd955b
parent 7917	fb1dcd2edc4e
child 8000	62ea15884e2b