|
12856
|
1 |
--- gimp-hdrtools-0.1/hdrtools.c.orig 2008-07-18 13:21:24.412734000 +0800
|
|
|
2 |
+++ gimp-hdrtools-0.1/hdrtools.c 2008-07-18 13:33:25.517065000 +0800
|
|
|
3 |
@@ -1228,19 +1228,19 @@
|
|
|
4 |
g_object_set_data(G_OBJECT(gamma_spin), "preview", preview);
|
|
|
5 |
|
|
|
6 |
|
|
|
7 |
- gtk_signal_connect(GTK_OBJECT(dlg), "response",
|
|
|
8 |
- GTK_SIGNAL_FUNC(dialog_response), 0);
|
|
|
9 |
- gtk_signal_connect(GTK_OBJECT(dlg), "destroy",
|
|
|
10 |
- GTK_SIGNAL_FUNC(gtk_main_quit), 0);
|
|
|
11 |
- gtk_signal_connect(GTK_OBJECT(preview), "invalidated",
|
|
|
12 |
- GTK_SIGNAL_FUNC(tonemap_image),
|
|
|
13 |
- drawable);
|
|
|
14 |
- gtk_signal_connect(GTK_OBJECT(exposure_spin), "value_changed",
|
|
|
15 |
- GTK_SIGNAL_FUNC(on_spin_changed),
|
|
|
16 |
- &g_tonemap_vals.exposure);
|
|
|
17 |
- gtk_signal_connect(GTK_OBJECT(gamma_spin), "value_changed",
|
|
|
18 |
- GTK_SIGNAL_FUNC(on_spin_changed),
|
|
|
19 |
- &g_tonemap_vals.gamma);
|
|
|
20 |
+ g_signal_connect(dlg, "response",
|
|
|
21 |
+ G_CALLBACK(dialog_response), 0);
|
|
|
22 |
+ g_signal_connect(dlg, "destroy",
|
|
|
23 |
+ G_CALLBACK(gtk_main_quit), 0);
|
|
|
24 |
+ g_signal_connect(preview, "invalidated",
|
|
|
25 |
+ G_CALLBACK(tonemap_image),
|
|
|
26 |
+ drawable);
|
|
|
27 |
+ g_signal_connect(exposure_spin, "value_changed",
|
|
|
28 |
+ G_CALLBACK(on_spin_changed),
|
|
|
29 |
+ &g_tonemap_vals.exposure);
|
|
|
30 |
+ g_signal_connect(gamma_spin, "value_changed",
|
|
|
31 |
+ G_CALLBACK(on_spin_changed),
|
|
|
32 |
+ &g_tonemap_vals.gamma);
|
|
|
33 |
|
|
|
34 |
gtk_widget_show(dlg);
|
|
|
35 |
|
|
|
36 |
@@ -1291,14 +1291,14 @@
|
|
|
37 |
slider, 1, 0);
|
|
|
38 |
g_object_set_data(G_OBJECT(slider), "preview", preview);
|
|
|
39 |
|
|
|
40 |
- gtk_signal_connect(GTK_OBJECT(dlg), "response",
|
|
|
41 |
- GTK_SIGNAL_FUNC(dialog_response), 0);
|
|
|
42 |
- gtk_signal_connect(GTK_OBJECT(dlg), "destroy",
|
|
|
43 |
- GTK_SIGNAL_FUNC(gtk_main_quit), 0);
|
|
|
44 |
- gtk_signal_connect(GTK_OBJECT(preview), "invalidated",
|
|
|
45 |
- GTK_SIGNAL_FUNC(convert_rgbe_to_rgbdiv8), drawable);
|
|
|
46 |
- gtk_signal_connect(GTK_OBJECT(slider), "value_changed",
|
|
|
47 |
- GTK_SIGNAL_FUNC(on_slider_changed),
|
|
|
48 |
+ g_signal_connect(dlg, "response",
|
|
|
49 |
+ G_CALLBACK(dialog_response), 0);
|
|
|
50 |
+ g_signal_connect(dlg, "destroy",
|
|
|
51 |
+ G_CALLBACK(gtk_main_quit), 0);
|
|
|
52 |
+ g_signal_connect(preview, "invalidated",
|
|
|
53 |
+ G_CALLBACK(convert_rgbe_to_rgbdiv8), drawable);
|
|
|
54 |
+ g_signal_connect(slider, "value_changed",
|
|
|
55 |
+ G_CALLBACK(on_slider_changed),
|
|
|
56 |
&g_rgbd8_vals.range);
|
|
|
57 |
|
|
|
58 |
gtk_widget_show(dlg);
|
|
|
59 |
@@ -1389,22 +1389,22 @@
|
|
|
60 |
g_object_set_data(G_OBJECT(uflchk), "exposure_spin", exposure_spin);
|
|
|
61 |
g_object_set_data(G_OBJECT(uflchk), "gamma_spin", gamma_spin);
|
|
|
62 |
|
|
|
63 |
- gtk_signal_connect(GTK_OBJECT(dlg), "response",
|
|
|
64 |
- GTK_SIGNAL_FUNC(dialog_response), 0);
|
|
|
65 |
- gtk_signal_connect(GTK_OBJECT(dlg), "destroy",
|
|
|
66 |
- GTK_SIGNAL_FUNC(gtk_main_quit), 0);
|
|
|
67 |
- gtk_signal_connect(GTK_OBJECT(tmchk), "clicked",
|
|
|
68 |
- GTK_SIGNAL_FUNC(on_checkbox_clicked),
|
|
|
69 |
- &g_tonemap_vals.tonemap);
|
|
|
70 |
- gtk_signal_connect(GTK_OBJECT(uflchk), "clicked",
|
|
|
71 |
- GTK_SIGNAL_FUNC(on_file_levels_checked),
|
|
|
72 |
- &g_tonemap_vals.usefilelevels);
|
|
|
73 |
- gtk_signal_connect(GTK_OBJECT(exposure_spin), "value_changed",
|
|
|
74 |
- GTK_SIGNAL_FUNC(on_spin_changed),
|
|
|
75 |
- &g_tonemap_vals.exposure);
|
|
|
76 |
- gtk_signal_connect(GTK_OBJECT(gamma_spin), "value_changed",
|
|
|
77 |
- GTK_SIGNAL_FUNC(on_spin_changed),
|
|
|
78 |
- &g_tonemap_vals.gamma);
|
|
|
79 |
+ g_signal_connect(dlg, "response",
|
|
|
80 |
+ G_CALLBACK(dialog_response), 0);
|
|
|
81 |
+ g_signal_connect(dlg, "destroy",
|
|
|
82 |
+ G_CALLBACK(gtk_main_quit), 0);
|
|
|
83 |
+ g_signal_connect(tmchk, "clicked",
|
|
|
84 |
+ G_CALLBACK(on_checkbox_clicked),
|
|
|
85 |
+ &g_tonemap_vals.tonemap);
|
|
|
86 |
+ g_signal_connect(uflchk, "clicked",
|
|
|
87 |
+ G_CALLBACK(on_file_levels_checked),
|
|
|
88 |
+ &g_tonemap_vals.usefilelevels);
|
|
|
89 |
+ g_signal_connect(exposure_spin, "value_changed",
|
|
|
90 |
+ G_CALLBACK(on_spin_changed),
|
|
|
91 |
+ &g_tonemap_vals.exposure);
|
|
|
92 |
+ g_signal_connect(gamma_spin, "value_changed",
|
|
|
93 |
+ G_CALLBACK(on_spin_changed),
|
|
|
94 |
+ &g_tonemap_vals.gamma);
|
|
|
95 |
|
|
|
96 |
gtk_widget_show(dlg);
|
|
|
97 |
|
|
|
98 |
@@ -1494,22 +1494,22 @@
|
|
|
99 |
g_object_set_data(G_OBJECT(wlchk), "exposure_spin", exposure_spin);
|
|
|
100 |
g_object_set_data(G_OBJECT(wlchk), "gamma_spin", gamma_spin);
|
|
|
101 |
|
|
|
102 |
- gtk_signal_connect(GTK_OBJECT(dlg), "response",
|
|
|
103 |
- GTK_SIGNAL_FUNC(dialog_response), 0);
|
|
|
104 |
- gtk_signal_connect(GTK_OBJECT(dlg), "destroy",
|
|
|
105 |
- GTK_SIGNAL_FUNC(gtk_main_quit), 0);
|
|
|
106 |
- gtk_signal_connect(GTK_OBJECT(rlechk), "clicked",
|
|
|
107 |
- GTK_SIGNAL_FUNC(on_checkbox_clicked),
|
|
|
108 |
- &g_write_vals.rle);
|
|
|
109 |
- gtk_signal_connect(GTK_OBJECT(wlchk), "clicked",
|
|
|
110 |
- GTK_SIGNAL_FUNC(on_write_levels_checked),
|
|
|
111 |
- &g_write_vals.writelevels);
|
|
|
112 |
- gtk_signal_connect(GTK_OBJECT(exposure_spin), "value_changed",
|
|
|
113 |
- GTK_SIGNAL_FUNC(on_spin_changed),
|
|
|
114 |
- &g_write_vals.exposure);
|
|
|
115 |
- gtk_signal_connect(GTK_OBJECT(gamma_spin), "value_changed",
|
|
|
116 |
- GTK_SIGNAL_FUNC(on_spin_changed),
|
|
|
117 |
- &g_write_vals.gamma);
|
|
|
118 |
+ g_signal_connect(dlg, "response",
|
|
|
119 |
+ G_CALLBACK(dialog_response), 0);
|
|
|
120 |
+ g_signal_connect(dlg, "destroy",
|
|
|
121 |
+ G_CALLBACK(gtk_main_quit), 0);
|
|
|
122 |
+ g_signal_connect(rlechk, "clicked",
|
|
|
123 |
+ G_CALLBACK(on_checkbox_clicked),
|
|
|
124 |
+ &g_write_vals.rle);
|
|
|
125 |
+ g_signal_connect(wlchk, "clicked",
|
|
|
126 |
+ G_CALLBACK(on_write_levels_checked),
|
|
|
127 |
+ &g_write_vals.writelevels);
|
|
|
128 |
+ g_signal_connect(exposure_spin, "value_changed",
|
|
|
129 |
+ G_CALLBACK(on_spin_changed),
|
|
|
130 |
+ &g_write_vals.exposure);
|
|
|
131 |
+ g_signal_connect(gamma_spin, "value_changed",
|
|
|
132 |
+ G_CALLBACK(on_spin_changed),
|
|
|
133 |
+ &g_write_vals.gamma);
|
|
|
134 |
|
|
|
135 |
gtk_widget_show(dlg);
|
|
|
136 |
|
|
|
137 |
--- gimp-hdrtools-0.1/Makefile.orig 2008-07-18 13:21:34.184384000 +0800
|
|
|
138 |
+++ gimp-hdrtools-0.1/Makefile 2008-07-18 13:55:38.240222000 +0800
|
|
|
139 |
@@ -1,10 +1,10 @@
|
|
|
140 |
|
|
|
141 |
GIMPTOOL=gimptool-2.0
|
|
|
142 |
|
|
|
143 |
-CC=gcc
|
|
|
144 |
-CFLAGS=-g -O2 -Wall `$(GIMPTOOL) --cflags` -DGETTEXT_PACKAGE
|
|
|
145 |
-LD=gcc
|
|
|
146 |
+CFLAGS=-xO2 -w `$(GIMPTOOL) --cflags` -DGETTEXT_PACKAGE $(EXTRA_CFLAGS)
|
|
|
147 |
+LD=$(CC)
|
|
|
148 |
-LDFLAGS=
|
|
|
149 |
+LDFLAGS=$(EXTRA_LDFLAGS)
|
|
|
150 |
+PREFIX=$(DESTDIR)
|
|
|
151 |
|
|
|
152 |
TARGET=hdrtools
|
|
|
153 |
|
|
|
154 |
@@ -24,7 +24,7 @@
|
|
|
155 |
rm -f $(OBJS) $(TARGET)
|
|
|
156 |
|
|
|
157 |
install: all
|
|
|
158 |
- $(GIMPTOOL) --install-bin $(TARGET)
|
|
|
159 |
+ $(GIMPTOOL) --prefix=$(PREFIX) --install-admin-bin $(TARGET)
|
|
|
160 |
|
|
|
161 |
.c.o:
|
|
|
162 |
$(CC) -c $(CFLAGS) $<
|