*** empty log message ***
authorLutz Mueller <lutz.s.mueller@gmail.com>
Fri, 25 Jan 2002 14:37:59 +0000 (15:37 +0100)
committerLutz Mueller <lutz.s.mueller@gmail.com>
Fri, 25 Jan 2002 14:37:59 +0000 (15:37 +0100)
.gitignore
configure.in
libexif/.gitignore
test/Makefile.am
test/test-browser.c [deleted file]
test/test-exif.c [deleted file]
test/test-tree.c [deleted file]

index cbdc977..9c416bf 100644 (file)
@@ -46,3 +46,6 @@ missing
 mkinstalldirs
 stamp-h
 stamp-h.in
+conftest
+conftest.c
+
index 0f671ec..746a3cc 100644 (file)
@@ -15,55 +15,6 @@ dnl ALL_LINGUAS=""
 dnl AM_GNU_GETTEXT
 
 dnl ---------------------------------------------------------------------------
-dnl gtk-support
-dnl ---------------------------------------------------------------------------
-have_gtk=false
-try_gtk=true
-gtk_msg=no
-AC_ARG_WITH(gtk, [  --without-gtk       Don't use gtk],
-       if test x$withval = xno; then
-               try_gtk=false
-       fi
-)
-if $try_gtk; then
-       AC_PATH_PROG(GTK_CONFIG,gtk-config)
-       if test -n "$GTK_CONFIG" ; then
-               have_gtk=true
-               gtk_msg=yes
-               GTK_CFLAGS=`$GTK_CONFIG --cflags`
-               GTK_LIBS=`$GTK_CONFIG --libs`
-       fi
-fi
-AC_SUBST(GTK_CFLAGS)
-AC_SUBST(GTK_LIBS)
-AM_CONDITIONAL(HAVE_GTK, $have_gtk)
-
-dnl ---------------------------------------------------------------------------
-dnl gdk-pixbuf support?
-dnl ---------------------------------------------------------------------------
-have_gdk_pixbuf=false
-try_gdk_pixbuf=true
-gtk_gdk_pixbuf=no
-AC_ARG_WITH(gdk-pixbuf, [  --without-gdk-pixbuf       Don't use gdk-pixbuf],
-        if test x$withval = xno; then
-                try_gdk_pixbuf=false
-        fi
-)
-if $try_gdk_pixbuf; then
-        AC_PATH_PROG(GDK_PIXBUF_CONFIG,gdk-pixbuf-config)
-        if test -n "$GDK_PIXBUF_CONFIG" ; then
-                have_gdk_pixbuf=true
-                gdk_pixbuf_msg=yes
-                GDK_PIXBUF_CFLAGS=`$GDK_PIXBUF_CONFIG --cflags`
-                GDK_PIXBUF_LIBS=`$GDK_PIXBUF_CONFIG --libs`
-               AC_DEFINE(HAVE_GDK_PIXBUF)
-        fi
-fi
-AC_SUBST(GDK_PIXBUF_CFLAGS)
-AC_SUBST(GDK_PIXBUF_LIBS)
-AM_CONDITIONAL(HAVE_GDK_PIXBUF, $have_gdk_pixbuf)
-
-dnl ---------------------------------------------------------------------------
 dnl Warnings
 dnl ---------------------------------------------------------------------------
 CFLAGS="$CFLAGS -g -Wall -Wmissing-declarations -Wmissing-prototypes"
@@ -75,12 +26,9 @@ AC_OUTPUT([
 Makefile
 gexif/Makefile
 libexif/Makefile
-libexif-gtk/Makefile
-libexif-gtk/gtk-extensions/Makefile
 libjpeg/Makefile
 test/Makefile
 libexif/libexif.pc
-libexif-gtk/libexif-gtk.pc
 ])
 
 echo "
index 0f19e06..c1dcedd 100644 (file)
@@ -5,3 +5,4 @@ Makefile.in
 libexif.la
 *.o
 *.lo
+libexif.pc
index 2c0991b..08100e2 100644 (file)
@@ -1,20 +1,9 @@
 INCLUDES =                     \
-       -I$(top_srcdir)         \
-       $(GTK_CFLAGS)
-       
-
-if HAVE_GTK
-PROGRAMS_GTK =         \
-       test-browser
-endif
+       -I$(top_srcdir) 
 
 noinst_PROGRAMS =      \
-       $(PROGRAMS_GTK) \
        test-tree
 
 test_tree_LDADD =              \
        ../libjpeg/libjpeg.la   \
        ../libexif/libexif.la
-test_browser_LDADD =           \
-       ../libjpeg/libjpeg.la   \
-       ../libexif-gtk/libexif-gtk.la
diff --git a/test/test-browser.c b/test/test-browser.c
deleted file mode 100644 (file)
index 4801d97..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-#include <config.h>
-
-#include <stdio.h>
-
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkscrolledwindow.h>
-
-#include <libjpeg/jpeg-data.h>
-#include <libexif/exif-data.h>
-#include <libexif-gtk/gtk-exif-browser.h>
-
-int
-main (int argc, char **argv)
-{
-       GtkWidget *dialog, *button, *browser;
-       JPEGData *jdata;
-       ExifData *edata;
-
-       if (argc <= 1) {
-               printf ("You need to specify a file!\n");
-               return (1);
-       }
-
-       g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL);
-       gtk_init (&argc, &argv);
-
-       jdata = jpeg_data_new_from_file (argv[1]);
-       if (!jdata) {
-               printf ("Could not read '%s'!\n", argv[1]);
-               return (1);
-       }
-       edata = jpeg_data_get_exif_data (jdata);
-       jpeg_data_unref (jdata);
-       if (!edata) {
-               printf ("Could not find EXIF information in '%s'!\n", argv[1]);
-               return (1);
-       }
-
-       dialog = gtk_dialog_new ();
-       gtk_widget_show (dialog);
-       gtk_signal_connect (GTK_OBJECT (dialog), "delete_event",
-                           GTK_SIGNAL_FUNC (gtk_main_quit), dialog);
-       gtk_widget_set_usize (dialog, 200, 300);
-
-       browser = gtk_exif_browser_new ();
-       gtk_widget_show (browser);
-       gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), browser);
-       gtk_exif_browser_set_data (GTK_EXIF_BROWSER (browser), edata);
-       exif_data_unref (edata);
-
-       button = gtk_button_new_with_label ("Ok");
-       gtk_widget_show (button);
-       gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area),
-                          button);
-       gtk_signal_connect (GTK_OBJECT (button), "clicked",
-                           GTK_SIGNAL_FUNC (gtk_main_quit), dialog);
-
-       gtk_main ();
-
-       return (0);
-}
diff --git a/test/test-exif.c b/test/test-exif.c
deleted file mode 100644 (file)
index 4aa6318..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
-
-Copyright (c) 2000 Curtis Galloway
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-$Id: test-exif.c,v 1.1 2001/12/11 20:28:30 lutz Exp $
-
-*/
-
-#include <stdio.h>
-#include "exif.h"
-
-static void
-usage(void)
-{
-  fprintf(stderr, "Usage: exif <file> [<tag> ...]\n");
-}
-
-static void
-print_record(exif_record_t *rec)
-{
-  printf("%s: ", rec->rec_name);
-  switch (rec->rec_type) {
-  case 's':
-    printf("\"%s\"", rec->rec_data.s);
-    break;
-  case 'f':
-    printf("%f", rec->rec_data.f);
-    break;
-  case 'g':
-    printf("%g", rec->rec_data.f);
-    break;
-  case 'l':
-    printf("%ld", rec->rec_data.l);
-    break;
-  case 'r':
-    printf("%ld/%ld", rec->rec_data.r.num,
-          rec->rec_data.r.denom);
-    break;
-  }
-  printf("\n");
-}
-
-
-main(int argc, char **argv)
-{
-  int ret;
-  exif_data_t *d;
-  exif_record_t *rec;
-  int i;
-
-  exif_init(NULL, NULL, NULL);
-  if (argc < 2) {
-    usage();
-    exit(1);
-  }
-  d = exif_parse_file(argv[1]);
-  if (d == NULL) {
-    printf("Null returned.\n");
-    exit(1);
-  }
-  if (argc > 2) {
-    for (i=2; i<argc; i++) {
-      rec = exif_find_record(d, argv[i]);
-      if (rec) {
-       print_record(rec);
-      }
-    }
-  } else {
-    for (i=0; i<d->n_recs; i++) {
-      print_record(&d->recs[i]);
-    }
-  }
-  exif_free_data(d);
-  return 0;
-}
diff --git a/test/test-tree.c b/test/test-tree.c
deleted file mode 100644 (file)
index 2b20af7..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-#include <config.h>
-
-#include <stdio.h>
-
-#include <libjpeg/jpeg-data.h>
-
-int
-main (int argc, char **argv)
-{
-       JPEGData *data;
-
-       if (argc <= 1) {
-               printf ("You need to specify a file!\n");
-               return (1);
-       }
-
-       data = jpeg_data_new_from_file (argv[1]);
-       if (!data) {
-               printf ("Could not load '%s'!\n", argv[1]);
-               return (1);
-       }
-       jpeg_data_dump (data);
-       jpeg_data_free (data);
-
-       return (0);
-}