Menu
▾
▴
libexif-cvs — CVS commitlogs of all libexif CVS modules
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(22) |
Sep
(57) |
Oct
(39) |
Nov
(93) |
Dec
(72) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(15) |
Feb
(8) |
Mar
(12) |
Apr
(25) |
May
(2) |
Jun
|
Jul
(11) |
Aug
(32) |
Sep
(18) |
Oct
(53) |
Nov
|
Dec
(11) |
| 2004 |
Jan
(19) |
Feb
(1) |
Mar
(15) |
Apr
(17) |
May
(56) |
Jun
(19) |
Jul
(6) |
Aug
(16) |
Sep
(44) |
Oct
(31) |
Nov
(36) |
Dec
(13) |
| 2005 |
Jan
(2) |
Feb
(41) |
Mar
(304) |
Apr
(176) |
May
(19) |
Jun
(33) |
Jul
(14) |
Aug
(21) |
Sep
(4) |
Oct
(3) |
Nov
|
Dec
(8) |
| 2006 |
Jan
(18) |
Feb
(9) |
Mar
(5) |
Apr
(2) |
May
(2) |
Jun
(4) |
Jul
(2) |
Aug
|
Sep
(7) |
Oct
(10) |
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
(3) |
Mar
(1) |
Apr
(4) |
May
(124) |
Jun
(59) |
Jul
(1) |
Aug
(13) |
Sep
(3) |
Oct
(11) |
Nov
(30) |
Dec
(35) |
| 2008 |
Jan
(31) |
Feb
(42) |
Mar
(4) |
Apr
(5) |
May
(2) |
Jun
(12) |
Jul
(8) |
Aug
(2) |
Sep
(4) |
Oct
(5) |
Nov
(89) |
Dec
(23) |
| 2009 |
Jan
(71) |
Feb
(5) |
Mar
(8) |
Apr
(7) |
May
(8) |
Jun
(7) |
Jul
|
Aug
(4) |
Sep
(58) |
Oct
(74) |
Nov
(53) |
Dec
(32) |
| 2010 |
Jan
(8) |
Feb
(13) |
Mar
(4) |
Apr
|
May
|
Jun
(10) |
Jul
(1) |
Aug
(2) |
Sep
(12) |
Oct
(17) |
Nov
(2) |
Dec
(24) |
| 2011 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(24) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
(20) |
Mar
(18) |
Apr
|
May
|
Jun
|
Jul
(5) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
(4) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(12) |
Oct
|
Nov
|
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(8) |
Jun
|
Jul
(7) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(5) |
|
From: <hu...@us...> - 2002-11-17 17:16:55
|
Update of /cvsroot/libexif/gexif
In directory usw-pr-cvs1:/tmp/cvs-serv7262
Modified Files:
Makefile.am
Log Message:
removed misguided bzip2 tarball creation
Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/gexif/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile.am 1 Nov 2002 19:59:27 -0000 1.8
+++ Makefile.am 17 Nov 2002 17:16:52 -0000 1.9
@@ -1,15 +1 @@
SUBDIRS = libjpeg gexif po
-
-
-########################################################################
-# create .tar.bz2 distribution package for convenience if the
-# tar on this system supports it. else do nothing.
-dist-hook:
- if [ "x${CDPATH}" != "x" ]; then \
- echo "You have set CDPATH. If make dist fails, try to unset CDPATH."; \
- fi
- -$(MAKE) dist-bzip2
-
-dist-bzip2:
- -chmod -R a+r $(distdir)
- -tar -c --bzip2 -h -o -f $(distdir).tar.bz2 $(distdir)
|
|
From: <hu...@us...> - 2002-11-17 17:10:34
|
Update of /cvsroot/libexif/libmnote In directory usw-pr-cvs1:/tmp/cvs-serv30726 Modified Files: Makefile.am Log Message: added test/ subdir Index: Makefile.am =================================================================== RCS file: /cvsroot/libexif/libmnote/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Makefile.am 17 Nov 2002 14:25:47 -0000 1.6 +++ Makefile.am 17 Nov 2002 17:10:30 -0000 1.7 @@ -1,4 +1,4 @@ -SUBDIRS = libmnote po +SUBDIRS = libmnote test po EXTRA_DIST = @PACKAGE@.spec |
|
From: <as...@us...> - 2002-11-17 15:07:19
|
Update of /cvsroot/libexif/libmnote/libmnote/pentax In directory usw-pr-cvs1:/tmp/cvs-serv4588 Modified Files: Makefile.am Log Message: Add -I$(top_srcdir)/intl Index: Makefile.am =================================================================== RCS file: /cvsroot/libexif/libmnote/libmnote/pentax/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile.am 15 Nov 2002 19:54:49 -0000 1.2 +++ Makefile.am 17 Nov 2002 15:07:15 -0000 1.3 @@ -1,6 +1,7 @@ INCLUDES = \ - -I$(top_srcdir) \ -DLIBMNOTE_LOCALEDIR=\""$(datadir)/locale"\" \ + -I$(top_srcdir) \ + -I$(top_srcdir)/intl \ $(LIBEXIF_CFLAGS) noinst_LTLIBRARIES = libmnote-pentax.la |
|
From: <as...@us...> - 2002-11-17 14:25:51
|
Update of /cvsroot/libexif/libmnote In directory usw-pr-cvs1:/tmp/cvs-serv22339 Modified Files: Makefile.am Log Message: po is needed in SUBDIRS Index: Makefile.am =================================================================== RCS file: /cvsroot/libexif/libmnote/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Makefile.am 15 Nov 2002 22:19:41 -0000 1.5 +++ Makefile.am 17 Nov 2002 14:25:47 -0000 1.6 @@ -1,4 +1,4 @@ -SUBDIRS = libmnote +SUBDIRS = libmnote po EXTRA_DIST = @PACKAGE@.spec |
|
From: <as...@us...> - 2002-11-17 11:54:03
|
Update of /cvsroot/libexif/libmnote/po In directory usw-pr-cvs1:/tmp/cvs-serv3948 Removed Files: ChangeLog Makevars Log Message: gettext generated files --- ChangeLog DELETED --- --- Makevars DELETED --- |
|
From: <rw...@us...> - 2002-11-17 04:56:15
|
Update of /cvsroot/libexif/libmnote In directory usw-pr-cvs1:/tmp/cvs-serv24351 Modified Files: AUTHORS ChangeLog README Log Message: Updated AUTHORS and README with my details. Index: AUTHORS =================================================================== RCS file: /cvsroot/libexif/libmnote/AUTHORS,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- AUTHORS 15 Nov 2002 21:39:19 -0000 1.2 +++ AUTHORS 17 Nov 2002 04:56:12 -0000 1.3 @@ -1 +1,2 @@ -Rod Whitby <???> +Lutz Müller <lu...@us...> +Rod Whitby <sof...@rw...> Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libmnote/ChangeLog,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ChangeLog 15 Nov 2002 22:37:47 -0000 1.7 +++ ChangeLog 17 Nov 2002 04:56:12 -0000 1.8 @@ -1,3 +1,8 @@ +2002-11-15 Rod Whitby <sof...@rw...> + + * README: + * AUTHORS: Added my details. + 2002-11-15 Lutz Müller <lu...@us...> * configure.in: AC_DEFINE(HAVE_MNOTE) Index: README =================================================================== RCS file: /cvsroot/libexif/libmnote/README,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- README 15 Nov 2002 21:39:19 -0000 1.2 +++ README 17 Nov 2002 04:56:12 -0000 1.3 @@ -9,7 +9,10 @@ FEATURES -------- -libmnote currently just compiles. I have no idea what features there are. +libmnote supports parsing, editing and saving of EXIF MakerNote +data. In addition, it has gettext support. Currently, libmnote +supports only a few camera manufacturer MakerNote formats (submissions +are welcome). REQUIREMENTS ------------ @@ -32,4 +35,6 @@ AUTHORS ------- -libmnote has been written by Rod Whitby <???>. +libmnote was derived from libexif's original MakerNote support by +Rod Whitby <sof...@rw...>. The MakerNote support +in libexif was written by Lutz Müller <lu...@us...>. |
|
From: <rw...@us...> - 2002-11-17 04:49:47
|
Update of /cvsroot/libexif/exif In directory usw-pr-cvs1:/tmp/cvs-serv20750 Modified Files: ChangeLog Log Message: Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/exif/ChangeLog,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- ChangeLog 15 Nov 2002 21:32:19 -0000 1.24 +++ ChangeLog 17 Nov 2002 04:49:44 -0000 1.25 @@ -1,3 +1,16 @@ +2002-11-17 Rod Whitby <sof...@rw...> + + * configure.in: + * exif/main.c: + * exif/actions.c: + * exif/actions.h: + * exif/utils.c: + * exif/utils.h: Added support for libmnote (MakerNote parsing). + + * exif/main.c: Changed show_entry to use exif_entry_dump. + + * exif/main.c: Fixed set_value for EXIF_FORMAT_ASCII. + 2002-11-15 Lutz Müller <lu...@us...> * configure.in: Ok, I got the message. Let exif _optionally_ use |
|
From: <rw...@us...> - 2002-11-17 04:40:00
|
Update of /cvsroot/libexif/exif
In directory usw-pr-cvs1:/tmp/cvs-serv14861
Modified Files:
configure.in
Log Message:
Made configure check the libmnote version (just like libexif).
Index: configure.in
===================================================================
RCS file: /cvsroot/libexif/exif/configure.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- configure.in 17 Nov 2002 04:17:20 -0000 1.20
+++ configure.in 17 Nov 2002 04:39:57 -0000 1.21
@@ -25,23 +25,19 @@
dnl ---------------------------------------------------------------------------
mnote_msg=no
try_mnote=true
-have_mnote=false
AC_ARG_WITH(mnote, [ --without-mnote Don't use libmnote],
if test x$withval = xno; then
try_mnote=false
fi)
if $try_mnote; then
if ${PKG_CONFIG} --exists libmnote > /dev/null 2>&1; then
- LIBMNOTE_LIBS=`$PKG_CONFIG --libs libmnote`
- LIBMNOTE_CFLAGS=`$PKG_CONFIG --cflags libmnote`
+ PKG_CHECK_MODULES(LIBMNOTE, libmnote >= 0.5.4)
AC_DEFINE(HAVE_MNOTE,1,[whether we have mnote])
- AC_SUBST(LIBMNOTE_CFLAGS)
AC_SUBST(LIBMNOTE_LIBS)
- have_popt=true
+ AC_SUBST(LIBMNOTE_CFLAGS)
mnote_msg="yes"
fi
fi
-AM_CONDITIONAL(HAVE_POPT, $have_popt)
dnl ---------------------------------------------------------------------------
dnl locale.h: locale.h provides setlocale. It seems that some systems don't
|
|
From: <rw...@us...> - 2002-11-17 04:17:23
|
Update of /cvsroot/libexif/exif
In directory usw-pr-cvs1:/tmp/cvs-serv1863
Modified Files:
configure.in
Log Message:
Added the HAVE_MNOTE conditional to identify MakerNote support (or not).
Index: configure.in
===================================================================
RCS file: /cvsroot/libexif/exif/configure.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- configure.in 17 Nov 2002 03:32:57 -0000 1.19
+++ configure.in 17 Nov 2002 04:17:20 -0000 1.20
@@ -25,6 +25,7 @@
dnl ---------------------------------------------------------------------------
mnote_msg=no
try_mnote=true
+have_mnote=false
AC_ARG_WITH(mnote, [ --without-mnote Don't use libmnote],
if test x$withval = xno; then
try_mnote=false
@@ -33,11 +34,14 @@
if ${PKG_CONFIG} --exists libmnote > /dev/null 2>&1; then
LIBMNOTE_LIBS=`$PKG_CONFIG --libs libmnote`
LIBMNOTE_CFLAGS=`$PKG_CONFIG --cflags libmnote`
+ AC_DEFINE(HAVE_MNOTE,1,[whether we have mnote])
AC_SUBST(LIBMNOTE_CFLAGS)
AC_SUBST(LIBMNOTE_LIBS)
+ have_popt=true
mnote_msg="yes"
fi
fi
+AM_CONDITIONAL(HAVE_POPT, $have_popt)
dnl ---------------------------------------------------------------------------
dnl locale.h: locale.h provides setlocale. It seems that some systems don't
|
|
From: <rw...@us...> - 2002-11-17 03:33:02
|
Update of /cvsroot/libexif/exif In directory usw-pr-cvs1:/tmp/cvs-serv8056 Modified Files: configure.in Log Message: Removed my erroneous change (Lutz had already done it in a better way). Index: configure.in =================================================================== RCS file: /cvsroot/libexif/exif/configure.in,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- configure.in 17 Nov 2002 03:15:02 -0000 1.18 +++ configure.in 17 Nov 2002 03:32:57 -0000 1.19 @@ -19,9 +19,6 @@ PKG_CHECK_MODULES(LIBEXIF, libexif >= 0.5.4) AC_SUBST(LIBEXIF_LIBS) AC_SUBST(LIBEXIF_CFLAGS) -PKG_CHECK_MODULES(LIBMNOTE, libmnote >= 0.5.4) -AC_SUBST(LIBMNOTE_LIBS) -AC_SUBST(LIBMNOTE_CFLAGS) dnl --------------------------------------------------------------------------- dnl libmnote: Useful for parsing MakerNote-tags. |
|
From: <rw...@us...> - 2002-11-17 03:29:39
|
Update of /cvsroot/libexif/exif/exif
In directory usw-pr-cvs1:/tmp/cvs-serv5992/exif
Modified Files:
actions.c actions.h main.c utils.c utils.h
Log Message:
Wrapped all libmnote-specific code in HAVE_MNOTE.
Index: actions.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/actions.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- actions.c 17 Nov 2002 03:15:02 -0000 1.9
+++ actions.c 17 Nov 2002 03:29:36 -0000 1.10
@@ -77,6 +77,8 @@
}
}
+#ifdef HAVE_MNOTE
+
void
action_ntag_table (const char *filename, MNoteData *en)
{
@@ -102,6 +104,8 @@
}
}
+#endif
+
static void
show_entry (ExifEntry *entry, void *data)
{
@@ -125,6 +129,8 @@
exif_content_foreach_entry (content, show_entry, data);
}
+#ifdef HAVE_MNOTE
+
static void
show_note_entry (MNoteData *note, MNoteTag tag, void *data)
{
@@ -142,6 +148,8 @@
fputc ('\n', stdout);
}
+#endif
+
static void
print_hline (unsigned char ids)
{
@@ -189,6 +197,8 @@
}
}
+#ifdef HAVE_MNOTE
+
void
action_ntag_list (const char *filename, MNoteData *en, unsigned char ids)
{
@@ -216,3 +226,5 @@
mnote_data_foreach_entry (en, show_note_entry, &ids);
print_hline (ids);
}
+
+#endif
Index: actions.h
===================================================================
RCS file: /cvsroot/libexif/exif/exif/actions.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- actions.h 17 Nov 2002 03:15:02 -0000 1.2
+++ actions.h 17 Nov 2002 03:29:36 -0000 1.3
@@ -22,11 +22,17 @@
#define __ACTIONS_H__
#include <libexif/exif-data.h>
+
+#ifdef HAVE_MNOTE
#include <libmnote/mnote-data.h>
+#endif
void action_tag_table (const char *filename, ExifData *ed);
-void action_ntag_table (const char *filename, MNoteData *en);
void action_tag_list (const char *filename, ExifData *ed, unsigned char ids);
+
+#ifdef HAVE_MNOTE
+void action_ntag_table (const char *filename, MNoteData *en);
void action_ntag_list (const char *filename, MNoteData *en, unsigned char ids);
+#endif
#endif /* __ACTIONS_H__ */
Index: main.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/main.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- main.c 17 Nov 2002 03:15:02 -0000 1.28
+++ main.c 17 Nov 2002 03:29:36 -0000 1.29
@@ -29,7 +29,9 @@
#include <libexif/exif-data.h>
#include <libexif/exif-utils.h>
+#ifdef HAVE_MNOTE
#include <libmnote/mnote-data.h>
+#endif
#include "libjpeg/jpeg-data.h"
@@ -75,6 +77,8 @@
exif_entry_dump(entry, 0);
}
+#ifdef HAVE_MNOTE
+
static void
show_note_entry (MNoteData *note, MNoteTag tag)
{
@@ -86,6 +90,8 @@
mnote_data_dump_entry(note, tag, 0);
}
+#endif
+
static void
search_entry (ExifData *ed, ExifTag tag)
{
@@ -143,22 +149,33 @@
struct _ExifOptions {
unsigned char use_ids;
ExifTag tag;
+#ifdef HAVE_MNOTE
MNoteTag ntag;
+#endif
};
int
main (int argc, const char **argv)
{
/* POPT_ARG_NONE needs an int, not char! */
- unsigned int list_tags = 0, list_ntags = 0, show_description = 0;
+ unsigned int list_tags = 0, show_description = 0;
+#ifdef HAVE_MNOTE
+ unsigned int list_ntags = 0;
+#endif
unsigned int extract_thumbnail = 0, remove_thumbnail = 0;
unsigned int remove = 0;
- const char *set_value = NULL, *ifd_string = NULL;
- const char *tag_string = NULL, *ntag_string = NULL;
+ const char *set_value = NULL, *ifd_string = NULL, *tag_string = NULL;
+#ifdef HAVE_MNOTE
+ const char *ntag_string = NULL;
+#endif
ExifIfd ifd = -1;
ExifTag tag = 0;
+#ifdef HAVE_MNOTE
MNoteTag ntag = 0;
ExifOptions eo = {0, 0, 0};
+#else
+ ExifOptions eo = {0, 0};
+#endif
poptContext ctx;
const char **args, *output = NULL;
const char *ithumbnail = NULL;
@@ -168,14 +185,18 @@
N_("Show IDs instead of tag names"), NULL},
{"tag", 't', POPT_ARG_STRING, &tag_string, 0,
N_("Select tag"), N_("tag")},
+#ifdef HAVE_MNOTE
{"ntag", '\0', POPT_ARG_STRING, &ntag_string, 0,
N_("Select MakerNote tag"), N_("ntag")},
+#endif
{"ifd", '\0', POPT_ARG_STRING, &ifd_string, 0,
N_("Select IFD"), N_("IFD")},
{"list-tags", 'l', POPT_ARG_NONE, &list_tags, 0,
N_("List all EXIF tags"), NULL},
+#ifdef HAVE_MNOTE
{"list-ntags", '\0', POPT_ARG_NONE, &list_ntags, 0,
N_("List all EXIF MakerNote tags"), NULL},
+#endif
{"remove", '\0', POPT_ARG_NONE, &remove, 0,
N_("Remove tag or ifd"), NULL},
{"show-description", 's', POPT_ARG_NONE, &show_description, 0,
@@ -191,9 +212,11 @@
{"set-value", '\0', POPT_ARG_STRING, &set_value, 0,
N_("Value"), NULL},
POPT_TABLEEND};
- ExifData *ed = NULL;
- ExifEntry *e = NULL;
- MNoteData *md = NULL;
+ ExifData *ed;
+ ExifEntry *e;
+#ifdef HAVE_MNOTE
+ MNoteData *md;
+#endif
char fname[1024];
FILE *f;
@@ -237,7 +260,11 @@
}
}
- if (show_description && !ntag_string) {
+ if (show_description
+#ifdef HAVE_MNOTE
+ && !ntag_string
+#endif
+ ) {
if (!eo.tag) {
fprintf (stderr, _("Please specify a tag!"));
fputc ('\n', stderr);
@@ -268,6 +295,7 @@
exit (1);
}
+#ifdef HAVE_MNOTE
if (ntag_string || list_ntags || ntag) {
e = exif_content_get_entry(ed->ifd[EXIF_IFD_EXIF],
EXIF_TAG_MAKER_NOTE);
@@ -285,6 +313,7 @@
exit (1);
}
}
+#endif
/* Where do we save the output? */
memset (fname, 0, sizeof (fname));
@@ -296,6 +325,7 @@
sizeof (fname) - 1);
}
+#ifdef HAVE_MNOTE
if (ntag_string) {
ntag = mnote_tag_from_string (md, ntag_string);
if (!ntag || !mnote_tag_get_name (md, ntag)) {
@@ -320,11 +350,14 @@
printf ("\n");
return (0);
}
+#endif
if (list_tags) {
action_tag_table (*args, ed);
+#ifdef HAVE_MNOTE
} else if (list_ntags) {
action_ntag_table (*args, md);
+#endif
} else if (tag && !set_value) {
if ((ifd >= EXIF_IFD_0) &&
(ifd < EXIF_IFD_COUNT)) {
@@ -343,6 +376,7 @@
} else {
search_entry (ed, eo.tag);
}
+#ifdef HAVE_MNOTE
} else if (ntag && !set_value) {
char *value = mnote_data_get_value (md, ntag);
if (value)
@@ -355,6 +389,7 @@
fputc ('\n', stderr);
return (1);
}
+#endif
} else if (extract_thumbnail) {
/* No thumbnail? Exit. */
Index: utils.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/utils.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- utils.c 17 Nov 2002 03:15:02 -0000 1.4
+++ utils.c 17 Nov 2002 03:29:36 -0000 1.5
@@ -139,6 +139,8 @@
return (-1);
}
+#ifdef HAVE_MNOTE
+
MNoteTag
mnote_tag_from_string (MNoteData *note, const char *string)
{
@@ -237,3 +239,5 @@
return (tag);
}
+
+#endif
Index: utils.h
===================================================================
RCS file: /cvsroot/libexif/exif/exif/utils.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- utils.h 17 Nov 2002 03:15:02 -0000 1.3
+++ utils.h 17 Nov 2002 03:29:36 -0000 1.4
@@ -23,12 +23,17 @@
#include <libexif/exif-tag.h>
#include <libexif/exif-ifd.h>
+
+#ifdef HAVE_MNOTE
#include <libmnote/mnote-data.h>
+#endif
ExifTag exif_tag_from_string (const char *string);
ExifIfd exif_ifd_from_string (const char *string);
+#ifdef HAVE_MNOTE
MNoteTag mnote_tag_from_string (MNoteData *note, const char *string);
+#endif
#endif /* __UTILS_H__ */
|
|
From: <rw...@us...> - 2002-11-17 03:15:06
|
Update of /cvsroot/libexif/exif/exif
In directory usw-pr-cvs1:/tmp/cvs-serv29272/exif
Modified Files:
actions.c actions.h main.c utils.c utils.h
Log Message:
Added support for libmnote (EXIF MakerNote parsing).
Everything completed, except for set_value handling.
Index: actions.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/actions.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- actions.c 15 Sep 2002 21:55:27 -0000 1.8
+++ actions.c 17 Nov 2002 03:15:02 -0000 1.9
@@ -61,7 +61,7 @@
snprintf (txt, sizeof (txt) - 1, _("EXIF tags in '%s':"), filename);
fprintf (stdout, "%-38.38s", txt);
for (i = 0; i < EXIF_IFD_COUNT; i++)
- printf ("%-7.7s", exif_ifd_get_name (i));
+ fprintf (stdout, "%-7.7s", exif_ifd_get_name (i));
fputc ('\n', stdout);
for (tag = 0; tag < 0xffff; tag++) {
name = exif_tag_get_title (tag);
@@ -77,6 +77,31 @@
}
}
+void
+action_ntag_table (const char *filename, MNoteData *en)
+{
+ unsigned int tag;
+ const char *name;
+ char txt[1024];
+
+ memset (txt, 0, sizeof (txt));
+ snprintf (txt, sizeof (txt) - 1, _("EXIF MakerNote tags in '%s':"), filename);
+ fprintf (stdout, "%-38.38s", txt);
+ fprintf (stdout, "%-7.7s", "MakerNote");
+ fputc ('\n', stdout);
+ for (tag = 0; tag < 0xffff; tag++) {
+ name = mnote_tag_get_title (en, tag);
+ if (!name)
+ continue;
+ fprintf (stdout, " 0x%04x %-29.29s", tag, name);
+ if (mnote_data_get_value (en, tag))
+ printf (ENTRY_FOUND);
+ else
+ printf (ENTRY_NOT_FOUND);
+ fputc ('\n', stdout);
+ }
+}
+
static void
show_entry (ExifEntry *entry, void *data)
{
@@ -101,6 +126,23 @@
}
static void
+show_note_entry (MNoteData *note, MNoteTag tag, void *data)
+{
+ unsigned char *ids = data;
+
+ if (*ids)
+ fprintf (stdout, "0x%04x", tag);
+ else
+ fprintf (stdout, "%-20.20s", mnote_tag_get_title (note, tag));
+ printf ("|");
+ if (*ids)
+ fprintf (stdout, "%-72.72s", mnote_data_get_value (note, tag));
+ else
+ fprintf (stdout, "%-58.58s", mnote_data_get_value (note, tag));
+ fputc ('\n', stdout);
+}
+
+static void
print_hline (unsigned char ids)
{
unsigned int i, width;
@@ -145,4 +187,32 @@
"(%i bytes)."), ed->size);
fputc ('\n', stdout);
}
+}
+
+void
+action_ntag_list (const char *filename, MNoteData *en, unsigned char ids)
+{
+ ExifByteOrder order;
+
+ if (!en)
+ return;
+
+ order = mnote_data_get_byte_order (en);
+ fprintf (stdout, _("EXIF MakerNote tags in '%s' ('%s' byte order):"), filename,
+ exif_byte_order_get_name (order));
+ fputc ('\n', stdout);
+ print_hline (ids);
+ if (ids)
+ fprintf (stdout, "%-6.6s", _("Tag"));
+ else
+ fprintf (stdout, "%-20.20s", _("Tag"));
+ fputc ('|', stdout);
+ if (ids)
+ fprintf (stdout, "%-72.72s", _("Value"));
+ else
+ fprintf (stdout, "%-58.58s", _("Value"));
+ fputc ('\n', stdout);
+ print_hline (ids);
+ mnote_data_foreach_entry (en, show_note_entry, &ids);
+ print_hline (ids);
}
Index: actions.h
===================================================================
RCS file: /cvsroot/libexif/exif/exif/actions.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- actions.h 12 Feb 2002 19:47:40 -0000 1.1
+++ actions.h 17 Nov 2002 03:15:02 -0000 1.2
@@ -22,8 +22,11 @@
#define __ACTIONS_H__
#include <libexif/exif-data.h>
+#include <libmnote/mnote-data.h>
void action_tag_table (const char *filename, ExifData *ed);
+void action_ntag_table (const char *filename, MNoteData *en);
void action_tag_list (const char *filename, ExifData *ed, unsigned char ids);
+void action_ntag_list (const char *filename, MNoteData *en, unsigned char ids);
#endif /* __ACTIONS_H__ */
Index: main.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/main.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- main.c 23 Oct 2002 19:57:19 -0000 1.27
+++ main.c 17 Nov 2002 03:15:02 -0000 1.28
@@ -27,9 +27,10 @@
#include <popt.h>
#include <libexif/exif-data.h>
-#include <libexif/exif-note.h>
#include <libexif/exif-utils.h>
+#include <libmnote/mnote-data.h>
+
#include "libjpeg/jpeg-data.h"
#include "actions.h"
@@ -64,69 +65,25 @@
#endif
static void
-show_maker_note (ExifEntry *entry)
-{
- ExifNote *note;
- char **value;
- unsigned int i;
-
- note = exif_note_new_from_data (entry->data, entry->size);
- if (!note) {
- fprintf (stderr, _("Could not parse data of tag '%s'."),
- exif_tag_get_name (entry->tag));
- fputc ('\n', stderr);
- return;
- }
-
- value = exif_note_get_value (note);
- exif_note_unref (note);
-
- if (!value || !value[0]) {
- fprintf (stderr,
- _("Tag '%s' does not contain known information."),
- exif_tag_get_name (entry->tag));
- fputc ('\n', stderr);
- return;
- } else if (!value[1]) {
- printf (_("Tag '%s' contains one piece of information:"),
- exif_tag_get_name (entry->tag));
- printf ("\n");
- } else {
- printf (_("Tag '%s' contains the following information:"),
- exif_tag_get_name (entry->tag));
- printf ("\n");
- }
- for (i = 0; value && value[i]; i++) {
- printf (" %3i %s\n", i, value[i]);
- free (value[i]);
- }
- free (value);
-}
-
-static void
show_entry (ExifEntry *entry, const char *caption)
{
- unsigned int i;
-
printf (_("EXIF entry '%s' (0x%x, '%s') exists in IFD '%s':"),
exif_tag_get_title (entry->tag), entry->tag,
exif_tag_get_name (entry->tag), caption);
printf ("\n");
- printf (_(" Format: '%s'"), exif_format_get_name (entry->format));
- printf ("\n");
- printf (_(" Components: %i"), (int) entry->components);
- printf ("\n");
- printf (_(" Value: '%s'"), exif_entry_get_value (entry));
- printf ("\n");
- printf (_(" Data:"));
- for (i = 0; i < entry->size; i++) {
- if (!(i % 10))
- printf ("\n ");
- printf ("0x%02x ", entry->data[i]);
- }
+
+ exif_entry_dump(entry, 0);
+}
+
+static void
+show_note_entry (MNoteData *note, MNoteTag tag)
+{
+ printf (_("MakerNote entry '%s' (0x%x, '%s'):"),
+ mnote_tag_get_title (note, tag), tag,
+ mnote_tag_get_name (note, tag));
printf ("\n");
- if (entry->tag == EXIF_TAG_MAKER_NOTE)
- show_maker_note (entry);
+
+ mnote_data_dump_entry(note, tag, 0);
}
static void
@@ -186,19 +143,22 @@
struct _ExifOptions {
unsigned char use_ids;
ExifTag tag;
+ MNoteTag ntag;
};
int
main (int argc, const char **argv)
{
/* POPT_ARG_NONE needs an int, not char! */
- unsigned int list_tags = 0, show_description = 0;
+ unsigned int list_tags = 0, list_ntags = 0, show_description = 0;
unsigned int extract_thumbnail = 0, remove_thumbnail = 0;
unsigned int remove = 0;
- const char *set_value = NULL, *ifd_string = NULL, *tag_string = NULL;
+ const char *set_value = NULL, *ifd_string = NULL;
+ const char *tag_string = NULL, *ntag_string = NULL;
ExifIfd ifd = -1;
ExifTag tag = 0;
- ExifOptions eo = {0, 0};
+ MNoteTag ntag = 0;
+ ExifOptions eo = {0, 0, 0};
poptContext ctx;
const char **args, *output = NULL;
const char *ithumbnail = NULL;
@@ -208,10 +168,14 @@
N_("Show IDs instead of tag names"), NULL},
{"tag", 't', POPT_ARG_STRING, &tag_string, 0,
N_("Select tag"), N_("tag")},
+ {"ntag", '\0', POPT_ARG_STRING, &ntag_string, 0,
+ N_("Select MakerNote tag"), N_("ntag")},
{"ifd", '\0', POPT_ARG_STRING, &ifd_string, 0,
N_("Select IFD"), N_("IFD")},
{"list-tags", 'l', POPT_ARG_NONE, &list_tags, 0,
N_("List all EXIF tags"), NULL},
+ {"list-ntags", '\0', POPT_ARG_NONE, &list_ntags, 0,
+ N_("List all EXIF MakerNote tags"), NULL},
{"remove", '\0', POPT_ARG_NONE, &remove, 0,
N_("Remove tag or ifd"), NULL},
{"show-description", 's', POPT_ARG_NONE, &show_description, 0,
@@ -227,8 +191,9 @@
{"set-value", '\0', POPT_ARG_STRING, &set_value, 0,
N_("Value"), NULL},
POPT_TABLEEND};
- ExifData *ed;
- ExifEntry *e;
+ ExifData *ed = NULL;
+ ExifEntry *e = NULL;
+ MNoteData *md = NULL;
char fname[1024];
FILE *f;
@@ -272,7 +237,7 @@
}
}
- if (show_description) {
+ if (show_description && !ntag_string) {
if (!eo.tag) {
fprintf (stderr, _("Please specify a tag!"));
fputc ('\n', stderr);
@@ -303,6 +268,24 @@
exit (1);
}
+ if (ntag_string || list_ntags || ntag) {
+ e = exif_content_get_entry(ed->ifd[EXIF_IFD_EXIF],
+ EXIF_TAG_MAKER_NOTE);
+ if (!e) {
+ fprintf (stderr, _("'%s' does not "
+ "contain EXIF MakerNote data!"), *args);
+ fputc ('\n', stderr);
+ exit (1);
+ }
+
+ md = mnote_data_new_from_data (e->data, e->size);
+ if (!md) {
+ fprintf (stderr, "Could not parse EXIF tag MakerNote in '%s'!", *args);
+ fputc ('\n', stderr);
+ exit (1);
+ }
+ }
+
/* Where do we save the output? */
memset (fname, 0, sizeof (fname));
if (output)
@@ -313,8 +296,35 @@
sizeof (fname) - 1);
}
+ if (ntag_string) {
+ ntag = mnote_tag_from_string (md, ntag_string);
+ if (!ntag || !mnote_tag_get_name (md, ntag)) {
+ fprintf (stderr, _("Invalid MakerNote tag '%s'!"), ntag_string);
+ fputc ('\n', stderr);
+ return (1);
+ }
+ eo.ntag = ntag;
+
+ }
+
+ if (show_description && ntag_string) {
+ if (!eo.ntag) {
+ fprintf (stderr, _("Please specify a MakerNote tag!"));
+ fputc ('\n', stderr);
+ return (1);
+ }
+ printf (_("Tag '%s' (0x%04x, '%s'): %s"),
+ mnote_tag_get_title (md, eo.ntag), eo.ntag,
+ mnote_tag_get_name (md, eo.ntag),
+ mnote_tag_get_description (md, eo.ntag));
+ printf ("\n");
+ return (0);
+ }
+
if (list_tags) {
action_tag_table (*args, ed);
+ } else if (list_ntags) {
+ action_ntag_table (*args, md);
} else if (tag && !set_value) {
if ((ifd >= EXIF_IFD_0) &&
(ifd < EXIF_IFD_COUNT)) {
@@ -333,6 +343,18 @@
} else {
search_entry (ed, eo.tag);
}
+ } else if (ntag && !set_value) {
+ char *value = mnote_data_get_value (md, ntag);
+ if (value)
+ show_note_entry (md, ntag);
+ else {
+ fprintf (stderr, _("Makernote "
+ "does not contain tag "
+ "'%s'."),
+ ntag_string);
+ fputc ('\n', stderr);
+ return (1);
+ }
} else if (extract_thumbnail) {
/* No thumbnail? Exit. */
@@ -512,6 +534,8 @@
return (1);
}
strcpy (e->data, buf);
+ e->components = strlen(e->data) + 1;
+ i = e->components - 1;
break;
case EXIF_FORMAT_SHORT:
exif_set_short (e->data + (s * i), o, atoi (buf));
Index: utils.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/utils.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- utils.c 25 Jul 2002 16:29:45 -0000 1.3
+++ utils.c 17 Nov 2002 03:15:02 -0000 1.4
@@ -138,3 +138,102 @@
return (-1);
}
+
+MNoteTag
+mnote_tag_from_string (MNoteData *note, const char *string)
+{
+ MNoteTag tag;
+ unsigned int i, number, factor;
+ const char *name;
+
+ if (!string)
+ return (0);
+
+ /* Is the string a tag's name or title? */
+ for (tag = 0xffff; tag > 0; tag--) {
+ name = mnote_tag_get_name (note, tag);
+ if (name && !strcmp (string, name))
+ return (tag);
+ name = mnote_tag_get_title (note, tag);
+ if (name && !strcmp (string, name))
+ return (tag);
+ }
+
+ /* Is the string a decimal number? */
+ if (strspn (string, "0123456789") == strlen (string))
+ return (atoi (string));
+
+ /* Is the string a hexadecimal number? */
+ for (i = 0; i < strlen (string); i++)
+ if (string[i] == 'x')
+ break;
+ if (i == strlen (string))
+ return (0);
+
+ string += i + 1;
+ tag = 0;
+ for (i = strlen (string); i > 0; i--) {
+ switch (string[i - 1]) {
+ case '0':
+ number = 0;
+ break;
+ case '1':
+ number = 1;
+ break;
+ case '2':
+ number = 2;
+ break;
+ case '3':
+ number = 3;
+ break;
+ case '4':
+ number = 4;
+ break;
+ case '5':
+ number = 5;
+ break;
+ case '6':
+ number = 6;
+ break;
+ case '7':
+ number = 7;
+ break;
+ case '8':
+ number = 8;
+ break;
+ case '9':
+ number = 9;
+ break;
+ case 'a':
+ case 'A':
+ number = 10;
+ break;
+ case 'b':
+ case 'B':
+ number = 11;
+ break;
+ case 'c':
+ case 'C':
+ number = 12;
+ break;
+ case 'd':
+ case 'D':
+ number = 13;
+ break;
+ case 'e':
+ case 'E':
+ number = 14;
+ break;
+ case 'f':
+ case 'F':
+ number = 15;
+ break;
+ default:
+ return (0);
+ }
+ factor = 1 << ((strlen (string) - i) * 4);
+ tag += (number * factor);
+ }
+
+ return (tag);
+}
Index: utils.h
===================================================================
RCS file: /cvsroot/libexif/exif/exif/utils.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- utils.h 25 Jul 2002 16:29:45 -0000 1.2
+++ utils.h 17 Nov 2002 03:15:02 -0000 1.3
@@ -23,9 +23,12 @@
#include <libexif/exif-tag.h>
#include <libexif/exif-ifd.h>
+#include <libmnote/mnote-data.h>
ExifTag exif_tag_from_string (const char *string);
ExifIfd exif_ifd_from_string (const char *string);
+
+MNoteTag mnote_tag_from_string (MNoteData *note, const char *string);
#endif /* __UTILS_H__ */
|
|
From: <rw...@us...> - 2002-11-17 03:15:06
|
Update of /cvsroot/libexif/exif In directory usw-pr-cvs1:/tmp/cvs-serv29272 Modified Files: configure.in Log Message: Added support for libmnote (EXIF MakerNote parsing). Everything completed, except for set_value handling. Index: configure.in =================================================================== RCS file: /cvsroot/libexif/exif/configure.in,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- configure.in 15 Nov 2002 21:32:19 -0000 1.17 +++ configure.in 17 Nov 2002 03:15:02 -0000 1.18 @@ -19,6 +19,9 @@ PKG_CHECK_MODULES(LIBEXIF, libexif >= 0.5.4) AC_SUBST(LIBEXIF_LIBS) AC_SUBST(LIBEXIF_CFLAGS) +PKG_CHECK_MODULES(LIBMNOTE, libmnote >= 0.5.4) +AC_SUBST(LIBMNOTE_LIBS) +AC_SUBST(LIBMNOTE_CFLAGS) dnl --------------------------------------------------------------------------- dnl libmnote: Useful for parsing MakerNote-tags. |
|
From: <lu...@us...> - 2002-11-15 22:37:50
|
Update of /cvsroot/libexif/libmnote In directory usw-pr-cvs1:/tmp/cvs-serv32265 Modified Files: ChangeLog Log Message: 2002-11-15 Lutz Müller <lu...@us...> * configure.in: AC_DEFINE(HAVE_MNOTE) Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libmnote/ChangeLog,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ChangeLog 15 Nov 2002 22:10:05 -0000 1.6 +++ ChangeLog 15 Nov 2002 22:37:47 -0000 1.7 @@ -1,5 +1,9 @@ 2002-11-15 Lutz Müller <lu...@us...> + * configure.in: AC_DEFINE(HAVE_MNOTE) + +2002-11-15 Lutz Müller <lu...@us...> + * test: New 2002-11-15 Lutz Müller <lu...@us...> |
|
From: <lu...@us...> - 2002-11-15 21:32:27
|
Update of /cvsroot/libexif/exif
In directory usw-pr-cvs1:/tmp/cvs-serv9211
Modified Files:
ChangeLog configure.in
Log Message:
2002-11-15 Lutz Müller <lu...@us...>
* configure.in: Ok, I got the message. Let exif _optionally_ use
libmnote if available.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/exif/ChangeLog,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- ChangeLog 15 Nov 2002 19:59:52 -0000 1.23
+++ ChangeLog 15 Nov 2002 21:32:19 -0000 1.24
@@ -1,5 +1,10 @@
2002-11-15 Lutz Müller <lu...@us...>
+ * configure.in: Ok, I got the message. Let exif _optionally_ use
+ libmnote if available.
+
+2002-11-15 Lutz Müller <lu...@us...>
+
* configure.in: Make exif depend on libmnote. This library isn't used
yet, but that's subject to change.
Index: configure.in
===================================================================
RCS file: /cvsroot/libexif/exif/configure.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- configure.in 15 Nov 2002 19:59:53 -0000 1.16
+++ configure.in 15 Nov 2002 21:32:19 -0000 1.17
@@ -5,6 +5,7 @@
AM_MAINTAINER_MODE
AM_PROG_LIBTOOL
+AC_PATH_PROG(PKG_CONFIG,pkg-config)
dnl ---------------------------------------------------------------------------
dnl i18n support
@@ -15,11 +16,30 @@
dnl ---------------------------------------------------------------------------
dnl libraries needed
dnl ---------------------------------------------------------------------------
-PKG_CHECK_MODULES(LIBEXIF, libexif >= 0.5.4 libmnote)
+PKG_CHECK_MODULES(LIBEXIF, libexif >= 0.5.4)
AC_SUBST(LIBEXIF_LIBS)
AC_SUBST(LIBEXIF_CFLAGS)
dnl ---------------------------------------------------------------------------
+dnl libmnote: Useful for parsing MakerNote-tags.
+dnl ---------------------------------------------------------------------------
+mnote_msg=no
+try_mnote=true
+AC_ARG_WITH(mnote, [ --without-mnote Don't use libmnote],
+ if test x$withval = xno; then
+ try_mnote=false
+ fi)
+if $try_mnote; then
+ if ${PKG_CONFIG} --exists libmnote > /dev/null 2>&1; then
+ LIBMNOTE_LIBS=`$PKG_CONFIG --libs libmnote`
+ LIBMNOTE_CFLAGS=`$PKG_CONFIG --cflags libmnote`
+ AC_SUBST(LIBMNOTE_CFLAGS)
+ AC_SUBST(LIBMNOTE_LIBS)
+ mnote_msg="yes"
+ fi
+fi
+
+dnl ---------------------------------------------------------------------------
dnl locale.h: locale.h provides setlocale. It seems that some systems don't
dnl have it (at least if configured --without-nls).
dnl ---------------------------------------------------------------------------
@@ -89,4 +109,6 @@
Source code location: ${srcdir}
Compiler: ${CC}
+
+ Support for MakerNotes: $mnote_msg
"
|
|
From: <lu...@us...> - 2002-11-15 21:32:27
|
Update of /cvsroot/libexif/exif/exif In directory usw-pr-cvs1:/tmp/cvs-serv9211/exif Modified Files: Makefile.am Log Message: 2002-11-15 Lutz Müller <lu...@us...> * configure.in: Ok, I got the message. Let exif _optionally_ use libmnote if available. Index: Makefile.am =================================================================== RCS file: /cvsroot/libexif/exif/exif/Makefile.am,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- Makefile.am 28 Oct 2002 12:35:46 -0000 1.11 +++ Makefile.am 15 Nov 2002 21:32:20 -0000 1.12 @@ -2,7 +2,7 @@ -I$(top_srcdir) \ -I$(top_srcdir)/intl \ -DEXIF_LOCALEDIR=\""$(datadir)/locale"\" \ - $(LIBEXIF_CFLAGS) \ + $(LIBEXIF_CFLAGS) $(LIBMNOTE_CFLAGS) \ $(POPT_CFLAGS) bin_PROGRAMS = exif @@ -11,8 +11,8 @@ actions.h actions.c \ main.c \ utils.h utils.c -exif_LDADD = \ - ../libjpeg/libjpeg.la \ - $(LIBEXIF_LIBS) \ - $(POPT_LIBS) \ +exif_LDADD = \ + ../libjpeg/libjpeg.la \ + $(LIBEXIF_LIBS) $(LIBMNOTE_LIBS) \ + $(POPT_LIBS) \ $(INTLLIBS) |
|
From: <lu...@us...> - 2002-11-15 19:59:59
|
Update of /cvsroot/libexif/exif In directory usw-pr-cvs1:/tmp/cvs-serv8192 Modified Files: ChangeLog configure.in Log Message: 2002-11-15 Lutz Müller <lu...@us...> * configure.in: Make exif depend on libmnote. This library isn't used yet, but that's subject to change. Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/exif/ChangeLog,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- ChangeLog 23 Oct 2002 19:57:18 -0000 1.22 +++ ChangeLog 15 Nov 2002 19:59:52 -0000 1.23 @@ -1,3 +1,8 @@ +2002-11-15 Lutz Müller <lu...@us...> + + * configure.in: Make exif depend on libmnote. This library isn't used + yet, but that's subject to change. + 2002-10-23 Lutz Müller <lu...@us...> * exif/main.c: s/poptPrintUsage/poptPrintHelp Index: configure.in =================================================================== RCS file: /cvsroot/libexif/exif/configure.in,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- configure.in 28 Oct 2002 11:43:34 -0000 1.15 +++ configure.in 15 Nov 2002 19:59:53 -0000 1.16 @@ -15,7 +15,7 @@ dnl --------------------------------------------------------------------------- dnl libraries needed dnl --------------------------------------------------------------------------- -PKG_CHECK_MODULES(LIBEXIF, libexif >= 0.5.4) +PKG_CHECK_MODULES(LIBEXIF, libexif >= 0.5.4 libmnote) AC_SUBST(LIBEXIF_LIBS) AC_SUBST(LIBEXIF_CFLAGS) |
|
From: <rw...@us...> - 2002-11-15 12:00:41
|
Update of /cvsroot/libexif/libexif/libexif
In directory usw-pr-cvs1:/tmp/cvs-serv1034
Modified Files:
exif-format.c
Log Message:
Fixed an incorrect string representation of SLong.
Index: exif-format.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-format.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- exif-format.c 10 Jun 2002 13:07:49 -0000 1.2
+++ exif-format.c 15 Nov 2002 12:00:10 -0000 1.3
@@ -51,7 +51,7 @@
{EXIF_FORMAT_SHORT, "Short", 2},
{EXIF_FORMAT_LONG, "Long", 4},
{EXIF_FORMAT_RATIONAL, "Rational", 8},
- {EXIF_FORMAT_SLONG, "SShort", 4},
+ {EXIF_FORMAT_SLONG, "SLong", 4},
{EXIF_FORMAT_SRATIONAL, "SRational", 8},
{EXIF_FORMAT_UNDEFINED, N_("Undefined"), 1},
{0, NULL, 0}
|
|
From: <as...@us...> - 2002-11-01 19:59:48
|
Update of /cvsroot/libexif/libexif-gtk In directory usw-pr-cvs1:/tmp/cvs-serv16151 Modified Files: Makefile.am Log Message: tar short options to long ones Index: Makefile.am =================================================================== RCS file: /cvsroot/libexif/libexif-gtk/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Makefile.am 1 Nov 2002 19:56:10 -0000 1.5 +++ Makefile.am 1 Nov 2002 19:59:45 -0000 1.6 @@ -12,4 +12,4 @@ dist-bzip2: -chmod -R a+r $(distdir) - -tar chojf $(distdir).tar.bz2 $(distdir) + -tar -c --bzip2 -h -o -f $(distdir).tar.bz2 $(distdir) |
|
From: <as...@us...> - 2002-11-01 19:59:40
|
Update of /cvsroot/libexif/libexif In directory usw-pr-cvs1:/tmp/cvs-serv16094 Modified Files: Makefile.am Log Message: tar short options to long ones Index: Makefile.am =================================================================== RCS file: /cvsroot/libexif/libexif/Makefile.am,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- Makefile.am 1 Nov 2002 19:56:03 -0000 1.11 +++ Makefile.am 1 Nov 2002 19:59:37 -0000 1.12 @@ -15,4 +15,4 @@ dist-bzip2: -chmod -R a+r $(distdir) - -tar chojf $(distdir).tar.bz2 $(distdir) + -tar -c --bzip2 -h -o -f $(distdir).tar.bz2 $(distdir) |
|
From: <as...@us...> - 2002-11-01 19:59:31
|
Update of /cvsroot/libexif/gexif In directory usw-pr-cvs1:/tmp/cvs-serv16009 Modified Files: Makefile.am Log Message: tar short options to long ones Index: Makefile.am =================================================================== RCS file: /cvsroot/libexif/gexif/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Makefile.am 1 Nov 2002 19:55:55 -0000 1.7 +++ Makefile.am 1 Nov 2002 19:59:27 -0000 1.8 @@ -12,4 +12,4 @@ dist-bzip2: -chmod -R a+r $(distdir) - -tar chojf $(distdir).tar.bz2 $(distdir) + -tar -c --bzip2 -h -o -f $(distdir).tar.bz2 $(distdir) |
|
From: <as...@us...> - 2002-11-01 19:56:14
|
Update of /cvsroot/libexif/libexif-gtk
In directory usw-pr-cvs1:/tmp/cvs-serv14689
Modified Files:
Makefile.am
Log Message:
s/$(TAR)/tar/
Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif-gtk/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.am 30 Sep 2002 12:15:55 -0000 1.4
+++ Makefile.am 1 Nov 2002 19:56:10 -0000 1.5
@@ -3,7 +3,7 @@
########################################################################
# create .tar.bz2 distribution package for convenience if the
-# $(TAR) on this system supports it. else do nothing.
+# tar on this system supports it. else do nothing.
dist-hook:
if [ "x${CDPATH}" != "x" ]; then \
echo "You have set CDPATH. If make dist fails, try to unset CDPATH."; \
@@ -12,4 +12,4 @@
dist-bzip2:
-chmod -R a+r $(distdir)
- -$(TAR) chojf $(distdir).tar.bz2 $(distdir)
+ -tar chojf $(distdir).tar.bz2 $(distdir)
|
|
From: <as...@us...> - 2002-11-01 19:56:06
|
Update of /cvsroot/libexif/libexif
In directory usw-pr-cvs1:/tmp/cvs-serv14633
Modified Files:
Makefile.am
Log Message:
s/$(TAR)/tar/
Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile.am 16 Sep 2002 18:24:25 -0000 1.10
+++ Makefile.am 1 Nov 2002 19:56:03 -0000 1.11
@@ -6,7 +6,7 @@
########################################################################
# create .tar.bz2 distribution package for convenience if the
-# $(TAR) on this system supports it. else do nothing.
+# tar on this system supports it. else do nothing.
dist-hook:
if [ "x${CDPATH}" != "x" ]; then \
echo "You have set CDPATH. If make dist fails, try to unset CDPATH."; \
@@ -15,4 +15,4 @@
dist-bzip2:
-chmod -R a+r $(distdir)
- -$(TAR) chojf $(distdir).tar.bz2 $(distdir)
+ -tar chojf $(distdir).tar.bz2 $(distdir)
|
|
From: <as...@us...> - 2002-11-01 19:55:59
|
Update of /cvsroot/libexif/gexif
In directory usw-pr-cvs1:/tmp/cvs-serv14538
Modified Files:
Makefile.am
Log Message:
s/$(TAR)/tar/
Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/gexif/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.am 30 Sep 2002 12:14:35 -0000 1.6
+++ Makefile.am 1 Nov 2002 19:55:55 -0000 1.7
@@ -3,7 +3,7 @@
########################################################################
# create .tar.bz2 distribution package for convenience if the
-# $(TAR) on this system supports it. else do nothing.
+# tar on this system supports it. else do nothing.
dist-hook:
if [ "x${CDPATH}" != "x" ]; then \
echo "You have set CDPATH. If make dist fails, try to unset CDPATH."; \
@@ -12,4 +12,4 @@
dist-bzip2:
-chmod -R a+r $(distdir)
- -$(TAR) chojf $(distdir).tar.bz2 $(distdir)
+ -tar chojf $(distdir).tar.bz2 $(distdir)
|
|
From: <as...@us...> - 2002-10-30 15:53:13
|
Update of /cvsroot/libexif/libexif-gtk
In directory usw-pr-cvs1:/tmp/cvs-serv13666
Modified Files:
autogen.sh
Log Message:
really cleans what comes out automake
Index: autogen.sh
===================================================================
RCS file: /cvsroot/libexif/libexif-gtk/autogen.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- autogen.sh 27 Oct 2002 10:45:40 -0000 1.8
+++ autogen.sh 30 Oct 2002 15:53:09 -0000 1.9
@@ -157,7 +157,7 @@
find . -name '*.am' -print |
while read file
do # remove all .in files with a corresponding .am file
- rm -f "$(sed s/\.am$/.in/g)"
+ rm -f $(echo "$file" | sed s/\.am\$/.in/g)
done
rm -f depcomp install-sh missing mkinstalldirs
rm -f stamp-h* libgphoto2/stamp-h*
|
