Browse Source

* synchronised with r209 of the common interfaces:

...
r209 | adriaan | 2007-06-11 05:46:07 +0200 (Mon, 11 Jun 2007) | 1 line

made kPMPrintAllPages unsigned
...
r208 | gale | 2007-06-10 18:20:15 +0200 (Sun, 10 Jun 2007) | 4 lines

Changed all temporary trial "_GAP_Private_field_type_fix" suffixes to
permanent "_fix" suffixes for fixing record field identifier related
redeclaration warnings.

...
r207 | adriaan | 2007-06-10 09:30:05 +0200 (Sun, 10 Jun 2007) | 1 line

renamed FreeMem to MacFreeMem
...
r206 | gale | 2007-05-30 11:06:04 +0200 (Wed, 30 May 2007) | 3 lines

Fixed errors in CGImage.pas declarations kCGBitmapByteOrder16Big and
kCGBitmapByteOrder32Big to match those in MacOSX10.4u.sdk CGImage.h.

...
r205 | gale | 2007-05-22 10:59:23 +0200 (Tue, 22 May 2007) | 71 lines

Updated CMApplication.pas, CMICCProfile.pas, CMTypes.pas, and Quickdraw.pas
to correspond with MacOSX10.4u.sdk respective headers.

1.  Moved from CMApplication to CMTypes declarations for type
CMChromaticAdaptation and constants cmUseDefaultChromaticAdaptation,
cmLinearChromaticAdaptation, cmVonKriesChromaticAdaptation, and
cmBradfordChromaticAdaptation.

2.  Moved from CMApplication to CMICCProfile declarations for types
CMProfileMD5 and CMProfileMD5Ptr.

3.  To match Mac OS X QuickDraw.h and CMApplication.h, added active
declarations for CWMatchPixMap, CWCheckPixMap, NCMBeginMatching,
CMEndMatching, NCMDrawMatchedPicture, CMEnableMatchingComment, and
NCMUseProfileComment routines to QuickDraw.pas and changed
CMApplication.pas's conditional compilation setting _DECLARE_CS_QD_API_ to
match CMApplication.h's setting to not compile the declarations in
CMApplication.pas.

4.  Additional CMApplication.pas changes:

a.  Added CMMakeProfile, CMProfileCopyICCData,
CMCopyProfileDescriptionString, and CWFillLookupTexture functions;
cmTextureRGBtoRGBX8 constant; and kCMPrefsChangedNotification CFSTR
constant.

b.  Removed TARGET_OS_MAC conditional compilation for CMGetProfileByAVID,
CMSetProfileByAVID, CMGetGammaByAVID, CMSetGammaByAVID, and
CMGetColorSyncFolderSpec functions.

c.  Removed TARGET_OS_WIN32 OR TARGET_OS_UNIX conditional compiled
CMGetColorSyncFolderPath function since it is unsupported in Carbon.

d.  Fixed a CWCheckColors function parameter type error (result needed
SInt8; was UInt32).

5.  Additional CMICCProfile.pas changes:

a.  Added constants cmICCProfileVersion4, cmBlackPointCompensationMask,
cmBlackPointCompensation, cmNativeDisplayInfoTag, cmSigCrdInfoType,
cmSigMultiFunctA2BType, cmSigMultiFunctB2AType, cmSigParametricCurveType,
cmSigProfileSequenceDescType, cmTechnologyDigitalCamera, cmYCbCrData,
cm9CLRData, cm10CLRData, cm11CLRData, cm12CLRData, cm13CLRData, cm14CLRData,
cm15CLRData, cmParametricType0, cmParametricType1, cmParametricType2,
cmParametricType3, and cmParametricType4.

b.  Added types CMFixedXYColor, CMFixedXYColorPtr, CM4Header,
CMMultiFunctLutType, CMMultiFunctLutTypePtr, CMMultiFunctLutA2BType,
CMMultiFunctLutA2BTypePtr, CMMultiFunctLutB2AType,
CMMultiFunctLutB2ATypePtr, CMMultiFunctCLUTType, CMMultiFunctCLUTTypePtr,
CMNativeDisplayInfo, CMNativeDisplayInfoPtr, CMNativeDisplayInfoType,
CMNativeDisplayInfoTypePtr, CMParametricCurveType, and
CMParametricCurveTypePtr

6.  Additional Quickdraw.pas changes:

a.  Added  QDGetPictureBounds and IsValidRgnHandle functions.

b.  Updated PrinterFontStatus.iStyle field type to used fixed Style (SInt8)
type.

c.  Updated PixMap record declaration with pixMap extension fields version
used on Mac OS X.

d.  Updated GDevice record declaration with QuickTime 3.0 private info field
version used on Mac OS X.

e.  Since LMGetHiliteRGB and LMSetHiliteRGB procedures are always available,
removed confusing, superfluous conditional compilation directives and
multiple declaration text.

git-svn-id: trunk@8700 -
Jonas Maebe 18 years ago
parent
commit
232efef956

+ 1 - 1
packages/extra/univint/ATSTypes.pas

@@ -386,7 +386,7 @@ type
 	end;
 
 	GlyphID								= ATSGlyphRef;
-	GlyphID_GAP_Private_field_type_fix	= GlyphID; { used as field type when a record declaration contains a GlyphID field identifier }
+	GlyphID_fix	= GlyphID; { used as field type when a record declaration contains a GlyphID field identifier }
 	GlyphIDPtr = ^GlyphID;
 {$ALIGN MAC68K}
 

+ 2 - 2
packages/extra/univint/ATSUnicodeTypes.pas

@@ -1021,7 +1021,7 @@ type
    * kGlyphCollectionGID). For Adobe glyph collections, this value
    * represents a CID
    }
-		glyphID: GlyphID_GAP_Private_field_type_fix;
+		glyphID: GlyphID_fix;
 	end;
 	ATSUGlyphSelectorPtr = ^ATSUGlyphSelector;
 
@@ -1100,7 +1100,7 @@ type
  }
 type
 	ATSUGlyphInfo = record
-		glyphID: GlyphID_GAP_Private_field_type_fix;
+		glyphID: GlyphID_fix;
 		reserved: UInt16;
 		layoutFlags: UInt32;
 		charIndex: UniCharArrayOffset;

+ 3 - 2
packages/extra/univint/CGImage.pas

@@ -4,6 +4,7 @@
  }
 {       Pascal Translation Updated:  Peter N Lewis, <[email protected]>, August 2005 }
 {       Pascal Translation Updated:  Peter N Lewis, <[email protected]>, November 2005 }
