#REFACTORING by mawalch
authormawalch
Wed, 17 May 2017 14:46:44 +0200
changeset 8026 532ccce8b1fd
parent 8025 2e4d3fedcbd3
child 8027 6fbc6eee1156
#REFACTORING by mawalch class: ImageReader changed: #makeImage #notNil and #notEmpty -> #notEmptyOrNil
ImageReader.st
--- a/ImageReader.st	Thu May 11 09:20:44 2017 +0200
+++ b/ImageReader.st	Wed May 17 14:46:44 2017 +0200
@@ -1960,33 +1960,33 @@
 
     depth := self bitsPerPixel.
     (depth notNil and:[data notNil]) ifTrue:[
-	image := Image newForDepth:depth.
-	image depth:depth.
-	inStream isFileStream ifTrue:[
-	    image fileName:inStream pathName.
-	].
-	image
-	    width:width
-	    height:height
-	    photometric:photometric
-	    samplesPerPixel:samplesPerPixel
-	    bitsPerSample:bitsPerSample
-	    colorMap:colorMap
-	    bits:data
-	    mask:mask.
+        image := Image newForDepth:depth.
+        image depth:depth.
+        inStream isFileStream ifTrue:[
+            image fileName:inStream pathName.
+        ].
+        image
+            width:width
+            height:height
+            photometric:photometric
+            samplesPerPixel:samplesPerPixel
+            bitsPerSample:bitsPerSample
+            colorMap:colorMap
+            bits:data
+            mask:mask.
 
-	imageSequence notNil ifTrue:[
-	    image imageSequence:imageSequence.
-	].
-	(metaData notNil and:[metaData notEmpty]) ifTrue:[
-	    image metaData:metaData
-	].
+        imageSequence notNil ifTrue:[
+            image imageSequence:imageSequence.
+        ].
+        metaData notEmptyOrNil ifTrue:[
+            image metaData:metaData
+        ].
     ].
     ^ image
 
-    "Modified: / 15.1.1998 / 15:46:24 / stefan"
-    "Created: / 1.4.1998 / 14:09:45 / cg"
-    "Modified: / 1.4.1998 / 14:41:35 / cg"
+    "Modified: / 15-01-1998 / 15:46:24 / stefan"
+    "Created: / 01-04-1998 / 14:09:45 / cg"
+    "Modified: / 17-05-2017 / 14:37:16 / mawalch"
 !
 
 mask