• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
Keine Tags

Frequently used words (click to add to your profile)

javaandroidc++linuxc#objective-ccocoa誰得qtrubypythongamewindowsbathyscaphephpguic翻訳omegattwitterframeworktestbtronarduinovb.net計画中(planning stage)directxpreviewerゲームエンジンdom

GImageView is a GTK+ based image viewer which supports tabbed browsing, thumbnail table views, directory tree views and drag and drop. It also support movies using the Xine library and MPlayer, and supports images in compressed archive formats.


Commit MetaInfo

Revisiona3aab23af81255ec511c32758c1ea9a37b173eb7 (tree)
Zeit2009-01-13 15:34:52
Autormakeinu <makeinu@aeae...>
Commitermakeinu

Log Message

Remove needless lines.

git-svn-id: https://gtkmmviewer.svn.sourceforge.net/svnroot/gtkmmviewer/gimageview/trunk@1212 aeae0eed-423c-0410-9251-95fb8af3d19f

Ändern Zusammenfassung

Diff

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
11 2009-01-13 Takuro Ashie <ashie@homa.ne.jp>
22
3+ * configure.ac, plugins/image_loader/Makefile.am,
4+ plugins/image_loader/svg.[ch]: Removed needless code.
5+
6+2009-01-13 Takuro Ashie <ashie@homa.ne.jp>
7+
38 * plugins/image_loader/svg.c: Don't use GError.
49
510 2009-01-13 Takuro Ashie <ashie@homa.ne.jp>
--- a/configure.ac
+++ b/configure.ac
@@ -102,8 +102,6 @@ PKG_CHECK_MODULES(GTK,
102102 gdk-pixbuf-2.0 >= $GDK_PIXBUF2_REQUIRED
103103 gtk+-2.0 >= $GTK2_REQUIRED], ,
104104 [ AC_MSG_ERROR(Test for GTK+-2.0 failed. See the file 'INSTALL' for help) ])
105-AC_SUBST(GTK_CFLAGS)
106-AC_SUBST(GTK_LIBS)
107105
108106
109107 dnl ********************
@@ -243,9 +241,6 @@ if test x"$enable_exif" = xyes; then
243241 AC_DEFINE(ENABLE_EXIF, 1, [Define if you want to compile EXIF features.])
244242 fi
245243
246-AC_SUBST(EXIF_CFLAGS)
247-AC_SUBST(EXIF_LIBS)
248-
249244
250245 dnl ********************
251246 dnl Test for libmng
@@ -318,16 +313,6 @@ fi
318313
319314 AM_CONDITIONAL(ENABLE_LIBRSVG, test x"$enable_librsvg" = xyes)
320315
321-if test x"$enable_librsvg" = xyes; then
322- AC_DEFINE(HAVE_LIBRSVG, 1, [Define if you have librsvg.])
323- AC_DEFINE(ENABLE_SVG, 1, [Define if you want to compile svg plugin.])
324-fi
325-
326-AC_SUBST(XML_CFLAGS)
327-AC_SUBST(XML_LIBS)
328-AC_SUBST(LIBRSVG_CFLAGS)
329-AC_SUBST(LIBRSVG_LIBS)
330-
331316
332317 dnl ****************************
333318 dnl Check for libwmf
--- a/plugins/image_loader/Makefile.am
+++ b/plugins/image_loader/Makefile.am
@@ -53,7 +53,6 @@ INCLUDES = \
5353 $(PNG_CFLAGS) \
5454 $(JPEG_CFLAGS) \
5555 $(MNG_CFLAGS) \
56- $(XML_CFLAGS) \
5756 $(LIBRSVG_CFLAGS) \
5857 $(LIBWMF_CFLAGS) \
5958 $(DLLLOADER_CFLAGS) \
@@ -100,7 +99,7 @@ libgimv_spi_loader_la_SOURCES = \
10099 spi.c spi.h spi-private.h \
101100 spi_image_loader.c spi_image_loader.h
102101
103-libgimv_rsvg_loader_la_LIBADD = $(GTK_LIBS) $(XML_LIBS) $(LIBRSVG_LIBS)
102+libgimv_rsvg_loader_la_LIBADD = $(GTK_LIBS) $(LIBRSVG_LIBS)
104103 libgimv_rsvg_loader_la_LDFLAGS = -module -avoid-version $(no_undefined) $(GIMV_LIBS)
105104 libgimv_rsvg_loader_la_SOURCES = svg.c svg.h
106105
--- a/plugins/image_loader/svg.c
+++ b/plugins/image_loader/svg.c
@@ -23,8 +23,6 @@
2323
2424 #include "svg.h"
2525
26-#ifdef ENABLE_SVG
27-
2826 #include <stdio.h>
2927 #include <gdk-pixbuf/gdk-pixbuf.h>
3028 #include <librsvg/rsvg.h>
@@ -126,4 +124,3 @@ svg_load_image (GimvImageLoader *loader, gpointer data)
126124 return NULL;
127125 }
128126 }
129-#endif /* ENABLE_SVG */
--- a/plugins/image_loader/svg.h
+++ b/plugins/image_loader/svg.h
@@ -28,14 +28,10 @@
2828 # include "config.h"
2929 #endif
3030
31-#ifdef ENABLE_SVG
32-
3331 #include "gimv_image.h"
3432 #include "gimv_image_loader.h"
3533
3634 GimvImage *svg_load_image (GimvImageLoader *loader,
3735 gpointer data);
3836
39-#endif /* ENABLE_SVG */
40-
4137 #endif /* __SVG_H__ */