The Trunk: Multilingual-ul.150.mcz

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

The Trunk: Multilingual-ul.150.mcz

commits-2
Levente Uzonyi uploaded a new version of Multilingual to project The Trunk:
http://source.squeak.org/trunk/Multilingual-ul.150.mcz

==================== Summary ====================

Name: Multilingual-ul.150
Author: ul
Time: 22 May 2011, 5:13:48.808 pm
UUID: fc805db9-5884-134f-a146-8f715558999f
Ancestors: Multilingual-ul.149

- small bugfix

=============== Diff against Multilingual-ul.149 ===============

Item was changed:
  ----- Method: UTF16TextConverter>>nextFromStream: (in category 'conversion') -----
  nextFromStream: aStream
 
  | character1 character2 readBOM charValue |
+ aStream isBinary ifTrue: [ ^aStream basicNext ].
- aStream isBinary ifTrue: [^ aStream basicNext].
  character1 := aStream basicNext ifNil: [ ^nil ].
  character2 := aStream basicNext ifNil: [ ^nil ].
 
  readBOM := false.
  (character1 asciiValue = 16rFF and: [character2 asciiValue = 16rFE]) ifTrue: [
  self
  useByteOrderMark: true;
  useLittleEndian: true.
  readBOM := true ].
  (character1 asciiValue = 16rFE and: [character2 asciiValue = 16rFF]) ifTrue: [
  self
  useByteOrderMark: true;
  useLittleEndian: false.
  readBOM := true ].
 
  readBOM ifTrue: [
  character1 := aStream basicNext ifNil: [ ^nil ].
  character2 := aStream basicNext ifNil: [ ^nil ] ].
 
  useLittleEndian
+ ifTrue: [ charValue := (character2 charCode bitShift: 8) + character1 charCode ]
+ ifFalse: [ charValue := (character1 charCode bitShift: 8) + character2 charCode ].
- ifTrue: [ charValue := character2 charCode bitShift: 8 + character1 charCode ]
- ifFalse: [ charValue := character1 charCode bitShift: 8 + character2 charCode ].
 
  ^ self charFromStream: aStream withFirst: charValue!