View | Details | Raw Unified | Return to issue 96549
Collapse All | Expand All

(-)aqua/source/gdi/salgdi.cxx (+12 lines)
Lines 1500-1508 Link Here
1500
    ATSFontContainerRef aATSFontContainer;
1500
    ATSFontContainerRef aATSFontContainer;
1501
1501
1502
    const ATSFontContext eContext = kATSFontContextLocal; // TODO: *Global???
1502
    const ATSFontContext eContext = kATSFontContextLocal; // TODO: *Global???
1503
#if (MAC_OS_X_VERSION_MIN_ALLOWED >= MAC_OS_X_VERSION_10_5)
1504
    eStatus = ::ATSFontActivateFromFileReference( &aPathFSRef,
1505
        eContext, kATSFontFormatUnspecified, NULL, kATSOptionFlagsDefault,
1506
        &aATSFontContainer );
1507
#else
1503
    eStatus = ::ATSFontActivateFromFileSpecification( &aPathFSSpec,
1508
    eStatus = ::ATSFontActivateFromFileSpecification( &aPathFSSpec,
1504
        eContext, kATSFontFormatUnspecified, NULL, kATSOptionFlagsDefault,
1509
        eContext, kATSFontFormatUnspecified, NULL, kATSOptionFlagsDefault,
1505
        &aATSFontContainer );
1510
        &aATSFontContainer );
1511
#endif
1506
    if( eStatus != noErr )
1512
    if( eStatus != noErr )
1507
        return false;
1513
        return false;
1508
1514
Lines 1587-1595 Link Here
1587
	ATSFontContainerRef oContainer;
1593
	ATSFontContainerRef oContainer;
1588
1594
1589
	const ATSFontContext eContext = kATSFontContextLocal; // TODO: *Global???
1595
	const ATSFontContext eContext = kATSFontContextLocal; // TODO: *Global???
1596
#if (MAC_OS_X_VERSION_MIN_ALLOWED >= MAC_OS_X_VERSION_10_5)
1597
	eStatus = ::ATSFontActivateFromFileReference( &aNewRef,
1598
		eContext, kATSFontFormatUnspecified, NULL, kATSOptionFlagsDefault,
1599
		&oContainer );
1600
#else
1590
	eStatus = ::ATSFontActivateFromFileSpecification( &aFontFSSpec,
1601
	eStatus = ::ATSFontActivateFromFileSpecification( &aFontFSSpec,
1591
		eContext, kATSFontFormatUnspecified, NULL, kATSOptionFlagsDefault,
1602
		eContext, kATSFontFormatUnspecified, NULL, kATSOptionFlagsDefault,
1592
		&oContainer );
1603
		&oContainer );
1604
#endif
1593
	if( eStatus != noErr )
1605
	if( eStatus != noErr )
1594
		return false;
1606
		return false;
1595
1607

Return to issue 96549