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.
dimensionReport
authorClaus Gittinger <cg@exept.de>
Wed, 19 Nov 2003 16:28:36 +0100
changeset 1846 d29322944b05
parent 1845 9e16152a374f
child 1847 b8f2855bf510
dimensionReport
BlitImageReader.st file | annotate | diff | comparison | revisions
FLIReader.st file | annotate | diff | comparison | revisions
FaceReader.st file | annotate | diff | comparison | revisions
GIFReader.st file | annotate | diff | comparison | revisions
IrisRGBReader.st file | annotate | diff | comparison | revisions
PCXReader.st file | annotate | diff | comparison | revisions
PNGReader.st file | annotate | diff | comparison | revisions
ST80FormReader.st file | annotate | diff | comparison | revisions
SunRasterReader.st file | annotate | diff | comparison | revisions
TIFFReader.st file | annotate | diff | comparison | revisions
TargaReader.st file | annotate | diff | comparison | revisions
WindowsIconReader.st file | annotate | diff | comparison | revisions
XPMReader.st file | annotate | diff | comparison | revisions
XWDReader.st file | annotate | diff | comparison | revisions 
--- a/BlitImageReader.st	Wed Nov 19 16:27:07 2003 +0100
+++ b/BlitImageReader.st	Wed Nov 19 16:28:36 2003 +0100
@@ -162,10 +162,10 @@
 
     |line 
      dstIndex "{ Class: SmallInteger }"
-     bytesPerRow
-     s words nm|
+     bytesPerRow words|
 
     width := height := 48.
+    self reportDimension.
     bytesPerRow := width // 8.
 
     data := ByteArray new:(bytesPerRow * height).
@@ -207,7 +207,7 @@
 !BlitImageReader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/BlitImageReader.st,v 1.15 2003-04-10 14:26:01 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/BlitImageReader.st,v 1.16 2003-11-19 15:28:36 cg Exp $'
 ! !
 
 BlitImageReader initialize!
--- a/FLIReader.st	Wed Nov 19 16:27:07 2003 +0100
+++ b/FLIReader.st	Wed Nov 19 16:28:36 2003 +0100
@@ -290,9 +290,8 @@
     width := header wordAt:(1+8).
     height := header wordAt:(1+10).
 
-    dimensionCallBack notNil ifTrue:[
-        dimensionCallBack value
-    ].
+    self reportDimension.
+
     flags := header wordAt:(1+14).
     speed := header wordAt:(1+16).
     speed <= 0 ifTrue:[
@@ -564,7 +563,7 @@
 !FLIReader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/FLIReader.st,v 1.13 2003-09-01 14:47:45 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/FLIReader.st,v 1.14 2003-11-19 15:28:19 cg Exp $'
 ! !
 
 FLIReader initialize!
--- a/FaceReader.st	Wed Nov 19 16:27:07 2003 +0100
+++ b/FaceReader.st	Wed Nov 19 16:28:36 2003 +0100
@@ -118,6 +118,8 @@
         ^ self fileFormatError:'only depth 8 supported'.
     ].
 
+    self reportDimension.
+
     [line isEmpty] whileTrue:[
         line := inStream nextLine.
     ].
@@ -155,7 +157,7 @@
 !FaceReader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/FaceReader.st,v 1.29 2003-09-01 14:47:36 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/FaceReader.st,v 1.30 2003-11-19 15:28:06 cg Exp $'
 ! !
 
 FaceReader initialize!
--- a/GIFReader.st	Wed Nov 19 16:27:07 2003 +0100
+++ b/GIFReader.st	Wed Nov 19 16:28:36 2003 +0100
@@ -304,9 +304,7 @@
     width := aStream nextShortMSB:false.
     height := aStream nextShortMSB:false.
 
-    dimensionCallBack notNil ifTrue:[
-        dimensionCallBack value:self
-    ].
+    self reportDimension.
 
 "/
 "/    'width ' print. width printNewline.
