Skip to content

Commit 36fcdd2

Browse files
author
jenkins-pharo
committed
EXPORT VERSION 60498
1 parent ebbc1c0 commit 36fcdd2

File tree

10 files changed

+28
-32
lines changed

10 files changed

+28
-32
lines changed

‎src/Athens-Cairo.package/AthensCairoMatrix.class/class/fieldsDesc.st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ fieldsDesc
44
^ #(
55
double sx; double shx;
66
double shy; double sy;
7-
double x; double y;
7+
double x; double y;
88
)

‎src/Athens-Cairo.package/CairoFontFace.class/class/fromFreetypeFace..st

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ instance creation
22
fromFreetypeFace: aFace
33
| handle cairoFace |
44

5-
handle := aFace handle nbUlongAt: 1.
6-
cairoFace := self primFtFace: handle loadFlags: ( LoadNoHinting | LoadTargetLCD | LoadNoAutohint | LoadNoBitmap).
5+
handle := aFace handle pointerAt: 1.
6+
cairoFace := self primFtFace: handle loadFlags: ( LoadNoHinting | LoadTargetLCD | LoadNoAutohint | LoadNoBitmap).
77

88
^ cairoFace initializeWithFreetypeFace: aFace

‎src/Athens-Cairo.package/CairoFontFace.class/class/primFtFace.loadFlags..st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ cairo_font_face_t * cairo_ft_font_face_create_for_ft_face
88
"
99
<primitive: #primitiveNativeCall module: #NativeBoostPlugin error: errorCode>
1010

11-
^ self nbCall: #( CairoFontFace cairo_ft_font_face_create_for_ft_face(uint aFace , int flags ))
11+
^ self nbCall: #( CairoFontFace cairo_ft_font_face_create_for_ft_face(void * aFace , int flags ))

‎src/Athens-Cairo.package/CairoScaledFont.class/class/fromFreetypeFont..st

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ fromFreetypeFont: aFont
44
^ CairoBackendCache soleInstance at: aFont ifAbsentPut: [ | emphasis |
55
emphasis := aFont simulatedEmphasis.
66
ftFace := aFont face.
7-
face := CairoBackendCache soleInstance at: {ftFace. emphasis} ifAbsentPut: [ | cff |
7+
face := CairoBackendCache soleInstance
8+
at: {ftFace. emphasis}
9+
ifAbsentPut: [ | cff |
810
cff := CairoFontFace fromFreetypeFace: ftFace.
911
emphasis ifNotNil: [ cff synthesizeEmphasis: emphasis ].
1012
cff ].

‎src/Morphic-Base.package/SystemProgressItemMorph.class/instance/refresh.st

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ private
22
refresh
33

44
lastRefresh := Time millisecondClockValue.
5-
self currentWorld doOneCycleNow.
5+
UIManager default uiProcess == Processor activeProcess
6+
ifTrue: [ self currentWorld doOneCycleNow ]

‎src/Morphic-Base.package/SystemProgressMorph.class/instance/refresh.st

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ updating
22
refresh
33
"We may be blocking the UI thread, and thus have to draw the world ourselves when necessary"
44
lastRefresh := Time millisecondClockValue.
5-
self currentWorld doOneCycleNow.
5+
UIManager default uiProcess == Processor activeProcess
6+
ifTrue: [ self currentWorld doOneCycleNow]

‎src/ScriptLoader60.package/ScriptLoader.class/instance/commentForCurrentUpdate.st

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
public
22
commentForCurrentUpdate
3-
^ '20084 Highlight Message Send is not enabled by default in bootstrapped/reloaded image
4-
https://pharo.fogbugz.com/f/cases/20084
3+
^ '20095 SystemProgressMorph should call doOneCycleNow on refresh only when active process is UIProcess
4+
https://pharo.fogbugz.com/f/cases/20095
55
6-
20072 Importing Resource Help needs improvement
7-
https://pharo.fogbugz.com/f/cases/20072
8-
9-
19809 Failing test: WeakAnnouncerTest>>#testNoDeadWeakSubscriptions
10-
https://pharo.fogbugz.com/f/cases/19809'
6+
20099 Cairo fonts crashing on 64bits
7+
https://pharo.fogbugz.com/f/cases/20099'

‎src/ScriptLoader60.package/ScriptLoader.class/instance/script60497.st renamed to ‎src/ScriptLoader60.package/ScriptLoader.class/instance/script60498.st

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
pharo - scripts
2-
script60497
2+
script60498
33

44
^ 'AST-Core-TheIntegrator.494.mcz
55
AST-Tests-Core-TheIntegrator.134.mcz
@@ -8,7 +8,7 @@ Announcements-Core-TheIntegrator.84.mcz
88
Announcements-Help-TheIntegrator.12.mcz
99
Announcements-Tests-Core-TheIntegrator.39.mcz
1010
Athens-Balloon-MarcusDenker.20.mcz
11-
Athens-Cairo-TheIntegrator.144.mcz
11+
Athens-Cairo-TheIntegrator.147.mcz
1212
Athens-CairoPools-NicolaiHess.14.mcz
1313
Athens-Core-AliakseiSyrel.57.mcz
1414
Athens-Examples-TheIntegrator.47.mcz
@@ -206,7 +206,7 @@ MonticelloGUI-TheIntegrator.437.mcz
206206
MonticelloMocks-TheIntegrator.9.mcz
207207
MonticelloRemoteRepositories-TheIntegrator.19.mcz
208208
Moose-Algos-Graph-VincentBlondeau.33.mcz
209-
Morphic-Base-TheIntegrator.615.mcz
209+
Morphic-Base-TheIntegrator.618.mcz
210210
Morphic-Core-TheIntegrator.313.mcz
211211
Morphic-Examples-TheIntegrator.64.mcz
212212
Morphic-Tests-TheIntegrator.13.mcz

‎src/ScriptLoader60.package/ScriptLoader.class/instance/update60497.st

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎src/ScriptLoader60.package/ScriptLoader.class/instance/update60498.st

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
pharo - updates
2+
update60498
3+
"self new update60498"
4+
self withUpdateLog: '20095 SystemProgressMorph should call doOneCycleNow on refresh only when active process is UIProcess
5+
https://pharo.fogbugz.com/f/cases/20095
6+
7+
20099 Cairo fonts crashing on 64bits
8+
https://pharo.fogbugz.com/f/cases/20099'.
9+
self loadTogether: self script60498 merge: false.
10+
self flushCaches.

0 commit comments

Comments
 (0)