+{       Pascal Translation Updated:  Gale R Paeper, <[email protected]>, 2007 }
 {
     Modified for use with Free Pascal
     Version 200
@@ -117,10 +118,10 @@ const
 	kCGBitmapFloatComponents = 1 shl 8;
     
 	kCGBitmapByteOrderMask = $7000;
-	kCGBitmapByteOrder16Big = 0 shl 12;
-	kCGBitmapByteOrder32Big = kCGBitmapByteOrder16Big;
 	kCGBitmapByteOrder16Little = 1 shl 12;
 	kCGBitmapByteOrder32Little = 2 shl 12;
+	kCGBitmapByteOrder16Big = 3 shl 12;
+	kCGBitmapByteOrder32Big = 4 shl 12;
 type
 	CGBitmapInfo = UInt32; { Available in MAC OS X 10.4 & later. }
 

File diff suppressed because it is too large
+ 459 - 172
packages/extra/univint/CMApplication.pas


+ 165 - 29
packages/extra/univint/CMICCProfile.pas

@@ -1,12 +1,11 @@
 {
-     File:       CMICCProfile.p
+     File:       ColorSync/CMICCProfile.h
  
      Contains:   ICC Profile Format Definitions
  
-     Version:    Technology: ColorSync 2.5
-                 Release:    Universal Interfaces 3.4.2
+     Version:    ColorSync-174.1~229
  
-     Copyright:  © 1994-2002 by Apple Computer, Inc., all rights reserved.
+     Copyright:  © 1994-2006 by Apple Computer, Inc., all rights reserved.
  
      Bugs?:      For bug reports, consult the following page on
                  the World Wide Web:
@@ -14,7 +13,7 @@
                      http://www.freepascal.org/bugs.html
  
 }
-
+{       Pascal Translation Updated:  Gale R Paeper, <[email protected]>, 2007 }
 
 {
     Modified for use with Free Pascal
@@ -112,6 +111,7 @@ uses MacTypes;
 { ICC Profile version constants  }
 
 const
+	cmICCProfileVersion4        = $04000000;
 	cmICCProfileVersion2		= $02000000;
 	cmICCProfileVersion21		= $02100000;
 	cmCS2ProfileVersion			= $02000000;
@@ -132,6 +132,7 @@ const
 	cmICCReservedFlagsMask		= $0000FFFF;					{  these bits of the flags field are defined and reserved by ICC  }
 	cmEmbeddedMask				= $00000001;					{  if bit 0 is 0 then not embedded profile, if 1 then embedded profile  }
 	cmEmbeddedUseMask			= $00000002;					{  if bit 1 is 0 then ok to use anywhere, if 1 then ok to use as embedded profile only  }
+	cmBlackPointCompensationMask = $00000004;                   { if bit 1 is 0 then ok to use anywhere, if 1 then ok to use as embedded profile only }
 	cmCMSReservedFlagsMask		= $FFFF0000;					{  these bits of the flags field are defined and reserved by CMS vendor  }
 	cmQualityMask				= $00030000;					{  if bits 16-17 is 0 then normal, if 1 then draft, if 2 then best  }
 	cmInterpolationMask			= $00040000;					{  if bit 18 is 0 then interpolation, if 1 then lookup only  }
@@ -146,6 +147,8 @@ const
 	cmDraftMode					= 1;							{  it should be evaulated like this: right shift 16 bits first, mask off the  }
 	cmBestMode					= 2;							{  high 14 bits, and then compare with the enum to determine the option value  }
 
+    { black point compensation flag option }
+	cmBlackPointCompensation    = 1;                            { 0 do not apply Black Point Compensation, 1 apply }
 
 	{	*** deviceAttributes fields ***	}
 	{	 deviceAttributes[0] is defined by and reserved for device vendors 	}
@@ -227,40 +230,23 @@ const
 	cmVideoCardGammaTag			= $76636774 (* 'vcgt' *);
 	cmMakeAndModelTag			= $6D6D6F64 (* 'mmod' *);
 	cmProfileDescriptionMLTag	= $6473636D (* 'dscm' *);
-
-	{	 technology tag descriptions 	}
-	cmTechnologyFilmScanner		= $6673636E (* 'fscn' *);
-	cmTechnologyReflectiveScanner = $7273636E (* 'rscn' *);
-	cmTechnologyInkJetPrinter	= $696A6574 (* 'ijet' *);
-	cmTechnologyThermalWaxPrinter = $74776178 (* 'twax' *);
-	cmTechnologyElectrophotographicPrinter = $6570686F (* 'epho' *);
-	cmTechnologyElectrostaticPrinter = $65737461 (* 'esta' *);
-	cmTechnologyDyeSublimationPrinter = $64737562 (* 'dsub' *);
-	cmTechnologyPhotographicPaperPrinter = $7270686F (* 'rpho' *);
-	cmTechnologyFilmWriter		= $6670726E (* 'fprn' *);
-	cmTechnologyVideoMonitor	= $7669646D (* 'vidm' *);
-	cmTechnologyVideoCamera		= $76696463 (* 'vidc' *);
-	cmTechnologyProjectionTelevision = $706A7476 (* 'pjtv' *);
-	cmTechnologyCRTDisplay		= $43525420 (* 'CRT ' *);
-	cmTechnologyPMDisplay		= $504D4420 (* 'PMD ' *);
-	cmTechnologyAMDisplay		= $414D4420 (* 'AMD ' *);
-	cmTechnologyPhotoCD			= $4B504344 (* 'KPCD' *);
-	cmTechnologyPhotoImageSetter = $696D6773 (* 'imgs' *);
-	cmTechnologyGravure			= $67726176 (* 'grav' *);
-	cmTechnologyOffsetLithography = $6F666673 (* 'offs' *);
-	cmTechnologySilkscreen		= $73696C6B (* 'silk' *);
-	cmTechnologyFlexography		= $666C6578 (* 'flex' *);
+	cmNativeDisplayInfoTag      = $6E64696E (* 'ndin' *);
 
 	{	 public type signatures 	}
+	cmSigCrdInfoType            = $63726469 (* 'crdi' *);
 	cmSigCurveType				= $63757276 (* 'curv' *);
 	cmSigDataType				= $64617461 (* 'data' *);
 	cmSigDateTimeType			= $6474696D (* 'dtim' *);
 	cmSigLut16Type				= $6D667432 (* 'mft2' *);
 	cmSigLut8Type				= $6D667431 (* 'mft1' *);
 	cmSigMeasurementType		= $6D656173 (* 'meas' *);
+	cmSigMultiFunctA2BType      = $6D414220 (* 'mAB ' *);
+	cmSigMultiFunctB2AType      = $6D424120 (* 'mBA ' *);
 	cmSigNamedColorType			= $6E636F6C (* 'ncol' *);
 	cmSigNamedColor2Type		= $6E636C32 (* 'ncl2' *);
+	cmSigParametricCurveType    = $70617261 (* 'para' *);
 	cmSigProfileDescriptionType	= $64657363 (* 'desc' *);
+	cmSigProfileSequenceDescType = $70736571 (* 'pseq' *);
 	cmSigScreeningType			= $7363726E (* 'scrn' *);
 	cmSigS15Fixed16Type			= $73663332 (* 'sf32' *);
 	cmSigSignatureType			= $73696720 (* 'sig ' *);
@@ -280,8 +266,33 @@ const
 	cmSigPS2CRDVMSizeType		= $7073766D (* 'psvm' *);
 	cmSigVideoCardGammaType		= $76636774 (* 'vcgt' *);
 	cmSigMakeAndModelType		= $6D6D6F64 (* 'mmod' *);
+	cmSigNativeDisplayInfoType  = $6E64696E (* 'ndin' *);
 	cmSigMultiLocalizedUniCodeType = $6D6C7563 (* 'mluc' *);
 
+	{	 technology tag descriptions 	}
+	cmTechnologyDigitalCamera   = $6463616D (* 'dcam' *);
+	cmTechnologyFilmScanner		= $6673636E (* 'fscn' *);
+	cmTechnologyReflectiveScanner = $7273636E (* 'rscn' *);
+	cmTechnologyInkJetPrinter	= $696A6574 (* 'ijet' *);
+	cmTechnologyThermalWaxPrinter = $74776178 (* 'twax' *);
+	cmTechnologyElectrophotographicPrinter = $6570686F (* 'epho' *);
+	cmTechnologyElectrostaticPrinter = $65737461 (* 'esta' *);
+	cmTechnologyDyeSublimationPrinter = $64737562 (* 'dsub' *);
+	cmTechnologyPhotographicPaperPrinter = $7270686F (* 'rpho' *);
+	cmTechnologyFilmWriter		= $6670726E (* 'fprn' *);
+	cmTechnologyVideoMonitor	= $7669646D (* 'vidm' *);
+	cmTechnologyVideoCamera		= $76696463 (* 'vidc' *);
+	cmTechnologyProjectionTelevision = $706A7476 (* 'pjtv' *);
+	cmTechnologyCRTDisplay		= $43525420 (* 'CRT ' *);
+	cmTechnologyPMDisplay		= $504D4420 (* 'PMD ' *);
+	cmTechnologyAMDisplay		= $414D4420 (* 'AMD ' *);
+	cmTechnologyPhotoCD			= $4B504344 (* 'KPCD' *);
+	cmTechnologyPhotoImageSetter = $696D6773 (* 'imgs' *);
+	cmTechnologyGravure			= $67726176 (* 'grav' *);
+	cmTechnologyOffsetLithography = $6F666673 (* 'offs' *);
+	cmTechnologySilkscreen		= $73696C6B (* 'silk' *);
+	cmTechnologyFlexography		= $666C6578 (* 'flex' *);
+
 
 	{	 Measurement type encodings 	}
 	{	 Measurement Flare 	}
@@ -323,6 +334,7 @@ const
 	cmXYZData					= $58595A20 (* 'XYZ ' *);
 	cmLabData					= $4C616220 (* 'Lab ' *);
 	cmLuvData					= $4C757620 (* 'Luv ' *);
+	cmYCbCrData                 = $59436272 (* 'YCbr' *);
 	cmYxyData					= $59787920 (* 'Yxy ' *);
 	cmRGBData					= $52474220 (* 'RGB ' *);
 	cmSRGBData					= $73524742 (* 'sRGB' *);
@@ -341,6 +353,13 @@ const
 	cm6CLRData					= $36434C52 (* '6CLR' *);
 	cm7CLRData					= $37434C52 (* '7CLR' *);
 	cm8CLRData					= $38434C52 (* '8CLR' *);
+	cm9CLRData                  = $39434C52 (* '9CLR' *);
+	cm10CLRData                 = $41434C52 (* 'ACLR' *);
+	cm11CLRData                 = $42434C52 (* 'BCLR' *);
+	cm12CLRData                 = $43434C52 (* 'CCLR' *);
+	cm13CLRData                 = $44434C52 (* 'DCLR' *);
+	cm14CLRData                 = $45434C52 (* 'ECLR' *);
+	cm15CLRData                 = $46434C52 (* 'FCLR' *);
 	cmNamedData					= $4E414D45 (* 'NAME' *);
 
 	{	 profileClass enumerations 	}
@@ -359,7 +378,15 @@ const
 	cmSiliconGraphics			= $53474920 (* 'SGI ' *);
 	cmTaligent					= $54474E54 (* 'TGNT' *);
 
-	{	 ColorSync 1.0 elements 	}
+	{ parametric curve type enumerations }
+	cmParametricType0           = 0;    { Y = X^gamma }
+	cmParametricType1           = 1;    { Y = (aX+b)^gamma     [X>=-b/a],  Y = 0    [X<-b/a] }
+	cmParametricType2           = 2;    { Y = (aX+b)^gamma + c [X>=-b/a],  Y = c    [X<-b/a] }
+	cmParametricType3           = 3;    { Y = (aX+b)^gamma     [X>=d],     Y = cX   [X<d]    }
+	cmParametricType4           = 4;     { Y = (aX+b)^gamma + e [X>=d],     Y = cX+f [X<d]    }
+
+
+	{ ColorSync 1.0 elements }
 	cmCS1ChromTag				= $6368726D (* 'chrm' *);
 	cmCS1TRCTag					= $74726320 (* 'trc ' *);
 	cmCS1NameTag				= $6E616D65 (* 'name' *);
@@ -378,6 +405,12 @@ type
 		seconds:				UInt16;
 	end;
 
+	CMFixedXYColorPtr = ^CMFixedXYColor;
+	CMFixedXYColor = record
+		x: Fixed;
+		y: Fixed;
+	end;
+
 	CMFixedXYZColorPtr = ^CMFixedXYZColor;
 	CMFixedXYZColor = record
 		X:						Fixed;
@@ -393,6 +426,22 @@ type
 		Z:						CMXYZComponent;
 	end;
 
+{ Type for Profile MD5 message digest }
+{ Derived from the RSA Data Security, Inc. MD5 Message-Digest Algorithm }
+
+     CMProfileMD5 = packed array[0..15] of UInt8;
+     CMProfileMD5Ptr = ^CMProfileMD5;
+
+{
+ *  CMProfileMD5AreEqual()
+ *  
+ *  Availability:       available as macro/inline
+ }
+//  #define CMProfileMD5AreEqual(a, b) (\
+//    ((long*)a)[0]==((long*)b)[0] && ((long*)a)[1]==((long*)b)[1] && \
+//  ((long*)a)[2]==((long*)b)[2] && ((long*)a)[3]==((long*)b)[3])
+
+
 	CM2HeaderPtr = ^CM2Header;
 	CM2Header = record
 		size:					UInt32;									{  This is the total size of the Profile  }
@@ -414,6 +463,28 @@ type
 		reserved:				packed array [0..43] of char;			{  reserved for future use  }
 	end;
 
+	CM4HeaderPtr = ^ CM4Header;
+	CM4Header = record
+		size:                   UInt32;                                 { This is the total size of the Profile }
+		CMMType:                OSType;                                 { CMM signature,  Registered with CS2 consortium  }
+		profileVersion:         UInt32;                                 { Version of CMProfile format }
+		profileClass:           OSType;                                 { input, display, output, devicelink, abstract, or color conversion profile type }
+		dataColorSpace:         OSType;                                 { color space of data }
+		profileConnectionSpace: OSType;                                 { profile connection color space }
+		dateTime:               CMDateTime;                             { date and time of profile creation }
+		CS2profileSignature:    OSType;                                 { 'acsp' constant ColorSync 2.0 file ID }
+		platform:               OSType;                                 { primary profile platform, Registered with CS2 consortium }
+		flags:                  UInt32;                                 { profile flags }
+		deviceManufacturer:     OSType;                                 { Registered with ICC consortium }
+		deviceModel:            UInt32;                                 { Registered with ICC consortium }
+		deviceAttributes:       array[0..1] of UInt32;                  { Attributes[0] is for device vendors, [1] is for ICC }
+		renderingIntent:        UInt32;                                 { preferred rendering intent of tagged object }
+		white:                  CMFixedXYZColor;                        { profile illuminant }
+		creator:                OSType;                                 { profile creator }
+		digest:                 CMProfileMD5;                           { Profile message digest }
+		reserved:               packed array[0..27] of char;            { reserved for future use }
+    end;
+    
 	CMTagRecordPtr = ^CMTagRecord;
 	CMTagRecord = record
 		tag:					OSType;									{  Registered with CS2 consortium  }
@@ -492,6 +563,36 @@ type
 		inputTable:				SInt8;									{  variable size, determined by inputChannels*256  }
 	end;
 
+    CMMultiFunctLutTypePtr = ^CMMultiFunctLutType;
+	CMMultiFunctLutType = record
+		typeDescriptor:         OSType;                                 { 'mAB ' = cmSigMultiFunctA2BType or 'mBA ' = cmSigMultiFunctB2AType }
+		reserved:               UInt32;                                 { fill with 0x00 }
+		inputChannels:          SInt8;                                  { Number of input channels }
+		outputChannels:         SInt8;                                  { Number of output channels }
+		reserved2:              UInt16;                                 { fill with 0x00 }
+		offsetBcurves:          UInt32;                                 { offset to first "B" curve }
+		offsetMatrix:           UInt32;                                 { offset to 3x4 matrix }
+		offsetMcurves:          UInt32;                                 { offset to first "M" curve }
+		offsetCLUT:             UInt32;                                 { offset to multi-dimensional LUT of type CMMultiFunctCLUTType }
+		offsetAcurves:          UInt32;                                 { offset to first "A" curve }
+		data:                   SInt8;                                  { variable size }
+	end;
+
+	CMMultiFunctLutA2BType = CMMultiFunctLutType;
+	CMMultiFunctLutA2BTypePtr = ^CMMultiFunctLutA2BType;
+	CMMultiFunctLutB2AType = CMMultiFunctLutType;
+	CMMultiFunctLutB2ATypePtr = ^CMMultiFunctLutB2AType;
+	
+	CMMultiFunctCLUTTypePtr = ^CMMultiFunctCLUTType;
+	CMMultiFunctCLUTType = record
+		gridPoints:             packed array[0..15] of UInt8;           { grigpoints for each input channel dimension (remaining are 0) }
+		entrySize:              SInt8;                                  { bytes per lut enrty (1 or 2) }
+		reserved:               array[0..2] of SInt8;                   { fill with 0x00 }
+		data:                   SInt8;                                  { variable size, determined by above }
+        pad:                    SInt8;                                  { pad byte needed for correct record size. Critical to accessing CMMultiFunctLutType's variable sized data field contents. }
+	end;
+
+
 	CMMeasurementTypePtr = ^CMMeasurementType;
 	CMMeasurementType = record
 		typeDescriptor:			OSType;									{  'meas' = cmSigMeasurementType  }
@@ -531,6 +632,41 @@ type
 		data:					SInt8;									{  variable size data for CMNamedColor2EntryType  }
 	end;
 
+	CMNativeDisplayInfoPtr = ^CMNativeDisplayInfo;
+	CMNativeDisplayInfo = record
+		dataSize:               UInt32;                                 { Size of this structure }
+		redPhosphor:            CMFixedXYColor;                         { Phosphors - native cromaticity values of the display  }
+		greenPhosphor:          CMFixedXYColor;
+		bluePhosphor:           CMFixedXYColor;
+		whitePoint:             CMFixedXYColor;
+		redGammaValue:          Fixed;                                  { Gammas - native gamma values of the display }
+		greenGammaValue:        Fixed;
+		blueGammaValue:         Fixed;
+                                                                        {  Gamma tables - if if gammaChannels is not zero, }
+                                                                        {  native gamma tables are preferred over values }
+                                                                        {  redGammaValue, greenGammaValue, blueGammaValue }
+		gammaChannels:          UInt16;                                 { # of gamma channels (1 or 3) }
+		gammaEntryCount:        UInt16;                                 { 1-based number of entries per channel }
+		gammaEntrySize:         UInt16;                                 { size in bytes of each entry }
+		gammaData:              SInt8;                                  { variable size, determined by channels*entryCount*entrySize }
+	end;
+
+	CMNativeDisplayInfoTypePtr = ^CMNativeDisplayInfoType;
+	CMNativeDisplayInfoType = record
+		typeDescriptor:         OSType;                                 { 'ndin' = cmSigNativeDisplayInfoType }
+		reserved:               UInt32;                                 { fill with 0x00 }
+		nativeDisplayInfo:      CMNativeDisplayInfo;                    { data of type CMNativeDisplayInfo }
+	end;
+
+	CMParametricCurveTypePtr = ^CMParametricCurveType;
+	CMParametricCurveType = record
+		typeDescriptor:         OSType;                                 { 'para' = cmSigParametricCurveType }
+		reserved:               UInt32;                                 { fill with 0x00 }
+		functionType:           UInt16;                                 { cmParametricType0, cmParametricType1, etc. }
+		reserved2:              UInt16;                                 { fill with 0x00 }
+		value:                  array[0..0] of Fixed;                   { variable size, determined by functionType }
+	end;
+
 	CMTextDescriptionTypePtr = ^CMTextDescriptionType;
 	CMTextDescriptionType = packed record
 		typeDescriptor:			OSType;									{  'desc' = cmSigProfileDescriptionType  }

+ 89 - 52
packages/extra/univint/CMTypes.pas

@@ -1,12 +1,11 @@
 {
-     File:       CMTypes.p
+     File:       ColorSync/CMTypes.h
  
-     Contains:   xxx put contents here xxx
+     Contains:   ColorSync types
  
-     Version:    Technology: ColorSync 3
-                 Release:    Universal Interfaces 3.4.2
+     Version:    ColorSync-174.1~229
  
-     Copyright:  © 2000-2002 by Apple Computer, Inc., all rights reserved.
+     Copyright:  © 2000-2006 by Apple Computer, Inc., all rights reserved.
  
      Bugs?:      For bug reports, consult the following page on
                  the World Wide Web:
@@ -14,7 +13,7 @@
                      http://www.freepascal.org/bugs.html
  
 }
-
+{       Pascal Translation Updated:  Gale R Paeper, <[email protected]>, 2007 }
 
 {
     Modified for use with Free Pascal
@@ -130,7 +129,15 @@ type
 	{	 On 8 & 9 this is a AVIDType 	}
 	{	 On X this is a CGSDisplayID 	}
 	CMDisplayIDType						= UInt32;
+	CMChromaticAdaptation = UInt32;
+
+const
+	cmUseDefaultChromaticAdaptation = 0;
+	cmLinearChromaticAdaptation     = 1;
+	cmVonKriesChromaticAdaptation   = 2;
+	cmBradfordChromaticAdaptation   = 3;
 
+type
 	{	 Caller-supplied flatten function 	}
 {$ifc TYPED_FUNCTION_POINTERS}
 	CMFlattenProcPtr = function(command: SInt32; var size: SInt32; data: UnivPtr; refCon: UnivPtr): OSErr;
@@ -198,141 +205,171 @@ const
 	uppCMConcatCallBackProcInfo = $000003D0;
 	uppCMProfileFilterProcInfo = $000003D0;
 	uppCMProfileAccessProcInfo = $0000FFE0;
-	{
-	 *  NewCMFlattenUPP()
-	 *  
-	 *  Availability:
-	 *    Non-Carbon CFM:   available as macro/inline
-	 *    CarbonLib:        in CarbonLib 1.0 and later
-	 *    Mac OS X:         in 3.0 and later
-	 	}
-function NewCMFlattenUPP(userRoutine: CMFlattenProcPtr): CMFlattenUPP; external name '_NewCMFlattenUPP'; { old name was NewCMFlattenProc }
 {
- *  NewCMBitmapCallBackUPP()
+ *  NewCMFlattenUPP()
  *  
  *  Availability:
+ *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
+ *    CarbonLib:        in CarbonLib 1.0 and later
  *    Non-Carbon CFM:   available as macro/inline
+ }
+function NewCMFlattenUPP(userRoutine: CMFlattenProcPtr): CMFlattenUPP; external name '_NewCMFlattenUPP';
+(* AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER *)
+
+{
+ *  NewCMBitmapCallBackUPP()
+ *  
+ *  Availability:
+ *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
- *    Mac OS X:         in 3.0 and later
+ *    Non-Carbon CFM:   available as macro/inline
  }
-function NewCMBitmapCallBackUPP(userRoutine: CMBitmapCallBackProcPtr): CMBitmapCallBackUPP; external name '_NewCMBitmapCallBackUPP'; { old name was NewCMBitmapCallBackProc }
+function NewCMBitmapCallBackUPP(userRoutine: CMBitmapCallBackProcPtr): CMBitmapCallBackUPP; external name '_NewCMBitmapCallBackUPP';
+(* AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER *)
+
 {
  *  NewCMConcatCallBackUPP()
  *  
  *  Availability:
- *    Non-Carbon CFM:   available as macro/inline
+ *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
- *    Mac OS X:         in 3.0 and later
+ *    Non-Carbon CFM:   available as macro/inline
  }
-function NewCMConcatCallBackUPP(userRoutine: CMConcatCallBackProcPtr): CMConcatCallBackUPP; external name '_NewCMConcatCallBackUPP'; { old name was NewCMConcatCallBackProc }
+function NewCMConcatCallBackUPP(userRoutine: CMConcatCallBackProcPtr): CMConcatCallBackUPP; external name '_NewCMConcatCallBackUPP';
+(* AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER *)
+
 {
  *  NewCMProfileFilterUPP()
  *  
  *  Availability:
- *    Non-Carbon CFM:   available as macro/inline
+ *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
- *    Mac OS X:         in 3.0 and later
+ *    Non-Carbon CFM:   available as macro/inline
  }
-function NewCMProfileFilterUPP(userRoutine: CMProfileFilterProcPtr): CMProfileFilterUPP; external name '_NewCMProfileFilterUPP'; { old name was NewCMProfileFilterProc }
+function NewCMProfileFilterUPP(userRoutine: CMProfileFilterProcPtr): CMProfileFilterUPP; external name '_NewCMProfileFilterUPP';
+(* AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER *)
+
 {
  *  NewCMProfileAccessUPP()
  *  
  *  Availability:
- *    Non-Carbon CFM:   available as macro/inline
+ *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
- *    Mac OS X:         in 3.0 and later
+ *    Non-Carbon CFM:   available as macro/inline
  }
-function NewCMProfileAccessUPP(userRoutine: CMProfileAccessProcPtr): CMProfileAccessUPP; external name '_NewCMProfileAccessUPP'; { old name was NewCMProfileAccessProc }
+function NewCMProfileAccessUPP(userRoutine: CMProfileAccessProcPtr): CMProfileAccessUPP; external name '_NewCMProfileAccessUPP';
+(* AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER *)
+
 {
  *  DisposeCMFlattenUPP()
  *  
  *  Availability:
- *    Non-Carbon CFM:   available as macro/inline
+ *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
- *    Mac OS X:         in 3.0 and later
+ *    Non-Carbon CFM:   available as macro/inline
  }
 procedure DisposeCMFlattenUPP(userUPP: CMFlattenUPP); external name '_DisposeCMFlattenUPP';
+(* AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER *)
+
 {
  *  DisposeCMBitmapCallBackUPP()
  *  
  *  Availability:
- *    Non-Carbon CFM:   available as macro/inline
+ *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
- *    Mac OS X:         in 3.0 and later
+ *    Non-Carbon CFM:   available as macro/inline
  }
 procedure DisposeCMBitmapCallBackUPP(userUPP: CMBitmapCallBackUPP); external name '_DisposeCMBitmapCallBackUPP';
+(* AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER *)
+
 {
  *  DisposeCMConcatCallBackUPP()
  *  
  *  Availability:
- *    Non-Carbon CFM:   available as macro/inline
+ *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
- *    Mac OS X:         in 3.0 and later
+ *    Non-Carbon CFM:   available as macro/inline
  }
 procedure DisposeCMConcatCallBackUPP(userUPP: CMConcatCallBackUPP); external name '_DisposeCMConcatCallBackUPP';
+(* AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER *)
+
 {
  *  DisposeCMProfileFilterUPP()
  *  
  *  Availability:
- *    Non-Carbon CFM:   available as macro/inline
+ *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
- *    Mac OS X:         in 3.0 and later
+ *    Non-Carbon CFM:   available as macro/inline
  }
 procedure DisposeCMProfileFilterUPP(userUPP: CMProfileFilterUPP); external name '_DisposeCMProfileFilterUPP';
+(* AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER *)
+
 {
  *  DisposeCMProfileAccessUPP()
  *  
  *  Availability:
- *    Non-Carbon CFM:   available as macro/inline
+ *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
- *    Mac OS X:         in 3.0 and later
+ *    Non-Carbon CFM:   available as macro/inline
  }
 procedure DisposeCMProfileAccessUPP(userUPP: CMProfileAccessUPP); external name '_DisposeCMProfileAccessUPP';
+(* AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER *)
+
 {
  *  InvokeCMFlattenUPP()
  *  
  *  Availability:
- *    Non-Carbon CFM:   available as macro/inline
+ *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
- *    Mac OS X:         in 3.0 and later
+ *    Non-Carbon CFM:   available as macro/inline
  }
-function InvokeCMFlattenUPP(command: SInt32; var size: SInt32; data: UnivPtr; refCon: UnivPtr; userRoutine: CMFlattenUPP): OSErr; external name '_InvokeCMFlattenUPP'; { old name was CallCMFlattenProc }
+function InvokeCMFlattenUPP(command: SInt32; var size: SInt32; data: UnivPtr; refCon: UnivPtr; userRoutine: CMFlattenUPP): OSErr; external name '_InvokeCMFlattenUPP';
+(* AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER *)
+
 {
  *  InvokeCMBitmapCallBackUPP()
  *  
  *  Availability:
- *    Non-Carbon CFM:   available as macro/inline
+ *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
- *    Mac OS X:         in 3.0 and later
+ *    Non-Carbon CFM:   available as macro/inline
  }
-function InvokeCMBitmapCallBackUPP(progress: SInt32; refCon: UnivPtr; userRoutine: CMBitmapCallBackUPP): boolean; external name '_InvokeCMBitmapCallBackUPP'; { old name was CallCMBitmapCallBackProc }
+function InvokeCMBitmapCallBackUPP(progress: SInt32; refCon: UnivPtr; userRoutine: CMBitmapCallBackUPP): boolean; external name '_InvokeCMBitmapCallBackUPP';
+(* AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER *)
+
 {
  *  InvokeCMConcatCallBackUPP()
  *  
  *  Availability:
- *    Non-Carbon CFM:   available as macro/inline
+ *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
- *    Mac OS X:         in 3.0 and later
+ *    Non-Carbon CFM:   available as macro/inline
  }
-function InvokeCMConcatCallBackUPP(progress: SInt32; refCon: UnivPtr; userRoutine: CMConcatCallBackUPP): boolean; external name '_InvokeCMConcatCallBackUPP'; { old name was CallCMConcatCallBackProc }
+function InvokeCMConcatCallBackUPP(progress: SInt32; refCon: UnivPtr; userRoutine: CMConcatCallBackUPP): boolean; external name '_InvokeCMConcatCallBackUPP';
+(* AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER *)
+
 {
  *  InvokeCMProfileFilterUPP()
  *  
  *  Availability:
- *    Non-Carbon CFM:   available as macro/inline
+ *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
- *    Mac OS X:         in 3.0 and later
+ *    Non-Carbon CFM:   available as macro/inline
  }
-function InvokeCMProfileFilterUPP(prof: CMProfileRef; refCon: UnivPtr; userRoutine: CMProfileFilterUPP): boolean; external name '_InvokeCMProfileFilterUPP'; { old name was CallCMProfileFilterProc }
+function InvokeCMProfileFilterUPP(prof: CMProfileRef; refCon: UnivPtr; userRoutine: CMProfileFilterUPP): boolean; external name '_InvokeCMProfileFilterUPP';
+(* AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER *)
+
 {
  *  InvokeCMProfileAccessUPP()
  *  
  *  Availability:
- *    Non-Carbon CFM:   available as macro/inline
+ *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
- *    Mac OS X:         in 3.0 and later
+ *    Non-Carbon CFM:   available as macro/inline
  }
-function InvokeCMProfileAccessUPP(command: SInt32; offset: SInt32; var size: SInt32; data: UnivPtr; refCon: UnivPtr; userRoutine: CMProfileAccessUPP): OSErr; external name '_InvokeCMProfileAccessUPP'; { old name was CallCMProfileAccessProc }
+function InvokeCMProfileAccessUPP(command: SInt32; offset: SInt32; var size: SInt32; data: UnivPtr; refCon: UnivPtr; userRoutine: CMProfileAccessUPP): OSErr; external name '_InvokeCMProfileAccessUPP';
+(* AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER *)
+
 {$ALIGN MAC68K}
 
 

+ 4 - 4
packages/extra/univint/CarbonEvents.pas

@@ -9303,8 +9303,8 @@ type
 	HICommand = record
 		attributes: UInt32;
 		commandID: UInt32;
-		menuRef: MenuRef_GAP_Private_field_type_fix;
-		menuItemIndex: MenuItemIndex_GAP_Private_field_type_fix;
+		menuRef: MenuRef_fix;
+		menuItemIndex: MenuItemIndex_fix;
 	end;
 	HICommandPtr = ^HICommand;
 type
@@ -9319,8 +9319,8 @@ type
 			window: WindowRef;
 		);
 		2: (
-			menuRef: MenuRef_GAP_Private_field_type_fix;
-			menuItemIndex: MenuItemIndex_GAP_Private_field_type_fix;
+			menuRef: MenuRef_fix;
+			menuItemIndex: MenuItemIndex_fix;
 		 );
 	end;
 	HICommandExtendedPtr = ^HICommandExtended;

+ 3 - 3
packages/extra/univint/Controls.pas

@@ -379,13 +379,13 @@ type
 			resID:				SInt16;
 			);
 		1: (
-			cIconHandle:		CIconHandle_GAP_Private_field_type_fix;
+			cIconHandle:		CIconHandle_fix;
 			);
 		2: (
 			iconSuite:			Handle;
 			);
 		3: (
-			iconRef:			IconRef_GAP_Private_field_type_fix;
+			iconRef:			IconRef_fix;
 			);
 		4: (
 			picture:			PicHandle;
@@ -729,7 +729,7 @@ type
 	ControlDataAccessRec = record
 		tag: ResType;
 		part: ResType;
-		size: Size_GAP_Private_field_type_fix;
+		size: Size_fix;
 		dataPtr: Ptr;
 	end;
 type

+ 2 - 2
packages/extra/univint/DriverFamilyMatching.pas

@@ -212,7 +212,7 @@ const
 
 type
 	DriverDescVersion					= UInt32;
-	DriverDescVersion_GAP_Private_field_type_fix = DriverDescVersion; { used as field type when a record declaration contains a DriverDescVersion field identifier }
+	DriverDescVersion_fix               = DriverDescVersion; { used as field type when a record declaration contains a DriverDescVersion field identifier }
 	{	  The Driver Description 	}
 
 const
@@ -227,7 +227,7 @@ type
 	DriverDescriptionPtr = ^DriverDescription;
 	DriverDescription = record
 		driverDescSignature:	OSType;									{  Signature field of this structure }
-		driverDescVersion:		DriverDescVersion_GAP_Private_field_type_fix; {  Version of this data structure }
+		driverDescVersion:		DriverDescVersion_fix;                  {  Version of this data structure }
 		driverType:				MacDriverType;							{  Type of Driver }
 		driverOSRuntimeInfo:	DriverOSRuntime;						{  OS Runtime Requirements of Driver }
 		driverServices:			DriverOSService;						{  Apple Service API Membership }

File diff suppressed because it is too large
+ 415 - 143
packages/extra/univint/FPCMacOSAll.pas


+ 1 - 1
packages/extra/univint/HIView.pas

@@ -557,7 +557,7 @@ type
 			iconSuite: IconSuiteRef;
 			);
 		1: (
-			iconRef: IconRef_GAP_Private_field_type_fix;
+			iconRef: IconRef_fix;
 			);
 		2: (
 			imageRef: CGImageRef;

+ 4 - 4
packages/extra/univint/Icons.pas

@@ -467,7 +467,7 @@ type
 	end;
 
 	CIconHandle							= ^CIconPtr;
-	CIconHandle_GAP_Private_field_type_fix = CIconHandle; { used as field type when a record declaration contains a CIconHandle field identifier }
+	CIconHandle_fix                     = CIconHandle; { used as field type when a record declaration contains a CIconHandle field identifier }
 	{
 	 *  GetCIcon()
 	 *  
@@ -523,9 +523,9 @@ type
 	IconSuiteRef						= Handle;
 	IconCacheRef						= Handle;
 	{  IconRefs are 32-bit values identifying cached icon data. IconRef 0 is invalid. }
-	IconRef    = ^SInt32; { an opaque 32-bit type }
-	IconRef_GAP_Private_field_type_fix = IconRef; { used as field type when a record declaration contains a IconRef field identifier }
-	IconRefPtr = ^IconRef;  { when a var xx:IconRef parameter can be nil, it is changed to xx: IconRefPtr }
+	IconRef     = ^SInt32;  { an opaque 32-bit type }
+	IconRef_fix = IconRef;  { used as field type when a record declaration contains a IconRef field identifier }
+	IconRefPtr  = ^IconRef; { when a var xx:IconRef parameter can be nil, it is changed to xx: IconRefPtr }
 	{
 	 *  PlotIconID()
 	 *  

+ 1 - 1
packages/extra/univint/ImageCompression.pas

@@ -326,7 +326,7 @@ const
 
 type
 	CodecType							= OSType;
-	CodecType_GAP_Private_field_type_fix = CodecType; { used as field type when a record declaration contains a CodecType field identifier }
+	CodecType_fix                       = CodecType; { used as field type when a record declaration contains a CodecType field identifier }
 	CodecFlags							= UInt16;
 	CodecQ								= UInt32;
 

+ 5 - 1
packages/extra/univint/MacMemory.pas

@@ -701,8 +701,12 @@ procedure PurgeMemSys(cbNeeded: Size); external name '_PurgeMemSys';
  *    Non-Carbon CFM:   in InterfaceLib 7.1 and later
  *    CarbonLib:        in CarbonLib 1.0 and later
  *    Mac OS X:         in version 10.0 and later
+
+ *  Note:
+      FreeMem has been renamed MacFreeMem, to resolve a naming conflict with
+      FreeMem in the Turbo Pascal/Delphi/FreePascal runtime library
  }
-function FreeMem: SInt32; external name '_FreeMem';
+function MacFreeMem: SInt32; external name '_FreeMem';
 {$ifc CALL_NOT_IN_CARBON}
 {
  *  FreeMemSys()

+ 7 - 7
packages/extra/univint/MacTypes.pas

@@ -293,9 +293,9 @@ type
 	Ptr = ^SInt8;
 	PtrPtr = ^Ptr;       
 	Handle = ^Ptr;
-	Handle_GAP_Private_field_type_fix = Handle; { used as field type when a record declaration contains a Handle field identifier }
+	Handle_fix = Handle; { used as field type when a record declaration contains a Handle field identifier }
 	Size = SInt32;
-	Size_GAP_Private_field_type_fix = Size; { used as field type when a record declaration contains a Size field identifier }
+	Size_fix = Size; { used as field type when a record declaration contains a Size field identifier }
 	SizePtr = ^Size;
 	UnivPtr = Pointer;
 	UnivPtrPtr = ^UnivPtr;
@@ -353,7 +353,7 @@ type
  	RegionCodePtr = ^RegionCode;
 	FourCharCode = UInt32;
 	OSType = FourCharCode;
-	OSType_GAP_Private_field_type_fix = OSType; { used as field type when a record declaration contains a OSType field identifier }
+	OSType_fix = OSType; { used as field type when a record declaration contains a OSType field identifier }
 	ResType = FourCharCode;
 	OSTypePtr = ^OSType;
 	ResTypePtr = ^ResType;
@@ -370,7 +370,7 @@ type
 type
 { "Boolean", "true", and "false" are built into the Pascal language }
 	BooleanPtr = ^Boolean;
-	boolean_GAP_Private_field_type_fix = boolean; { used as field type when a record declaration contains a boolean field identifier }
+	boolean_fix = boolean; { used as field type when a record declaration contains a boolean field identifier }
 {*******************************************************************************
 
     Function Pointer Types
@@ -616,7 +616,7 @@ const
 
 type
 	Style = SInt8;
-	Style_GAP_Private_field_type_fix = Style; { used as field type when a record declaration contains a Style field identifier }
+	Style_fix = Style; { used as field type when a record declaration contains a Style field identifier }
 	StyleParameter = SInt16;
 	StyleField = Style;
 
@@ -636,13 +636,13 @@ type
 type
 	TimeValue = SInt32;
 	TimeScale = SInt32;
-	TimeScale_GAP_Private_field_type_fix = TimeScale; { used as field type when a record declaration contains a TimeScale field identifier }
+	TimeScale_fix = TimeScale; { used as field type when a record declaration contains a TimeScale field identifier }
 	CompTimeValue = wide;
 	CompTimeValuePtr = ^CompTimeValue;
 	TimeValue64 = SInt64;
 	TimeValue64Ptr = ^TimeValue64;
 	TimeBase = ^SInt32; { an opaque 32-bit type }
-	TimeBase_GAP_Private_field_type_fix = TimeBase; { used as field type when a record declaration contains a TimeBase field identifier }
+	TimeBase_fix = TimeBase; { used as field type when a record declaration contains a TimeBase field identifier }
 	TimeBasePtr = ^TimeBase;
 	TimeRecord = record
 		value: CompTimeValue;                  { units (duration or absolute) }

+ 6 - 6
packages/extra/univint/MacWindows.pas

@@ -141,7 +141,7 @@ type
  }
 type
 	WindowClass = UInt32;
-	WindowClass_GAP_Private_field_type_fix = WindowClass; { used as field type when a record declaration contains a WindowClass field identifier }
+	WindowClass_fix = WindowClass; { used as field type when a record declaration contains a WindowClass field identifier }
 const
 {
    * An alert window is used when the application needs the user's
@@ -394,7 +394,7 @@ const
 
 type
 	WindowAttributes = UInt32;
-	WindowAttributes_GAP_Private_field_type_fix = WindowAttributes; { used as field type when a record declaration contains a WindowAttributes field identifier }
+	WindowAttributes_fix = WindowAttributes; { used as field type when a record declaration contains a WindowAttributes field identifier }
 
 {
  *  Summary:
@@ -811,7 +811,7 @@ const
  }
 type
 	WindowPositionMethod = UInt32;
-	WindowPositionMethod_GAP_Private_field_type_fix = WindowPositionMethod; { used as field type when a record declaration contains a WindowPositionMethod field identifier }
+	WindowPositionMethod_fix = WindowPositionMethod; { used as field type when a record declaration contains a WindowPositionMethod field identifier }
 const
 {
    * Centers the window on the main screen.
@@ -1249,7 +1249,7 @@ type
 		windowZoomRect: Rect;         { location on screen when zoomed out}
 		windowRefCon: UInt32;           { the refcon - __avoid saving stale pointers here__  }
 		windowStateFlags: UInt32;       { window state bit flags}
-		windowPositionMethod: WindowPositionMethod_GAP_Private_field_type_fix; { method last used by RepositionWindow to position the window (if any)}
+		windowPositionMethod: WindowPositionMethod_fix; { method last used by RepositionWindow to position the window (if any)}
 
 		windowDefinitionVersion: UInt32;
 		case SInt16 of
@@ -1258,8 +1258,8 @@ type
 			windowHasCloseBox:	Boolean;
 		   );
 		1: (
-			windowClass:		WindowClass_GAP_Private_field_type_fix;	{  the class }
-			windowAttributes:	WindowAttributes_GAP_Private_field_type_fix;						{  the attributes }
+			windowClass:		WindowClass_fix;	  {  the class }
+			windowAttributes:	WindowAttributes_fix; {  the attributes }
 		   );
 	end;
 {  the window manager stores the default collection items using these IDs}

+ 4 - 4
packages/extra/univint/MediaHandlers.pas

@@ -186,7 +186,7 @@ type
 		trackDuration:			TimeValue;
 		mediaDuration:			TimeValue;
 		effectiveRate:			Fixed;
-		timeBase:				TimeBase_GAP_Private_field_type_fix;
+		timeBase:				TimeBase_fix;
 		volume:					SInt16;
 		width:					Fixed;
 		height:					Fixed;
@@ -224,12 +224,12 @@ type
 
 	QTCustomActionTargetRecordPtr = ^QTCustomActionTargetRecord;
 	QTCustomActionTargetRecord = record
-		movie:					Movie_GAP_Private_field_type_fix;
+		movie:					Movie_fix;
 		doMCActionCallbackProc:	DoMCActionUPP;
 		callBackRefcon:			SInt32;
-		track:					Track_GAP_Private_field_type_fix;
+		track:					Track_fix;
 		trackObjectRefCon:		SInt32;
-		defaultTrack:			Track_GAP_Private_field_type_fix;
+		defaultTrack:			Track_fix;
 		defaultObjectRefCon:	SInt32;
 		reserved1:				SInt32;
 		reserved2:				SInt32;

+ 3 - 3
packages/extra/univint/Menus.pas

@@ -819,12 +819,12 @@ type
 	MenuID = SInt16;
 type
 	MenuItemIndex = UInt16;
-	MenuItemIndex_GAP_Private_field_type_fix = MenuItemIndex; { used as field type when a record declaration contains a MenuItemIndex field identifier }
+	MenuItemIndex_fix = MenuItemIndex; { used as field type when a record declaration contains a MenuItemIndex field identifier }
 	MenuItemIndexPtr = ^MenuItemIndex;
 	MenuCommand = UInt32;
 type
 	MenuRef = ^SInt32; { an opaque 32-bit type }
-	MenuRef_GAP_Private_field_type_fix = MenuRef; { used as field type when a record declaration contains a MenuRef field identifier }
+	MenuRef_fix = MenuRef; { used as field type when a record declaration contains a MenuRef field identifier }
 	MenuRefPtr = ^MenuRef;
 { MenuHandle is old name for MenuRef}
 type
@@ -1283,7 +1283,7 @@ type
 		cmdKey: UniChar;
 		cmdKeyGlyph: UInt32;
 		cmdKeyModifiers: UInt32;
-		style: Style_GAP_Private_field_type_fix;
+		style: Style_fix;
 		enabled: Boolean;
 		iconEnabled: Boolean;
 		filler1: SInt8;

+ 2 - 2
packages/extra/univint/Movies.pas

@@ -208,7 +208,7 @@ type
 	end;
 
 	Movie								= ^MovieRecord;
-	Movie_GAP_Private_field_type_fix	= Movie; { used as field type when a record declaration contains a Movie field identifier }
+	Movie_fix	                        = Movie; { used as field type when a record declaration contains a Movie field identifier }
 	MoviePtr							= ^Movie;
 	TrackRecordPtr = ^TrackRecord;
 	TrackRecord = record
@@ -216,7 +216,7 @@ type
 	end;
 
 	Track								= ^TrackRecord;
-	Track_GAP_Private_field_type_fix	= Track; { used as field type when a record declaration contains a Track field identifier }
+	Track_fix	                        = Track; { used as field type when a record declaration contains a Track field identifier }
 	MediaRecordPtr = ^MediaRecord;
 	MediaRecord = record
 		data:					array [0..0] of SInt32;

+ 4 - 4
packages/extra/univint/MoviesFormat.pas

@@ -367,7 +367,7 @@ type
 		size:					SInt32;
 		atomType:				SInt32;
 	end;
-	MediaInfo_GAP_Private_field_type_fix = MediaInfo; { used as field type when a record declaration contains a MediaInfo field identifier }
+	MediaInfo_fix = MediaInfo; { used as field type when a record declaration contains a MediaInfo field identifier }
 
 	{	**********************
 	* Media Directory Structures
@@ -396,7 +396,7 @@ type
 		atomType:				SInt32;								{  = 'mdia'  }
 		mediaHeader:			MediaHeaderAtom;						{  standard Media information  }
 		mediaHandler:			HandlerAtom;
-		mediaInfo:				MediaInfo_GAP_Private_field_type_fix;
+		mediaInfo:				MediaInfo_fix;
 	end;
 
 	{	**********************
@@ -485,7 +485,7 @@ type
 		media:					MediaDirectory;
 		userData:				UserDataAtom;							{  space for extending with new data types  }
 	end;
-	TrackDirectory_GAP_Private_field_type_fix = TrackDirectory; { used as field type when a record declaration contains a TrackDirectory field identifier }
+	TrackDirectory_fix = TrackDirectory; { used as field type when a record declaration contains a TrackDirectory field identifier }
 
 	{	***************************************
 	*
@@ -526,7 +526,7 @@ type
 
 	TrackDirectoryEntryPtr = ^TrackDirectoryEntry;
 	TrackDirectoryEntry = record
-		trackDirectory:			TrackDirectory_GAP_Private_field_type_fix;							{  Track directory information  }
+		trackDirectory:			TrackDirectory_fix;							{  Track directory information  }
 	end;
 
 	MovieDirectoryPtr = ^MovieDirectory;

+ 2 - 2
packages/extra/univint/Navigation.pas

@@ -563,10 +563,10 @@ const
 type
 	NavTypeListPtr = ^NavTypeList;
 	NavTypeList = record
-		componentSignature:		OSType_GAP_Private_field_type_fix;
+		componentSignature:		OSType_fix;
 		reserved:				SInt16;
 		osTypeCount:			SInt16;
-		osType:					array [0..0] of OSType_GAP_Private_field_type_fix;
+		osType:					array [0..0] of OSType_fix;
 	end;
 
 	NavTypeListHandle					= ^NavTypeListPtr;

+ 1 - 1
packages/extra/univint/PMDefinitions.pas

@@ -454,7 +454,7 @@ const
 	kPMInvalidPreset			= -30882;						{  the preset is invalid }
 
 
-	kPMPrintAllPages			= -1;
+	kPMPrintAllPages			= $FFFFFFFF;
 
 	kPMUnlocked					= false;
 	kPMLocked					= true;

+ 4 - 4
packages/extra/univint/QTStreamingComponents.pas

@@ -221,7 +221,7 @@ type
 	QTSTrackParams = record
 		version:				SInt32;
 		flags:					SInt32;
-		track:					Track_GAP_Private_field_type_fix;
+		track:					Track_fix;
 		trackStartOffset:		TimeValue64;							{  to start other than at the beginning otherwise set to 0 }
 		duration:				TimeValue64;							{  to limit the duration otherwise set to 0 }
 		loopParams:				QTSLoopParamsPtr;						{  set to NULL if not using; default is no looping  }
@@ -237,7 +237,7 @@ type
 	QTSSourcerTimingParams = record
 		version:				SInt32;
 		flags:					SInt32;
-		timeScale:				TimeScale_GAP_Private_field_type_fix;
+		timeScale:				TimeScale_fix;
 		presentationStartTime:	TimeValue64;
 		presentationEndTime:	TimeValue64;
 		presentationCurrentTime: TimeValue64;
@@ -648,8 +648,8 @@ type
 		reserved1:				SInt8;
 		reserved2:				SInt8;
 		reserved3:				SInt8;
-		timeBase:				TimeBase_GAP_Private_field_type_fix;
-		timeScale:				TimeScale_GAP_Private_field_type_fix;
+		timeBase:				TimeBase_fix;
+		timeScale:				TimeScale_fix;
 	end;
 
 	RTPDescParamsPtr = ^RTPDescParams;

+ 4 - 4
packages/extra/univint/QuickTimeComponents.pas

@@ -289,7 +289,7 @@ const
 type
 	SCSpatialSettingsPtr = ^SCSpatialSettings;
 	SCSpatialSettings = record
-		codecType:				CodecType_GAP_Private_field_type_fix;
+		codecType:				CodecType_fix;
 		codec:					CodecComponent;
 		depth:					SInt16;
 		spatialQuality:			CodecQ;
@@ -722,7 +722,7 @@ type
 		numFrames:				SInt8;									{  frames/sec for timecode (eg. 30) OR frames/tick for counter mode }
 		padding:				SInt8;									{  unused padding byte }
 	end;
-	TimeCodeDef_GAP_Private_field_type_fix = TimeCodeDef; { used as field type when a record declaration contains a TimeCodeDef field identifier }
+	TimeCodeDef_fix = TimeCodeDef; { used as field type when a record declaration contains a TimeCodeDef field identifier }
 
 
 const
@@ -762,7 +762,7 @@ type
 		resvd2:					SInt16;
 		dataRefIndex:			SInt16;
 		flags:					SInt32;								{  timecode specific stuff }
-		timeCodeDef:			TimeCodeDef_GAP_Private_field_type_fix;
+		timeCodeDef:			TimeCodeDef_fix;
 		srcRef:					array [0..0] of SInt32;
 	end;
 
@@ -4092,7 +4092,7 @@ type
 			number:				SInt32;									{     The value when valueKind is attributeValueKindInteger or attributeValueKindPercent }
 			);
 		1: (
-			boolean:			boolean_GAP_Private_field_type_fix;		{     The value when valueKind is attributeValueKindBoolean or attributeValueKindOnOff }
+			boolean:			boolean_fix;		                    {     The value when valueKind is attributeValueKindBoolean or attributeValueKindOnOff }
 			);
 		2: (
 			color:				RGBColor;								{     The value when valueKind is attributeValueKindColor }

+ 4 - 4
packages/extra/univint/QuickTimeStreaming.pas

@@ -403,7 +403,7 @@ type
 		height:					Fixed;
 		matrix:					MatrixRecord;
 		gWorld:					CGrafPtr;
-		gdHandle:				GDHandle_GAP_Private_field_type_fix;
+		gdHandle:				GDHandle_fix;
 		clip:					RgnHandle;
 		graphicsMode:			SInt16;
 		opColor:				RGBColor;
@@ -557,7 +557,7 @@ type
 		dataLength:				UInt32;
 		editList:				QTSEditListHandle;
 		flags:					SInt32;
-		timeScale:				TimeScale_GAP_Private_field_type_fix;	{  set to 0 for default timescale  }
+		timeScale:				TimeScale_fix;	{  set to 0 for default timescale  }
 		mediaParams:			QTSMediaParamsPtr;
 		notificationProc:		QTSNotificationUPP;
 		notificationRefCon:		Ptr;
@@ -568,7 +568,7 @@ type
 		version:				UInt32;
 		editList:				QTSEditListHandle;
 		flags:					SInt32;
-		timeScale:				TimeScale_GAP_Private_field_type_fix;	{  set to 0 for default timescale  }
+		timeScale:				TimeScale_fix;	{  set to 0 for default timescale  }
 		mediaParams:			QTSMediaParamsPtr;
 		notificationProc:		QTSNotificationUPP;
 		notificationRefCon:		Ptr;
@@ -1624,7 +1624,7 @@ type
 	QTSDurationAtomPtr = ^QTSDurationAtom;
 	QTSDurationAtom = record
 		versionAndFlags:		SInt32;
-		timeScale:				TimeScale_GAP_Private_field_type_fix;
+		timeScale:				TimeScale_fix;
 		duration:				TimeValue64;
 	end;
 

+ 1 - 1
packages/extra/univint/QuickTimeVR.pas

@@ -353,7 +353,7 @@ type
 	QTVRCursorRecord = record
 		theType:				UInt16;									{  field was previously named "type" }
 		rsrcID:					SInt16;
-		handle:					Handle_GAP_Private_field_type_fix;
+		handle:					Handle_fix;
 	end;
 
 	QTVRFloatPointPtr = ^QTVRFloatPoint;

File diff suppressed because it is too large
+ 1408 - 491
packages/extra/univint/Quickdraw.pas


+ 2 - 2
packages/extra/univint/TextCommon.pas

@@ -429,7 +429,7 @@ const
 
 type
 	TextEncoding						= UInt32;
-	TextEncoding_GAP_Private_field_type_fix = TextEncoding; { used as field type when a record declaration contains a TextEncoding field identifier }
+	TextEncoding_fix                    = TextEncoding;  { used as field type when a record declaration contains a TextEncoding field identifier }
 	TextEncodingPtr						= ^TextEncoding; { when a VAR xx: TextEncoding parameter can be nil, it is changed to xx: TextEncodingPtr }
 	{  name part selector for GetTextEncodingName }
 	TextEncodingNameSelector			= UInt32;
@@ -446,7 +446,7 @@ type
 	TextEncodingRunPtr = ^TextEncodingRun;
 	TextEncodingRun = record
 		offset:					ByteOffset;
-		textEncoding:			TextEncoding_GAP_Private_field_type_fix;
+		textEncoding:			TextEncoding_fix;
 	end;
 
 	ConstTextEncodingRunPtr				= ^TextEncodingRun;

+ 21 - 21
packages/extra/univint/USB.pas

@@ -142,9 +142,9 @@ const
 
 type
 	USBReference						= SInt32;
-	USBReference_GAP_Private_field_type_fix	= USBReference; { used as field type when a record declaration contains a USBReference field identifier }
+	USBReference_fix	                = USBReference; { used as field type when a record declaration contains a USBReference field identifier }
 	USBDeviceRef						= USBReference;
-	USBDeviceRef_GAP_Private_field_type_fix	= USBDeviceRef; { used as field type when a record declaration contains a USBDeviceRef field identifier }
+	USBDeviceRef_fix	                = USBDeviceRef; { used as field type when a record declaration contains a USBDeviceRef field identifier }
 	USBDeviceRefPtr						= ^USBDeviceRef;
 	USBInterfaceRef						= USBReference;
 	USBPipeRef							= USBReference;
@@ -152,7 +152,7 @@ type
 	USBPipeState						= UInt32;
 	USBCount							= UInt32;
 	USBFlags							= UInt32;
-	USBFlags_GAP_Private_field_type_fix	= USBFlags; { used as field type when a record declaration contains a USBFlags field identifier }
+	USBFlags_fix	                    = USBFlags; { used as field type when a record declaration contains a USBFlags field identifier }
 	USBRequest							= UInt8;
 	USBDirection						= UInt8;
 	USBRqRecipient						= UInt8;
@@ -198,10 +198,10 @@ type
 	USBPBPtr = ^USBPB;
 {$ifc TYPED_FUNCTION_POINTERS}
 	USBCompletion = procedure(pb: USBPBPtr);
-	USBCompletion_GAP_Private_field_type_fix = USBCompletion; { used as field type when a record declaration contains a USBCompletion field identifier }
+	USBCompletion_fix = USBCompletion; { used as field type when a record declaration contains a USBCompletion field identifier }
 {$elsec}
 	USBCompletion = ProcPtr;
-	USBCompletion_GAP_Private_field_type_fix = USBCompletion; { used as field type when a record declaration contains a USBCompletion field identifier }
+	USBCompletion_fix = USBCompletion; { used as field type when a record declaration contains a USBCompletion field identifier }
 {$endc}
 
 	USBVariantBitsPtr = ^USBVariantBits;
@@ -226,13 +226,13 @@ type
 		reserved1:				UInt16;
 		reserved2:				UInt32;
 		usbStatus:				OSStatus;
-		usbCompletion:			USBCompletion_GAP_Private_field_type_fix;
+		usbCompletion:			USBCompletion_fix;
 		usbRefcon:				UInt32;
-		usbReference:			USBReference_GAP_Private_field_type_fix;
+		usbReference:			USBReference_fix;
 		usbBuffer:				Ptr;
 		usbReqCount:			USBCount;
 		usbActCount:			USBCount;
-		usbFlags:				USBFlags_GAP_Private_field_type_fix;
+		usbFlags:				USBFlags_fix;
 		usb:					USBVariantBits;
 		usbFrame:				UInt32;
 		usbClassType:			UInt8;
@@ -1159,7 +1159,7 @@ type
 		pbVersion:				UInt16;
 		usbDeviceNotification:	SInt8;
 		reserved1:				SInt8;									{  needed because of 2-byte 68k alignment }
-		usbDeviceRef:			USBDeviceRef_GAP_Private_field_type_fix;
+		usbDeviceRef:			USBDeviceRef_fix;
 		usbClass:				UInt16;
 		usbSubClass:			UInt16;
 		usbProtocol:			UInt16;
@@ -1641,10 +1641,10 @@ const
 
 type
 	USBDriverDescVersion				= UInt32;
-	USBDriverDescVersion_GAP_Private_field_type_fix	= USBDriverDescVersion; { used as field type when a record declaration contains a USBDriverDescVersion field identifier }
+	USBDriverDescVersion_fix	= USBDriverDescVersion;    { used as field type when a record declaration contains a USBDriverDescVersion field identifier }
 	{   Driver Loading Options }
 	USBDriverLoadingOptions 	= UInt32;
-	USBDriverLoadingOptions_GAP_Private_field_type_fix = USBDriverLoadingOptions; { used as field type when a record declaration contains a USBDriverLoadingOptions field identifier }
+	USBDriverLoadingOptions_fix = USBDriverLoadingOptions; { used as field type when a record declaration contains a USBDriverLoadingOptions field identifier }
 const
 	kUSBDoNotMatchGenericDevice	= $00000001;					{  Driver's VendorID must match Device's VendorID }
 	kUSBDoNotMatchInterface		= $00000002;					{  Do not load this driver as an interface driver. }
@@ -1662,7 +1662,7 @@ type
 		usbDeviceReleaseNumber:	UInt16;									{  Release Number of Device }
 		usbDeviceProtocol:		UInt16;									{  Protocol Info. }
 	end;
-	USBDeviceInfo_GAP_Private_field_type_fix = USBDeviceInfo; { used as field type when a record declaration contains a USBDeviceInfo field identifier }
+	USBDeviceInfo_fix = USBDeviceInfo; { used as field type when a record declaration contains a USBDeviceInfo field identifier }
 
 	USBInterfaceInfoPtr = ^USBInterfaceInfo;
 	USBInterfaceInfo = record
@@ -1673,7 +1673,7 @@ type
 		usbInterfaceProtocol:	SInt8;									{  Interface Protocol }
 		pad:					SInt8
 	end;
-	USBInterfaceInfo_GAP_Private_field_type_fix = USBInterfaceInfo; { used as field type when a record declaration contains a USBInterfaceInfo field identifier }
+	USBInterfaceInfo_fix = USBInterfaceInfo; { used as field type when a record declaration contains a USBInterfaceInfo field identifier }
 
 	USBDriverTypePtr = ^USBDriverType;
 	USBDriverType = record
@@ -1682,16 +1682,16 @@ type
 		usbDriverSubClass:		SInt8;									{  Module type }
 		usbDriverVersion:		NumVersion;								{  Class driver version number. }
 	end;
-	USBDriverType_GAP_Private_field_type_fix = USBDriverType; { used as field type when a record declaration contains a USBDriverType field identifier }
+	USBDriverType_fix = USBDriverType; { used as field type when a record declaration contains a USBDriverType field identifier }
 
 	USBDriverDescriptionPtr = ^USBDriverDescription;
 	USBDriverDescription = record
 		usbDriverDescSignature:	OSType;									{  Signature field of this structure. }
-		usbDriverDescVersion:	USBDriverDescVersion_GAP_Private_field_type_fix; {  Version of this data structure. }
-		usbDeviceInfo:			USBDeviceInfo_GAP_Private_field_type_fix; {  Product & Vendor Info }
-		usbInterfaceInfo:		USBInterfaceInfo_GAP_Private_field_type_fix; {  Interface info }
-		usbDriverType:			USBDriverType_GAP_Private_field_type_fix; {  Driver Info. }
-		usbDriverLoadingOptions: USBDriverLoadingOptions_GAP_Private_field_type_fix; {  Options for class driver loading. }
+		usbDriverDescVersion:	USBDriverDescVersion_fix;               {  Version of this data structure. }
+		usbDeviceInfo:			USBDeviceInfo_fix;                      {  Product & Vendor Info }
+		usbInterfaceInfo:		USBInterfaceInfo_fix;                   {  Interface info }
+		usbDriverType:			USBDriverType_fix;                      {  Driver Info. }
+		usbDriverLoadingOptions: USBDriverLoadingOptions_fix;           {  Options for class driver loading. }
 	end;
 
 	{
@@ -1770,7 +1770,7 @@ const
 
 type
 	USBShimDescVersion 			= UInt32;
-	USBShimDescVersion_GAP_Private_field_type_fix = USBShimDescVersion; { used as field type when a record declaration contains a USBShimDescVersion field identifier }
+	USBShimDescVersion_fix      = USBShimDescVersion; { used as field type when a record declaration contains a USBShimDescVersion field identifier }
 const
 	kCurrentUSBShimDescVers		= $0100;
 
@@ -1786,7 +1786,7 @@ type
 	USBShimDescriptionPtr = ^USBShimDescription;
 	USBShimDescription = record
 		usbShimDescSignature:	OSType;									{  Signature field of this structure. }
-		usbShimDescVersion:		USBShimDescVersion_GAP_Private_field_type_fix; {  Version of this data structure. }
+		usbShimDescVersion:		USBShimDescVersion_fix;                 {  Version of this data structure. }
 		usbDriverLoadingOptions: USBShimLoadingOptions;					{  Options for shim loading. }
 		libraryName:			Str63;									{  For optional shared library registration }
 	end;

Some files were not shown because too many files changed in this diff