@@ -980,7 +978,7 @@
 !GIFReader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/GIFReader.st,v 1.88 2003-09-12 11:40:36 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/GIFReader.st,v 1.89 2003-11-19 15:28:00 cg Exp $'
 ! !
 
 GIFReader initialize!
--- a/IrisRGBReader.st	Wed Nov 19 16:27:07 2003 +0100
+++ b/IrisRGBReader.st	Wed Nov 19 16:28:36 2003 +0100
@@ -128,6 +128,8 @@
         ^ self fileFormatError:'can only read 3-channel images'.
     ].
 
+    self reportDimension.
+
     isRLE ifTrue:[
         self readRLEData
     ] ifFalse:[
@@ -231,7 +233,7 @@
 !IrisRGBReader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/IrisRGBReader.st,v 1.10 2003-09-01 14:47:57 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/IrisRGBReader.st,v 1.11 2003-11-19 15:27:22 cg Exp $'
 ! !
 
 IrisRGBReader initialize!
--- a/PCXReader.st	Wed Nov 19 16:27:07 2003 +0100
+++ b/PCXReader.st	Wed Nov 19 16:28:36 2003 +0100
@@ -298,6 +298,8 @@
 "/    'width=' print. width printNL.
 "/    'height=' print. width printNL.
 
+    self reportDimension.
+
     (version == 2) ifTrue:[
         colorMap := self extractColorMap16.
     ].
@@ -360,7 +362,7 @@
 !PCXReader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/PCXReader.st,v 1.31 2003-09-01 14:47:48 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/PCXReader.st,v 1.32 2003-11-19 15:26:45 cg Exp $'
 ! !
 
 PCXReader initialize!
--- a/PNGReader.st	Wed Nov 19 16:27:07 2003 +0100
+++ b/PNGReader.st	Wed Nov 19 16:28:36 2003 +0100
@@ -142,6 +142,7 @@
         'PNGReader: invalid dimension(s)' infoPrintCR.
         ^ false.
     ].
+    self reportDimension.
 
     depth := inStream nextByte.
     colorType := inStream nextByte.
@@ -443,7 +444,7 @@
 !PNGReader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/PNGReader.st,v 1.8 2003-09-01 14:47:50 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/PNGReader.st,v 1.9 2003-11-19 15:26:24 cg Exp $'
 ! !
 
 PNGReader initialize!
--- a/ST80FormReader.st	Wed Nov 19 16:27:07 2003 +0100
+++ b/ST80FormReader.st	Wed Nov 19 16:28:36 2003 +0100
@@ -126,6 +126,7 @@
     ].
     offsetX := aStream nextUnsignedShortMSB:true.
     offsetY := aStream nextUnsignedShortMSB:true.
+    self reportDimension.
 
     nBytes := width + 15 // 16 * 2 * height.
     data := ByteArray new:nBytes.
@@ -184,7 +185,7 @@
 !ST80FormReader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/ST80FormReader.st,v 1.24 2003-09-12 11:40:49 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/ST80FormReader.st,v 1.25 2003-11-19 15:26:11 cg Exp $'
 ! !
 
 ST80FormReader initialize!
--- a/SunRasterReader.st	Wed Nov 19 16:27:07 2003 +0100
+++ b/SunRasterReader.st	Wed Nov 19 16:28:36 2003 +0100
@@ -141,6 +141,7 @@
 
     width := aStream nextLong.
     height := aStream nextLong.
+    self reportDimension.
 
     depth := aStream nextLong.
     aStream nextLong.   "Ignore the image length since I can't rely on it anyway."
@@ -276,7 +277,7 @@
 !SunRasterReader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/SunRasterReader.st,v 1.30 2003-09-01 14:47:29 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/SunRasterReader.st,v 1.31 2003-11-19 15:25:57 cg Exp $'
 ! !
 
 SunRasterReader initialize!
--- a/TIFFReader.st	Wed Nov 19 16:27:07 2003 +0100
+++ b/TIFFReader.st	Wed Nov 19 16:28:36 2003 +0100
@@ -2220,9 +2220,7 @@
         ^ self fileFormatError:'missing stripByteCounts tag'.
     ].
 
