hg/stx-libview: comparison Depth4Image.st

equal deleted inserted replaced

-:75ff98ae918d
+:62426e8110ae
 Most images coming from the windows world are represented as Depth4Images.
 It mainly consists of methods already implemented in Image,
 reimplemented here for more performance.
 [author:]
-Claus Gittinger
+	Claus Gittinger
 [see also:]
-Depth1Image Depth2Image Depth8Image Depth16Image Depth24Image
+	Depth1Image Depth2Image Depth8Image Depth16Image Depth24Image
-ImageReader
+	ImageReader
 "
 ! !
 !Depth4Image class methodsFor:'queries'!
 lineIndex := (self bytesPerRow * y) + 1.
 byteIndex := lineIndex + (x // 2).
 "left pixel in high bits"
 byteIndex > bytes size ifTrue:[
-^ 0
+	^ 0
 ].
 byte := bytes at:byteIndex.
 x even ifTrue:[
-^ (byte bitShift:-4) bitAnd:16rF.
+	^ (byte bitShift:-4) bitAnd:16rF.
 ].
 ^ byte bitAnd:16rF.
 "Created: 24.4.1997 / 16:06:43 / cg"
 !
 "left pixel is in high bits"
 index := lineIndex + (x // 2).
 byte := bytes at:index.
 x even ifTrue:[
-byte := (byte bitAnd:16rF) bitOr:(aPixelValue bitShift:4)
+	byte := (byte bitAnd:16rF) bitOr:(aPixelValue bitShift:4)
 ] ifFalse:[
-byte := (byte bitAnd:16rF0) bitOr:aPixelValue
+	byte := (byte bitAnd:16rF0) bitOr:aPixelValue
 ].
 bytes at:index put:byte
 "Created: 24.4.1997 / 17:06:39 / cg"
 !
 rowAt:y into:aPixelBuffer
 "fill aBuffer with pixel values retrieved from a single row.
 Notice: row coordinate starts with 0."
 |lineIndex "{ Class: SmallInteger }"
 byte      "{ Class: SmallInteger }"
 w         "{ Class: SmallInteger }"
 pixel dstIdx bytes|
 bytes := self bits.
 dstIdx := 1.
 w := width - 1.
 lineIndex := (self bytesPerRow * y).
 0 to:w do:[:x |
-x even ifTrue:[
+	x even ifTrue:[
-lineIndex := lineIndex + 1.
+	    lineIndex := lineIndex + 1.
-byte := bytes at:lineIndex.
+	    byte := bytes at:lineIndex.
-pixel := (byte bitShift:-4) bitAnd:16rF.
+	    pixel := (byte bitShift:-4) bitAnd:16rF.
-] ifFalse:[
+	] ifFalse:[
-pixel := byte bitAnd:16rF.
+	    pixel := byte bitAnd:16rF.
-].
+	].
-aPixelBuffer at:dstIdx put:pixel.
+	aPixelBuffer at:dstIdx put:pixel.
-dstIdx := dstIdx + 1
+	dstIdx := dstIdx + 1
 ].
 "Created: 21.7.1997 / 18:04:00 / cg"
 "Modified: 21.7.1997 / 18:05:47 / cg"
 ! !
 anyImageAsTrueColorFormOn:aDevice
 "return a true-color device-form for receiver.
 Supports true color devices with depths: 8, 16, 24 and 32"
 |depth
 colorValues
 form imageBits bestFormat usedDeviceDepth usedDeviceBitsPerPixel
 usedDevicePadding usedDeviceBytesPerRow padd|
 depth := aDevice depth.
 "/ gather r/g/b values for all colors in the map ...
 colorValues := self rgbColormapFor:aDevice.
 bestFormat := self bestSupportedImageFormatFor:aDevice.
 usedDeviceDepth := bestFormat at:#depth.
 usedDeviceDepth == 1 ifTrue:[
-^ self asMonochromeFormOn:aDevice
+	^ self asMonochromeFormOn:aDevice
 ].
 usedDeviceBitsPerPixel := bestFormat at:#bitsPerPixel.
 usedDevicePadding := bestFormat at:#padding.
 usedDeviceBytesPerRow := self class bytesPerRowForWidth:width depth:usedDeviceBitsPerPixel padding:usedDevicePadding.
 imageBits := ByteArray uninitializedNew:(usedDeviceBytesPerRow * height).
 "/ for now, only support some depths
 usedDeviceBitsPerPixel == 16 ifTrue:[
-"/ 16 bits/pixel
+	"/ 16 bits/pixel
-"/ now, walk over the image and replace
+	"/ now, walk over the image and replace
-"/ colorMap indices by color values in the bits array
+	"/ colorMap indices by color values in the bits array
 %{
-unsigned char *srcPtr = 0;
+	unsigned char *srcPtr = 0;
-unsigned char *dstPtr = 0;
+	unsigned char *dstPtr = 0;
-OBJ _bytes = __INST(bytes);
+	OBJ _bytes = __INST(bytes);
-if (__isByteArrayLike(_bytes)) {
+	if (__isByteArrayLike(_bytes)) {
-srcPtr = _ByteArrayInstPtr(_bytes)->ba_element;
+	    srcPtr = __ByteArrayInstPtr(_bytes)->ba_element;
-} else {
+	} else {
-if (__isExternalBytesLike(_bytes)) {
+	    if (__isExternalBytesLike(_bytes)) {
-srcPtr = __externalBytesAddress(_bytes);
+		srcPtr = __externalBytesAddress(_bytes);
-}
+	    }
-}
+	}
-if (__isByteArray(imageBits)) {
+	if (__isByteArray(imageBits)) {
-dstPtr = _ByteArrayInstPtr(imageBits)->ba_element;
+	    dstPtr = __ByteArrayInstPtr(imageBits)->ba_element;
-} else {
+	} else {
-if (__isExternalBytesLike(imageBits)) {
+	    if (__isExternalBytesLike(imageBits)) {
-dstPtr = __externalBytesAddress(imageBits);
+		dstPtr = __externalBytesAddress(imageBits);
-}
+	    }
-}
+	}
-if (__bothSmallInteger(_INST(height), _INST(width))
+	if (__bothSmallInteger(__INST(height), __INST(width))
-&& __isArrayLike(colorValues)
+	 && __isArrayLike(colorValues)
-&& srcPtr
+	 && srcPtr
-&& dstPtr) {
+	 && dstPtr) {
-int r,p;
+	    int r,p;
-int x, y, w, h, nPix;
+	    int x, y, w, h, nPix;
-int byte;
+	    int byte;
-OBJ *ap = __ArrayInstPtr(colorValues)->a_element;
+	    OBJ *ap = __ArrayInstPtr(colorValues)->a_element;
-w = __intVal(_INST(width));
+	    w = __intVal(__INST(width));
-h = __intVal(_INST(height));
+	    h = __intVal(__INST(height));
-r = 0;
+	    r = 0;
-p = __intVal(padd);
+	    p = __intVal(padd);
-nPix = w * h;
+	    nPix = w * h;
-while (nPix-- > 0) {
+	    while (nPix-- > 0) {
-unsigned idx, v;
+		unsigned idx, v;
-OBJ clr;
+		OBJ clr;
-if (r & 1) {
+		if (r & 1) {
-idx = byte & 0xF;
+		    idx = byte & 0xF;
-} else {
+		} else {
-byte = *srcPtr++;
+		    byte = *srcPtr++;
-idx = (byte>>4) & 0xF;
+		    idx = (byte>>4) & 0xF;
-}
+		}
-clr = ap[idx];
+		clr = ap[idx];
-v = __intVal(clr);
+		v = __intVal(clr);
 #ifdef __MSBFIRST
-((short *)dstPtr)[0] = v;
+		((short *)dstPtr)[0] = v;
 #else
 # ifdef xxSWAP_BYTES
-SWAP_BYTES(v);
+		SWAP_BYTES(v);
-((short *)dstPtr)[0] = v;
+		((short *)dstPtr)[0] = v;
 # else
-dstPtr[0] = (v>>8) & 0xFF;
+		dstPtr[0] = (v>>8) & 0xFF;
-dstPtr[1] = (v) & 0xFF;
+		dstPtr[1] = (v) & 0xFF;
 # endif
 #endif
-dstPtr += 2;
+		dstPtr += 2;
-if (++r == w) {
+		if (++r == w) {
-dstPtr += p;
+		    dstPtr += p;
-r = 0;
+		    r = 0;
-}
+		}
-}
+	    }
-}
+	}
 %}.
 ] ifFalse:[
-usedDeviceBitsPerPixel == 32 ifTrue:[
+	usedDeviceBitsPerPixel == 32 ifTrue:[
-"/ 32 bits/pixel
+	    "/ 32 bits/pixel
-"/ now, walk over the image and replace
+	    "/ now, walk over the image and replace
-"/ colorMap indices by color values in the bits array
+	    "/ colorMap indices by color values in the bits array
 %{
-unsigned char *srcPtr = 0;
+	    unsigned char *srcPtr = 0;
-unsigned char *dstPtr = 0;
+	    unsigned char *dstPtr = 0;
-OBJ _bytes = __INST(bytes);
+	    OBJ _bytes = __INST(bytes);
-if (__isByteArrayLike(_bytes)) {
+	    if (__isByteArrayLike(_bytes)) {
-srcPtr = _ByteArrayInstPtr(_bytes)->ba_element;
+		srcPtr = __ByteArrayInstPtr(_bytes)->ba_element;
-} else {
+	    } else {
-if (__isExternalBytesLike(_bytes)) {
+		if (__isExternalBytesLike(_bytes)) {
-srcPtr = __externalBytesAddress(_bytes);
+		    srcPtr = __externalBytesAddress(_bytes);
-}
+		}
-}
+	    }
-if (__isByteArray(imageBits)) {
+	    if (__isByteArray(imageBits)) {
-dstPtr = _ByteArrayInstPtr(imageBits)->ba_element;
+		dstPtr = __ByteArrayInstPtr(imageBits)->ba_element;
-} else {
+	    } else {
-if (__isExternalBytesLike(imageBits)) {
+		if (__isExternalBytesLike(imageBits)) {
-dstPtr = __externalBytesAddress(imageBits);
+		    dstPtr = __externalBytesAddress(imageBits);
-}
+		}
-}
+	    }
-if (__bothSmallInteger(_INST(height), _INST(width))
+	    if (__bothSmallInteger(__INST(height), __INST(width))
-&& __isArrayLike(colorValues)
+	     && __isArrayLike(colorValues)
-&& srcPtr
+	     && srcPtr
-&& dstPtr) {
+	     && dstPtr) {
-int x, y, w, h, nPix;
+		int x, y, w, h, nPix;
-int r,p;
+		int r,p;
-int byte;
+		int byte;
-OBJ *ap = __ArrayInstPtr(colorValues)->a_element;
+		OBJ *ap = __ArrayInstPtr(colorValues)->a_element;
-w = __intVal(_INST(width));
+		w = __intVal(__INST(width));
-h = __intVal(_INST(height));
+		h = __intVal(__INST(height));
-r = 0;
+		r = 0;
-p = __intVal(padd);
+		p = __intVal(padd);
-nPix = w * h;
+		nPix = w * h;
-while (nPix > 0) {
+		while (nPix > 0) {
-unsigned idx, v;
+		    unsigned idx, v;
-OBJ clr;
+		    OBJ clr;
-if (r & 1) {
+		    if (r & 1) {
-idx = byte & 0xF;
+			idx = byte & 0xF;
-} else {
+		    } else {
-byte = *srcPtr++;
+			byte = *srcPtr++;
-idx = (byte>>4) & 0xF;
+			idx = (byte>>4) & 0xF;
-}
+		    }
-clr = ap[idx];
+		    clr = ap[idx];
-v = __intVal(clr);
+		    v = __intVal(clr);
 #ifdef __MSBFIRST
-((long *)dstPtr)[0] = v;
+		    ((long *)dstPtr)[0] = v;
 #else
-dstPtr[0] = (v>>24) & 0xFF;
+		    dstPtr[0] = (v>>24) & 0xFF;
-dstPtr[1] = (v>>16) & 0xFF;
+		    dstPtr[1] = (v>>16) & 0xFF;
-dstPtr[2] = (v>>8) & 0xFF;
+		    dstPtr[2] = (v>>8) & 0xFF;
-dstPtr[3] = (v) & 0xFF;
+		    dstPtr[3] = (v) & 0xFF;
 #endif
-dstPtr += 4;
+		    dstPtr += 4;
-nPix--;
+		    nPix--;
-if (++r == w) {
+		    if (++r == w) {
-dstPtr += p;
+			dstPtr += p;
-r = 0;
+			r = 0;
-}
+		    }
-}
+		}
-}
+	    }
 %}.
-] ifFalse:[
+	] ifFalse:[
-usedDeviceBitsPerPixel == 8 ifTrue:[
+	    usedDeviceBitsPerPixel == 8 ifTrue:[
-"/ 8 bits/pixel
+		"/ 8 bits/pixel
-"/ now, walk over the image and replace
+		"/ now, walk over the image and replace
-"/ colorMap indices by color values in the bits array
+		"/ colorMap indices by color values in the bits array
 %{
-unsigned char *srcPtr = 0;
+		unsigned char *srcPtr = 0;
-unsigned char *dstPtr = 0;
+		unsigned char *dstPtr = 0;
-OBJ _bytes = __INST(bytes);
+		OBJ _bytes = __INST(bytes);
-if (__isByteArrayLike(_bytes)) {
+		if (__isByteArrayLike(_bytes)) {
-srcPtr = _ByteArrayInstPtr(_bytes)->ba_element;
+		    srcPtr = __ByteArrayInstPtr(_bytes)->ba_element;
-} else {
+		} else {
-if (__isExternalBytesLike(_bytes)) {
+		    if (__isExternalBytesLike(_bytes)) {
-srcPtr = __externalBytesAddress(_bytes);
+			srcPtr = __externalBytesAddress(_bytes);
-}
+		    }
-}
+		}
-if (__isByteArray(imageBits)) {
+		if (__isByteArray(imageBits)) {
-dstPtr = _ByteArrayInstPtr(imageBits)->ba_element;
+		    dstPtr = __ByteArrayInstPtr(imageBits)->ba_element;
-} else {
+		} else {
-if (__isExternalBytesLike(imageBits)) {
+		    if (__isExternalBytesLike(imageBits)) {
-dstPtr = __externalBytesAddress(imageBits);
+			dstPtr = __externalBytesAddress(imageBits);
-}
+		    }
-}
+		}
-if (__bothSmallInteger(_INST(height), _INST(width))
+		if (__bothSmallInteger(__INST(height), __INST(width))
-&& __isArrayLike(colorValues)
+		 && __isArrayLike(colorValues)
-&& srcPtr
+		 && srcPtr
-&& dstPtr) {
+		 && dstPtr) {
-int x, y, w, h, nPix;
+		    int x, y, w, h, nPix;
-int r,p, byte;
+		    int r,p, byte;
-OBJ *ap = __ArrayInstPtr(colorValues)->a_element;
+		    OBJ *ap = __ArrayInstPtr(colorValues)->a_element;
-w = __intVal(_INST(width));
+		    w = __intVal(__INST(width));
-h = __intVal(_INST(height));
+		    h = __intVal(__INST(height));
-r = 0;
+		    r = 0;
-p = __intVal(padd);
+		    p = __intVal(padd);
-nPix = w * h;
+		    nPix = w * h;
-while (nPix > 0) {
+		    while (nPix > 0) {
-unsigned idx, v;
+			unsigned idx, v;
-OBJ clr;
+			OBJ clr;
-if (r & 1) {
+			if (r & 1) {
-idx = byte & 0xF;
+			    idx = byte & 0xF;
-} else {
+			} else {
-byte = *srcPtr++;
+			    byte = *srcPtr++;
-idx = (byte>>4) & 0xF;
+			    idx = (byte>>4) & 0xF;
-}
+			}
-clr = ap[idx];
+			clr = ap[idx];
-v = __intVal(clr);
+			v = __intVal(clr);
-dstPtr[0] = v;
+			dstPtr[0] = v;
-dstPtr += 1;
+			dstPtr += 1;
-nPix--;
+			nPix--;
-if (++r == w) {
+			if (++r == w) {
-dstPtr += p;
+			    dstPtr += p;
-r = 0;
+			    r = 0;
-}
+			}
-}
+		    }
-}
+		}
 %}.
-] ifFalse:[
+	    ] ifFalse:[
-usedDeviceBitsPerPixel == 24 ifTrue:[
+		usedDeviceBitsPerPixel == 24 ifTrue:[
-"/ 24 bits/pixel
+		    "/ 24 bits/pixel
-"/ now, walk over the image and replace
+		    "/ now, walk over the image and replace
-"/ colorMap indices by color values in the bits array
+		    "/ colorMap indices by color values in the bits array
 %{
-unsigned char *srcPtr = 0;
+		    unsigned char *srcPtr = 0;
-unsigned char *dstPtr = 0;
+		    unsigned char *dstPtr = 0;
-OBJ _bytes = __INST(bytes);
+		    OBJ _bytes = __INST(bytes);
-if (__isByteArrayLike(_bytes)) {
+		    if (__isByteArrayLike(_bytes)) {
-srcPtr = _ByteArrayInstPtr(_bytes)->ba_element;
+			srcPtr = __ByteArrayInstPtr(_bytes)->ba_element;
-} else {
+		    } else {
-if (__isExternalBytesLike(_bytes)) {
+			if (__isExternalBytesLike(_bytes)) {
-srcPtr = __externalBytesAddress(_bytes);
+			    srcPtr = __externalBytesAddress(_bytes);
-}
+			}
-}
+		    }
-if (__isByteArray(imageBits)) {
+		    if (__isByteArray(imageBits)) {
-dstPtr = _ByteArrayInstPtr(imageBits)->ba_element;
+			dstPtr = __ByteArrayInstPtr(imageBits)->ba_element;
-} else {
+		    } else {
-if (__isExternalBytesLike(imageBits)) {
+			if (__isExternalBytesLike(imageBits)) {
-dstPtr = __externalBytesAddress(imageBits);
+			    dstPtr = __externalBytesAddress(imageBits);
-}
+			}
-}
+		    }
-if (__bothSmallInteger(_INST(height), _INST(width))
+		    if (__bothSmallInteger(__INST(height), __INST(width))
-&& __isArrayLike(colorValues)
+		     && __isArrayLike(colorValues)
-&& srcPtr
+		     && srcPtr
-&& dstPtr) {
+		     && dstPtr) {
-int x, y, w, h, nPix;
+			int x, y, w, h, nPix;
-int r, p, byte;
+			int r, p, byte;
-OBJ *ap = __ArrayInstPtr(colorValues)->a_element;
+			OBJ *ap = __ArrayInstPtr(colorValues)->a_element;
-w = __intVal(_INST(width));
+			w = __intVal(__INST(width));
-h = __intVal(_INST(height));
+			h = __intVal(__INST(height));
-r = 0;
+			r = 0;
-p = __intVal(padd);
+			p = __intVal(padd);
-nPix = w * h;
+			nPix = w * h;
-while (nPix > 0) {
+			while (nPix > 0) {
-unsigned idx, v;
+			    unsigned idx, v;
-OBJ clr;
+			    OBJ clr;
-if (r & 1) {
+			    if (r & 1) {
-idx = byte & 0xF;
+				idx = byte & 0xF;
-} else {
+			    } else {
-byte = *srcPtr++;
+				byte = *srcPtr++;
-idx = (byte>>4) & 0xF;
+				idx = (byte>>4) & 0xF;
-}
+			    }
-clr = ap[idx];
+			    clr = ap[idx];
-v = __intVal(clr);
+			    v = __intVal(clr);
-dstPtr[0] = (v>>16) & 0xFF;
+			    dstPtr[0] = (v>>16) & 0xFF;
-dstPtr[1] = (v>>8) & 0xFF;
+			    dstPtr[1] = (v>>8) & 0xFF;
-dstPtr[2] = (v) & 0xFF;
+			    dstPtr[2] = (v) & 0xFF;
-dstPtr += 3;
+			    dstPtr += 3;
-nPix--;
+			    nPix--;
-if (++r == w) {
+			    if (++r == w) {
-dstPtr += p;
+				dstPtr += p;
-r = 0;
+				r = 0;
-}
+			    }
-}
+			}
-}
+		    }
 %}.
-] ifFalse:[
+		] ifFalse:[
-'Image [warning]: unimplemented trueColor depth in anyImageAsTrueColorFormOn: ' errorPrint. usedDeviceBitsPerPixel errorPrintCR.
+		    'Image [warning]: unimplemented trueColor depth in anyImageAsTrueColorFormOn: ' errorPrint. usedDeviceBitsPerPixel errorPrintCR.
-^ nil
+		    ^ nil
-]
+		]
-]
+	    ]
-]
+	]
 ].
 imageBits isNil ifTrue:[
-^ nil
+	^ nil
 ].
 form := Form width:width height:height depth:usedDeviceDepth onDevice:aDevice.
 form isNil ifTrue:[^ nil].
 form initGC.
 form
-copyBitsFrom:imageBits
+	copyBitsFrom:imageBits
-bitsPerPixel:usedDeviceBitsPerPixel
+	bitsPerPixel:usedDeviceBitsPerPixel
-depth:usedDeviceDepth
+	depth:usedDeviceDepth
-padding:usedDevicePadding
+	padding:usedDevicePadding
-width:width height:height
+	width:width height:height
-x:0 y:0
+	x:0 y:0
-toX:0 y:0.
+	toX:0 y:0.
 ^ form
 "Created: / 20-10-1995 / 22:05:10 / cg"
 "Modified: / 29-05-2007 / 19:22:19 / cg"
 orderedDitheredGrayBitsWithDitherMatrix:ditherMatrix ditherWidth:dW depth:depth
 "return the bitmap for a dithered depth-bitmap from the image;
 with a constant ditherMatrix, this can be used for thresholding.
 Redefined to make use of knowing that pixels are 4-bit values."
 |dH nDither bytes
 greyLevels greyMap1 greyMap2
 bytesPerRow  "{Class: SmallInteger }"
 bytesPerOutRow  "{Class: SmallInteger }"
 pixelsPerByte   "{Class: SmallInteger }"
 outBits
 bytesPerRow := self bytesPerRow.
 bytesPerOutRow := (w * depth + 7) // 8.
 outBits := ByteArray uninitializedNew:(bytesPerOutRow * h).
 (outBits isNil or:[bytes isNil]) ifTrue:[
-^ nil
+	^ nil
 ].
 greyMap1 := self greyMapForRange:(greyLevels-1).                    "/ the pixels
 greyMap1 := (greyMap1 collect:[:b | b isNil ifTrue:[
-0
+					    0
-] ifFalse:[
+					] ifFalse:[
-b truncated
+					    b truncated
-]
+					]
-]) asByteArray.
+				  ]) asByteArray.
 greyMap2 := self greyMapForRange:(greyLevels-1).
 greyMap2 := (greyMap2 collect:[:el |
-el isNil ifTrue:[
+					el isNil ifTrue:[
-0
+					    0
-] ifFalse:[
+					] ifFalse:[
-((el - el truncated)  "/ the error (0..1)
+					    ((el - el truncated)  "/ the error (0..1)
-* nDither) rounded
+					    * nDither) rounded
-]]) asByteArray.
+					]]) asByteArray.
 %{
 int __dW = __intVal(dW);
 int __dH = __intVal(dH);
 int __byte;
 unsigned char *__greyMap1 = __ByteArrayInstPtr(greyMap1)->ba_element;
 unsigned char *__greyMap2 = __ByteArrayInstPtr(greyMap2)->ba_element;
 __oY = __dY = 0;
 for (__y=0; __y<__h; __y++) {
-__nextDst = __dstIdx + __bytesPerOutRow;
+	__nextDst = __dstIdx + __bytesPerOutRow;
-__nextSrc = __srcIdx + __bytesPerRow;
+	__nextSrc = __srcIdx + __bytesPerRow;
-__byte = 0;
+	__byte = 0;
-__bitCnt = 8;
+	__bitCnt = 8;
-__oX = 0;
+	__oX = 0;
-for (__x=0; __x<__w; __x++) {
+	for (__x=0; __x<__w; __x++) {
-if (__x & 1) {
+	    if (__x & 1) {
-/* odd */
+		/* odd */
-__grey = __inByte & 0xF;
+		__grey = __inByte & 0xF;
-__srcIdx++;
+		__srcIdx++;
-} else {
+	    } else {
-__inByte = __bytes[__srcIdx];
+		__inByte = __bytes[__srcIdx];
-__grey = (__inByte >> 4) & 0xF;
+		__grey = (__inByte >> 4) & 0xF;
-}
+	    }
-__pixel = __greyMap1[__grey];            /* 0..(greyLevels-1) */
+	    __pixel = __greyMap1[__grey];            /* 0..(greyLevels-1) */
-__dO    = __greyMap2[__grey];            /* 0.. nDither-1) */
+	    __dO    = __greyMap2[__grey];            /* 0.. nDither-1) */
-__dT = __ditherMatrix[__dY + __oX];
+	    __dT = __ditherMatrix[__dY + __oX];
-if (__dO > __dT)                         /* dither says: next pixel */
+	    if (__dO > __dT)                         /* dither says: next pixel */
-__pixel++;
+		__pixel++;
-__oX++;
+	    __oX++;
-if (__oX == __dW) __oX = 0;
+	    if (__oX == __dW) __oX = 0;
-__byte = (__byte << __depth) | __pixel;
+	    __byte = (__byte << __depth) | __pixel;
-__bitCnt = __bitCnt - __depth;
+	    __bitCnt = __bitCnt - __depth;
-if (__bitCnt == 0) {
+	    if (__bitCnt == 0) {
-__outBits[__dstIdx] = __byte;
+		__outBits[__dstIdx] = __byte;
-__dstIdx++;
+		__dstIdx++;
-__byte = 0;
+		__byte = 0;
-__bitCnt = 8;
+		__bitCnt = 8;
-}
+	    }
-}
+	}
-if (__bitCnt != 8) {
+	if (__bitCnt != 8) {
-__byte = __byte << __bitCnt;
+	    __byte = __byte << __bitCnt;
-__outBits[__dstIdx] = __byte;
+	    __outBits[__dstIdx] = __byte;
-}
+	}
-__oY++; __dY += __dW;
+	__oY++; __dY += __dW;
-if (__oY == __dH) {
+	if (__oY == __dH) {
-__oY = 0;
+	    __oY = 0;
-__dY = 0;
+	    __dY = 0;
-}
+	}
-__srcIdx = __nextSrc;
+	__srcIdx = __nextSrc;
-__dstIdx = __nextDst;
+	__dstIdx = __nextDst;
 }
 %}.
 ^ outBits
 !
 orderedDitheredMonochromeBitsWithDitherMatrix:ditherMatrix ditherWidth:dW
 "return the dithered monochrome bits for the receiver image;
 with a constant ditherMatrix, this can be used for thresholding.
 Redefined to make use of knowing that pixels are 4-bit values."
 |dH nDither bytes
 greyMap monoBits
 bytesPerMonoRow "{Class: SmallInteger }"
 bytesPerRow     "{Class: SmallInteger }"
 w               "{Class: SmallInteger }"
 h               "{Class: SmallInteger }"|
 bytesPerRow := self bytesPerRow.
 bytesPerMonoRow := w + 7 // 8.
 monoBits := ByteArray uninitializedNew:(bytesPerMonoRow * h).
 (monoBits isNil or:[bytes isNil]) ifTrue:[
-^ nil
+	^ nil
 ].
 greyMap := self greyByteMapForRange:nDither.
 %{
 unsigned char *__bytes = __ByteArrayInstPtr(bytes)->ba_element;
 unsigned char *__greyMap = __ByteArrayInstPtr(greyMap)->ba_element;
 __oY = __dY = 0;
 for (__y=0; __y<__h; __y++) {
-__nextDst = __dstIdx + __bytesPerMonoRow;
+	__nextDst = __dstIdx + __bytesPerMonoRow;
-__nextSrc = __srcIdx + __bytesPerRow;
+	__nextSrc = __srcIdx + __bytesPerRow;
-__byte = 0;
+	__byte = 0;
-__bitCnt = 8;
+	__bitCnt = 8;
-__oX = 0;
+	__oX = 0;
-for (__x=0; __x<__w; __x++) {
+	for (__x=0; __x<__w; __x++) {
-if (__x & 1) {
+	    if (__x & 1) {
-/* odd */
+		/* odd */
-__grey = __inByte & 0xF;
+		__grey = __inByte & 0xF;
-__srcIdx++;
+		__srcIdx++;
-} else {
+	    } else {
-__inByte = __bytes[__srcIdx];   /* 0..255 */
+		__inByte = __bytes[__srcIdx];   /* 0..255 */
-__grey = (__inByte >> 4) & 0xF;
+		__grey = (__inByte >> 4) & 0xF;
-}
+	    }
-__grey = __greyMap[__grey];
+	    __grey = __greyMap[__grey];
-__dT = __ditherMatrix[__dY + __oX];
+	    __dT = __ditherMatrix[__dY + __oX];
-__oX++;
+	    __oX++;
-if (__oX == __dW) __oX = 0;
+	    if (__oX == __dW) __oX = 0;
-__byte = __byte << 1;
+	    __byte = __byte << 1;
-if (__grey > __dT) {
+	    if (__grey > __dT) {
-__byte = __byte | 1;       /* white */
+		__byte = __byte | 1;       /* white */
-}
+	    }
-__bitCnt--;
+	    __bitCnt--;
-if (__bitCnt == 0) {
+	    if (__bitCnt == 0) {
-__monoBits[__dstIdx] = __byte;
+		__monoBits[__dstIdx] = __byte;
-__dstIdx++;
+		__dstIdx++;
-__byte = 0;
+		__byte = 0;
-__bitCnt = 8;
+		__bitCnt = 8;
-}
+	    }
-}
+	}
-if (__bitCnt != 8) {
+	if (__bitCnt != 8) {
-__byte = __byte << __bitCnt;
+	    __byte = __byte << __bitCnt;
-__monoBits[__dstIdx] = __byte;
+	    __monoBits[__dstIdx] = __byte;
-}
+	}
-__oY++; __dY += __dW;
+	__oY++; __dY += __dW;
-if (__oY == __dH) {
+	if (__oY == __dH) {
-__oY = 0;
+	    __oY = 0;
-__dY = 0;
+	    __dY = 0;
-}
+	}
-__srcIdx = __nextSrc;
+	__srcIdx = __nextSrc;
-__dstIdx = __nextDst;
+	__dstIdx = __nextDst;
 }
 %}.
 ^ monoBits
 ! !
 x2 := xHigh.
 srcIndex := (self bytesPerRow * y) + 1.
 srcIndex := srcIndex + (x1 // 2).
 x1 even ifTrue:[
-shift := -4
+	shift := -4
 ] ifFalse:[
-shift := 0
+	shift := 0
 ].
 byte := bytes at:srcIndex.
 x1 to:x2 do:[:x |
-shift == 0 ifTrue:[
+	shift == 0 ifTrue:[
-value := byte bitAnd:16rF.
+	    value := byte bitAnd:16rF.
-shift := -4.
+	    shift := -4.
-srcIndex := srcIndex + 1.
+	    srcIndex := srcIndex + 1.
-] ifFalse:[
+	] ifFalse:[
-srcIndex > byteSize ifTrue:[
+	    srcIndex > byteSize ifTrue:[
-byte := 0.
+		byte := 0.
-] ifFalse:[
+	    ] ifFalse:[
-byte := bytes at:srcIndex.
+		byte := bytes at:srcIndex.
-].
+	    ].
-value := (byte bitShift:-4) bitAnd:16rF.
+	    value := (byte bitShift:-4) bitAnd:16rF.
-shift := 0
+	    shift := 0
-].
+	].
-aBlock value:x value:(colorArray at:(value + 1)).
+	aBlock value:x value:(colorArray at:(value + 1)).
 ]
 "Created: / 7.6.1996 / 19:12:33 / cg"
 "Modified: / 28.7.1998 / 21:26:11 / cg"
 !
 x1 := xLow.
 x2 := xHigh.
 srcIndex := (self bytesPerRow * y) + 1.
 srcIndex := srcIndex + (x1 // 2).
 x1 even ifTrue:[
-shift := -4
+	shift := -4
 ] ifFalse:[
-shift := 0
+	shift := 0
 ].
 x1 to:x2 do:[:x |
-shift == 0 ifTrue:[
+	shift == 0 ifTrue:[
-byte := bytes at:srcIndex.
+	    byte := bytes at:srcIndex.
-pixelValue := byte bitAnd:16rF.
+	    pixelValue := byte bitAnd:16rF.
-shift := -4.
+	    shift := -4.
-srcIndex := srcIndex + 1.
+	    srcIndex := srcIndex + 1.
-] ifFalse:[
+	] ifFalse:[
-byte := bytes at:srcIndex.
+	    byte := bytes at:srcIndex.
-pixelValue := (byte bitShift:-4) bitAnd:16rF.
+	    pixelValue := (byte bitShift:-4) bitAnd:16rF.
-shift := 0
+	    shift := 0
-].
+	].
-aBlock value:x value:pixelValue.
+	aBlock value:x value:pixelValue.
 ]
 "Created: 7.6.1996 / 19:09:45 / cg"
 ! !
 !Depth4Image methodsFor:'magnification'!
 magnifyRowFrom:srcBytes offset:srcStart
-into:dstBytes offset:dstStart factor:mX
+	  into:dstBytes offset:dstStart factor:mX
 "magnify a single pixel row - can only magnify by integer factors.
 Specially tuned for factor 2."
 %{
 int _mag;
 REGISTER int i;
 REGISTER unsigned char _byte;
 int _pixels;
 REGISTER int outcnt, bits, bit;
-OBJ w = _INST(width);
+OBJ w = __INST(width);
 if (__bothSmallInteger(srcStart, dstStart)
 && __bothSmallInteger(w, mX)
 && __isByteArrayLike(srcBytes) && __isByteArray(dstBytes)) {
-_mag = __intVal(mX);
+	_mag = __intVal(mX);
-srcP = __ByteArrayInstPtr(srcBytes)->ba_element - 1 + __intVal(srcStart);
+	srcP = __ByteArrayInstPtr(srcBytes)->ba_element - 1 + __intVal(srcStart);
-dstP = __ByteArrayInstPtr(dstBytes)->ba_element - 1 + __intVal(dstStart);
+	dstP = __ByteArrayInstPtr(dstBytes)->ba_element - 1 + __intVal(dstStart);
-_pixels = __intVal(w);
+	_pixels = __intVal(w);
-switch (_mag) {
+	switch (_mag) {
-case 1:
+	    case 1:
-break;
+		break;
-case 2:
+	    case 2:
-_byte = *srcP++;
+		_byte = *srcP++;
-while (_pixels) {
+		while (_pixels) {
-bit = (_byte >> 4) & 0xF;
+		    bit = (_byte >> 4) & 0xF;
-bits = (bit << 4) | bit;
+		    bits = (bit << 4) | bit;
-*dstP++ = bits;
+		    *dstP++ = bits;
-if (--_pixels) {
+		    if (--_pixels) {
-bit = _byte & 0xF;
+			bit = _byte & 0xF;
-bits = (bit << 4) | bit;
+			bits = (bit << 4) | bit;
-*dstP++ = bits;
+			*dstP++ = bits;
-_byte = *srcP++;
+			_byte = *srcP++;
-_pixels--;
+			_pixels--;
-}
+		    }
-}
+		}
-break;
+		break;
-default:
+	    default:
-bits = 0, outcnt = 0;
+		bits = 0, outcnt = 0;
-_byte = *srcP++;
+		_byte = *srcP++;
-while (_pixels) {
+		while (_pixels) {
-bit = (_byte >> 4) & 0xF;
+		    bit = (_byte >> 4) & 0xF;
-for (i=_mag; i>0; i--) {
+		    for (i=_mag; i>0; i--) {
-bits = (bits << 4) | bit;
+			bits = (bits << 4) | bit;
-outcnt++;
+			outcnt++;
-if (outcnt == 2) {
+			if (outcnt == 2) {
-*dstP++ = bits;
+			    *dstP++ = bits;
-bits = 0;
+			    bits = 0;
-outcnt = 0;
+			    outcnt = 0;
-}
+			}
-}
+		    }
-if (--_pixels) {
+		    if (--_pixels) {
-bit = _byte & 0xF;
+			bit = _byte & 0xF;
-for (i=_mag; i>0; i--) {
+			for (i=_mag; i>0; i--) {
-bits = (bits << 4) | bit;
+			    bits = (bits << 4) | bit;
-outcnt++;
+			    outcnt++;
-if (outcnt == 2) {
+			    if (outcnt == 2) {
-*dstP++ = bits;
+				*dstP++ = bits;
-bits = 0;
+				bits = 0;
-outcnt = 0;
+				outcnt = 0;
-}
+			    }
-}
+			}
-_byte = *srcP++;
+			_byte = *srcP++;
-_pixels--;
+			_pixels--;
-}
+		    }
-}
+		}
-if (outcnt) {
+		if (outcnt) {
-*dstP = bits << 4;
+		    *dstP = bits << 4;
-}
+		}
-break;
+		break;
-}
+	}
-RETURN (self);
+	RETURN (self);
 }
 %}.
 super
-magnifyRowFrom:srcBytes offset:srcStart
+	magnifyRowFrom:srcBytes offset:srcStart
-into:dstBytes offset:dstStart factor:mX
+	into:dstBytes offset:dstStart factor:mX
 ! !
 !Depth4Image methodsFor:'queries'!
 bitsPerPixel
 colorFromValue:pixelValue
 "given a pixel value, return the corresponding color.
 Pixel values start with 0."
 photometric == #whiteIs0 ifTrue:[
-^ Color gray:100 - (100 / 15 * pixelValue)
+	^ Color gray:100 - (100 / 15 * pixelValue)
 ].
 photometric == #blackIs0 ifTrue:[
-^ Color gray:(100 / 15 * pixelValue)
+	^ Color gray:(100 / 15 * pixelValue)
 ].
 photometric == #palette ifTrue:[
