diff --git a/ChangeLog b/ChangeLog index 8ec78dbea..f1fe24d54 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,26 @@ +2013-02-05 Fred Kiefer + + * Headers/Additions/GNUstepGUI/GSMethodTable.h + * Headers/AppKit/DPSOperators.h + * Headers/AppKit/NSCachedImageRep.h + * Headers/AppKit/NSGraphicsContext.h + * Headers/AppKit/NSImageRep.h + * Headers/AppKit/PSOperators.h + * Source/Functions.m + * Source/NSAffineTransform.m + * Source/NSCachedImageRep.m + * Source/NSGraphicsContext.m: Change DPS/PS functions to CGFloat + and NSInteger. + +2013-02-05 David Chisnall + + * Source/NSMenu.m: When displaying the horizontal menu, set the + title of the main menu to the name of the application, not the + name of the process, if the info bundle contains an application + name. + * Source/NSSavePanel.m: Fix the NSBrowser delegate methods in + NSSavePanel to have the correct types. + 2013-02-01 Fred Kiefer * Source/NSBezierPath.m: Started the implementation of keyed diff --git a/Headers/Additions/GNUstepGUI/GSMethodTable.h b/Headers/Additions/GNUstepGUI/GSMethodTable.h index d9baad561..86af3eb54 100644 --- a/Headers/Additions/GNUstepGUI/GSMethodTable.h +++ b/Headers/Additions/GNUstepGUI/GSMethodTable.h @@ -43,61 +43,61 @@ typedef struct { /* Color operations */ /* ----------------------------------------------------------------------- */ void (*DPScurrentalpha_) - (NSGraphicsContext*, SEL, float*); + (NSGraphicsContext*, SEL, CGFloat*); void (*DPScurrentcmykcolor____) - (NSGraphicsContext*, SEL, float*, float*, float*, float*); + (NSGraphicsContext*, SEL, CGFloat*, CGFloat*, CGFloat*, CGFloat*); void (*DPScurrentgray_) - (NSGraphicsContext*, SEL, float*); + (NSGraphicsContext*, SEL, CGFloat*); void (*DPScurrenthsbcolor___) - (NSGraphicsContext*, SEL, float*, float*, float*); + (NSGraphicsContext*, SEL, CGFloat*, CGFloat*, CGFloat*); void (*DPScurrentrgbcolor___) - (NSGraphicsContext*, SEL, float*, float*, float*); + (NSGraphicsContext*, SEL, CGFloat*, CGFloat*, CGFloat*); void (*DPSsetalpha_) - (NSGraphicsContext*, SEL, float); + (NSGraphicsContext*, SEL, CGFloat); void (*DPSsetcmykcolor____) - (NSGraphicsContext*, SEL, float, float, float, float); + (NSGraphicsContext*, SEL, CGFloat, CGFloat, CGFloat, CGFloat); void (*DPSsetgray_) - (NSGraphicsContext*, SEL, float); + (NSGraphicsContext*, SEL, CGFloat); void (*DPSsethsbcolor___) - (NSGraphicsContext*, SEL, float, float, float); + (NSGraphicsContext*, SEL, CGFloat, CGFloat, CGFloat); void (*DPSsetrgbcolor___) - (NSGraphicsContext*, SEL, float, float, float); + (NSGraphicsContext*, SEL, CGFloat, CGFloat, CGFloat); void (*GSSetFillColorspace_) (NSGraphicsContext*, SEL, NSDictionary *); void (*GSSetStrokeColorspace_) (NSGraphicsContext*, SEL, NSDictionary *); void (*GSSetFillColor_) - (NSGraphicsContext*, SEL, float *); + (NSGraphicsContext*, SEL, CGFloat *); void (*GSSetStrokeColor_) - (NSGraphicsContext*, SEL, float *); + (NSGraphicsContext*, SEL, CGFloat *); /* ----------------------------------------------------------------------- */ /* Text operations */ /* ----------------------------------------------------------------------- */ void (*DPSashow___) - (NSGraphicsContext*, SEL, float, float, const char*); + (NSGraphicsContext*, SEL, CGFloat, CGFloat, const char*); void (*DPSawidthshow______) - (NSGraphicsContext*, SEL, float, float, int, float, float, const char*); + (NSGraphicsContext*, SEL, CGFloat, CGFloat, int, CGFloat, CGFloat, const char*); void (*DPScharpath__) (NSGraphicsContext*, SEL, const char*, int); void (*DPSshow_) (NSGraphicsContext*, SEL, const char*); void (*DPSwidthshow____) - (NSGraphicsContext*, SEL, float, float, int, const char*); + (NSGraphicsContext*, SEL, CGFloat, CGFloat, int, const char*); void (*DPSxshow___) - (NSGraphicsContext*, SEL, const char*, const float*, int); + (NSGraphicsContext*, SEL, const char*, const CGFloat*, int); void (*DPSxyshow___) - (NSGraphicsContext*, SEL, const char*, const float*, int); + (NSGraphicsContext*, SEL, const char*, const CGFloat*, int); void (*DPSyshow___) - (NSGraphicsContext*, SEL, const char*, const float*, int); + (NSGraphicsContext*, SEL, const char*, const CGFloat*, int); void (*GSSetCharacterSpacing_) - (NSGraphicsContext*, SEL, float); + (NSGraphicsContext*, SEL, CGFloat); void (*GSSetFont_) (NSGraphicsContext*, SEL, NSFont*); void (*GSSetFontSize_) - (NSGraphicsContext*, SEL, float); + (NSGraphicsContext*, SEL, CGFloat); NSAffineTransform * (*GSGetTextCTM) (NSGraphicsContext*, SEL); NSPoint (*GSGetTextPosition) @@ -125,46 +125,46 @@ typedef struct { void (*DPSinitgraphics) (NSGraphicsContext*, SEL); void (*DPSsetgstate_) - (NSGraphicsContext*, SEL, int); + (NSGraphicsContext*, SEL, NSInteger); - int (*GSDefineGState) + NSInteger (*GSDefineGState) (NSGraphicsContext*, SEL); void (*GSUndefineGState_) - (NSGraphicsContext*, SEL, int); + (NSGraphicsContext*, SEL, NSInteger); void (*GSReplaceGState_) - (NSGraphicsContext*, SEL, int); + (NSGraphicsContext*, SEL, NSInteger); /* ----------------------------------------------------------------------- */ /* Gstate operations */ /* ----------------------------------------------------------------------- */ void (*DPScurrentflat_) - (NSGraphicsContext*, SEL, float*); + (NSGraphicsContext*, SEL, CGFloat*); void (*DPScurrentlinecap_) (NSGraphicsContext*, SEL, int*); void (*DPScurrentlinejoin_) (NSGraphicsContext*, SEL, int*); void (*DPScurrentlinewidth_) - (NSGraphicsContext*, SEL, float*); + (NSGraphicsContext*, SEL, CGFloat*); void (*DPScurrentmiterlimit_) - (NSGraphicsContext*, SEL, float*); + (NSGraphicsContext*, SEL, CGFloat*); void (*DPScurrentpoint__) - (NSGraphicsContext*, SEL, float*, float*); + (NSGraphicsContext*, SEL, CGFloat*, CGFloat*); void (*DPScurrentstrokeadjust_) (NSGraphicsContext*, SEL, int*); void (*DPSsetdash___) - (NSGraphicsContext*, SEL, const float*, int, float); + (NSGraphicsContext*, SEL, const CGFloat*, NSInteger, CGFloat); void (*DPSsetflat_) - (NSGraphicsContext*, SEL, float); + (NSGraphicsContext*, SEL, CGFloat); void (*DPSsethalftonephase__) - (NSGraphicsContext*, SEL, float, float); + (NSGraphicsContext*, SEL, CGFloat, CGFloat); void (*DPSsetlinecap_) (NSGraphicsContext*, SEL, int); void (*DPSsetlinejoin_) (NSGraphicsContext*, SEL, int); void (*DPSsetlinewidth_) - (NSGraphicsContext*, SEL, float); + (NSGraphicsContext*, SEL, CGFloat); void (*DPSsetmiterlimit_) - (NSGraphicsContext*, SEL, float); + (NSGraphicsContext*, SEL, CGFloat); void (*DPSsetstrokeadjust_) (NSGraphicsContext*, SEL, int); @@ -172,15 +172,15 @@ typedef struct { /* Matrix operations */ /* ----------------------------------------------------------------------- */ void (*DPSconcat_) - (NSGraphicsContext*, SEL, const float*); + (NSGraphicsContext*, SEL, const CGFloat*); void (*DPSinitmatrix) (NSGraphicsContext*, SEL); void (*DPSrotate_) - (NSGraphicsContext*, SEL, float); + (NSGraphicsContext*, SEL, CGFloat); void (*DPSscale__) - (NSGraphicsContext*, SEL, float, float); + (NSGraphicsContext*, SEL, CGFloat, CGFloat); void (*DPStranslate__) - (NSGraphicsContext*, SEL, float, float); + (NSGraphicsContext*, SEL, CGFloat, CGFloat); NSAffineTransform * (*GSCurrentCTM) (NSGraphicsContext*, SEL); @@ -193,17 +193,17 @@ typedef struct { /* Paint operations */ /* ----------------------------------------------------------------------- */ void (*DPSarc_____) - (NSGraphicsContext*, SEL, float, float, float, float, float); + (NSGraphicsContext*, SEL, CGFloat, CGFloat, CGFloat, CGFloat, CGFloat); void (*DPSarcn_____) - (NSGraphicsContext*, SEL, float, float, float, float, float); + (NSGraphicsContext*, SEL, CGFloat, CGFloat, CGFloat, CGFloat, CGFloat); void (*DPSarct_____) - (NSGraphicsContext*, SEL, float, float, float, float, float); + (NSGraphicsContext*, SEL, CGFloat, CGFloat, CGFloat, CGFloat, CGFloat); void (*DPSclip) (NSGraphicsContext*, SEL); void (*DPSclosepath) (NSGraphicsContext*, SEL); void (*DPScurveto______) - (NSGraphicsContext*, SEL, float, float, float, float, float, float); + (NSGraphicsContext*, SEL, CGFloat, CGFloat, CGFloat, CGFloat, CGFloat, CGFloat); void (*DPSeoclip) (NSGraphicsContext*, SEL); void (*DPSeofill) @@ -215,27 +215,27 @@ typedef struct { void (*DPSinitclip) (NSGraphicsContext*, SEL); void (*DPSlineto__) - (NSGraphicsContext*, SEL, float, float); + (NSGraphicsContext*, SEL, CGFloat, CGFloat); void (*DPSmoveto__) - (NSGraphicsContext*, SEL, float, float); + (NSGraphicsContext*, SEL, CGFloat, CGFloat); void (*DPSnewpath) (NSGraphicsContext*, SEL); void (*DPSpathbbox____) - (NSGraphicsContext*, SEL, float*, float*, float*, float*); + (NSGraphicsContext*, SEL, CGFloat*, CGFloat*, CGFloat*, CGFloat*); void (*DPSrcurveto______) - (NSGraphicsContext*, SEL, float, float, float, float, float, float); + (NSGraphicsContext*, SEL, CGFloat, CGFloat, CGFloat, CGFloat, CGFloat, CGFloat); void (*DPSrectclip____) - (NSGraphicsContext*, SEL, float, float, float, float); + (NSGraphicsContext*, SEL, CGFloat, CGFloat, CGFloat, CGFloat); void (*DPSrectfill____) - (NSGraphicsContext*, SEL, float, float, float, float); + (NSGraphicsContext*, SEL, CGFloat, CGFloat, CGFloat, CGFloat); void (*DPSrectstroke____) - (NSGraphicsContext*, SEL, float, float, float, float); + (NSGraphicsContext*, SEL, CGFloat, CGFloat, CGFloat, CGFloat); void (*DPSreversepath) (NSGraphicsContext*, SEL); void (*DPSrlineto__) - (NSGraphicsContext*, SEL, float, float); + (NSGraphicsContext*, SEL, CGFloat, CGFloat); void (*DPSrmoveto__) - (NSGraphicsContext*, SEL, float, float); + (NSGraphicsContext*, SEL, CGFloat, CGFloat); void (*DPSstroke) (NSGraphicsContext*, SEL); @@ -262,11 +262,11 @@ typedef struct { /* Graphics Extensions Ops */ /*-------------------------------------------------------------------------*/ void (*DPScomposite________) - (NSGraphicsContext*, SEL, float, float, float, float, int, float, float, int); + (NSGraphicsContext*, SEL, CGFloat, CGFloat, CGFloat, CGFloat, NSInteger, CGFloat, CGFloat, NSCompositingOperation); void (*DPScompositerect_____) - (NSGraphicsContext*, SEL, float, float, float, float, int); + (NSGraphicsContext*, SEL, CGFloat, CGFloat, CGFloat, CGFloat, NSCompositingOperation); void (*DPSdissolve________) - (NSGraphicsContext*, SEL, float, float, float, float, int, float, float, float); + (NSGraphicsContext*, SEL, CGFloat, CGFloat, CGFloat, CGFloat, NSInteger, CGFloat, CGFloat, CGFloat); void (*GSDrawImage__) (NSGraphicsContext*, SEL, NSRect, void *); @@ -298,12 +298,12 @@ typedef struct { * Render Bitmap Images */ void (*NSDrawBitmap___________)(NSGraphicsContext*, SEL, NSRect rect, - int pixelsWide, - int pixelsHigh, - int bitsPerSample, - int samplesPerPixel, - int bitsPerPixel, - int bytesPerRow, + NSInteger pixelsWide, + NSInteger pixelsHigh, + NSInteger bitsPerSample, + NSInteger samplesPerPixel, + NSInteger bitsPerPixel, + NSInteger bytesPerRow, BOOL isPlanar, BOOL hasAlpha, NSString *colorSpaceName, diff --git a/Headers/AppKit/DPSOperators.h b/Headers/AppKit/DPSOperators.h index 1a0db27b5..02c9850c7 100644 --- a/Headers/AppKit/DPSOperators.h +++ b/Headers/AppKit/DPSOperators.h @@ -36,43 +36,43 @@ /* Color operations */ /* ----------------------------------------------------------------------- */ static inline void -DPScurrentalpha(GSCTXT *ctxt, float* a) +DPScurrentalpha(GSCTXT *ctxt, CGFloat* a) __attribute__((unused)); static inline void -DPScurrentcmykcolor(GSCTXT *ctxt, float* c, float* m, float* y, float* k) +DPScurrentcmykcolor(GSCTXT *ctxt, CGFloat* c, CGFloat* m, CGFloat* y, CGFloat* k) __attribute__((unused)); static inline void -DPScurrentgray(GSCTXT *ctxt, float* gray) +DPScurrentgray(GSCTXT *ctxt, CGFloat* gray) __attribute__((unused)); static inline void -DPScurrenthsbcolor(GSCTXT *ctxt, float* h, float* s, float* b) +DPScurrenthsbcolor(GSCTXT *ctxt, CGFloat* h, CGFloat* s, CGFloat* b) __attribute__((unused)); static inline void -DPScurrentrgbcolor(GSCTXT *ctxt, float* r, float* g, float* b) +DPScurrentrgbcolor(GSCTXT *ctxt, CGFloat* r, CGFloat* g, CGFloat* b) __attribute__((unused)); static inline void -DPSsetalpha(GSCTXT *ctxt, float a) +DPSsetalpha(GSCTXT *ctxt, CGFloat a) __attribute__((unused)); static inline void -DPSsetcmykcolor(GSCTXT *ctxt, float c, float m, float y, float k) +DPSsetcmykcolor(GSCTXT *ctxt, CGFloat c, CGFloat m, CGFloat y, CGFloat k) __attribute__((unused)); static inline void -DPSsetgray(GSCTXT *ctxt, float gray) +DPSsetgray(GSCTXT *ctxt, CGFloat gray) __attribute__((unused)); static inline void -DPSsethsbcolor(GSCTXT *ctxt, float h, float s, float b) +DPSsethsbcolor(GSCTXT *ctxt, CGFloat h, CGFloat s, CGFloat b) __attribute__((unused)); static inline void -DPSsetrgbcolor(GSCTXT *ctxt, float r, float g, float b) +DPSsetrgbcolor(GSCTXT *ctxt, CGFloat r, CGFloat g, CGFloat b) __attribute__((unused)); @@ -85,11 +85,11 @@ GSSetStrokeColorspace(GSCTXT *ctxt, NSDictionary * dict) __attribute__((unused)); static inline void -GSSetFillColor(GSCTXT *ctxt, float * values) +GSSetFillColor(GSCTXT *ctxt, CGFloat * values) __attribute__((unused)); static inline void -GSSetStrokeColor(GSCTXT *ctxt, float * values) +GSSetStrokeColor(GSCTXT *ctxt, CGFloat * values) __attribute__((unused)); @@ -97,11 +97,11 @@ __attribute__((unused)); /* Text operations */ /* ----------------------------------------------------------------------- */ static inline void -DPSashow(GSCTXT *ctxt, float x, float y, const char* s) +DPSashow(GSCTXT *ctxt, CGFloat x, CGFloat y, const char* s) __attribute__((unused)); static inline void -DPSawidthshow(GSCTXT *ctxt, float cx, float cy, int c, float ax, float ay, const char* s) +DPSawidthshow(GSCTXT *ctxt, CGFloat cx, CGFloat cy, int c, CGFloat ax, CGFloat ay, const char* s) __attribute__((unused)); static inline void @@ -113,24 +113,24 @@ DPSshow(GSCTXT *ctxt, const char* s) __attribute__((unused)); static inline void -DPSwidthshow(GSCTXT *ctxt, float x, float y, int c, const char* s) +DPSwidthshow(GSCTXT *ctxt, CGFloat x, CGFloat y, int c, const char* s) __attribute__((unused)); static inline void -DPSxshow(GSCTXT *ctxt, const char* s, const float* numarray, int size) +DPSxshow(GSCTXT *ctxt, const char* s, const CGFloat* numarray, int size) __attribute__((unused)); static inline void -DPSxyshow(GSCTXT *ctxt, const char* s, const float* numarray, int size) +DPSxyshow(GSCTXT *ctxt, const char* s, const CGFloat* numarray, int size) __attribute__((unused)); static inline void -DPSyshow(GSCTXT *ctxt, const char* s, const float* numarray, int size) +DPSyshow(GSCTXT *ctxt, const char* s, const CGFloat* numarray, int size) __attribute__((unused)); static inline void -GSSetCharacterSpacing(GSCTXT *ctxt, float extra) +GSSetCharacterSpacing(GSCTXT *ctxt, CGFloat extra) __attribute__((unused)); static inline void @@ -138,7 +138,7 @@ GSSetFont(GSCTXT *ctxt, NSFont* font) __attribute__((unused)); static inline void -GSSetFontSize(GSCTXT *ctxt, float size) +GSSetFontSize(GSCTXT *ctxt, CGFloat size) __attribute__((unused)); static inline NSAffineTransform * @@ -191,27 +191,27 @@ DPSinitgraphics(GSCTXT *ctxt) __attribute__((unused)); static inline void -DPSsetgstate(GSCTXT *ctxt, int gst) +DPSsetgstate(GSCTXT *ctxt, NSInteger gst) __attribute__((unused)); -static inline int +static inline NSInteger GSDefineGState(GSCTXT *ctxt) __attribute__((unused)); static inline void -GSUndefineGState(GSCTXT *ctxt, int gst) +GSUndefineGState(GSCTXT *ctxt, NSInteger gst) __attribute__((unused)); static inline void -GSReplaceGState(GSCTXT *ctxt, int gst) +GSReplaceGState(GSCTXT *ctxt, NSInteger gst) __attribute__((unused)); /* ----------------------------------------------------------------------- */ /* Gstate operations */ /* ----------------------------------------------------------------------- */ static inline void -DPScurrentflat(GSCTXT *ctxt, float* flatness) +DPScurrentflat(GSCTXT *ctxt, CGFloat* flatness) __attribute__((unused)); static inline void @@ -223,15 +223,15 @@ DPScurrentlinejoin(GSCTXT *ctxt, int* linejoin) __attribute__((unused)); static inline void -DPScurrentlinewidth(GSCTXT *ctxt, float* width) +DPScurrentlinewidth(GSCTXT *ctxt, CGFloat* width) __attribute__((unused)); static inline void -DPScurrentmiterlimit(GSCTXT *ctxt, float* limit) +DPScurrentmiterlimit(GSCTXT *ctxt, CGFloat* limit) __attribute__((unused)); static inline void -DPScurrentpoint(GSCTXT *ctxt, float* x, float* y) +DPScurrentpoint(GSCTXT *ctxt, CGFloat* x, CGFloat* y) __attribute__((unused)); static inline void @@ -239,15 +239,15 @@ DPScurrentstrokeadjust(GSCTXT *ctxt, int* b) __attribute__((unused)); static inline void -DPSsetdash(GSCTXT *ctxt, const float* pat, int size, float offset) +DPSsetdash(GSCTXT *ctxt, const CGFloat* pat, NSInteger size, CGFloat offset) __attribute__((unused)); static inline void -DPSsetflat(GSCTXT *ctxt, float flatness) +DPSsetflat(GSCTXT *ctxt, CGFloat flatness) __attribute__((unused)); static inline void -DPSsethalftonephase(GSCTXT *ctxt, float x, float y) +DPSsethalftonephase(GSCTXT *ctxt, CGFloat x, CGFloat y) __attribute__((unused)); static inline void @@ -259,11 +259,11 @@ DPSsetlinejoin(GSCTXT *ctxt, int linejoin) __attribute__((unused)); static inline void -DPSsetlinewidth(GSCTXT *ctxt, float width) +DPSsetlinewidth(GSCTXT *ctxt, CGFloat width) __attribute__((unused)); static inline void -DPSsetmiterlimit(GSCTXT *ctxt, float limit) +DPSsetmiterlimit(GSCTXT *ctxt, CGFloat limit) __attribute__((unused)); static inline void @@ -275,7 +275,7 @@ __attribute__((unused)); /* Matrix operations */ /* ----------------------------------------------------------------------- */ static inline void -DPSconcat(GSCTXT *ctxt, const float* m) +DPSconcat(GSCTXT *ctxt, const CGFloat* m) __attribute__((unused)); static inline void @@ -283,15 +283,15 @@ DPSinitmatrix(GSCTXT *ctxt) __attribute__((unused)); static inline void -DPSrotate(GSCTXT *ctxt, float angle) +DPSrotate(GSCTXT *ctxt, CGFloat angle) __attribute__((unused)); static inline void -DPSscale(GSCTXT *ctxt, float x, float y) +DPSscale(GSCTXT *ctxt, CGFloat x, CGFloat y) __attribute__((unused)); static inline void -DPStranslate(GSCTXT *ctxt, float x, float y) +DPStranslate(GSCTXT *ctxt, CGFloat x, CGFloat y) __attribute__((unused)); @@ -312,15 +312,15 @@ __attribute__((unused)); /* Paint operations */ /* ----------------------------------------------------------------------- */ static inline void -DPSarc(GSCTXT *ctxt, float x, float y, float r, float angle1, float angle2) +DPSarc(GSCTXT *ctxt, CGFloat x, CGFloat y, CGFloat r, CGFloat angle1, CGFloat angle2) __attribute__((unused)); static inline void -DPSarcn(GSCTXT *ctxt, float x, float y, float r, float angle1, float angle2) +DPSarcn(GSCTXT *ctxt, CGFloat x, CGFloat y, CGFloat r, CGFloat angle1, CGFloat angle2) __attribute__((unused)); static inline void -DPSarct(GSCTXT *ctxt, float x1, float y1, float x2, float y2, float r) +DPSarct(GSCTXT *ctxt, CGFloat x1, CGFloat y1, CGFloat x2, CGFloat y2, CGFloat r) __attribute__((unused)); static inline void @@ -332,7 +332,7 @@ DPSclosepath(GSCTXT *ctxt) __attribute__((unused)); static inline void -DPScurveto(GSCTXT *ctxt, float x1, float y1, float x2, float y2, float x3, float y3) +DPScurveto(GSCTXT *ctxt, CGFloat x1, CGFloat y1, CGFloat x2, CGFloat y2, CGFloat x3, CGFloat y3) __attribute__((unused)); static inline void @@ -356,11 +356,11 @@ DPSinitclip(GSCTXT *ctxt) __attribute__((unused)); static inline void -DPSlineto(GSCTXT *ctxt, float x, float y) +DPSlineto(GSCTXT *ctxt, CGFloat x, CGFloat y) __attribute__((unused)); static inline void -DPSmoveto(GSCTXT *ctxt, float x, float y) +DPSmoveto(GSCTXT *ctxt, CGFloat x, CGFloat y) __attribute__((unused)); static inline void @@ -368,23 +368,23 @@ DPSnewpath(GSCTXT *ctxt) __attribute__((unused)); static inline void -DPSpathbbox(GSCTXT *ctxt, float* llx, float* lly, float* urx, float* ury) +DPSpathbbox(GSCTXT *ctxt, CGFloat* llx, CGFloat* lly, CGFloat* urx, CGFloat* ury) __attribute__((unused)); static inline void -DPSrcurveto(GSCTXT *ctxt, float x1, float y1, float x2, float y2, float x3, float y3) +DPSrcurveto(GSCTXT *ctxt, CGFloat x1, CGFloat y1, CGFloat x2, CGFloat y2, CGFloat x3, CGFloat y3) __attribute__((unused)); static inline void -DPSrectclip(GSCTXT *ctxt, float x, float y, float w, float h) +DPSrectclip(GSCTXT *ctxt, CGFloat x, CGFloat y, CGFloat w, CGFloat h) __attribute__((unused)); static inline void -DPSrectfill(GSCTXT *ctxt, float x, float y, float w, float h) +DPSrectfill(GSCTXT *ctxt, CGFloat x, CGFloat y, CGFloat w, CGFloat h) __attribute__((unused)); static inline void -DPSrectstroke(GSCTXT *ctxt, float x, float y, float w, float h) +DPSrectstroke(GSCTXT *ctxt, CGFloat x, CGFloat y, CGFloat w, CGFloat h) __attribute__((unused)); static inline void @@ -392,11 +392,11 @@ DPSreversepath(GSCTXT *ctxt) __attribute__((unused)); static inline void -DPSrlineto(GSCTXT *ctxt, float x, float y) +DPSrlineto(GSCTXT *ctxt, CGFloat x, CGFloat y) __attribute__((unused)); static inline void -DPSrmoveto(GSCTXT *ctxt, float x, float y) +DPSrmoveto(GSCTXT *ctxt, CGFloat x, CGFloat y) __attribute__((unused)); static inline void @@ -445,15 +445,15 @@ __attribute__((unused)); /* Graphics Extensions Ops */ /*-------------------------------------------------------------------------*/ static inline void -DPScomposite(GSCTXT *ctxt, float x, float y, float w, float h, int gstateNum, float dx, float dy, int op) +DPScomposite(GSCTXT *ctxt, CGFloat x, CGFloat y, CGFloat w, CGFloat h, NSInteger gstateNum, CGFloat dx, CGFloat dy, NSCompositingOperation op) __attribute__((unused)); static inline void -DPScompositerect(GSCTXT *ctxt, float x, float y, float w, float h, int op) +DPScompositerect(GSCTXT *ctxt, CGFloat x, CGFloat y, CGFloat w, CGFloat h, NSCompositingOperation op) __attribute__((unused)); static inline void -DPSdissolve(GSCTXT *ctxt, float x, float y, float w, float h, int gstateNum, float dx, float dy, float delta) +DPSdissolve(GSCTXT *ctxt, CGFloat x, CGFloat y, CGFloat w, CGFloat h, NSInteger gstateNum, CGFloat dx, CGFloat dy, CGFloat delta) __attribute__((unused)); @@ -476,70 +476,70 @@ __attribute__((unused)); /* Color operations */ /* ----------------------------------------------------------------------- */ static inline void -DPScurrentalpha(GSCTXT *ctxt, float* a) +DPScurrentalpha(GSCTXT *ctxt, CGFloat* a) { (ctxt->methods->DPScurrentalpha_) (ctxt, @selector(DPScurrentalpha:), a); } static inline void -DPScurrentcmykcolor(GSCTXT *ctxt, float* c, float* m, float* y, float* k) +DPScurrentcmykcolor(GSCTXT *ctxt, CGFloat* c, CGFloat* m, CGFloat* y, CGFloat* k) { (ctxt->methods->DPScurrentcmykcolor____) (ctxt, @selector(DPScurrentcmykcolor: : : :), c, m, y, k); } static inline void -DPScurrentgray(GSCTXT *ctxt, float* gray) +DPScurrentgray(GSCTXT *ctxt, CGFloat* gray) { (ctxt->methods->DPScurrentgray_) (ctxt, @selector(DPScurrentgray:), gray); } static inline void -DPScurrenthsbcolor(GSCTXT *ctxt, float* h, float* s, float* b) +DPScurrenthsbcolor(GSCTXT *ctxt, CGFloat* h, CGFloat* s, CGFloat* b) { (ctxt->methods->DPScurrenthsbcolor___) (ctxt, @selector(DPScurrenthsbcolor: : :), h, s, b); } static inline void -DPScurrentrgbcolor(GSCTXT *ctxt, float* r, float* g, float* b) +DPScurrentrgbcolor(GSCTXT *ctxt, CGFloat* r, CGFloat* g, CGFloat* b) { (ctxt->methods->DPScurrentrgbcolor___) (ctxt, @selector(DPScurrentrgbcolor: : :), r, g, b); } static inline void -DPSsetalpha(GSCTXT *ctxt, float a) +DPSsetalpha(GSCTXT *ctxt, CGFloat a) { (ctxt->methods->DPSsetalpha_) (ctxt, @selector(DPSsetalpha:), a); } static inline void -DPSsetcmykcolor(GSCTXT *ctxt, float c, float m, float y, float k) +DPSsetcmykcolor(GSCTXT *ctxt, CGFloat c, CGFloat m, CGFloat y, CGFloat k) { (ctxt->methods->DPSsetcmykcolor____) (ctxt, @selector(DPSsetcmykcolor: : : :), c, m, y, k); } static inline void -DPSsetgray(GSCTXT *ctxt, float gray) +DPSsetgray(GSCTXT *ctxt, CGFloat gray) { (ctxt->methods->DPSsetgray_) (ctxt, @selector(DPSsetgray:), gray); } static inline void -DPSsethsbcolor(GSCTXT *ctxt, float h, float s, float b) +DPSsethsbcolor(GSCTXT *ctxt, CGFloat h, CGFloat s, CGFloat b) { (ctxt->methods->DPSsethsbcolor___) (ctxt, @selector(DPSsethsbcolor: : :), h, s, b); } static inline void -DPSsetrgbcolor(GSCTXT *ctxt, float r, float g, float b) +DPSsetrgbcolor(GSCTXT *ctxt, CGFloat r, CGFloat g, CGFloat b) { (ctxt->methods->DPSsetrgbcolor___) (ctxt, @selector(DPSsetrgbcolor: : :), r, g, b); @@ -561,14 +561,14 @@ GSSetStrokeColorspace(GSCTXT *ctxt, NSDictionary * dict) } static inline void -GSSetFillColor(GSCTXT *ctxt, float * values) +GSSetFillColor(GSCTXT *ctxt, CGFloat * values) { (ctxt->methods->GSSetFillColor_) (ctxt, @selector(GSSetFillColor:), values); } static inline void -GSSetStrokeColor(GSCTXT *ctxt, float * values) +GSSetStrokeColor(GSCTXT *ctxt, CGFloat * values) { (ctxt->methods->GSSetStrokeColor_) (ctxt, @selector(GSSetStrokeColor:), values); @@ -579,14 +579,14 @@ GSSetStrokeColor(GSCTXT *ctxt, float * values) /* Text operations */ /* ----------------------------------------------------------------------- */ static inline void -DPSashow(GSCTXT *ctxt, float x, float y, const char* s) +DPSashow(GSCTXT *ctxt, CGFloat x, CGFloat y, const char* s) { (ctxt->methods->DPSashow___) (ctxt, @selector(DPSashow: : :), x, y, s); } static inline void -DPSawidthshow(GSCTXT *ctxt, float cx, float cy, int c, float ax, float ay, const char* s) +DPSawidthshow(GSCTXT *ctxt, CGFloat cx, CGFloat cy, int c, CGFloat ax, CGFloat ay, const char* s) { (ctxt->methods->DPSawidthshow______) (ctxt, @selector(DPSawidthshow: : : : : :), cx, cy, c, ax, ay, s); @@ -607,28 +607,28 @@ DPSshow(GSCTXT *ctxt, const char* s) } static inline void -DPSwidthshow(GSCTXT *ctxt, float x, float y, int c, const char* s) +DPSwidthshow(GSCTXT *ctxt, CGFloat x, CGFloat y, int c, const char* s) { (ctxt->methods->DPSwidthshow____) (ctxt, @selector(DPSwidthshow: : : :), x, y, c, s); } static inline void -DPSxshow(GSCTXT *ctxt, const char* s, const float* numarray, int size) +DPSxshow(GSCTXT *ctxt, const char* s, const CGFloat* numarray, int size) { (ctxt->methods->DPSxshow___) (ctxt, @selector(DPSxshow: : :), s, numarray, size); } static inline void -DPSxyshow(GSCTXT *ctxt, const char* s, const float* numarray, int size) +DPSxyshow(GSCTXT *ctxt, const char* s, const CGFloat* numarray, int size) { (ctxt->methods->DPSxyshow___) (ctxt, @selector(DPSxyshow: : :), s, numarray, size); } static inline void -DPSyshow(GSCTXT *ctxt, const char* s, const float* numarray, int size) +DPSyshow(GSCTXT *ctxt, const char* s, const CGFloat* numarray, int size) { (ctxt->methods->DPSyshow___) (ctxt, @selector(DPSyshow: : :), s, numarray, size); @@ -636,7 +636,7 @@ DPSyshow(GSCTXT *ctxt, const char* s, const float* numarray, int size) static inline void -GSSetCharacterSpacing(GSCTXT *ctxt, float extra) +GSSetCharacterSpacing(GSCTXT *ctxt, CGFloat extra) { (ctxt->methods->GSSetCharacterSpacing_) (ctxt, @selector(GSSetCharacterSpacing:), extra); @@ -650,7 +650,7 @@ GSSetFont(GSCTXT *ctxt, NSFont* font) } static inline void -GSSetFontSize(GSCTXT *ctxt, float size) +GSSetFontSize(GSCTXT *ctxt, CGFloat size) { (ctxt->methods->GSSetFontSize_) (ctxt, @selector(GSSetFontSize:), size); @@ -738,14 +738,14 @@ DPSinitgraphics(GSCTXT *ctxt) } static inline void -DPSsetgstate(GSCTXT *ctxt, int gst) +DPSsetgstate(GSCTXT *ctxt, NSInteger gst) { (ctxt->methods->DPSsetgstate_) (ctxt, @selector(DPSsetgstate:), gst); } -static inline int +static inline NSInteger GSDefineGState(GSCTXT *ctxt) { return (ctxt->methods->GSDefineGState) @@ -753,14 +753,14 @@ GSDefineGState(GSCTXT *ctxt) } static inline void -GSUndefineGState(GSCTXT *ctxt, int gst) +GSUndefineGState(GSCTXT *ctxt, NSInteger gst) { (ctxt->methods->GSUndefineGState_) (ctxt, @selector(GSUndefineGState:), gst); } static inline void -GSReplaceGState(GSCTXT *ctxt, int gst) +GSReplaceGState(GSCTXT *ctxt, NSInteger gst) { (ctxt->methods->GSReplaceGState_) (ctxt, @selector(GSReplaceGState:), gst); @@ -770,7 +770,7 @@ GSReplaceGState(GSCTXT *ctxt, int gst) /* Gstate operations */ /* ----------------------------------------------------------------------- */ static inline void -DPScurrentflat(GSCTXT *ctxt, float* flatness) +DPScurrentflat(GSCTXT *ctxt, CGFloat* flatness) { (ctxt->methods->DPScurrentflat_) (ctxt, @selector(DPScurrentflat:), flatness); @@ -791,21 +791,21 @@ DPScurrentlinejoin(GSCTXT *ctxt, int* linejoin) } static inline void -DPScurrentlinewidth(GSCTXT *ctxt, float* width) +DPScurrentlinewidth(GSCTXT *ctxt, CGFloat* width) { (ctxt->methods->DPScurrentlinewidth_) (ctxt, @selector(DPScurrentlinewidth:), width); } static inline void -DPScurrentmiterlimit(GSCTXT *ctxt, float* limit) +DPScurrentmiterlimit(GSCTXT *ctxt, CGFloat* limit) { (ctxt->methods->DPScurrentmiterlimit_) (ctxt, @selector(DPScurrentmiterlimit:), limit); } static inline void -DPScurrentpoint(GSCTXT *ctxt, float* x, float* y) +DPScurrentpoint(GSCTXT *ctxt, CGFloat* x, CGFloat* y) { (ctxt->methods->DPScurrentpoint__) (ctxt, @selector(DPScurrentpoint: :), x, y); @@ -819,21 +819,21 @@ DPScurrentstrokeadjust(GSCTXT *ctxt, int* b) } static inline void -DPSsetdash(GSCTXT *ctxt, const float* pat, int size, float offset) +DPSsetdash(GSCTXT *ctxt, const CGFloat* pat, NSInteger size, CGFloat offset) { (ctxt->methods->DPSsetdash___) (ctxt, @selector(DPSsetdash: : :), pat, size, offset); } static inline void -DPSsetflat(GSCTXT *ctxt, float flatness) +DPSsetflat(GSCTXT *ctxt, CGFloat flatness) { (ctxt->methods->DPSsetflat_) (ctxt, @selector(DPSsetflat:), flatness); } static inline void -DPSsethalftonephase(GSCTXT *ctxt, float x, float y) +DPSsethalftonephase(GSCTXT *ctxt, CGFloat x, CGFloat y) { (ctxt->methods->DPSsethalftonephase__) (ctxt, @selector(DPSsethalftonephase: :), x, y); @@ -854,14 +854,14 @@ DPSsetlinejoin(GSCTXT *ctxt, int linejoin) } static inline void -DPSsetlinewidth(GSCTXT *ctxt, float width) +DPSsetlinewidth(GSCTXT *ctxt, CGFloat width) { (ctxt->methods->DPSsetlinewidth_) (ctxt, @selector(DPSsetlinewidth:), width); } static inline void -DPSsetmiterlimit(GSCTXT *ctxt, float limit) +DPSsetmiterlimit(GSCTXT *ctxt, CGFloat limit) { (ctxt->methods->DPSsetmiterlimit_) (ctxt, @selector(DPSsetmiterlimit:), limit); @@ -879,7 +879,7 @@ DPSsetstrokeadjust(GSCTXT *ctxt, int b) /* Matrix operations */ /* ----------------------------------------------------------------------- */ static inline void -DPSconcat(GSCTXT *ctxt, const float* m) +DPSconcat(GSCTXT *ctxt, const CGFloat* m) { (ctxt->methods->DPSconcat_) (ctxt, @selector(DPSconcat:), m); @@ -893,21 +893,21 @@ DPSinitmatrix(GSCTXT *ctxt) } static inline void -DPSrotate(GSCTXT *ctxt, float angle) +DPSrotate(GSCTXT *ctxt, CGFloat angle) { (ctxt->methods->DPSrotate_) (ctxt, @selector(DPSrotate:), angle); } static inline void -DPSscale(GSCTXT *ctxt, float x, float y) +DPSscale(GSCTXT *ctxt, CGFloat x, CGFloat y) { (ctxt->methods->DPSscale__) (ctxt, @selector(DPSscale: :), x, y); } static inline void -DPStranslate(GSCTXT *ctxt, float x, float y) +DPStranslate(GSCTXT *ctxt, CGFloat x, CGFloat y) { (ctxt->methods->DPStranslate__) (ctxt, @selector(DPStranslate: :), x, y); @@ -940,21 +940,21 @@ GSConcatCTM(GSCTXT *ctxt, NSAffineTransform * ctm) /* Paint operations */ /* ----------------------------------------------------------------------- */ static inline void -DPSarc(GSCTXT *ctxt, float x, float y, float r, float angle1, float angle2) +DPSarc(GSCTXT *ctxt, CGFloat x, CGFloat y, CGFloat r, CGFloat angle1, CGFloat angle2) { (ctxt->methods->DPSarc_____) (ctxt, @selector(DPSarc: : : : :), x, y, r, angle1, angle2); } static inline void -DPSarcn(GSCTXT *ctxt, float x, float y, float r, float angle1, float angle2) +DPSarcn(GSCTXT *ctxt, CGFloat x, CGFloat y, CGFloat r, CGFloat angle1, CGFloat angle2) { (ctxt->methods->DPSarcn_____) (ctxt, @selector(DPSarcn: : : : :), x, y, r, angle1, angle2); } static inline void -DPSarct(GSCTXT *ctxt, float x1, float y1, float x2, float y2, float r) +DPSarct(GSCTXT *ctxt, CGFloat x1, CGFloat y1, CGFloat x2, CGFloat y2, CGFloat r) { (ctxt->methods->DPSarct_____) (ctxt, @selector(DPSarct: : : : :), x1, y1, x2, y2, r); @@ -975,7 +975,7 @@ DPSclosepath(GSCTXT *ctxt) } static inline void -DPScurveto(GSCTXT *ctxt, float x1, float y1, float x2, float y2, float x3, float y3) +DPScurveto(GSCTXT *ctxt, CGFloat x1, CGFloat y1, CGFloat x2, CGFloat y2, CGFloat x3, CGFloat y3) { (ctxt->methods->DPScurveto______) (ctxt, @selector(DPScurveto: : : : : :), x1, y1, x2, y2, x3, y3); @@ -1017,14 +1017,14 @@ DPSinitclip(GSCTXT *ctxt) } static inline void -DPSlineto(GSCTXT *ctxt, float x, float y) +DPSlineto(GSCTXT *ctxt, CGFloat x, CGFloat y) { (ctxt->methods->DPSlineto__) (ctxt, @selector(DPSlineto: :), x, y); } static inline void -DPSmoveto(GSCTXT *ctxt, float x, float y) +DPSmoveto(GSCTXT *ctxt, CGFloat x, CGFloat y) { (ctxt->methods->DPSmoveto__) (ctxt, @selector(DPSmoveto: :), x, y); @@ -1038,35 +1038,35 @@ DPSnewpath(GSCTXT *ctxt) } static inline void -DPSpathbbox(GSCTXT *ctxt, float* llx, float* lly, float* urx, float* ury) +DPSpathbbox(GSCTXT *ctxt, CGFloat* llx, CGFloat* lly, CGFloat* urx, CGFloat* ury) { (ctxt->methods->DPSpathbbox____) (ctxt, @selector(DPSpathbbox: : : :), llx, lly, urx, ury); } static inline void -DPSrcurveto(GSCTXT *ctxt, float x1, float y1, float x2, float y2, float x3, float y3) +DPSrcurveto(GSCTXT *ctxt, CGFloat x1, CGFloat y1, CGFloat x2, CGFloat y2, CGFloat x3, CGFloat y3) { (ctxt->methods->DPSrcurveto______) (ctxt, @selector(DPSrcurveto: : : : : :), x1, y1, x2, y2, x3, y3); } static inline void -DPSrectclip(GSCTXT *ctxt, float x, float y, float w, float h) +DPSrectclip(GSCTXT *ctxt, CGFloat x, CGFloat y, CGFloat w, CGFloat h) { (ctxt->methods->DPSrectclip____) (ctxt, @selector(DPSrectclip: : : :), x, y, w, h); } static inline void -DPSrectfill(GSCTXT *ctxt, float x, float y, float w, float h) +DPSrectfill(GSCTXT *ctxt, CGFloat x, CGFloat y, CGFloat w, CGFloat h) { (ctxt->methods->DPSrectfill____) (ctxt, @selector(DPSrectfill: : : :), x, y, w, h); } static inline void -DPSrectstroke(GSCTXT *ctxt, float x, float y, float w, float h) +DPSrectstroke(GSCTXT *ctxt, CGFloat x, CGFloat y, CGFloat w, CGFloat h) { (ctxt->methods->DPSrectstroke____) (ctxt, @selector(DPSrectstroke: : : :), x, y, w, h); @@ -1080,14 +1080,14 @@ DPSreversepath(GSCTXT *ctxt) } static inline void -DPSrlineto(GSCTXT *ctxt, float x, float y) +DPSrlineto(GSCTXT *ctxt, CGFloat x, CGFloat y) { (ctxt->methods->DPSrlineto__) (ctxt, @selector(DPSrlineto: :), x, y); } static inline void -DPSrmoveto(GSCTXT *ctxt, float x, float y) +DPSrmoveto(GSCTXT *ctxt, CGFloat x, CGFloat y) { (ctxt->methods->DPSrmoveto__) (ctxt, @selector(DPSrmoveto: :), x, y); @@ -1166,21 +1166,22 @@ DPSsetoffset(GSCTXT *ctxt, short int x, short int y) /* Graphics Extensions Ops */ /*-------------------------------------------------------------------------*/ static inline void -DPScomposite(GSCTXT *ctxt, float x, float y, float w, float h, int gstateNum, float dx, float dy, int op) +DPScomposite(GSCTXT *ctxt, CGFloat x, CGFloat y, CGFloat w, CGFloat h, + NSInteger gstateNum, CGFloat dx, CGFloat dy, NSCompositingOperation op) { (ctxt->methods->DPScomposite________) (ctxt, @selector(DPScomposite: : : : : : : :), x, y, w, h, gstateNum, dx, dy, op); } static inline void -DPScompositerect(GSCTXT *ctxt, float x, float y, float w, float h, int op) +DPScompositerect(GSCTXT *ctxt, CGFloat x, CGFloat y, CGFloat w, CGFloat h, NSCompositingOperation op) { (ctxt->methods->DPScompositerect_____) (ctxt, @selector(DPScompositerect: : : : :), x, y, w, h, op); } static inline void -DPSdissolve(GSCTXT *ctxt, float x, float y, float w, float h, int gstateNum, float dx, float dy, float delta) +DPSdissolve(GSCTXT *ctxt, CGFloat x, CGFloat y, CGFloat w, CGFloat h, NSInteger gstateNum, CGFloat dx, CGFloat dy, CGFloat delta) { (ctxt->methods->DPSdissolve________) (ctxt, @selector(DPSdissolve: : : : : : : :), x, y, w, h, gstateNum, dx, dy, delta); diff --git a/Headers/AppKit/NSCachedImageRep.h b/Headers/AppKit/NSCachedImageRep.h index 4e272d327..37570edbb 100644 --- a/Headers/AppKit/NSCachedImageRep.h +++ b/Headers/AppKit/NSCachedImageRep.h @@ -51,9 +51,9 @@ * GNUstep extension */ - (id) initWithSize: (NSSize)aSize - pixelsWide: (int)pixelsWide - pixelsHigh: (int)pixelsHigh - depth: (int)aDepth + pixelsWide: (NSInteger)pixelsWide + pixelsHigh: (NSInteger)pixelsHigh + depth: (NSWindowDepth)aDepth separate: (BOOL)separate alpha: (BOOL)alpha; diff --git a/Headers/AppKit/NSGraphicsContext.h b/Headers/AppKit/NSGraphicsContext.h index 518a58968..f831e7655 100644 --- a/Headers/AppKit/NSGraphicsContext.h +++ b/Headers/AppKit/NSGraphicsContext.h @@ -79,7 +79,7 @@ typedef enum _NSBackingStoreType * NSCompositePlusLighter * */ -typedef enum _NSCompositingOperation +enum _NSCompositingOperation { NSCompositeClear, @@ -100,7 +100,8 @@ typedef enum _NSCompositingOperation #if OS_API_VERSION(GS_API_NONE, GS_API_NONE) , GSCompositeHighlight = 100 #endif -} NSCompositingOperation; +}; +typedef NSUInteger NSCompositingOperation; typedef int NSWindowDepth; @@ -191,7 +192,7 @@ typedef enum _GSColorSpace + (void) restoreGraphicsState; + (void) saveGraphicsState; -+ (void) setGraphicsState: (int)graphicsState; ++ (void) setGraphicsState: (NSInteger)graphicsState; + (void) setCurrentContext: (NSGraphicsContext*)context; + (NSGraphicsContext*) currentContext; #if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST) @@ -267,16 +268,16 @@ APPKIT_EXPORT NSGraphicsContext *GSCurrentContext(void); /* ----------------------------------------------------------------------- */ /* Color operations */ /* ----------------------------------------------------------------------- */ -- (void) DPScurrentalpha: (float*)a; -- (void) DPScurrentcmykcolor: (float*)c : (float*)m : (float*)y : (float*)k; -- (void) DPScurrentgray: (float*)gray; -- (void) DPScurrenthsbcolor: (float*)h : (float*)s : (float*)b; -- (void) DPScurrentrgbcolor: (float*)r : (float*)g : (float*)b; -- (void) DPSsetalpha: (float)a; -- (void) DPSsetcmykcolor: (float)c : (float)m : (float)y : (float)k; -- (void) DPSsetgray: (float)gray; -- (void) DPSsethsbcolor: (float)h : (float)s : (float)b; -- (void) DPSsetrgbcolor: (float)r : (float)g : (float)b; +- (void) DPScurrentalpha: (CGFloat*)a; +- (void) DPScurrentcmykcolor: (CGFloat*)c : (CGFloat*)m : (CGFloat*)y : (CGFloat*)k; +- (void) DPScurrentgray: (CGFloat*)gray; +- (void) DPScurrenthsbcolor: (CGFloat*)h : (CGFloat*)s : (CGFloat*)b; +- (void) DPScurrentrgbcolor: (CGFloat*)r : (CGFloat*)g : (CGFloat*)b; +- (void) DPSsetalpha: (CGFloat)a; +- (void) DPSsetcmykcolor: (CGFloat)c : (CGFloat)m : (CGFloat)y : (CGFloat)k; +- (void) DPSsetgray: (CGFloat)gray; +- (void) DPSsethsbcolor: (CGFloat)h : (CGFloat)s : (CGFloat)b; +- (void) DPSsetrgbcolor: (CGFloat)r : (CGFloat)g : (CGFloat)b; - (void) GSSetPatterColor: (NSImage*)image; @@ -288,21 +289,21 @@ APPKIT_EXPORT NSGraphicsContext *GSCurrentContext(void); /* ----------------------------------------------------------------------- */ /* Text operations */ /* ----------------------------------------------------------------------- */ -- (void) DPSashow: (float)x : (float)y : (const char*)s; -- (void) DPSawidthshow: (float)cx : (float)cy : (int)c : (float)ax : (float)ay - : (const char*)s; +- (void) DPSashow: (CGFloat)x : (CGFloat)y : (const char*)s; +- (void) DPSawidthshow: (CGFloat)cx : (CGFloat)cy : (int)c + : (CGFloat)ax : (CGFloat)ay : (const char*)s; - (void) DPScharpath: (const char*)s : (int)b; - (void) appendBezierPathWithPackedGlyphs: (const char *)packedGlyphs path: (NSBezierPath*)aPath; - (void) DPSshow: (const char*)s; -- (void) DPSwidthshow: (float)x : (float)y : (int)c : (const char*)s; -- (void) DPSxshow: (const char*)s : (const float*)numarray : (int)size; -- (void) DPSxyshow: (const char*)s : (const float*)numarray : (int)size; -- (void) DPSyshow: (const char*)s : (const float*)numarray : (int)size; +- (void) DPSwidthshow: (CGFloat)x : (CGFloat)y : (int)c : (const char*)s; +- (void) DPSxshow: (const char*)s : (const CGFloat*)numarray : (int)size; +- (void) DPSxyshow: (const char*)s : (const CGFloat*)numarray : (int)size; +- (void) DPSyshow: (const char*)s : (const CGFloat*)numarray : (int)size; -- (void) GSSetCharacterSpacing: (float)extra; +- (void) GSSetCharacterSpacing: (CGFloat)extra; - (void) GSSetFont: (void *)fontref; -- (void) GSSetFontSize: (float)size; +- (void) GSSetFontSize: (CGFloat)size; - (NSAffineTransform *) GSGetTextCTM; - (NSPoint) GSGetTextPosition; - (void) GSSetTextCTM: (NSAffineTransform *)ctm; @@ -318,39 +319,39 @@ APPKIT_EXPORT NSGraphicsContext *GSCurrentContext(void); - (void) DPSgrestore; - (void) DPSgsave; - (void) DPSinitgraphics; -- (void) DPSsetgstate: (int)gst; +- (void) DPSsetgstate: (NSInteger)gst; -- (int) GSDefineGState; -- (void) GSUndefineGState: (int)gst; -- (void) GSReplaceGState: (int)gst; +- (NSInteger) GSDefineGState; +- (void) GSUndefineGState: (NSInteger)gst; +- (void) GSReplaceGState: (NSInteger)gst; /* ----------------------------------------------------------------------- */ /* Gstate operations */ /* ----------------------------------------------------------------------- */ -- (void) DPScurrentflat: (float*)flatness; +- (void) DPScurrentflat: (CGFloat*)flatness; - (void) DPScurrentlinecap: (int*)linecap; - (void) DPScurrentlinejoin: (int*)linejoin; -- (void) DPScurrentlinewidth: (float*)width; -- (void) DPScurrentmiterlimit: (float*)limit; -- (void) DPScurrentpoint: (float*)x : (float*)y; +- (void) DPScurrentlinewidth: (CGFloat*)width; +- (void) DPScurrentmiterlimit: (CGFloat*)limit; +- (void) DPScurrentpoint: (CGFloat*)x : (CGFloat*)y; - (void) DPScurrentstrokeadjust: (int*)b; -- (void) DPSsetdash: (const float*)pat : (int)size : (float)offset; -- (void) DPSsetflat: (float)flatness; -- (void) DPSsethalftonephase: (float)x : (float)y; +- (void) DPSsetdash: (const CGFloat*)pat : (NSInteger)size : (CGFloat)offset; +- (void) DPSsetflat: (CGFloat)flatness; +- (void) DPSsethalftonephase: (CGFloat)x : (CGFloat)y; - (void) DPSsetlinecap: (int)linecap; - (void) DPSsetlinejoin: (int)linejoin; -- (void) DPSsetlinewidth: (float)width; -- (void) DPSsetmiterlimit: (float)limit; +- (void) DPSsetlinewidth: (CGFloat)width; +- (void) DPSsetmiterlimit: (CGFloat)limit; - (void) DPSsetstrokeadjust: (int)b; /* ----------------------------------------------------------------------- */ /* Matrix operations */ /* ----------------------------------------------------------------------- */ -- (void) DPSconcat: (const float*)m; +- (void) DPSconcat: (const CGFloat*)m; - (void) DPSinitmatrix; -- (void) DPSrotate: (float)angle; -- (void) DPSscale: (float)x : (float)y; -- (void) DPStranslate: (float)x : (float)y; +- (void) DPSrotate: (CGFloat)angle; +- (void) DPSscale: (CGFloat)x : (CGFloat)y; +- (void) DPStranslate: (CGFloat)x : (CGFloat)y; - (NSAffineTransform *) GSCurrentCTM; - (void) GSSetCTM: (NSAffineTransform *)ctm; @@ -359,32 +360,32 @@ APPKIT_EXPORT NSGraphicsContext *GSCurrentContext(void); /* ----------------------------------------------------------------------- */ /* Paint operations */ /* ----------------------------------------------------------------------- */ -- (void) DPSarc: (float)x : (float)y : (float)r : (float)angle1 - : (float)angle2; -- (void) DPSarcn: (float)x : (float)y : (float)r : (float)angle1 - : (float)angle2; -- (void) DPSarct: (float)x1 : (float)y1 : (float)x2 : (float)y2 : (float)r; +- (void) DPSarc: (CGFloat)x : (CGFloat)y : (CGFloat)r : (CGFloat)angle1 + : (CGFloat)angle2; +- (void) DPSarcn: (CGFloat)x : (CGFloat)y : (CGFloat)r : (CGFloat)angle1 + : (CGFloat)angle2; +- (void) DPSarct: (CGFloat)x1 : (CGFloat)y1 : (CGFloat)x2 : (CGFloat)y2 : (CGFloat)r; - (void) DPSclip; - (void) DPSclosepath; -- (void) DPScurveto: (float)x1 : (float)y1 : (float)x2 : (float)y2 - : (float)x3 : (float)y3; +- (void) DPScurveto: (CGFloat)x1 : (CGFloat)y1 : (CGFloat)x2 : (CGFloat)y2 + : (CGFloat)x3 : (CGFloat)y3; - (void) DPSeoclip; - (void) DPSeofill; - (void) DPSfill; - (void) DPSflattenpath; - (void) DPSinitclip; -- (void) DPSlineto: (float)x : (float)y; -- (void) DPSmoveto: (float)x : (float)y; +- (void) DPSlineto: (CGFloat)x : (CGFloat)y; +- (void) DPSmoveto: (CGFloat)x : (CGFloat)y; - (void) DPSnewpath; -- (void) DPSpathbbox: (float*)llx : (float*)lly : (float*)urx : (float*)ury; -- (void) DPSrcurveto: (float)x1 : (float)y1 : (float)x2 : (float)y2 - : (float)x3 : (float)y3; -- (void) DPSrectclip: (float)x : (float)y : (float)w : (float)h; -- (void) DPSrectfill: (float)x : (float)y : (float)w : (float)h; -- (void) DPSrectstroke: (float)x : (float)y : (float)w : (float)h; +- (void) DPSpathbbox: (CGFloat*)llx : (CGFloat*)lly : (CGFloat*)urx : (CGFloat*)ury; +- (void) DPSrcurveto: (CGFloat)x1 : (CGFloat)y1 : (CGFloat)x2 : (CGFloat)y2 + : (CGFloat)x3 : (CGFloat)y3; +- (void) DPSrectclip: (CGFloat)x : (CGFloat)y : (CGFloat)w : (CGFloat)h; +- (void) DPSrectfill: (CGFloat)x : (CGFloat)y : (CGFloat)w : (CGFloat)h; +- (void) DPSrectstroke: (CGFloat)x : (CGFloat)y : (CGFloat)w : (CGFloat)h; - (void) DPSreversepath; -- (void) DPSrlineto: (float)x : (float)y; -- (void) DPSrmoveto: (float)x : (float)y; +- (void) DPSrlineto: (CGFloat)x : (CGFloat)y; +- (void) DPSrmoveto: (CGFloat)x : (CGFloat)y; - (void) DPSstroke; - (void) DPSshfill: (NSDictionary *)shaderDictionary; @@ -403,23 +404,23 @@ APPKIT_EXPORT NSGraphicsContext *GSCurrentContext(void); /*-------------------------------------------------------------------------*/ /* Graphics Extensions Ops */ /*-------------------------------------------------------------------------*/ -- (void) DPScomposite: (float)x : (float)y : (float)w : (float)h - : (int)gstateNum : (float)dx : (float)dy : (int)op; -- (void) DPScompositerect: (float)x : (float)y : (float)w : (float)h : (int)op; -- (void) DPSdissolve: (float)x : (float)y : (float)w : (float)h - : (int)gstateNum : (float)dx : (float)dy : (float)delta; +- (void) DPScomposite: (CGFloat)x : (CGFloat)y : (CGFloat)w : (CGFloat)h + : (NSInteger)gstateNum : (CGFloat)dx : (CGFloat)dy : (NSCompositingOperation)op; +- (void) DPScompositerect: (CGFloat)x : (CGFloat)y : (CGFloat)w : (CGFloat)h : (NSCompositingOperation)op; +- (void) DPSdissolve: (CGFloat)x : (CGFloat)y : (CGFloat)w : (CGFloat)h + : (NSInteger)gstateNum : (CGFloat)dx : (CGFloat)dy : (CGFloat)delta; -- (void) GScomposite: (int)gstateNum +- (void) GScomposite: (NSInteger)gstateNum toPoint: (NSPoint)aPoint fromRect: (NSRect)srcRect operation: (NSCompositingOperation)op - fraction: (float)delta; + fraction: (CGFloat)delta; - (BOOL) supportsDrawGState; -- (void) GSdraw: (int)gstateNum +- (void) GSdraw: (NSInteger)gstateNum toPoint: (NSPoint)aPoint fromRect: (NSRect)srcRect operation: (NSCompositingOperation)op - fraction: (float)delta; + fraction: (CGFloat)delta; - (void) GSDrawImage: (NSRect)rect : (void *)imageref; /* ----------------------------------------------------------------------- */ @@ -471,9 +472,9 @@ transform between current user space and image space for this image. - (NSDictionary *) GSReadRect: (NSRect)rect; /* Soon to be obsolete */ -- (void) NSDrawBitmap: (NSRect) rect : (int) pixelsWide : (int) pixelsHigh - : (int) bitsPerSample : (int) samplesPerPixel - : (int) bitsPerPixel : (int) bytesPerRow : (BOOL) isPlanar +- (void) NSDrawBitmap: (NSRect) rect : (NSInteger) pixelsWide : (NSInteger) pixelsHigh + : (NSInteger) bitsPerSample : (NSInteger) samplesPerPixel + : (NSInteger) bitsPerPixel : (NSInteger) bytesPerRow : (BOOL) isPlanar : (BOOL) hasAlpha : (NSString *) colorSpaceName : (const unsigned char *const [5]) data; diff --git a/Headers/AppKit/NSImageRep.h b/Headers/AppKit/NSImageRep.h index a563e5ba2..4d3ee5777 100644 --- a/Headers/AppKit/NSImageRep.h +++ b/Headers/AppKit/NSImageRep.h @@ -53,9 +53,9 @@ enum { NSSize _size; BOOL _hasAlpha; BOOL _isOpaque; - int _bitsPerSample; - int _pixelsWide; - int _pixelsHigh; + NSInteger _bitsPerSample; + NSInteger _pixelsWide; + NSInteger _pixelsHigh; } // @@ -122,12 +122,12 @@ enum { * -setBitsPerSample: * */ -- (int)bitsPerSample; +- (NSInteger)bitsPerSample; - (NSString *)colorSpaceName; - (BOOL)hasAlpha; - (BOOL)isOpaque; -- (int)pixelsHigh; -- (int)pixelsWide; +- (NSInteger)pixelsHigh; +- (NSInteger)pixelsWide; - (void)setAlpha:(BOOL)flag; /** Sets the number of bits for each component of a pixel. @@ -136,11 +136,11 @@ enum { * -bitsPerSample * */ -- (void)setBitsPerSample:(int)anInt; +- (void)setBitsPerSample:(NSInteger)anInt; - (void)setColorSpaceName:(NSString *)aString; - (void)setOpaque:(BOOL)flag; -- (void)setPixelsHigh:(int)anInt; -- (void)setPixelsWide:(int)anInt; +- (void)setPixelsHigh:(NSInteger)anInt; +- (void)setPixelsWide:(NSInteger)anInt; // // Drawing the Image @@ -160,7 +160,7 @@ enum { - (BOOL) drawInRect: (NSRect)dstRect fromRect: (NSRect)srcRect operation: (NSCompositingOperation)op - fraction: (float)delta + fraction: (CGFloat)delta respectFlipped: (BOOL)respectFlipped hints: (NSDictionary*)hints; #endif diff --git a/Headers/AppKit/PSOperators.h b/Headers/AppKit/PSOperators.h index d98c752a9..14aa657db 100644 --- a/Headers/AppKit/PSOperators.h +++ b/Headers/AppKit/PSOperators.h @@ -39,43 +39,43 @@ /* Color operations */ /* ----------------------------------------------------------------------- */ static inline void -PScurrentalpha(float* a) +PScurrentalpha(CGFloat* a) __attribute__((unused)); static inline void -PScurrentcmykcolor(float* c, float* m, float* y, float* k) +PScurrentcmykcolor(CGFloat* c, CGFloat* m, CGFloat* y, CGFloat* k) __attribute__((unused)); static inline void -PScurrentgray(float* gray) +PScurrentgray(CGFloat* gray) __attribute__((unused)); static inline void -PScurrenthsbcolor(float* h, float* s, float* b) +PScurrenthsbcolor(CGFloat* h, CGFloat* s, CGFloat* b) __attribute__((unused)); static inline void -PScurrentrgbcolor(float* r, float* g, float* b) +PScurrentrgbcolor(CGFloat* r, CGFloat* g, CGFloat* b) __attribute__((unused)); static inline void -PSsetalpha(float a) +PSsetalpha(CGFloat a) __attribute__((unused)); static inline void -PSsetcmykcolor(float c, float m, float y, float k) +PSsetcmykcolor(CGFloat c, CGFloat m, CGFloat y, CGFloat k) __attribute__((unused)); static inline void -PSsetgray(float gray) +PSsetgray(CGFloat gray) __attribute__((unused)); static inline void -PSsethsbcolor(float h, float s, float b) +PSsethsbcolor(CGFloat h, CGFloat s, CGFloat b) __attribute__((unused)); static inline void -PSsetrgbcolor(float r, float g, float b) +PSsetrgbcolor(CGFloat r, CGFloat g, CGFloat b) __attribute__((unused)); @@ -84,11 +84,11 @@ __attribute__((unused)); /* Text operations */ /* ----------------------------------------------------------------------- */ static inline void -PSashow(float x, float y, const char* s) +PSashow(CGFloat x, CGFloat y, const char* s) __attribute__((unused)); static inline void -PSawidthshow(float cx, float cy, int c, float ax, float ay, const char* s) +PSawidthshow(CGFloat cx, CGFloat cy, int c, CGFloat ax, CGFloat ay, const char* s) __attribute__((unused)); static inline void @@ -100,19 +100,19 @@ PSshow(const char* s) __attribute__((unused)); static inline void -PSwidthshow(float x, float y, int c, const char* s) +PSwidthshow(CGFloat x, CGFloat y, int c, const char* s) __attribute__((unused)); static inline void -PSxshow(const char* s, const float* numarray, int size) +PSxshow(const char* s, const CGFloat* numarray, int size) __attribute__((unused)); static inline void -PSxyshow(const char* s, const float* numarray, int size) +PSxyshow(const char* s, const CGFloat* numarray, int size) __attribute__((unused)); static inline void -PSyshow(const char* s, const float* numarray, int size) +PSyshow(const char* s, const CGFloat* numarray, int size) __attribute__((unused)); @@ -133,7 +133,7 @@ PSinitgraphics() __attribute__((unused)); static inline void -PSsetgstate(int gst) +PSsetgstate(NSInteger gst) __attribute__((unused)); @@ -142,7 +142,7 @@ __attribute__((unused)); /* Gstate operations */ /* ----------------------------------------------------------------------- */ static inline void -PScurrentflat(float* flatness) +PScurrentflat(CGFloat* flatness) __attribute__((unused)); static inline void @@ -154,15 +154,15 @@ PScurrentlinejoin(int* linejoin) __attribute__((unused)); static inline void -PScurrentlinewidth(float* width) +PScurrentlinewidth(CGFloat* width) __attribute__((unused)); static inline void -PScurrentmiterlimit(float* limit) +PScurrentmiterlimit(CGFloat* limit) __attribute__((unused)); static inline void -PScurrentpoint(float* x, float* y) +PScurrentpoint(CGFloat* x, CGFloat* y) __attribute__((unused)); static inline void @@ -170,15 +170,15 @@ PScurrentstrokeadjust(int* b) __attribute__((unused)); static inline void -PSsetdash(const float* pat, int size, float offset) +PSsetdash(const CGFloat* pat, NSInteger size, CGFloat offset) __attribute__((unused)); static inline void -PSsetflat(float flatness) +PSsetflat(CGFloat flatness) __attribute__((unused)); static inline void -PSsethalftonephase(float x, float y) +PSsethalftonephase(CGFloat x, CGFloat y) __attribute__((unused)); static inline void @@ -190,11 +190,11 @@ PSsetlinejoin(int linejoin) __attribute__((unused)); static inline void -PSsetlinewidth(float width) +PSsetlinewidth(CGFloat width) __attribute__((unused)); static inline void -PSsetmiterlimit(float limit) +PSsetmiterlimit(CGFloat limit) __attribute__((unused)); static inline void @@ -206,7 +206,7 @@ __attribute__((unused)); /* Matrix operations */ /* ----------------------------------------------------------------------- */ static inline void -PSconcat(const float* m) +PSconcat(const CGFloat* m) __attribute__((unused)); static inline void @@ -214,15 +214,15 @@ PSinitmatrix() __attribute__((unused)); static inline void -PSrotate(float angle) +PSrotate(CGFloat angle) __attribute__((unused)); static inline void -PSscale(float x, float y) +PSscale(CGFloat x, CGFloat y) __attribute__((unused)); static inline void -PStranslate(float x, float y) +PStranslate(CGFloat x, CGFloat y) __attribute__((unused)); @@ -231,15 +231,15 @@ __attribute__((unused)); /* Paint operations */ /* ----------------------------------------------------------------------- */ static inline void -PSarc(float x, float y, float r, float angle1, float angle2) +PSarc(CGFloat x, CGFloat y, CGFloat r, CGFloat angle1, CGFloat angle2) __attribute__((unused)); static inline void -PSarcn(float x, float y, float r, float angle1, float angle2) +PSarcn(CGFloat x, CGFloat y, CGFloat r, CGFloat angle1, CGFloat angle2) __attribute__((unused)); static inline void -PSarct(float x1, float y1, float x2, float y2, float r) +PSarct(CGFloat x1, CGFloat y1, CGFloat x2, CGFloat y2, CGFloat r) __attribute__((unused)); static inline void @@ -251,7 +251,7 @@ PSclosepath() __attribute__((unused)); static inline void -PScurveto(float x1, float y1, float x2, float y2, float x3, float y3) +PScurveto(CGFloat x1, CGFloat y1, CGFloat x2, CGFloat y2, CGFloat x3, CGFloat y3) __attribute__((unused)); static inline void @@ -275,11 +275,11 @@ PSinitclip() __attribute__((unused)); static inline void -PSlineto(float x, float y) +PSlineto(CGFloat x, CGFloat y) __attribute__((unused)); static inline void -PSmoveto(float x, float y) +PSmoveto(CGFloat x, CGFloat y) __attribute__((unused)); static inline void @@ -287,23 +287,23 @@ PSnewpath() __attribute__((unused)); static inline void -PSpathbbox(float* llx, float* lly, float* urx, float* ury) +PSpathbbox(CGFloat* llx, CGFloat* lly, CGFloat* urx, CGFloat* ury) __attribute__((unused)); static inline void -PSrcurveto(float x1, float y1, float x2, float y2, float x3, float y3) +PSrcurveto(CGFloat x1, CGFloat y1, CGFloat x2, CGFloat y2, CGFloat x3, CGFloat y3) __attribute__((unused)); static inline void -PSrectclip(float x, float y, float w, float h) +PSrectclip(CGFloat x, CGFloat y, CGFloat w, CGFloat h) __attribute__((unused)); static inline void -PSrectfill(float x, float y, float w, float h) +PSrectfill(CGFloat x, CGFloat y, CGFloat w, CGFloat h) __attribute__((unused)); static inline void -PSrectstroke(float x, float y, float w, float h) +PSrectstroke(CGFloat x, CGFloat y, CGFloat w, CGFloat h) __attribute__((unused)); static inline void @@ -311,11 +311,11 @@ PSreversepath() __attribute__((unused)); static inline void -PSrlineto(float x, float y) +PSrlineto(CGFloat x, CGFloat y) __attribute__((unused)); static inline void -PSrmoveto(float x, float y) +PSrmoveto(CGFloat x, CGFloat y) __attribute__((unused)); static inline void @@ -331,15 +331,15 @@ __attribute__((unused)); /* Graphics Extensions Ops */ /*-------------------------------------------------------------------------*/ static inline void -PScomposite(float x, float y, float w, float h, int gstateNum, float dx, float dy, int op) +PScomposite(CGFloat x, CGFloat y, CGFloat w, CGFloat h, NSInteger gstateNum, CGFloat dx, CGFloat dy, NSCompositingOperation op) __attribute__((unused)); static inline void -PScompositerect(float x, float y, float w, float h, int op) +PScompositerect(CGFloat x, CGFloat y, CGFloat w, CGFloat h, NSCompositingOperation op) __attribute__((unused)); static inline void -PSdissolve(float x, float y, float w, float h, int gstateNum, float dx, float dy, float delta) +PSdissolve(CGFloat x, CGFloat y, CGFloat w, CGFloat h, NSInteger gstateNum, CGFloat dx, CGFloat dy, CGFloat delta) __attribute__((unused)); @@ -360,61 +360,61 @@ __attribute__((unused)); /* Color operations */ /* ----------------------------------------------------------------------- */ static inline void -PScurrentalpha(float* a) +PScurrentalpha(CGFloat* a) { DPScurrentalpha(DEFCTXT, a); } static inline void -PScurrentcmykcolor(float* c, float* m, float* y, float* k) +PScurrentcmykcolor(CGFloat* c, CGFloat* m, CGFloat* y, CGFloat* k) { DPScurrentcmykcolor(DEFCTXT, c, m, y, k); } static inline void -PScurrentgray(float* gray) +PScurrentgray(CGFloat* gray) { DPScurrentgray(DEFCTXT, gray); } static inline void -PScurrenthsbcolor(float* h, float* s, float* b) +PScurrenthsbcolor(CGFloat* h, CGFloat* s, CGFloat* b) { DPScurrenthsbcolor(DEFCTXT, h, s, b); } static inline void -PScurrentrgbcolor(float* r, float* g, float* b) +PScurrentrgbcolor(CGFloat* r, CGFloat* g, CGFloat* b) { DPScurrentrgbcolor(DEFCTXT, r, g, b); } static inline void -PSsetalpha(float a) +PSsetalpha(CGFloat a) { DPSsetalpha(DEFCTXT, a); } static inline void -PSsetcmykcolor(float c, float m, float y, float k) +PSsetcmykcolor(CGFloat c, CGFloat m, CGFloat y, CGFloat k) { DPSsetcmykcolor(DEFCTXT, c, m, y, k); } static inline void -PSsetgray(float gray) +PSsetgray(CGFloat gray) { DPSsetgray(DEFCTXT, gray); } static inline void -PSsethsbcolor(float h, float s, float b) +PSsethsbcolor(CGFloat h, CGFloat s, CGFloat b) { DPSsethsbcolor(DEFCTXT, h, s, b); } static inline void -PSsetrgbcolor(float r, float g, float b) +PSsetrgbcolor(CGFloat r, CGFloat g, CGFloat b) { DPSsetrgbcolor(DEFCTXT, r, g, b); } @@ -437,13 +437,13 @@ PSwindowlist(int __attribute__((unused)) d, /* Text operations */ /* ----------------------------------------------------------------------- */ static inline void -PSashow(float x, float y, const char* s) +PSashow(CGFloat x, CGFloat y, const char* s) { DPSashow(DEFCTXT, x, y, s); } static inline void -PSawidthshow(float cx, float cy, int c, float ax, float ay, const char* s) +PSawidthshow(CGFloat cx, CGFloat cy, int c, CGFloat ax, CGFloat ay, const char* s) { DPSawidthshow(DEFCTXT, cx, cy, c, ax, ay, s); } @@ -461,25 +461,25 @@ PSshow(const char* s) } static inline void -PSwidthshow(float x, float y, int c, const char* s) +PSwidthshow(CGFloat x, CGFloat y, int c, const char* s) { DPSwidthshow(DEFCTXT, x, y, c, s); } static inline void -PSxshow(const char* s, const float* numarray, int size) +PSxshow(const char* s, const CGFloat* numarray, int size) { DPSxshow(DEFCTXT, s, numarray, size); } static inline void -PSxyshow(const char* s, const float* numarray, int size) +PSxyshow(const char* s, const CGFloat* numarray, int size) { DPSxyshow(DEFCTXT, s, numarray, size); } static inline void -PSyshow(const char* s, const float* numarray, int size) +PSyshow(const char* s, const CGFloat* numarray, int size) { DPSyshow(DEFCTXT, s, numarray, size); } @@ -508,7 +508,7 @@ PSinitgraphics() } static inline void -PSsetgstate(int gst) +PSsetgstate(NSInteger gst) { DPSsetgstate(DEFCTXT, gst); } @@ -519,7 +519,7 @@ PSsetgstate(int gst) /* Gstate operations */ /* ----------------------------------------------------------------------- */ static inline void -PScurrentflat(float* flatness) +PScurrentflat(CGFloat* flatness) { DPScurrentflat(DEFCTXT, flatness); } @@ -537,19 +537,19 @@ PScurrentlinejoin(int* linejoin) } static inline void -PScurrentlinewidth(float* width) +PScurrentlinewidth(CGFloat* width) { DPScurrentlinewidth(DEFCTXT, width); } static inline void -PScurrentmiterlimit(float* limit) +PScurrentmiterlimit(CGFloat* limit) { DPScurrentmiterlimit(DEFCTXT, limit); } static inline void -PScurrentpoint(float* x, float* y) +PScurrentpoint(CGFloat* x, CGFloat* y) { DPScurrentpoint(DEFCTXT, x, y); } @@ -561,19 +561,19 @@ PScurrentstrokeadjust(int* b) } static inline void -PSsetdash(const float* pat, int size, float offset) +PSsetdash(const CGFloat* pat, NSInteger size, CGFloat offset) { DPSsetdash(DEFCTXT, pat, size, offset); } static inline void -PSsetflat(float flatness) +PSsetflat(CGFloat flatness) { DPSsetflat(DEFCTXT, flatness); } static inline void -PSsethalftonephase(float x, float y) +PSsethalftonephase(CGFloat x, CGFloat y) { DPSsethalftonephase(DEFCTXT, x, y); } @@ -591,13 +591,13 @@ PSsetlinejoin(int linejoin) } static inline void -PSsetlinewidth(float width) +PSsetlinewidth(CGFloat width) { DPSsetlinewidth(DEFCTXT, width); } static inline void -PSsetmiterlimit(float limit) +PSsetmiterlimit(CGFloat limit) { DPSsetmiterlimit(DEFCTXT, limit); } @@ -613,7 +613,7 @@ PSsetstrokeadjust(int b) /* Matrix operations */ /* ----------------------------------------------------------------------- */ static inline void -PSconcat(const float* m) +PSconcat(const CGFloat* m) { DPSconcat(DEFCTXT, m); } @@ -625,19 +625,19 @@ PSinitmatrix() } static inline void -PSrotate(float angle) +PSrotate(CGFloat angle) { DPSrotate(DEFCTXT, angle); } static inline void -PSscale(float x, float y) +PSscale(CGFloat x, CGFloat y) { DPSscale(DEFCTXT, x, y); } static inline void -PStranslate(float x, float y) +PStranslate(CGFloat x, CGFloat y) { DPStranslate(DEFCTXT, x, y); } @@ -648,19 +648,19 @@ PStranslate(float x, float y) /* Paint operations */ /* ----------------------------------------------------------------------- */ static inline void -PSarc(float x, float y, float r, float angle1, float angle2) +PSarc(CGFloat x, CGFloat y, CGFloat r, CGFloat angle1, CGFloat angle2) { DPSarc(DEFCTXT, x, y, r, angle1, angle2); } static inline void -PSarcn(float x, float y, float r, float angle1, float angle2) +PSarcn(CGFloat x, CGFloat y, CGFloat r, CGFloat angle1, CGFloat angle2) { DPSarcn(DEFCTXT, x, y, r, angle1, angle2); } static inline void -PSarct(float x1, float y1, float x2, float y2, float r) +PSarct(CGFloat x1, CGFloat y1, CGFloat x2, CGFloat y2, CGFloat r) { DPSarct(DEFCTXT, x1, y1, x2, y2, r); } @@ -678,7 +678,7 @@ PSclosepath() } static inline void -PScurveto(float x1, float y1, float x2, float y2, float x3, float y3) +PScurveto(CGFloat x1, CGFloat y1, CGFloat x2, CGFloat y2, CGFloat x3, CGFloat y3) { DPScurveto(DEFCTXT, x1, y1, x2, y2, x3, y3); } @@ -714,13 +714,13 @@ PSinitclip() } static inline void -PSlineto(float x, float y) +PSlineto(CGFloat x, CGFloat y) { DPSlineto(DEFCTXT, x, y); } static inline void -PSmoveto(float x, float y) +PSmoveto(CGFloat x, CGFloat y) { DPSmoveto(DEFCTXT, x, y); } @@ -732,31 +732,31 @@ PSnewpath() } static inline void -PSpathbbox(float* llx, float* lly, float* urx, float* ury) +PSpathbbox(CGFloat* llx, CGFloat* lly, CGFloat* urx, CGFloat* ury) { DPSpathbbox(DEFCTXT, llx, lly, urx, ury); } static inline void -PSrcurveto(float x1, float y1, float x2, float y2, float x3, float y3) +PSrcurveto(CGFloat x1, CGFloat y1, CGFloat x2, CGFloat y2, CGFloat x3, CGFloat y3) { DPSrcurveto(DEFCTXT, x1, y1, x2, y2, x3, y3); } static inline void -PSrectclip(float x, float y, float w, float h) +PSrectclip(CGFloat x, CGFloat y, CGFloat w, CGFloat h) { DPSrectclip(DEFCTXT, x, y, w, h); } static inline void -PSrectfill(float x, float y, float w, float h) +PSrectfill(CGFloat x, CGFloat y, CGFloat w, CGFloat h) { DPSrectfill(DEFCTXT, x, y, w, h); } static inline void -PSrectstroke(float x, float y, float w, float h) +PSrectstroke(CGFloat x, CGFloat y, CGFloat w, CGFloat h) { DPSrectstroke(DEFCTXT, x, y, w, h); } @@ -768,13 +768,13 @@ PSreversepath() } static inline void -PSrlineto(float x, float y) +PSrlineto(CGFloat x, CGFloat y) { DPSrlineto(DEFCTXT, x, y); } static inline void -PSrmoveto(float x, float y) +PSrmoveto(CGFloat x, CGFloat y) { DPSrmoveto(DEFCTXT, x, y); } @@ -796,19 +796,20 @@ PSshfill(NSDictionary *shaderDictionary) /* Graphics Extensions Ops */ /*-------------------------------------------------------------------------*/ static inline void -PScomposite(float x, float y, float w, float h, int gstateNum, float dx, float dy, int op) +PScomposite(CGFloat x, CGFloat y, CGFloat w, CGFloat h, NSInteger gstateNum, + CGFloat dx, CGFloat dy, NSCompositingOperation op) { DPScomposite(DEFCTXT, x, y, w, h, gstateNum, dx, dy, op); } static inline void -PScompositerect(float x, float y, float w, float h, int op) +PScompositerect(CGFloat x, CGFloat y, CGFloat w, CGFloat h, NSCompositingOperation op) { DPScompositerect(DEFCTXT, x, y, w, h, op); } static inline void -PSdissolve(float x, float y, float w, float h, int gstateNum, float dx, float dy, float delta) +PSdissolve(CGFloat x, CGFloat y, CGFloat w, CGFloat h, NSInteger gstateNum, CGFloat dx, CGFloat dy, CGFloat delta) { DPSdissolve(DEFCTXT, x, y, w, h, gstateNum, dx, dy, delta); } diff --git a/Source/Functions.m b/Source/Functions.m index 04b8db09e..f1d8c81fa 100644 --- a/Source/Functions.m +++ b/Source/Functions.m @@ -303,7 +303,7 @@ void NSCopyBitmapFromGState(int srcGstate, NSRect srcRect, NSRect destRect) void NSCopyBits(NSInteger srcGstate, NSRect srcRect, NSPoint destPoint) { - float x, y, w, h; + CGFloat x, y, w, h; NSGraphicsContext *ctxt = GSCurrentContext(); x = NSMinX(srcRect); @@ -644,7 +644,7 @@ NSRectFillListWithColorsUsingOperation(const NSRect *rects, void NSDottedFrameRect(const NSRect aRect) { - float dot_dash[] = {1.0, 1.0}; + CGFloat dot_dash[] = {1.0, 1.0}; NSGraphicsContext *ctxt = GSCurrentContext(); DPSgsave(ctxt); DPSsetgray(ctxt, NSBlack); @@ -1003,7 +1003,7 @@ NSDrawWindowBackground(NSRect aRect) CGFloat NSLinkFrameThickness(void) { - return 1; + return 1.0; } void diff --git a/Source/NSAffineTransform.m b/Source/NSAffineTransform.m index 2b9b06907..5b55c715d 100644 --- a/Source/NSAffineTransform.m +++ b/Source/NSAffineTransform.m @@ -68,8 +68,9 @@ static const CGFloat pi = 3.1415926535897932384626434; */ - (void) concat { + // FIXME Should use GSConcatCTM: NSAffineTransformStruct ats = [self transformStruct]; - float floatMatrix[6]; + CGFloat floatMatrix[6]; floatMatrix[0] = ats.m11; floatMatrix[1] = ats.m12; diff --git a/Source/NSCachedImageRep.m b/Source/NSCachedImageRep.m index 6f03301c2..16195d837 100644 --- a/Source/NSCachedImageRep.m +++ b/Source/NSCachedImageRep.m @@ -81,9 +81,9 @@ sharing it with other images.

*/ - (id) initWithSize: (NSSize)aSize - pixelsWide: (int)pixelsWide - pixelsHigh: (int)pixelsHigh - depth: (int)aDepth + pixelsWide: (NSInteger)pixelsWide + pixelsHigh: (NSInteger)pixelsHigh + depth: (NSWindowDepth)aDepth separate: (BOOL)separate alpha: (BOOL)alpha { @@ -120,7 +120,7 @@ } - (id) initWithSize: (NSSize)aSize - depth: (int)aDepth + depth: (NSWindowDepth)aDepth separate: (BOOL)separate alpha: (BOOL)alpha { @@ -242,11 +242,11 @@ - (void) nativeDrawInRect: (NSRect)dstRect fromRect: (NSRect)srcRect operation: (NSCompositingOperation)op - fraction: (float)delta + fraction: (CGFloat)delta { NSGraphicsContext *ctxt = GSCurrentContext(); NSWindow *window = [self window]; - int gState = [window gState]; + NSInteger gState = [window gState]; NSAffineTransform *transform, *backup; NSRect winSrcRect; diff --git a/Source/NSGraphicsContext.m b/Source/NSGraphicsContext.m index f630a8281..a5b2fba3a 100644 --- a/Source/NSGraphicsContext.m +++ b/Source/NSGraphicsContext.m @@ -273,7 +273,7 @@ NSGraphicsContext *GSCurrentContext(void) } } -+ (void) setGraphicsState: (int)graphicsState ++ (void) setGraphicsState: (NSInteger)graphicsState { /* FIXME: Need to keep a table of which context goes with a graphicState, or perhaps we could rely on the backend? */ @@ -782,13 +782,13 @@ NSGraphicsContext *GSCurrentContext(void) /* Color operations */ /* ----------------------------------------------------------------------- */ /** Returns the current alpha component (DPS). */ -- (void) DPScurrentalpha: (float *)a +- (void) DPScurrentalpha: (CGFloat *)a { [self subclassResponsibility: _cmd]; } /** Returns the current color according to the CMYK color model (DPS). */ -- (void) DPScurrentcmykcolor: (float*)c : (float*)m : (float*)y : (float*)k +- (void) DPScurrentcmykcolor: (CGFloat*)c : (CGFloat*)m : (CGFloat*)y : (CGFloat*)k { [self subclassResponsibility: _cmd]; } @@ -796,19 +796,19 @@ NSGraphicsContext *GSCurrentContext(void) /** Returns the gray-level equivalent in the current color space. The value may depend on the current color space and may be 0 if the current color space has no notion of a gray value (DPS) */ -- (void) DPScurrentgray: (float*)gray +- (void) DPScurrentgray: (CGFloat*)gray { [self subclassResponsibility: _cmd]; } /** Returns the current color according to the HSB color model (DPS). */ -- (void) DPScurrenthsbcolor: (float*)h : (float*)s : (float*)b +- (void) DPScurrenthsbcolor: (CGFloat*)h : (CGFloat*)s : (CGFloat*)b { [self subclassResponsibility: _cmd]; } /** Returns the current color according to the RGB color model (DPS). */ -- (void) DPScurrentrgbcolor: (float*)r : (float*)g : (float*)b +- (void) DPScurrentrgbcolor: (CGFloat*)r : (CGFloat*)g : (CGFloat*)b { [self subclassResponsibility: _cmd]; } @@ -816,7 +816,7 @@ NSGraphicsContext *GSCurrentContext(void) /** Sets the alpha drawing component. For this and other color setting commands that have no differentiation between fill and stroke colors, both the fill and stroke alpha are set (DPS). */ -- (void) DPSsetalpha: (float)a +- (void) DPSsetalpha: (CGFloat)a { [self subclassResponsibility: _cmd]; } @@ -825,28 +825,28 @@ NSGraphicsContext *GSCurrentContext(void) based on the indicated values. For this and other color setting commands that have no differentiation between fill and stroke colors, both the fill and stroke colors are set (DPS). */ -- (void) DPSsetcmykcolor: (float)c : (float)m : (float)y : (float)k +- (void) DPSsetcmykcolor: (CGFloat)c : (CGFloat)m : (CGFloat)y : (CGFloat)k { [self subclassResponsibility: _cmd]; } /** Sets the current colorspace to Device Gray and the current gray value (DPS). */ -- (void) DPSsetgray: (float)gray +- (void) DPSsetgray: (CGFloat)gray { [self subclassResponsibility: _cmd]; } /** Sets the current colorspace to Device RGB and the current color based on the indicated values (DPS). */ -- (void) DPSsethsbcolor: (float)h : (float)s : (float)b +- (void) DPSsethsbcolor: (CGFloat)h : (CGFloat)s : (CGFloat)b { [self subclassResponsibility: _cmd]; } /** Sets the current colorspace to Device RGB and the current color based on the indicated values (DPS). */ -- (void) DPSsetrgbcolor: (float)r : (float)g : (float)b +- (void) DPSsetrgbcolor: (CGFloat)r : (CGFloat)g : (CGFloat)b { [self subclassResponsibility: _cmd]; } @@ -905,7 +905,7 @@ NSGraphicsContext *GSCurrentContext(void) approach should be more efficient that using -DPSshow: with appropriate -DPSrmoveto:: operations. */ -- (void) DPSashow: (float)x : (float)y : (const char *)s +- (void) DPSashow: (CGFloat)x : (CGFloat)y : (const char *)s { [self subclassResponsibility: _cmd]; } @@ -916,7 +916,8 @@ NSGraphicsContext *GSCurrentContext(void) Using this method should be more efficient that using -DPSshow: with appropriate -DPSrmoveto:: operations. */ -- (void) DPSawidthshow: (float)cx : (float)cy : (int)c : (float)ax : (float)ay : (const char *)s +- (void) DPSawidthshow: (CGFloat)cx : (CGFloat)cy : (int)c + : (CGFloat)ax : (CGFloat)ay : (const char *)s { [self subclassResponsibility: _cmd]; } @@ -948,7 +949,7 @@ NSGraphicsContext *GSCurrentContext(void) Using this method should be more efficient than using -DPSshow: with appropriate -DPSrmoveto:: operations. */ -- (void) DPSwidthshow: (float)x : (float)y : (int)c : (const char *)s +- (void) DPSwidthshow: (CGFloat)x : (CGFloat)y : (int)c : (const char *)s { [self subclassResponsibility: _cmd]; } @@ -960,7 +961,7 @@ NSGraphicsContext *GSCurrentContext(void) should be more efficient than using -DPSshow: with appropriate -DPSrmoveto:: operations. */ -- (void) DPSxshow: (const char *)s : (const float*)numarray : (int)size +- (void) DPSxshow: (const char *)s : (const CGFloat*)numarray : (int)size { [self subclassResponsibility: _cmd]; } @@ -972,7 +973,7 @@ NSGraphicsContext *GSCurrentContext(void) should be more efficient than using -DPSshow: with appropriate -DPSrmoveto:: operations. */ -- (void) DPSxyshow: (const char *)s : (const float*)numarray : (int)size +- (void) DPSxyshow: (const char *)s : (const CGFloat*)numarray : (int)size { [self subclassResponsibility: _cmd]; } @@ -984,7 +985,7 @@ NSGraphicsContext *GSCurrentContext(void) should be more efficient than using -DPSshow: with appropriate -DPSrmoveto:: operations. */ -- (void) DPSyshow: (const char *)s : (const float*)numarray : (int)size +- (void) DPSyshow: (const char *)s : (const CGFloat*)numarray : (int)size { [self subclassResponsibility: _cmd]; } @@ -993,7 +994,7 @@ NSGraphicsContext *GSCurrentContext(void) (glyphs). This spacing is added to the normal spacing for each character. Units are in text-space coordinate system. (Quartz). */ -- (void) GSSetCharacterSpacing: (float)extra +- (void) GSSetCharacterSpacing: (CGFloat)extra { [self subclassResponsibility: _cmd]; } @@ -1006,7 +1007,7 @@ NSGraphicsContext *GSCurrentContext(void) /** Set the font size of the current NSFont used for drawing glyphs. (DPS, Quartz). */ -- (void) GSSetFontSize: (float)size +- (void) GSSetFontSize: (CGFloat)size { [self subclassResponsibility: _cmd]; } @@ -1115,7 +1116,7 @@ NSGraphicsContext *GSCurrentContext(void) /** Makes the gstate indicated by the tag gst the current gstate. Note that the gstate is copied, so that changes to either gstate do not affect the other. (DPS, Quartz). */ -- (void) DPSsetgstate: (int)gst +- (void) DPSsetgstate: (NSInteger)gst { [self subclassResponsibility: _cmd]; } @@ -1123,7 +1124,7 @@ NSGraphicsContext *GSCurrentContext(void) /** Creates a copy of the current gstate and associates it with a tag, which is given in the return value. This tag can later be used in -DPSsetgstate: to set the gstate as being current again. (DPS, Quartz). */ -- (int) GSDefineGState +- (NSInteger) GSDefineGState { [self subclassResponsibility: _cmd]; return 0; @@ -1132,14 +1133,14 @@ NSGraphicsContext *GSCurrentContext(void) /** Disassociates the tag gst with it's gstate and destroys the gstate object. The tag will no longer be valid and should not be used to refer to the gstate again. (DPS, Quartz). */ -- (void) GSUndefineGState: (int)gst +- (void) GSUndefineGState: (NSInteger)gst { [self subclassResponsibility: _cmd]; } /** Replaces the gstate refered to by the tag gst with the current gstate. The former gstate is destroyed. (DPS, Quartz). */ -- (void) GSReplaceGState: (int)gst +- (void) GSReplaceGState: (NSInteger)gst { [self subclassResponsibility: _cmd]; } @@ -1149,7 +1150,7 @@ NSGraphicsContext *GSCurrentContext(void) /* ----------------------------------------------------------------------- */ /** Returns the current flattness parameter, which controls how curved lines are drawn. (DPS, Quartz). */ -- (void) DPScurrentflat: (float*)flatness +- (void) DPScurrentflat: (CGFloat*)flatness { [self subclassResponsibility: _cmd]; } @@ -1167,19 +1168,19 @@ NSGraphicsContext *GSCurrentContext(void) } /** Returns the current line width. (DPS, Quartz). */ -- (void) DPScurrentlinewidth: (float*)width +- (void) DPScurrentlinewidth: (CGFloat*)width { [self subclassResponsibility: _cmd]; } /** Returns the current linecap value. (DPS, Quartz). */ -- (void) DPScurrentmiterlimit: (float*)limit +- (void) DPScurrentmiterlimit: (CGFloat*)limit { [self subclassResponsibility: _cmd]; } /** Returns the current point. (DPS, Quartz). */ -- (void) DPScurrentpoint: (float*)x : (float*)y +- (void) DPScurrentpoint: (CGFloat*)x : (CGFloat*)y { [self subclassResponsibility: _cmd]; } @@ -1192,19 +1193,19 @@ NSGraphicsContext *GSCurrentContext(void) /** Set the pattern for line dashes like the Postscript setdash operator. (DPS, Quartz). */ -- (void) DPSsetdash: (const float*)pat : (int)size : (float)offset +- (void) DPSsetdash: (const CGFloat*)pat : (NSInteger)size : (CGFloat)offset { [self subclassResponsibility: _cmd]; } /** Sets the current flattness parameter, which controls how curved lines are drawn. (DPS, Quartz). */ -- (void) DPSsetflat: (float)flatness +- (void) DPSsetflat: (CGFloat)flatness { [self subclassResponsibility: _cmd]; } -- (void) DPSsethalftonephase: (float)x : (float)y +- (void) DPSsethalftonephase: (CGFloat)x : (CGFloat)y { [self subclassResponsibility: _cmd]; } @@ -1222,13 +1223,13 @@ NSGraphicsContext *GSCurrentContext(void) } /** Set the current line width. (DPS, Quartz). */ -- (void) DPSsetlinewidth: (float)width +- (void) DPSsetlinewidth: (CGFloat)width { [self subclassResponsibility: _cmd]; } /** Set the current meter limit value. (DPS, Quartz). */ -- (void) DPSsetmiterlimit: (float)limit +- (void) DPSsetmiterlimit: (CGFloat)limit { [self subclassResponsibility: _cmd]; } @@ -1243,7 +1244,7 @@ NSGraphicsContext *GSCurrentContext(void) /* ----------------------------------------------------------------------- */ /** Concatenates the coordinate transform represented by the matrix m with the current coordinate transform. (DPS). */ -- (void) DPSconcat: (const float*)m +- (void) DPSconcat: (const CGFloat*)m { [self subclassResponsibility: _cmd]; } @@ -1256,19 +1257,19 @@ NSGraphicsContext *GSCurrentContext(void) } /** Rotate the coordinate system. (DPS). */ -- (void) DPSrotate: (float)angle +- (void) DPSrotate: (CGFloat)angle { [self subclassResponsibility: _cmd]; } /** Scale the coordinate system. (DPS). */ -- (void) DPSscale: (float)x : (float)y +- (void) DPSscale: (CGFloat)x : (CGFloat)y { [self subclassResponsibility: _cmd]; } /** Translate the coordinate system. (DPS). */ -- (void) DPStranslate: (float)x : (float)y +- (void) DPStranslate: (CGFloat)x : (CGFloat)y { [self subclassResponsibility: _cmd]; } @@ -1298,19 +1299,19 @@ NSGraphicsContext *GSCurrentContext(void) /* ----------------------------------------------------------------------- */ /* Paint operations */ /* ----------------------------------------------------------------------- */ -- (void) DPSarc: (float)x : (float)y : (float)r : (float)angle1 - : (float)angle2 +- (void) DPSarc: (CGFloat)x : (CGFloat)y : (CGFloat)r : (CGFloat)angle1 + : (CGFloat)angle2 { [self subclassResponsibility: _cmd]; } -- (void) DPSarcn: (float)x : (float)y : (float)r : (float)angle1 - : (float)angle2 +- (void) DPSarcn: (CGFloat)x : (CGFloat)y : (CGFloat)r : (CGFloat)angle1 + : (CGFloat)angle2 { [self subclassResponsibility: _cmd]; } -- (void) DPSarct: (float)x1 : (float)y1 : (float)x2 : (float)y2 : (float)r +- (void) DPSarct: (CGFloat)x1 : (CGFloat)y1 : (CGFloat)x2 : (CGFloat)y2 : (CGFloat)r { [self subclassResponsibility: _cmd]; } @@ -1326,8 +1327,8 @@ NSGraphicsContext *GSCurrentContext(void) [self subclassResponsibility: _cmd]; } -- (void) DPScurveto: (float)x1 : (float)y1 : (float)x2 : (float)y2 - : (float)x3 : (float)y3 +- (void) DPScurveto: (CGFloat)x1 : (CGFloat)y1 : (CGFloat)x2 : (CGFloat)y2 + : (CGFloat)x3 : (CGFloat)y3 { [self subclassResponsibility: _cmd]; } @@ -1358,12 +1359,12 @@ NSGraphicsContext *GSCurrentContext(void) [self subclassResponsibility: _cmd]; } -- (void) DPSlineto: (float)x : (float)y +- (void) DPSlineto: (CGFloat)x : (CGFloat)y { [self subclassResponsibility: _cmd]; } -- (void) DPSmoveto: (float)x : (float)y +- (void) DPSmoveto: (CGFloat)x : (CGFloat)y { [self subclassResponsibility: _cmd]; } @@ -1373,28 +1374,28 @@ NSGraphicsContext *GSCurrentContext(void) [self subclassResponsibility: _cmd]; } -- (void) DPSpathbbox: (float*)llx : (float*)lly : (float*)urx : (float*)ury +- (void) DPSpathbbox: (CGFloat*)llx : (CGFloat*)lly : (CGFloat*)urx : (CGFloat*)ury { [self subclassResponsibility: _cmd]; } -- (void) DPSrcurveto: (float)x1 : (float)y1 : (float)x2 : (float)y2 - : (float)x3 : (float)y3 +- (void) DPSrcurveto: (CGFloat)x1 : (CGFloat)y1 : (CGFloat)x2 : (CGFloat)y2 + : (CGFloat)x3 : (CGFloat)y3 { [self subclassResponsibility: _cmd]; } -- (void) DPSrectclip: (float)x : (float)y : (float)w : (float)h +- (void) DPSrectclip: (CGFloat)x : (CGFloat)y : (CGFloat)w : (CGFloat)h { [self subclassResponsibility: _cmd]; } -- (void) DPSrectfill: (float)x : (float)y : (float)w : (float)h +- (void) DPSrectfill: (CGFloat)x : (CGFloat)y : (CGFloat)w : (CGFloat)h { [self subclassResponsibility: _cmd]; } -- (void) DPSrectstroke: (float)x : (float)y : (float)w : (float)h +- (void) DPSrectstroke: (CGFloat)x : (CGFloat)y : (CGFloat)w : (CGFloat)h { [self subclassResponsibility: _cmd]; } @@ -1404,12 +1405,12 @@ NSGraphicsContext *GSCurrentContext(void) [self subclassResponsibility: _cmd]; } -- (void) DPSrlineto: (float)x : (float)y +- (void) DPSrlineto: (CGFloat)x : (CGFloat)y { [self subclassResponsibility: _cmd]; } -- (void) DPSrmoveto: (float)x : (float)y +- (void) DPSrmoveto: (CGFloat)x : (CGFloat)y { [self subclassResponsibility: _cmd]; } @@ -1481,19 +1482,19 @@ NSGraphicsContext *GSCurrentContext(void) /*-------------------------------------------------------------------------*/ /* Graphics Extension Ops */ /*-------------------------------------------------------------------------*/ -- (void) DPScomposite: (float)x : (float)y : (float)w : (float)h - : (int)gstateNum : (float)dx : (float)dy : (int)op +- (void) DPScomposite: (CGFloat)x : (CGFloat)y : (CGFloat)w : (CGFloat)h + : (NSInteger)gstateNum : (CGFloat)dx : (CGFloat)dy : (NSCompositingOperation)op { [self subclassResponsibility: _cmd]; } -- (void) DPScompositerect: (float)x : (float)y : (float)w : (float)h : (int)op +- (void) DPScompositerect: (CGFloat)x : (CGFloat)y : (CGFloat)w : (CGFloat)h : (NSCompositingOperation)op { [self subclassResponsibility: _cmd]; } -- (void) DPSdissolve: (float)x : (float)y : (float)w : (float)h - : (int)gstateNum : (float)dx : (float)dy : (float)delta +- (void) DPSdissolve: (CGFloat)x : (CGFloat)y : (CGFloat)w : (CGFloat)h + : (NSInteger)gstateNum : (CGFloat)dx : (CGFloat)dy : (CGFloat)delta { [self subclassResponsibility: _cmd]; } @@ -1502,11 +1503,11 @@ NSGraphicsContext *GSCurrentContext(void) As currently not all backends support mixed composite and dissolve operations, this method is here to dispatch to the best suited one implemented */ -- (void) GScomposite: (int)gstateNum +- (void) GScomposite: (NSInteger)gstateNum toPoint: (NSPoint)aPoint fromRect: (NSRect)srcRect operation: (NSCompositingOperation)op - fraction: (float)delta + fraction: (CGFloat)delta { [self subclassResponsibility: _cmd]; } @@ -1540,11 +1541,11 @@ effect on the content. Note: For the GScomposite operator, the scaling and rotation affects the destination point but not the content. */ -- (void) GSdraw: (int)gstateNum +- (void) GSdraw: (NSInteger)gstateNum toPoint: (NSPoint)aPoint fromRect: (NSRect)srcRect operation: (NSCompositingOperation)op - fraction: (float)delta + fraction: (CGFloat)delta { [self subclassResponsibility: _cmd]; } @@ -1590,9 +1591,9 @@ destination point but not the content. */ anywhere except in the AppKit itself. It will be replaced by the more flexible GSDrawImage method sometime in the future. (Quartz). */ -- (void) NSDrawBitmap: (NSRect) rect : (int) pixelsWide : (int) pixelsHigh - : (int) bitsPerSample : (int) samplesPerPixel - : (int) bitsPerPixel : (int) bytesPerRow : (BOOL) isPlanar +- (void) NSDrawBitmap: (NSRect) rect : (NSInteger) pixelsWide : (NSInteger) pixelsHigh + : (NSInteger) bitsPerSample : (NSInteger) samplesPerPixel + : (NSInteger) bitsPerPixel : (NSInteger) bytesPerRow : (BOOL) isPlanar : (BOOL) hasAlpha : (NSString *) colorSpaceName : (const unsigned char *const [5]) data { diff --git a/Source/NSImageRep.m b/Source/NSImageRep.m index 3661aab0f..3ce7828b9 100644 --- a/Source/NSImageRep.m +++ b/Source/NSImageRep.m @@ -433,7 +433,7 @@ implement, so we can't do that. */ } // Specifying Information about the Representation -- (int) bitsPerSample +- (NSInteger) bitsPerSample { return _bitsPerSample; } @@ -453,12 +453,12 @@ implement, so we can't do that. */ return _isOpaque; } -- (int) pixelsWide +- (NSInteger) pixelsWide { return _pixelsWide; } -- (int) pixelsHigh +- (NSInteger) pixelsHigh { return _pixelsHigh; } @@ -468,7 +468,7 @@ implement, so we can't do that. */ _hasAlpha = flag; } -- (void) setBitsPerSample: (int)anInt +- (void) setBitsPerSample: (NSInteger)anInt { _bitsPerSample = anInt; } @@ -483,12 +483,12 @@ implement, so we can't do that. */ _isOpaque = flag; } -- (void) setPixelsWide: (int)anInt +- (void) setPixelsWide: (NSInteger)anInt { _pixelsWide = anInt; } -- (void) setPixelsHigh: (int)anInt +- (void) setPixelsHigh: (NSInteger)anInt { _pixelsHigh = anInt; } @@ -552,7 +552,7 @@ behavior precisely matches Cocoa. */ - (void) nativeDrawInRect: (NSRect)dstRect fromRect: (NSRect)srcRect operation: (NSCompositingOperation)op - fraction: (float)delta + fraction: (CGFloat)delta { NSGraphicsContext *ctxt = GSCurrentContext(); /* An intermediate image used to scale the image to be drawn as needed */ @@ -646,7 +646,7 @@ Fallback for backends other than Cairo. */ - (void) guiDrawInRect: (NSRect)dstRect fromRect: (NSRect)srcRect operation: (NSCompositingOperation)op - fraction: (float)delta + fraction: (CGFloat)delta { NSGraphicsContext *ctxt = GSCurrentContext(); NSAffineTransform *transform; @@ -684,8 +684,8 @@ Fallback for backends other than Cairo. */ NSCachedImageRep *cache; NSAffineTransformStruct ts; NSPoint p; - double x0, y0, x1, y1, w, h; - int gState; + CGFloat x0, y0, x1, y1, w, h; + NSInteger gState; NSGraphicsContext *ctxt1; /* Figure out how big we need to make the window that'll hold the @@ -782,7 +782,7 @@ Fallback for backends other than Cairo. */ - (BOOL) drawInRect: (NSRect)dstRect fromRect: (NSRect)srcRect operation: (NSCompositingOperation)op - fraction: (float)delta + fraction: (CGFloat)delta respectFlipped: (BOOL)respectFlipped hints: (NSDictionary*)hints {