callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Start using CGFloat

Browse Source 
Fixes a bunch of compiler warnings.  Since CGFloat does not exist on
Tiger and earlier, we have added a typedef likewise as was done for
NSInteger.
This commit is contained in:
Kristian Rietveld
2009-12-28 09:01:01 +01:00
parent f3a5bf48d4
commit c8fef502e2
5 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gdk/quartz/gdkcolor-quartz.c
View File

@ -199,10 +199,10 @@ gdk_colormap_get_screen (GdkColormap *cmap)
void void
_gdk_quartz_colormap_get_rgba_from_pixel (GdkColormap *colormap, _gdk_quartz_colormap_get_rgba_from_pixel (GdkColormap *colormap,
guint32 pixel, guint32 pixel,
float *red, CGFloat *red,
float *green, CGFloat *green,
float *blue, CGFloat *blue,
float *alpha) CGFloat *alpha)
{ {
*red = (pixel >> 16 & 0xff) / 255.0; *red = (pixel >> 16 & 0xff) / 255.0;
*green = (pixel >> 8 & 0xff) / 255.0; *green = (pixel >> 8 & 0xff) / 255.0;

20
gdk/quartz/gdkgc-quartz.c
View File

@ -118,10 +118,10 @@ gdk_quartz_gc_set_dashes (GdkGC *gc,
private->dash_count = n; private->dash_count = n;
g_free (private->dash_lengths); g_free (private->dash_lengths);
private->dash_lengths = g_new (gfloat, n); private->dash_lengths = g_new (CGFloat, n);
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
private->dash_lengths[i] = (gfloat) dash_list[i]; private->dash_lengths[i] = (CGFloat) dash_list[i];
private->dash_phase = (gfloat) dash_offset; private->dash_phase = (CGFloat) dash_offset;
} }
static void static void
@ -269,7 +269,7 @@ _gdk_windowing_gc_copy (GdkGC *dst_gc,
g_free (dst_quartz_gc->dash_lengths); g_free (dst_quartz_gc->dash_lengths);
dst_quartz_gc->dash_lengths = g_memdup (src_quartz_gc->dash_lengths, dst_quartz_gc->dash_lengths = g_memdup (src_quartz_gc->dash_lengths,
sizeof (float) * src_quartz_gc->dash_count); sizeof (CGFloat) * src_quartz_gc->dash_count);
dst_quartz_gc->dash_count = src_quartz_gc->dash_count; dst_quartz_gc->dash_count = src_quartz_gc->dash_count;
dst_quartz_gc->dash_phase = src_quartz_gc->dash_phase; dst_quartz_gc->dash_phase = src_quartz_gc->dash_phase;
} }
@ -305,7 +305,7 @@ gdk_quartz_draw_stippled_pattern (void *info,
GdkGC *gc = GDK_GC (info); GdkGC *gc = GDK_GC (info);
CGImageRef pattern_image; CGImageRef pattern_image;
CGRect rect; CGRect rect;
gfloat r, g, b, a; CGFloat r, g, b, a;
pattern_image = GDK_PIXMAP_IMPL_QUARTZ (GDK_PIXMAP_OBJECT (_gdk_gc_get_stipple (gc))->impl)->image; pattern_image = GDK_PIXMAP_IMPL_QUARTZ (GDK_PIXMAP_OBJECT (_gdk_gc_get_stipple (gc))->impl)->image;
rect = CGRectMake (0, 0, rect = CGRectMake (0, 0,
@ -327,7 +327,7 @@ gdk_quartz_draw_opaque_stippled_pattern (void *info,
GdkGC *gc = GDK_GC (info); GdkGC *gc = GDK_GC (info);
CGImageRef pattern_image; CGImageRef pattern_image;
CGRect rect; CGRect rect;
gfloat r, g, b, a; CGFloat r, g, b, a;
pattern_image = GDK_PIXMAP_IMPL_QUARTZ (GDK_PIXMAP_OBJECT (_gdk_gc_get_stipple (gc))->impl)->image; pattern_image = GDK_PIXMAP_IMPL_QUARTZ (GDK_PIXMAP_OBJECT (_gdk_gc_get_stipple (gc))->impl)->image;
rect = CGRectMake (0, 0, rect = CGRectMake (0, 0,
@ -453,7 +453,7 @@ _gdk_quartz_gc_update_cg_context (GdkGC *gc,
{ {
CGLineCap line_cap = kCGLineCapButt; CGLineCap line_cap = kCGLineCapButt;
CGLineJoin line_join = kCGLineJoinMiter; CGLineJoin line_join = kCGLineJoinMiter;
gfloat r, g, b, a; CGFloat r, g, b, a;
_gdk_quartz_colormap_get_rgba_from_pixel (gc->colormap, _gdk_quartz_colormap_get_rgba_from_pixel (gc->colormap,
fg_pixel, fg_pixel,
@ -515,9 +515,9 @@ _gdk_quartz_gc_update_cg_context (GdkGC *gc,
GdkFill fill = _gdk_gc_get_fill (gc); GdkFill fill = _gdk_gc_get_fill (gc);
CGColorSpaceRef baseSpace; CGColorSpaceRef baseSpace;
CGColorSpaceRef patternSpace; CGColorSpaceRef patternSpace;
gfloat alpha = 1.0; CGFloat alpha = 1.0;
gfloat colors[4] = { 0.0, 0.0, 0.0, 0.0 }; CGFloat colors[4] = { 0.0, 0.0, 0.0, 0.0 };
gfloat r, g, b, a; CGFloat r, g, b, a;
if (fill == GDK_SOLID) if (fill == GDK_SOLID)
{ {

12
gdk/quartz/gdkprivate-quartz.h
View File

@ -66,9 +66,9 @@ struct _GdkGCQuartz
GdkCapStyle cap_style; GdkCapStyle cap_style;
GdkJoinStyle join_style; GdkJoinStyle join_style;
gfloat *dash_lengths; CGFloat *dash_lengths;
gint dash_count; gint dash_count;
gfloat dash_phase; CGFloat dash_phase;
CGPatternRef ts_pattern; CGPatternRef ts_pattern;
@ -131,10 +131,10 @@ void _gdk_quartz_gc_update_cg_context (GdkGC *gc,
/* Colormap */ /* Colormap */
void _gdk_quartz_colormap_get_rgba_from_pixel (GdkColormap *colormap, void _gdk_quartz_colormap_get_rgba_from_pixel (GdkColormap *colormap,
guint32 pixel, guint32 pixel,
gfloat *red, CGFloat *red,
gfloat *green, CGFloat *green,
gfloat *blue, CGFloat *blue,
gfloat *alpha); CGFloat *alpha);
/* Window */ /* Window */
gboolean _gdk_quartz_window_is_ancestor (GdkWindow *ancestor, gboolean _gdk_quartz_window_is_ancestor (GdkWindow *ancestor,

2
gdk/quartz/gdkwindow-quartz.c
View File

@ -255,7 +255,7 @@ gdk_window_impl_quartz_begin_paint_region (GdkPaintable *paintable,
if (bg_pixmap == NULL) if (bg_pixmap == NULL)
{ {
CGContextRef cg_context; CGContextRef cg_context;
gfloat r, g, b, a; CGFloat r, g, b, a;
gint i; gint i;
cg_context = gdk_quartz_drawable_get_context (GDK_DRAWABLE (impl), FALSE); cg_context = gdk_quartz_drawable_get_context (GDK_DRAWABLE (impl), FALSE);

2
gdk/quartz/gdkwindow-quartz.h
View File

@ -32,6 +32,8 @@
#ifndef NSINTEGER_DEFINED #ifndef NSINTEGER_DEFINED
typedef int NSInteger; typedef int NSInteger;
typedef unsigned int NSUInteger; typedef unsigned int NSUInteger;
typedef float CGFloat;
#endif #endif
G_BEGIN_DECLS G_BEGIN_DECLS