[sc-dev] SF.net SVN: supercollider:[9638] trunk/Source/app

[joshpar@xxxxxxxxxxxxxxxxxxxxx]

Revision: 9638
          http://supercollider.svn.sourceforge.net/supercollider/?rev=9638&view=rev
Author:   joshpar
Date:     2009-12-28 14:57:11 +0000 (Mon, 28 Dec 2009)

Log Message:
-----------
fixes for 10.4 compat

Modified Paths:
--------------
    trunk/Source/app/GUIPrimitives.M
    trunk/Source/app/SCGraphView.M

Modified: trunk/Source/app/GUIPrimitives.M
===================================================================
--- trunk/Source/app/GUIPrimitives.M	2009-12-27 20:37:31 UTC (rev 9637)
+++ trunk/Source/app/GUIPrimitives.M	2009-12-28 14:57:11 UTC (rev 9638)
@@ -216,7 +216,7 @@
 	if(!view) return errNone;
 	NSColor * color = [view backgroundColor];
 	if(!color) return errNone;
-	CGFloat red, green, blue, alpha;
+	float red, green, blue, alpha;
 	[color getRed:&red green:&green blue:&blue alpha:&alpha];
 	PyrSlot *slots = slotRawObject(b)->slots;
 	SetFloat(slots+0, red);
@@ -314,7 +314,7 @@
 	if(!view) return errNone;
 	NSColor * color = [[[view selectedTextAttributes] objectForKey: NSBackgroundColorAttributeName] colorUsingColorSpaceName: NSCalibratedRGBColorSpace];
 	if(!color) return errNone;
-	CGFloat red, green, blue, alpha;
+	float red, green, blue, alpha;
 	[color getRed:&red green:&green blue:&blue alpha:&alpha];
 	PyrSlot *slots = slotRawObject(b)->slots;
 	SetFloat(slots+0, red);
@@ -3280,7 +3280,7 @@
 
 static GradientInfo gGradientInfo;
 
-static void					GradientCalcLinear(void *info, const CGFloat *in, float *out)
+static void					GradientCalcLinear(void *info, const float *in, float *out)
 {
     size_t k;
 	/*

Modified: trunk/Source/app/SCGraphView.M
===================================================================
--- trunk/Source/app/SCGraphView.M	2009-12-27 20:37:31 UTC (rev 9637)
+++ trunk/Source/app/SCGraphView.M	2009-12-28 14:57:11 UTC (rev 9638)
@@ -28,6 +28,14 @@
 #include "GC.h"
 #include <Carbon/Carbon.h>
 
+#if __LP64__
+typedef long NSInteger;
+typedef unsigned long NSUInteger;
+#else
+typedef int NSInteger;
+typedef unsigned int NSUInteger;
+#endif
+
 extern PyrSymbol *s_draw;
 extern PyrSymbol *s_scview;
 extern PyrSymbol *s_closed;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

_______________________________________________
sc-dev mailing list

info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: https://listarc.bham.ac.uk/marchives/sc-dev/
search: https://listarc.bham.ac.uk/lists/sc-dev/search/