hg/stx-libview: comparison ImageReader.st

equal deleted inserted replaced

-:ced6a721d1a6
+:9af502584519
 |t|
 %{  /* OPTIONAL */
 if (__isByteArray(data) && __isSmallInteger(nBytes)) {
-int __nBytes = __intVal(nBytes);
+	int __nBytes = __intVal(nBytes);
-int __dataSize = __byteArraySize(data);
+	int __dataSize = __byteArraySize(data);
-if (__nBytes <= __dataSize) {
+	if (__nBytes <= __dataSize) {
-int __lastIndex = __nBytes - 2;
+	    int __lastIndex = __nBytes - 2;
-unsigned char *__cp = __ByteArrayInstPtr(data)->ba_element;
+	    unsigned char *__cp = __ByteArrayInstPtr(data)->ba_element;
-int __i;
+	    int __i;
-unsigned char __t;
+	    unsigned char __t;
-for (__i=0; __i<__lastIndex; __i+=3, __cp+=3) {
+	    for (__i=0; __i<__lastIndex; __i+=3, __cp+=3) {
-__t = __cp[0];
+		__t = __cp[0];
-__cp[0] = __cp[2];
+		__cp[0] = __cp[2];
-__cp[2] = __t;
+		__cp[2] = __t;
-}
+	    }
-RETURN (true);
+	    RETURN (true);
-}
+	}
 }
 %}.
 1 to:(nBytes - 2) by:3 do:[:i |
-t := data at:i.
+	t := data at:i.
-data at:i put:(data at:i+2).
+	data at:i put:(data at:i+2).
-data at:i+2 put:t
+	data at:i+2 put:t
 ].
 "
 |bytes|
 |bytes|
 bytes := ByteArray new:1000000.
 bytes replaceFrom:1 with:#[ 0 1 2 3 4 5 6 7 8 9 10 11 12].
 Time millisecondsToRun:[
-self swap:1000000 bytesFromRGB_to_BGR_in:bytes.
+	self swap:1000000 bytesFromRGB_to_BGR_in:bytes.
 ].
 bytes copyTo:10.
 "
 ! !
 ].
 ^ nil
 "
 XBMReader fromFile:'bitmaps/SBrowser.xbm'
-XPMReader fromFile:'bitmaps/xpmBitmaps/BOOK.xpm'
+XPMReader fromFile:'bitmaps/xpmBitmaps/misc_icons/BOOK.xpm'
-XBMReader fromFile:'bitmaps/xpmBitmaps/BOOK.xpm'
+XBMReader fromFile:'bitmaps/xpmBitmaps/misc_icons/BOOK.xpm'
 "
 "Modified: 4.4.1997 / 22:09:49 / cg"
 !
 |reader inStream|
 inStream := self streamReadingFile:aFileName.
 inStream isNil ifTrue:[
-'ImageReader [warning]: file open error' errorPrintCR.
+	'ImageReader [warning]: file open error' errorPrintCR.
-^ nil
+	^ nil
 ].
 reader := self new.
 reader inStream:inStream.
 [
-reader fromStream:inStream.
+	reader fromStream:inStream.
 ] ensure:[
-inStream close.
+	inStream close.
 ].
 ^ reader
 "
-XPMReader readFile:'bitmaps/xpmBitmaps/BOOK.xpm'
+XPMReader readFile:'bitmaps/xpmBitmaps/misc_icons/BOOK.xpm'
 "
 "Modified: 4.4.1997 / 22:06:49 / cg"
 !
 	    __outBits <<= __nOut;
 #ifdef DEBUG
 	    if (__outP >= outEnd) {
 		fprintf(stderr, "oops2 %d\n", __LINE__);
-	        goto fail;
+		goto fail;
 	    }
 #endif
 	    *__outP = __outBits;
 	}
 |image depth|
 depth := self bitsPerPixel.
 (depth notNil and:[data notNil]) ifTrue:[
-image := Image newForDepth:depth.
+	image := Image newForDepth:depth.
-image depth:depth.
+	image depth:depth.
-inStream isFileStream ifTrue:[
+	inStream isFileStream ifTrue:[
-image fileName:inStream pathName.
+	    image fileName:inStream pathName.
-].
+	].
-image
+	image
-width:width
+	    width:width
-height:height
+	    height:height
-photometric:photometric
+	    photometric:photometric
-samplesPerPixel:samplesPerPixel
+	    samplesPerPixel:samplesPerPixel
-bitsPerSample:bitsPerSample
+	    bitsPerSample:bitsPerSample
-colorMap:colorMap
+	    colorMap:colorMap
-bits:data
+	    bits:data
-mask:mask.
+	    mask:mask.
-imageSequence notNil ifTrue:[
+	imageSequence notNil ifTrue:[
-image imageSequence:imageSequence.
+	    image imageSequence:imageSequence.
-].
+	].
 ].
 ^ image
 "Modified: / 15.1.1998 / 15:46:24 / stefan"
 "Created: / 1.4.1998 / 14:09:45 / cg"
 "save image in my format on aFile"
 |stream|
 [
-stream := aFileName asFilename newReadWriteStream.
+	stream := aFileName asFilename newReadWriteStream.
 ] on:FileStream openErrorSignal do:[:ex|
-^ Image fileCreationErrorSignal
+	^ Image fileCreationErrorSignal
-raiseWith:image
+	    raiseWith:image
-errorString:('file creation error: ' , aFileName asString).
+	    errorString:('file creation error: ' , aFileName asString).
 ].
 [
-[
+	[
-self save:image onStream:stream.
+	    self save:image onStream:stream.
-] ifCurtailed:[
+	] ifCurtailed:[
-aFileName asFilename delete.
+	    aFileName asFilename delete.
-].
+	].
 ] ensure:[
-stream close.
+	stream close.
 ].
 !
 save:image onStream:aStream
 "save image in my format on a Stream"
 ^ Image cannotRepresentImageSignal
-raiseWith:image
+	raiseWith:image
-errorString:('image save not implemented for this format').
+	errorString:('image save not implemented for this format').
 ! !
 !ImageReader methodsFor:'initialization'!
 initialize
 progressHolder := aValueHolderOrBlock
 !
 reportDimension
 dimensionCallBack notNil ifTrue:[
-dimensionCallBack value:self
+	dimensionCallBack value:self
 ].
 dimensionHolder notNil ifTrue:[
-dimensionHolder value:(width @ height)
+	dimensionHolder value:(width @ height)
 ].
 !
 reportProgress:fraction
 "can be used by a GUI application to indicate loading progress (0..1)"
 progressHolder notNil ifTrue:[
-progressHolder value:fraction
+	progressHolder value:fraction
 ].
 ! !
 !ImageReader class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libview/ImageReader.st,v 1.86 2003-11-26 22:14:38 cg Exp $'
+^ '$Header: /cvs/stx/stx/libview/ImageReader.st,v 1.87 2004-02-24 10:35:25 cg Exp $'
 ! !

changeset 4033	9af502584519
parent 3965	8c9c9e08880c
child 4055	bb45fa7310eb