Merge jv
authorMerge Script
Thu, 24 Mar 2016 07:05:57 +0100
branchjv
changeset 7226 78d9aa881c26
parent 7223 bce4cd6c45cd (current diff)
parent 7225 0b34f9bae937 (diff)
child 7231 0550a616695c
Merge
Depth32Image.st
Image.st
--- a/Depth32Image.st	Fri Mar 18 07:49:36 2016 +0000
+++ b/Depth32Image.st	Thu Mar 24 07:05:57 2016 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1995 by Claus Gittinger
 	      All Rights Reserved
@@ -217,7 +219,7 @@
     pixelIndex := 1 + (((width * y) + x) * 4).
 
     "left pixel in high bits"
-    ^ bytes doubleWordAt:pixelIndex MSB:true.
+    ^ bytes unsignedInt32At:pixelIndex MSB:true.
 
     "Created: 24.4.1997 / 19:00:28 / cg"
     "Modified: 24.4.1997 / 23:11:05 / cg"
@@ -234,7 +236,7 @@
     bytes isNil ifTrue:[
         self createPixelStore
     ].
-    bytes doubleWordAt:pixelIndex put:aPixelValue MSB:true
+    bytes unsignedInt32At:pixelIndex put:aPixelValue MSB:true
 
     "Created: / 24-04-1997 / 19:00:28 / cg"
     "Modified: / 06-06-2007 / 12:20:57 / cg"
@@ -254,7 +256,7 @@
 
     0 to:w do:[:col |
         pixel := pixelArray at:(startIndex + col).
-        bytes doubleWordAt:dstIdx put:pixel MSB:true.
+        bytes unsignedInt32At:dstIdx put:pixel MSB:true.
         dstIdx := dstIdx + 4.
     ].
     ^ pixelArray
--- a/Image.st	Fri Mar 18 07:49:36 2016 +0000
+++ b/Image.st	Thu Mar 24 07:05:57 2016 +0100
@@ -14575,7 +14575,7 @@
                     dstIndex := dstRow.
 
                     1 to:w do:[:wi |
-                        lword := tmpData doubleWordAt:srcIndex MSB:isMSB.
+                        lword := tmpData unsignedInt32At:srcIndex MSB:isMSB.
                         r := (lword bitShift:shR) bitAnd:maskR.
                         g := (lword bitShift:shG) bitAnd:maskG.
                         b := (lword bitShift:shB) bitAnd:maskB.