|
722
|
1 |
--- gegl/buffer/gegl-provider.c.org 2007-12-13 17:51:26.520649000 +0800
|
|
|
2 |
+++ gegl/buffer/gegl-provider.c 2007-12-13 17:51:46.914633000 +0800
|
|
|
3 |
@@ -27,7 +27,7 @@
|
|
|
4 |
gint y,
|
|
|
5 |
gint z)
|
|
|
6 |
{
|
|
|
7 |
- g_warning ("implementationless %s called", __FUNCTION__);
|
|
|
8 |
+ g_warning ("implementationless %s called", G_GNUC_FUNCTION);
|
|
|
9 |
return NULL;
|
|
|
10 |
}
|
|
|
11 |
|
|
|
12 |
--- gegl/graph/gegl-node.c.org 2007-12-13 17:52:51.951240000 +0800
|
|
|
13 |
+++ gegl/graph/gegl-node.c 2007-12-13 17:53:22.372993000 +0800
|
|
|
14 |
@@ -1596,7 +1596,7 @@
|
|
|
15 |
|
|
|
16 |
if (!node)
|
|
|
17 |
{
|
|
|
18 |
- g_warning ("%s node==NULL", __FUNCTION__);
|
|
|
19 |
+ g_warning ("%s node==NULL", G_GNUC_FUNCTION);
|
|
|
20 |
return 0;
|
|
|
21 |
}
|
|
|
22 |
|
|
|
23 |
@@ -1604,7 +1604,7 @@
|
|
|
24 |
|
|
|
25 |
if (!pad)
|
|
|
26 |
{
|
|
|
27 |
- g_warning ("%s: no such pad %s for %s", __FUNCTION__, output_pad, gegl_node_get_debug_name (node));
|
|
|
28 |
+ g_warning ("%s: no such pad %s for %s", G_GNUC_FUNCTION, output_pad, gegl_node_get_debug_name (node));
|
|
|
29 |
return 0;
|
|
|
30 |
}
|
|
|
31 |
|
|
|
32 |
--- operations/Makefile-operations.am.org 2007-12-13 18:02:23.244010000 +0800
|
|
|
33 |
+++ operations/Makefile-operations.am 2007-12-13 18:02:37.110018000 +0800
|
|
|
34 |
@@ -14,7 +14,7 @@
|
|
|
35 |
|
|
|
36 |
CFLAGS += @DEP_CFLAGS@ @BABL_CFLAGS@ @CPPFLAGS@ \
|
|
|
37 |
-I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/gegl -I$(top_srcdir)/gegl/buffer -I. -fPIC
|
|
|
38 |
-LDFLAGS += -shared $(no_undefined)
|
|
|
39 |
+LDFLAGS += -G $(no_undefined)
|
|
|
40 |
|
|
|
41 |
LDADD = @DEP_LIBS@ @BABL_LIBS@ $(libgegldlla)
|
|
|
42 |
|
|
|
43 |
--- ./gegl/gegl-utils.h.org 2007-12-13 18:13:05.399141000 +0800
|
|
|
44 |
+++ ./gegl/gegl-utils.h 2007-12-13 18:21:34.055958000 +0800
|
|
|
45 |
@@ -73,8 +73,8 @@
|
|
|
46 |
|
|
|
47 |
#define INT_MULT(a,b,t) ((t) = (a) * (b) + 0x80, ((((t) >> 8) + (t)) >> 8))
|
|
|
48 |
|
|
|
49 |
-inline gint _gegl_float_epsilon_zero (float value);
|
|
|
50 |
-inline gint _gegl_float_epsilon_equal (float v1,
|
|
|
51 |
+gint _gegl_float_epsilon_zero (float value);
|
|
|
52 |
+gint _gegl_float_epsilon_equal (float v1,
|
|
|
53 |
float v2);
|
|
|
54 |
|
|
|
55 |
|
|
|
56 |
--- ./gegl/gegl-utils.c.org 2007-12-13 18:13:13.871133000 +0800
|
|
|
57 |
+++ ./gegl/gegl-utils.c 2007-12-13 18:21:23.184055000 +0800
|
|
|
58 |
@@ -46,13 +46,13 @@
|
|
|
59 |
va_list args);
|
|
|
60 |
|
|
|
61 |
|
|
|
62 |
-inline gint
|
|
|
63 |
+gint
|
|
|
64 |
_gegl_float_epsilon_zero (float value)
|
|
|
65 |
{
|
|
|
66 |
return value > -GEGL_FLOAT_EPSILON && value < GEGL_FLOAT_EPSILON;
|
|
|
67 |
}
|
|
|
68 |
|
|
|
69 |
-inline gint
|
|
|
70 |
+gint
|
|
|
71 |
_gegl_float_epsilon_equal (float v1, float v2)
|
|
|
72 |
{
|
|
|
73 |
register float diff = v1 - v2;
|
|
|
74 |
--- ./bin/editor.c.org 2007-12-13 18:56:40.556212000 +0800
|
|
|
75 |
+++ ./bin/editor.c 2007-12-13 18:57:37.297014000 +0800
|
|
|
76 |
@@ -35,6 +35,10 @@
|
|
|
77 |
|
|
|
78 |
#define KEY_ZOOM_FACTOR 2.0
|
|
|
79 |
|
|
|
80 |
+GtkWidget * StockIcon (const gchar *id, GtkIconSize size, GtkWidget *widget)
|
|
|
81 |
+{
|
|
|
82 |
+ return gtk_image_new_from_stock (id, size);
|
|
|
83 |
+}
|
|
|
84 |
|
|
|
85 |
static gchar *blank_composition =
|
|
|
86 |
"<gegl>"
|
|
|
87 |
--- ./docs/Makefile.am.org 2007-12-13 18:59:16.841023000 +0800
|
|
|
88 |
+++ ./docs/Makefile.am 2007-12-13 18:59:27.515387000 +0800
|
|
|
89 |
@@ -7,7 +7,6 @@
|
|
|
90 |
#
|
|
|
91 |
#
|
|
|
92 |
HTML_FILES = index-static.html \
|
|
|
93 |
- index.html \
|
|
|
94 |
operations.html \
|
|
|
95 |
class-hierarchy.html \
|
|
|
96 |
gegl.h.html
|
|
|
97 |
--- docs/Makefile.am.org 2007-12-13 19:14:32.526943000 +0800
|
|
|
98 |
+++ docs/Makefile.am 2007-12-13 19:14:44.209468000 +0800
|
|
|
99 |
@@ -83,7 +83,7 @@
|
|
|
100 |
install-exec-local: all-local
|
|
|
101 |
$(INSTALL) -d $(help_dir)
|
|
|
102 |
$(INSTALL) $(srcdir)/api.html $(srcdir)/gegl.devhelp $(help_dir)
|
|
|
103 |
- $(INSTALL) -T $(srcdir)/devhelp.css $(help_dir)/gegl.css
|
|
|
104 |
+ $(INSTALL) $(srcdir)/devhelp.css $(help_dir)/gegl.css
|
|
|
105 |
|
|
|
106 |
uninstall-local:
|
|
|
107 |
rm -f $(help_dir)/api.html $(help_dir)/gegl.devhelp
|