Mercurial Mercurial > hg > stx-libview / 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.
Merge jv
authorMerge Script
Wed, 16 Mar 2016 06:46:30 +0100
branchjv
changeset 7214 3ed9ddd4332c
parent 7208 d1e51f46d25b (current diff)
parent 7213 55e7421aab9d (diff)
child 7217 6acdcbd90773
Merge
Image.st file | annotate | diff | comparison | revisions 
--- a/Depth16Image.st	Tue Mar 15 07:54:53 2016 +0000
+++ b/Depth16Image.st	Wed Mar 16 06:46:30 2016 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1995 by Claus Gittinger
 	      All Rights Reserved
@@ -85,7 +87,7 @@
 
     lineIndex := (width * 2 * y) + 1.
 
-    ^ bytes wordAt:(lineIndex + (x * 2)) MSB:true.
+    ^ bytes unsignedInt16At:(lineIndex + (x * 2)) MSB:true.
 
     "Created: 24.4.1997 / 16:06:19 / cg"
 !
@@ -99,7 +101,7 @@
 
     lineIndex := (width * 2 * y) + 1.
 
-    bytes wordAt:(lineIndex + (x * 2)) put:aPixelValue MSB:true
+    bytes unsignedInt16At:(lineIndex + (x * 2)) put:aPixelValue MSB:true
 
     "Created: 24.4.1997 / 17:06:21 / cg"
 !
--- a/Depth48Image.st	Tue Mar 15 07:54:53 2016 +0000
+++ b/Depth48Image.st	Wed Mar 16 06:46:30 2016 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2009 by eXept Software AG
               All Rights Reserved
@@ -11,6 +13,8 @@
 "
 "{ Package: 'stx:libview' }"
 
+"{ NameSpace: Smalltalk }"
+
 Image subclass:#Depth48Image
 	instanceVariableNames:''
 	classVariableNames:''
@@ -78,9 +82,9 @@
 
     pixelIndex := (width * 6 * y) + 1 + (x * 6).
 
-    ^ ((bytes wordAt:pixelIndex MSB:true) bitShift:32)
-    + ((bytes wordAt:pixelIndex+2 MSB:true) bitShift:16)
-    + (bytes wordAt:pixelIndex+4 MSB:true).
+    ^ ((bytes unsignedInt16At:pixelIndex MSB:true) bitShift:32)
+    + ((bytes unsignedInt16At:pixelIndex+2 MSB:true) bitShift:16)
+    + (bytes unsignedInt16At:pixelIndex+4 MSB:true).
 !
 
 pixelAtX:x y:y put:aPixelValue
@@ -94,9 +98,9 @@
     bytes isNil ifTrue:[
         self createPixelStore
     ].
-    bytes wordAt:pixelIndex put:((aPixelValue bitShift:-32) bitAnd:16rFFFF) MSB:true.
-    bytes wordAt:pixelIndex+2 put:((aPixelValue bitShift:-16) bitAnd:16rFFFF) MSB:true.
-    bytes wordAt:pixelIndex+4 put:(aPixelValue bitAnd:16rFFFF) MSB:true.
+    bytes unsignedInt16At:pixelIndex put:((aPixelValue bitShift:-32) bitAnd:16rFFFF) MSB:true.
+    bytes unsignedInt16At:pixelIndex+2 put:((aPixelValue bitShift:-16) bitAnd:16rFFFF) MSB:true.
+    bytes unsignedInt16At:pixelIndex+4 put:(aPixelValue bitAnd:16rFFFF) MSB:true.
 ! !
 
 !Depth48Image methodsFor:'initialization'!
@@ -130,6 +134,6 @@
 !Depth48Image class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/Depth48Image.st,v 1.2 2014-03-02 13:59:57 cg Exp $'
+    ^ '$Header$'
 ! !
 
--- a/Depth64Image.st	Tue Mar 15 07:54:53 2016 +0000
+++ b/Depth64Image.st	Wed Mar 16 06:46:30 2016 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2009 by eXept Software AG
               All Rights Reserved
@@ -11,6 +13,8 @@
 "
 "{ Package: 'stx:libview' }"
 
+"{ NameSpace: Smalltalk }"
+
 Image subclass:#Depth64Image
 	instanceVariableNames:''
 	classVariableNames:''
@@ -78,10 +82,10 @@
 
     pixelIndex := (width * 8 * y) + 1 + (x * 8).
 
-    ^ ((bytes wordAt:pixelIndex MSB:true) bitShift:48)
-    + ((bytes wordAt:pixelIndex+2 MSB:true) bitShift:32)
-    + ((bytes wordAt:pixelIndex+4 MSB:true) bitShift:16)
-    + (bytes wordAt:pixelIndex+6 MSB:true).
+    ^ ((bytes unsignedInt16At:pixelIndex MSB:true) bitShift:48)
+    + ((bytes unsignedInt16At:pixelIndex+2 MSB:true) bitShift:32)
+    + ((bytes unsignedInt16At:pixelIndex+4 MSB:true) bitShift:16)
+    + (bytes unsignedInt16At:pixelIndex+6 MSB:true).
 !
 
 pixelAtX:x y:y put:aPixelValue
@@ -95,10 +99,10 @@
     bytes isNil ifTrue:[
         self createPixelStore
     ].
-    bytes wordAt:pixelIndex put:((aPixelValue bitShift:-48) bitAnd:16rFFFF) MSB:true.
-    bytes wordAt:pixelIndex+2 put:((aPixelValue bitShift:-32) bitAnd:16rFFFF) MSB:true.
-    bytes wordAt:pixelIndex+4 put:((aPixelValue bitShift:-16) bitAnd:16rFFFF) MSB:true.
-    bytes wordAt:pixelIndex+6 put:(aPixelValue bitAnd:16rFFFF) MSB:true.
+    bytes unsignedInt16At:pixelIndex put:((aPixelValue bitShift:-48) bitAnd:16rFFFF) MSB:true.
+    bytes unsignedInt16At:pixelIndex+2 put:((aPixelValue bitShift:-32) bitAnd:16rFFFF) MSB:true.
+    bytes unsignedInt16At:pixelIndex+4 put:((aPixelValue bitShift:-16) bitAnd:16rFFFF) MSB:true.
+    bytes unsignedInt16At:pixelIndex+6 put:(aPixelValue bitAnd:16rFFFF) MSB:true.
 ! !
 
 !Depth64Image methodsFor:'initialization'!
@@ -136,6 +140,10 @@
 !Depth64Image class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/Depth64Image.st,v 1.4 2014-03-02 13:59:31 cg Exp $'
+    ^ '$Header$'
+!
+
+version_CVS
+    ^ '$Header$'
 ! !
 
--- a/Image.st	Tue Mar 15 07:54:53 2016 +0000
+++ b/Image.st	Wed Mar 16 06:46:30 2016 +0100
@@ -14585,7 +14585,7 @@
                         dstIndex := dstRow.
 
                         1 to:w do:[:wi |
-                            word := tmpData wordAt:srcIndex MSB:isMSB.
+                            word := tmpData unsignedInt16At:srcIndex MSB:isMSB.
                             r := (word bitShift:shR) bitAnd:maskR.
                             g := (word bitShift:shG) bitAnd:maskG.
                             b := (word bitShift:shB) bitAnd:maskB.
hg/stx-libview