[squeak-dev] The Trunk: TrueType-nice.14.mcz

commits at source.squeak.org commits at source.squeak.org
Mon Jan 18 18:56:45 UTC 2010


Nicolas Cellier uploaded a new version of TrueType to project The Trunk:
http://source.squeak.org/trunk/TrueType-nice.14.mcz

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

Name: TrueType-nice.14
Author: nice
Time: 18 January 2010, 7:56:38.414 pm
UUID: 42c3efa6-4f77-3648-8c0f-5bf02f910f7d
Ancestors: TrueType-nice.13

move temp assignment outside block

=============== Diff against TrueType-nice.13 ===============

Item was changed:
  ----- Method: TTFileDescription class>>findFontFile: (in category 'font paths') -----
  findFontFile: fontFileName
  	"Find the path containing the font with the given name.
  	If it can't be found, return nil."
  	
+ 	self fontPathsDo:[:path|
+ 		| fd |
- 	self fontPathsDo:[:path| | fd |
  		fd := FileDirectory on: path.
  		([fd fileExists: fontFileName] on: Error do:[false]) 
  			ifTrue:[^fd fullNameFor: fontFileName].
  	].
  	^nil!

Item was changed:
  ----- Method: TTFileDescription class>>openFontFile:do: (in category 'instance creation') -----
  openFontFile: fontFileName do: aBlock
  	"Open the font with the given font file name"
  	| fontFilePath file |
  	fontFilePath := FontPaths at: fontFileName 
  		ifAbsentPut:[self findFontFile: fontFileName].
  	fontFilePath ifNil:[^nil].
+ 	file := [FileStream readOnlyFileNamed: fontFilePath] on: Error do:[:ex|
- 	[file := FileStream readOnlyFileNamed: fontFilePath] on: Error do:[:ex|
  		"We lost the font; someone might have moved it away"
  		fontFilePath removeKey: fontFileName ifAbsent:[].
  		^nil
  	].
  	^[aBlock value: file binary] ensure:[file close].!




More information about the Squeak-dev mailing list