-pixelValue < colorMap size ifTrue:[
+	pixelValue < colorMap size ifTrue:[
-^ colorMap at:(pixelValue + 1)
+	    ^ colorMap at:(pixelValue + 1)
-]
+	]
 ].
 ^ super colorFromValue:pixelValue
 !
 usedValues
 |useFlags usedValues|
 useFlags := Array new:16 withAll:false.
 width even ifFalse:[
-0 to:self height - 1 do:[:y |
+	0 to:self height - 1 do:[:y |
-self valuesAtY:y from:0 to:self width - 1 do:[:x :pixel |
+	    self valuesAtY:y from:0 to:self width - 1 do:[:x :pixel |
-useFlags at:(pixel + 1) put:true
+		useFlags at:(pixel + 1) put:true
-]
+	    ]
-].
+	].
 ] ifTrue:[
-self bits usedValues do:[:byte |
+	self bits usedValues do:[:byte |
-useFlags at:(byte bitShift:-4)+1 put:true.
+	    useFlags at:(byte bitShift:-4)+1 put:true.
-useFlags at:(byte bitAnd:2r1111)+1 put:true.
+	    useFlags at:(byte bitAnd:2r1111)+1 put:true.
-].
+	].
 ].
 ^ (0 to:15) select:[:i | useFlags at:(i+1)].
 "/    usedValues := OrderedCollection new.
 "/    1 to:16 do:[:i | (useFlags at:i) ifTrue:[usedValues add:(i-1)]].
 ! !
 !Depth4Image class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libview/Depth4Image.st,v 1.51 2009-11-05 14:37:10 stefan Exp $'
+^ '$Header: /cvs/stx/stx/libview/Depth4Image.st,v 1.52 2013-05-21 20:50:48 cg Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libview/Depth4Image.st,v 1.51 2009-11-05 14:37:10 stefan Exp $'
+^ '$Header: /cvs/stx/stx/libview/Depth4Image.st,v 1.52 2013-05-21 20:50:48 cg Exp $'
 ! !

changeset 6066	62426e8110ae
parent 5475	e6469c3d8a46
child 6298	c2980b510cf1