-    dimensionCallBack notNil ifTrue:[
-        dimensionCallBack value:self
-    ].
+    self reportDimension.
 
     "given all the information, read the bits"
 
@@ -2358,7 +2356,7 @@
 !TIFFReader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/TIFFReader.st,v 1.81 2003-10-29 10:36:29 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/TIFFReader.st,v 1.82 2003-11-19 15:25:43 cg Exp $'
 ! !
 
 TIFFReader initialize!
--- a/TargaReader.st	Wed Nov 19 16:27:07 2003 +0100
+++ b/TargaReader.st	Wed Nov 19 16:28:36 2003 +0100
@@ -203,6 +203,8 @@
     ].
     'TargaReader [info]: imageType: ' infoPrint. imageType infoPrintCR.
 
+    self reportDimension.
+
     "/ flags:
     "/    0000 xxxx  attribute-bits-per-pixel
     "/    0000 0001  greysc
@@ -550,7 +552,7 @@
 !TargaReader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/TargaReader.st,v 1.23 2003-09-01 14:47:27 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/TargaReader.st,v 1.24 2003-11-19 15:25:29 cg Exp $'
 ! !
 
 TargaReader initialize!
--- a/WindowsIconReader.st	Wed Nov 19 16:27:07 2003 +0100
+++ b/WindowsIconReader.st	Wed Nov 19 16:28:36 2003 +0100
@@ -403,6 +403,8 @@
         ]
     ].
 
+    self reportDimension.
+
     "read the colormap; notice: its in BGR order (sigh)"
 
     nColors := 1 bitShift:inDepth.
@@ -628,6 +630,8 @@
         ].
     ].
 
+    self reportDimension.
+
     numColor ~~ 0 ifTrue:[
         "read the colormap - notice: its in BGR order (sigh)"
 
@@ -767,6 +771,7 @@
         ^ self fileFormatError:'only depth 4/8 ico-images supported (depth is ' , inDepth printString , ')'.
 "/        self halt:'only depth 4 ico-images supported (depth is ' , inDepth printString , ')'.
     ].
+    self reportDimension.
 
     "read the colormap"
     cmapSize := (1 bitShift:inDepth).
@@ -1106,7 +1111,7 @@
 !WindowsIconReader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/WindowsIconReader.st,v 1.56 2003-09-01 14:47:47 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/WindowsIconReader.st,v 1.57 2003-11-19 15:25:15 cg Exp $'
 ! !
 
 WindowsIconReader initialize!
--- a/XPMReader.st	Wed Nov 19 16:27:07 2003 +0100
+++ b/XPMReader.st	Wed Nov 19 16:28:36 2003 +0100
@@ -218,6 +218,8 @@
     colorMapSize := Integer readFrom:s.
     charsPerPixel := Integer readFrom:s.
 
+    self reportDimension.
+
     charsPerPixel ~~ 1 ifTrue:[
         characterTranslation := Dictionary new:colorMapSize.
     ] ifFalse:[
@@ -622,7 +624,7 @@
 !XPMReader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/XPMReader.st,v 1.56 2003-09-12 11:42:42 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/XPMReader.st,v 1.57 2003-11-19 15:24:31 cg Exp $'
 ! !
 
 XPMReader initialize!
--- a/XWDReader.st	Wed Nov 19 16:27:07 2003 +0100
+++ b/XWDReader.st	Wed Nov 19 16:28:36 2003 +0100
@@ -103,6 +103,8 @@
     height := header at: 6.
     pad := header at: 11.
 
+    self reportDimension.
+
     bitsPerPixel := header at: 12.
     bitsPerPixel == 24 ifTrue:[
         bitsPerSample := #(8 8 8).
@@ -291,7 +293,7 @@
 !XWDReader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/XWDReader.st,v 1.26 2003-09-12 11:42:48 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/XWDReader.st,v 1.27 2003-11-19 15:24:16 cg Exp $'
 ! !
 
 XWDReader initialize!
hg/stx-libview2