Mercurial Mercurial > hg > stx-libview2 / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
authorClaus Gittinger <cg@exept.de>
Thu, 09 Nov 1995 17:57:45 +0100
changeset 113 465cc202f0fe
parent 112 9b59ed94db13
child 114 e577a2f332d0
*** empty log message ***
BlitImageReader.st file | annotate | diff | comparison | revisions
BlitImgRdr.st file | annotate | diff | comparison | revisions 
--- a/BlitImageReader.st	Thu Nov 09 17:10:26 1995 +0100
+++ b/BlitImageReader.st	Thu Nov 09 17:57:45 1995 +0100
@@ -1,4 +1,4 @@
-'From Smalltalk/X, Version:2.10.8 on 9-nov-1995 at 17:08:48'                    !
+'From Smalltalk/X, Version:2.10.8 on 9-nov-1995 at 17:56:18'                    !
 
 ImageReader subclass:#BlitImageReader
 	 instanceVariableNames:''
@@ -11,7 +11,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libview2/BlitImageReader.st,v 1.1 1995-11-09 16:10:26 cg Exp $
+$Header: /cvs/stx/stx/libview2/BlitImageReader.st,v 1.2 1995-11-09 16:57:45 cg Exp $
 "
 
     "Created: 9.11.1995 / 17:08:06 / cg"
@@ -54,6 +54,46 @@
     "Modified: 9.11.1995 / 17:06:28 / cg"
 ! !
 
