Mercurial > geeqie.yaz
annotate src/Makefile.am @ 1655:437c37d965ff
Fix two memory failures
1. if the description field for a exif information is empty the program
dumps core when trying to change this. The reason is a strcmp with a
NULL value.
The fix add the small functionality to set the field to default when
it is set empty.
2. There was a g_strdup miss in exif.c which could end in memory
corruption.
author | mow |
---|---|
date | Sun, 21 Jun 2009 22:52:08 +0000 |
parents | 6bfe8fc7a403 |
children | 3ba101d04c91 |
rev | line source |
---|---|
1 | 1 SUBDIRS = icons |
2 DIST_SUBDIRS = icons | |
3 | |
686 | 4 AM_CFLAGS = \ |
5 $(GLIB_CFLAGS) $(GTK_CFLAGS) \ | |
6 $(LCMS_CFLAGS) \ | |
7 $(EXIV2_CFLAGS) \ | |
1602 | 8 $(LIBCHAMPLAIN_CFLAGS) \ |
9 $(LIBCHAMPLAIN_GTK_CFLAGS) | |
686 | 10 -I$(top_srcdir) \ |
11 -I$(top_builddir) | |
12 | |
13 | |
14 AM_CXXFLAGS = \ | |
15 $(GLIB_CFLAGS) $(GTK_CFLAGS) \ | |
16 $(LCMS_CFLAGS) \ | |
17 $(EXIV2_CFLAGS) \ | |
1602 | 18 $(LIBCHAMPLAIN_CFLAGS) \ |
19 $(LIBCHAMPLAIN_GTK_CFLAGS) | |
686 | 20 -I$(top_srcdir) \ |
21 -I$(top_builddir) | |
9 | 22 |
23 module_SLIK = \ | |
24 intl.h \ | |
1571 | 25 gettext.h \ |
9 | 26 ui_bookmark.c \ |
27 ui_bookmark.h \ | |
28 ui_fileops.c \ | |
29 ui_fileops.h \ | |
30 ui_help.c \ | |
31 ui_help.h \ | |
32 ui_menu.c \ | |
33 ui_menu.h \ | |
34 ui_misc.c \ | |
35 ui_misc.h \ | |
36 ui_pathsel.c \ | |
37 ui_pathsel.h \ | |
38 ui_spinner.c \ | |
39 ui_spinner.h \ | |
40 ui_tabcomp.c \ | |
41 ui_tabcomp.h \ | |
42 ui_tree_edit.c \ | |
43 ui_tree_edit.h \ | |
44 ui_utildlg.c \ | |
45 ui_utildlg.h | |
46 | |
47 extra_ICONS = \ | |
48 ui_spinner.png \ | |
49 ui_tabcomp.png | |
50 | |
51 ICON_PAIRS = \ | |
52 icon_spinner $(srcdir)/ui_spinner.png \ | |
53 icon_tabcomp $(srcdir)/ui_tabcomp.png | |
54 | |
308
6cb3c072be3f
ui_icons.h and icons_inline.h depend on gdk-pixbuf-csource,
zas_
parents:
307
diff
changeset
|
55 ui_icons.h: $(extra_ICONS) Makefile.in |
6cb3c072be3f
ui_icons.h and icons_inline.h depend on gdk-pixbuf-csource,
zas_
parents:
307
diff
changeset
|
56 @(echo '/* Auto generated file, do not edit */'; echo; \ |
6cb3c072be3f
ui_icons.h and icons_inline.h depend on gdk-pixbuf-csource,
zas_
parents:
307
diff
changeset
|
57 echo '#ifndef UI_ICONS_H'; \ |
6cb3c072be3f
ui_icons.h and icons_inline.h depend on gdk-pixbuf-csource,
zas_
parents:
307
diff
changeset
|
58 echo '#define UI_ICONS_H'; echo; \ |
6cb3c072be3f
ui_icons.h and icons_inline.h depend on gdk-pixbuf-csource,
zas_
parents:
307
diff
changeset
|
59 $(GDK_PIXBUF_CSOURCE) --raw --extern --build-list $(ICON_PAIRS); \ |
6cb3c072be3f
ui_icons.h and icons_inline.h depend on gdk-pixbuf-csource,
zas_
parents:
307
diff
changeset
|
60 echo '#endif /* UI_ICONS_H */') > $@ || echo "!!! Failed to generate $@ !!!" |
9 | 61 |
424 | 62 ClayRGB1998_icc.h: ClayRGB1998.icc |
63 echo "/*" > $@ | |
64 echo " * This file was generated from ClayRGB1998.icc, DO NOT EDIT " >> $@ | |
65 echo " * http://www.argyllcms.com/ClayRGB1998.zip " >> $@ | |
66 echo " */ " >> $@ | |
67 xxd -i $^ >> $@ | |
68 | |
9 | 69 ui_spinner.o: ui_icons.h |
70 | |
71 | |
72 noinst_DATA = ui_icons.h | |
73 CLEANFILES = $(noinst_DATA) | |
74 | |
75 extra_SLIK = \ | |
76 $(extra_ICONS) | |
1 | 77 |
195 | 78 bin_PROGRAMS = geeqie |
1 | 79 |
195 | 80 geeqie_SOURCES = \ |
9 | 81 $(module_SLIK) \ |
424 | 82 ClayRGB1998.icc \ |
83 ClayRGB1998_icc.h \ | |
1293
48e064b37ba6
separated "normal" and advanced exif, "Normal" exif is now in the
nadvornik
parents:
1292
diff
changeset
|
84 advanced_exif.c \ |
48e064b37ba6
separated "normal" and advanced exif, "Normal" exif is now in the
nadvornik
parents:
1292
diff
changeset
|
85 advanced_exif.h \ |
1291
50ae02a4a675
replaced bar_info with an universal bar, restored the original
nadvornik
parents:
1178
diff
changeset
|
86 bar.c \ |
50ae02a4a675
replaced bar_info with an universal bar, restored the original
nadvornik
parents:
1178
diff
changeset
|
87 bar.h \ |
50ae02a4a675
replaced bar_info with an universal bar, restored the original
nadvornik
parents:
1178
diff
changeset
|
88 bar_comment.c \ |
50ae02a4a675
replaced bar_info with an universal bar, restored the original
nadvornik
parents:
1178
diff
changeset
|
89 bar_comment.h \ |
1602 | 90 bar_gps.c \ |
91 bar_gps.h \ | |
1298 | 92 bar_histogram.c \ |
93 bar_histogram.h \ | |
1291
50ae02a4a675
replaced bar_info with an universal bar, restored the original
nadvornik
parents:
1178
diff
changeset
|
94 bar_keywords.c \ |
50ae02a4a675
replaced bar_info with an universal bar, restored the original
nadvornik
parents:
1178
diff
changeset
|
95 bar_keywords.h \ |
9 | 96 bar_exif.c \ |
97 bar_exif.h \ | |
98 bar_sort.c \ | |
99 bar_sort.h \ | |
100 cache.c \ | |
101 cache.h \ | |
37
67ba4381497e
Wed Apr 13 18:16:14 2005 John Ellis <johne@verizon.net>
gqview
parents:
23
diff
changeset
|
102 cache-loader.c \ |
67ba4381497e
Wed Apr 13 18:16:14 2005 John Ellis <johne@verizon.net>
gqview
parents:
23
diff
changeset
|
103 cache-loader.h \ |
9 | 104 cache_maint.c \ |
105 cache_maint.h \ | |
106 cellrenderericon.c \ | |
107 cellrenderericon.h \ | |
108 collect.c \ | |
109 collect.h \ | |
110 collect-dlg.c \ | |
111 collect-dlg.h \ | |
112 collect-io.c \ | |
113 collect-io.h \ | |
114 collect-table.c \ | |
115 collect-table.h \ | |
113
55166d93498d
Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents:
105
diff
changeset
|
116 color-man.c \ |
55166d93498d
Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents:
105
diff
changeset
|
117 color-man.h \ |
457
5e9c24d3b3a8
Add a replacement for gtk_radio_action_set_current_value() which
zas_
parents:
424
diff
changeset
|
118 compat.c \ |
5e9c24d3b3a8
Add a replacement for gtk_radio_action_set_current_value() which
zas_
parents:
424
diff
changeset
|
119 compat.h \ |
507 | 120 debug.c \ |
121 debug.h \ | |
1479 | 122 desktop_file.c \ |
123 desktop_file.h \ | |
1 | 124 dnd.c \ |
9 | 125 dnd.h \ |
126 dupe.c \ | |
127 dupe.h \ | |
128 editors.c \ | |
129 editors.h \ | |
130 exif.c \ | |
131 exif.h \ | |
178
9dc8bc9b2bb9
first exiv2 support that does not crash immediately
nadvornik
parents:
177
diff
changeset
|
132 exif-int.h \ |
182 | 133 exif-common.c \ |
177 | 134 exiv2.cc \ |
844 | 135 filecache.c \ |
136 filecache.h \ | |
586 | 137 filedata.c \ |
138 filedata.h \ | |
139 filefilter.c \ | |
140 filefilter.h \ | |
1012
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
904
diff
changeset
|
141 gq-marshal.c \ |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
904
diff
changeset
|
142 gq-marshal.h \ |
1015 | 143 gq-marshal.list \ |
45
7cfa60beda76
Thu May 26 13:57:19 2005 John Ellis <johne@verizon.net>
gqview
parents:
43
diff
changeset
|
144 format_canon.c \ |
7cfa60beda76
Thu May 26 13:57:19 2005 John Ellis <johne@verizon.net>
gqview
parents:
43
diff
changeset
|
145 format_canon.h \ |
7cfa60beda76
Thu May 26 13:57:19 2005 John Ellis <johne@verizon.net>
gqview
parents:
43
diff
changeset
|
146 format_fuji.c \ |
7cfa60beda76
Thu May 26 13:57:19 2005 John Ellis <johne@verizon.net>
gqview
parents:
43
diff
changeset
|
147 format_fuji.h \ |
51
276ea4c98d33
Sat Jun 4 22:24:00 2005 John Ellis <johne@verizon.net>
gqview
parents:
45
diff
changeset
|
148 format_nikon.c \ |
276ea4c98d33
Sat Jun 4 22:24:00 2005 John Ellis <johne@verizon.net>
gqview
parents:
45
diff
changeset
|
149 format_nikon.h \ |
57
a8c9992320f4
Fri Jun 10 20:57:42 2005 John Ellis <johne@verizon.net>
gqview
parents:
51
diff
changeset
|
150 format_olympus.c \ |
a8c9992320f4
Fri Jun 10 20:57:42 2005 John Ellis <johne@verizon.net>
gqview
parents:
51
diff
changeset
|
151 format_olympus.h \ |
43
ee03f36e9e4b
Sun May 15 21:40:26 2005 John Ellis <johne@verizon.net>
gqview
parents:
37
diff
changeset
|
152 format_raw.c \ |
ee03f36e9e4b
Sun May 15 21:40:26 2005 John Ellis <johne@verizon.net>
gqview
parents:
37
diff
changeset
|
153 format_raw.h \ |
9 | 154 fullscreen.c \ |
155 fullscreen.h \ | |
273
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
195
diff
changeset
|
156 histogram.c \ |
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
195
diff
changeset
|
157 histogram.h \ |
902 | 158 history_list.c \ |
159 history_list.h \ | |
1 | 160 image.c \ |
161 image.h \ | |
9 | 162 image-load.c \ |
163 image-load.h \ | |
164 image-overlay.c \ | |
165 image-overlay.h \ | |
1 | 166 img-view.c \ |
9 | 167 img-view.h \ |
168 layout.c \ | |
169 layout.h \ | |
170 layout_config.c \ | |
171 layout_config.h \ | |
172 layout_image.c \ | |
173 layout_image.h \ | |
174 layout_util.c \ | |
175 layout_util.h \ | |
528 | 176 lirc.c \ |
177 lirc.h \ | |
678
6d6f042b8ca5
Add a log window that shows normal and debug messages. For now, it was added to Help menu.
zas_
parents:
648
diff
changeset
|
178 logwindow.c \ |
6d6f042b8ca5
Add a log window that shows normal and debug messages. For now, it was added to Help menu.
zas_
parents:
648
diff
changeset
|
179 logwindow.h \ |
1 | 180 main.c \ |
281 | 181 main.h \ |
9 | 182 md5-util.c \ |
183 md5-util.h \ | |
1 | 184 menu.c \ |
9 | 185 menu.h \ |
1178
f6449c17306b
Move comments/keywords read and write stuff to new metadata.{c,h}.
zas_
parents:
1022
diff
changeset
|
186 metadata.c \ |
f6449c17306b
Move comments/keywords read and write stuff to new metadata.{c,h}.
zas_
parents:
1022
diff
changeset
|
187 metadata.h \ |
1022
9962b24b6b43
Move miscellaneous functions to their own files (new misc.[ch]).
zas_
parents:
1015
diff
changeset
|
188 misc.c \ |
9962b24b6b43
Move miscellaneous functions to their own files (new misc.[ch]).
zas_
parents:
1015
diff
changeset
|
189 misc.h \ |
508
011a6be611c8
Move options stuff to options.{c,h} and remove globals.c
zas_
parents:
507
diff
changeset
|
190 options.c \ |
011a6be611c8
Move options stuff to options.{c,h} and remove globals.c
zas_
parents:
507
diff
changeset
|
191 options.h \ |
105
de64a683d5d0
Thu Nov 9 17:43:06 2006 John Ellis <johne@verizon.net>
gqview
parents:
57
diff
changeset
|
192 pan-calendar.c \ |
de64a683d5d0
Thu Nov 9 17:43:06 2006 John Ellis <johne@verizon.net>
gqview
parents:
57
diff
changeset
|
193 pan-folder.c \ |
de64a683d5d0
Thu Nov 9 17:43:06 2006 John Ellis <johne@verizon.net>
gqview
parents:
57
diff
changeset
|
194 pan-grid.c \ |
de64a683d5d0
Thu Nov 9 17:43:06 2006 John Ellis <johne@verizon.net>
gqview
parents:
57
diff
changeset
|
195 pan-item.c \ |
de64a683d5d0
Thu Nov 9 17:43:06 2006 John Ellis <johne@verizon.net>
gqview
parents:
57
diff
changeset
|
196 pan-timeline.c \ |
de64a683d5d0
Thu Nov 9 17:43:06 2006 John Ellis <johne@verizon.net>
gqview
parents:
57
diff
changeset
|
197 pan-types.h \ |
de64a683d5d0
Thu Nov 9 17:43:06 2006 John Ellis <johne@verizon.net>
gqview
parents:
57
diff
changeset
|
198 pan-util.c \ |
12
147f4c4b9025
##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents:
10
diff
changeset
|
199 pan-view.c \ |
147f4c4b9025
##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents:
10
diff
changeset
|
200 pan-view.h \ |
23
17acca639a86
##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents:
12
diff
changeset
|
201 pixbuf-renderer.c \ |
17acca639a86
##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents:
12
diff
changeset
|
202 pixbuf-renderer.h \ |
9 | 203 pixbuf_util.c \ |
204 pixbuf_util.h \ | |
205 preferences.c \ | |
206 preferences.h \ | |
207 print.c \ | |
208 print.h \ | |
209 remote.c \ | |
210 remote.h \ | |
1 | 211 rcfile.c \ |
9 | 212 rcfile.h \ |
213 search.c \ | |
214 search.h \ | |
307
667e49f52168
Move secure save code to its own files: secure_save.{c,h}.
zas_
parents:
281
diff
changeset
|
215 secure_save.c \ |
667e49f52168
Move secure save code to its own files: secure_save.{c,h}.
zas_
parents:
281
diff
changeset
|
216 secure_save.h \ |
9 | 217 similar.c \ |
218 similar.h \ | |
1 | 219 slideshow.c \ |
9 | 220 slideshow.h \ |
221 typedefs.h \ | |
1 | 222 thumb.c \ |
9 | 223 thumb.h \ |
224 thumb_standard.c \ | |
225 thumb_standard.h \ | |
597 | 226 trash.c \ |
686 | 227 trash.h \ |
904
1698baa37871
Move uri_*() functions to separate files: uri_utils.[ch]
zas_
parents:
902
diff
changeset
|
228 uri_utils.c \ |
1698baa37871
Move uri_*() functions to separate files: uri_utils.[ch]
zas_
parents:
902
diff
changeset
|
229 uri_utils.h \ |
1 | 230 utilops.c \ |
9 | 231 utilops.h \ |
380
5afe77bb563a
Introduce a new struct ViewDir to handle directory views common
zas_
parents:
308
diff
changeset
|
232 view_dir.c \ |
5afe77bb563a
Introduce a new struct ViewDir to handle directory views common
zas_
parents:
308
diff
changeset
|
233 view_dir.h \ |
9 | 234 view_dir_list.c \ |
235 view_dir_list.h \ | |
236 view_dir_tree.c \ | |
237 view_dir_tree.h \ | |
554
2da72a136070
Prepare merging of some parts of view_file_list and view_file_icon and
zas_
parents:
528
diff
changeset
|
238 view_file.c \ |
2da72a136070
Prepare merging of some parts of view_file_list and view_file_icon and
zas_
parents:
528
diff
changeset
|
239 view_file.h \ |
9 | 240 view_file_list.c \ |
241 view_file_list.h \ | |
242 view_file_icon.c \ | |
648
e34c1002e553
Move some functions from main.[ch] to new window.[ch].
zas_
parents:
597
diff
changeset
|
243 view_file_icon.h \ |
e34c1002e553
Move some functions from main.[ch] to new window.[ch].
zas_
parents:
597
diff
changeset
|
244 window.c \ |
e34c1002e553
Move some functions from main.[ch] to new window.[ch].
zas_
parents:
597
diff
changeset
|
245 window.h |
1 | 246 |
1602 | 247 geeqie_LDADD = $(GTK_LIBS) $(GLIB_LIBS) $(INTLLIBS) $(LCMS_LIBS) $(EXIV2_LIBS) $(LIBCHAMPLAIN_LIBS) $(LIBCHAMPLAIN_GTK_LIBS) |
1 | 248 |
9 | 249 EXTRA_DIST = \ |
250 $(extra_SLIK) | |
1 | 251 |
1012
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
904
diff
changeset
|
252 gq-marshal.h: gq-marshal.list |
1505 | 253 $(GLIB_GENMARSHAL) --prefix=gq_marshal $(srcdir)/gq-marshal.list --header >$@ |
1012
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
904
diff
changeset
|
254 |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
904
diff
changeset
|
255 gq-marshal.c: gq-marshal.list |
1505 | 256 (echo "#include \"gq-marshal.h\"" ; $(GLIB_GENMARSHAL) --prefix=gq_marshal $(srcdir)/gq-marshal.list --body ) >$@ |
1012
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
904
diff
changeset
|
257 |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
904
diff
changeset
|
258 |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
904
diff
changeset
|
259 |