+!BlitImageReader class methodsFor:'special formats'!
+
+fromCompressedString:aString
+    "since I am not willing to include the uncompface stuff into ST/X,
+     open a pipe to the uncompressor.
+     If you dont have compface/uncompface, get it from your nearest ftp server."
+
+    |f s img|
+
+    f := Filename newTemporary.
+    s := f writeStream.
+    s nextPutAll:aString.
+    s close.
+
+    s := PipeStream readingFrom:('uncompface ' , f name).
+    s isNil ifTrue:[
+        'BLITIMGREADER: no uncompface utility.' errorPrintNL.
+        ^ nil
+    ].
+
+    img := self fromStream:s.
+    s close.
+    ^ img
+
+    "   
+     |s|
+
+     s := '
+Iqsa(US9p?)Y^W
++6Ff[Z]<t?\A!!eaL''DG{20*#{C1;''Ct&}L}B^/1(aYI@hP)4!!<}7D=2gm
+8!!$T`8QNfK<te\20%A\`wm*wa2' , Character doubleQuote asString , '^Up*Qs' , Character doubleQuote asString ,
+'X}KeV*3XeB2te&sKp*t`N;^BDh[6=K{ZBE=O>rM' , Character doubleQuote asString , 'uFE)
+lFDjag1e]\/#2'.
+    BlitImageReader fromCompressedString:s
+    "
+
+    "Created: 9.11.1995 / 17:55:19 / cg"
+    "Modified: 9.11.1995 / 17:56:07 / cg"
+! !
+
 !BlitImageReader class methodsFor:'testing'!
 
 isValidImageFile:aFileName
@@ -72,46 +112,30 @@
      bytesPerRow
      s words nm|
 
-    "/
-    "/ extract its size from the name
-    "/ kludge
-    "/
-    aStream pathName notNil ifTrue:[
-        nm := aStream pathName asFilename baseName.
-        ('[0-9][0-9]x[0-9][0-9]x1' match:nm) ifTrue:[
-            width := Integer readFromString:(nm copyFrom:1 to:2).
-            height := Integer readFromString:(nm copyFrom:4 to:5).
-        ].
-    ].
-    width isNil ifTrue:[
-        ^ nil
-    ].
+    width := height := 48.
+    bytesPerRow := width // 8.
 
-    bytesPerRow := width // 8.
-    ((width \\ 8) ~~ 0) ifTrue:[
-        bytesPerRow := bytesPerRow + 1
-    ].
     data := ByteArray new:(bytesPerRow * height).
     dstIndex := 1.
 
     [aStream atEnd] whileFalse:[
-        line := aStream nextLine.
-        line notNil ifTrue:[
-            words := (line asCollectionOfSubstringsSeparatedBy:$,) asOrderedCollection.
-            words last isEmpty ifTrue:[
-                words removeLast
-            ].
-            words do:[:w |
-                |s bits|
+	line := aStream nextLine.
+	line notNil ifTrue:[
+	    words := (line asCollectionOfSubstringsSeparatedBy:$,) asOrderedCollection.
+	    words last isEmpty ifTrue:[
+		words removeLast
+	    ].
+	    words do:[:w |
+		|s bits|
 
-                s := w readStream.
-                s skip:2.
-                bits := Integer readFrom:s radix:16 onError:0. 
-                data at:dstIndex put:(bits bitShift:-8).
-                data at:dstIndex+1 put:(bits bitAnd:16rFF).
-                dstIndex := dstIndex + 2
-            ]
-        ]
+		s := w readStream.
+		s skip:2.
+		bits := Integer readFrom:s radix:16 onError:0. 
+		data at:dstIndex put:(bits bitShift:-8).
+		data at:dstIndex+1 put:(bits bitAnd:16rFF).
+		dstIndex := dstIndex + 2
+	    ]
+	]
     ].
 
 
--- a/BlitImgRdr.st	Thu Nov 09 17:10:26 1995 +0100
+++ b/BlitImgRdr.st	Thu Nov 09 17:57:45 1995 +0100
@@ -1,4 +1,4 @@
-'From Smalltalk/X, Version:2.10.8 on 9-nov-1995 at 17:08:48'                    !
+'From Smalltalk/X, Version:2.10.8 on 9-nov-1995 at 17:56:18'                    !
 
 ImageReader subclass:#BlitImageReader
 	 instanceVariableNames:''
@@ -11,7 +11,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libview2/Attic/BlitImgRdr.st,v 1.1 1995-11-09 16:10:26 cg Exp $
+$Header: /cvs/stx/stx/libview2/Attic/BlitImgRdr.st,v 1.2 1995-11-09 16:57:45 cg Exp $
 "
 
     "Created: 9.11.1995 / 17:08:06 / cg"
@@ -54,6 +54,46 @@
     "Modified: 9.11.1995 / 17:06:28 / cg"
 ! !
 
+!BlitImageReader class methodsFor:'special formats'!
+
+fromCompressedString:aString
+    "since I am not willing to include the uncompface stuff into ST/X,
+     open a pipe to the uncompressor.
+     If you dont have compface/uncompface, get it from your nearest ftp server."
+
+    |f s img|
+
+    f := Filename newTemporary.
+    s := f writeStream.
+    s nextPutAll:aString.
+    s close.
+
+    s := PipeStream readingFrom:('uncompface ' , f name).
+    s isNil ifTrue:[
+        'BLITIMGREADER: no uncompface utility.' errorPrintNL.
+        ^ nil
+    ].
+
+    img := self fromStream:s.
+    s close.
+    ^ img
+
+    "   
+     |s|
+
+     s := '
+Iqsa(US9p?)Y^W
++6Ff[Z]<t?\A!!eaL''DG{20*#{C1;''Ct&}L}B^/1(aYI@hP)4!!<}7D=2gm
+8!!$T`8QNfK<te\20%A\`wm*wa2' , Character doubleQuote asString , '^Up*Qs' , Character doubleQuote asString ,
+'X}KeV*3XeB2te&sKp*t`N;^BDh[6=K{ZBE=O>rM' , Character doubleQuote asString , 'uFE)
+lFDjag1e]\/#2'.
+    BlitImageReader fromCompressedString:s
+    "
+
+    "Created: 9.11.1995 / 17:55:19 / cg"
+    "Modified: 9.11.1995 / 17:56:07 / cg"
+! !
+
 !BlitImageReader class methodsFor:'testing'!
 
 isValidImageFile:aFileName
@@ -72,46 +112,30 @@
      bytesPerRow
      s words nm|
 
-    "/
-    "/ extract its size from the name
-    "/ kludge
-    "/
-    aStream pathName notNil ifTrue:[
-        nm := aStream pathName asFilename baseName.
-        ('[0-9][0-9]x[0-9][0-9]x1' match:nm) ifTrue:[
-            width := Integer readFromString:(nm copyFrom:1 to:2).
-            height := Integer readFromString:(nm copyFrom:4 to:5).
-        ].
-    ].
-    width isNil ifTrue:[
-        ^ nil
-    ].
+    width := height := 48.
+    bytesPerRow := width // 8.
 
-    bytesPerRow := width // 8.
-    ((width \\ 8) ~~ 0) ifTrue:[
-        bytesPerRow := bytesPerRow + 1
-    ].
     data := ByteArray new:(bytesPerRow * height).
     dstIndex := 1.
 
     [aStream atEnd] whileFalse:[
-        line := aStream nextLine.
-        line notNil ifTrue:[
-            words := (line asCollectionOfSubstringsSeparatedBy:$,) asOrderedCollection.
-            words last isEmpty ifTrue:[
-                words removeLast
-            ].
-            words do:[:w |
-                |s bits|
+	line := aStream nextLine.
+	line notNil ifTrue:[
+	    words := (line asCollectionOfSubstringsSeparatedBy:$,) asOrderedCollection.
+	    words last isEmpty ifTrue:[
+		words removeLast
+	    ].
+	    words do:[:w |
+		|s bits|
 
-                s := w readStream.
-                s skip:2.
-                bits := Integer readFrom:s radix:16 onError:0. 
-                data at:dstIndex put:(bits bitShift:-8).
-                data at:dstIndex+1 put:(bits bitAnd:16rFF).
-                dstIndex := dstIndex + 2
-            ]
-        ]
+		s := w readStream.
+		s skip:2.
+		bits := Integer readFrom:s radix:16 onError:0. 
+		data at:dstIndex put:(bits bitShift:-8).
+		data at:dstIndex+1 put:(bits bitAnd:16rFF).
+		dstIndex := dstIndex + 2
+	    ]
+	]
     ].
hg/stx-libview2