libexif-cvs — CVS commitlogs of all libexif CVS modules

[libexif-cvs] exif/exif actions.c,1.46,1.47

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/exif/exif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26323/exif

Modified Files:
	actions.c 
Log Message:
Fixed alignment of --list-tags header with --width


Index: actions.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/actions.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -d -r1.46 -r1.47
--- actions.c	13 Oct 2009 03:11:33 -0000	1.46
+++ actions.c	17 Oct 2009 19:00:44 -0000	1.47
@@ -372,7 +372,7 @@ action_tag_table (ExifData *ed, ExifPara
 #define ENTRY_NOT_FOUND "   -   "
 
 	snprintf (txt, sizeof (txt) - 1, _("EXIF tags in '%s':"), p.fin);
-	fieldwidth = width = 38;
+	fieldwidth = width = p.width - 42;
 	bytes = exif_mbstrlen(txt, &width);
 	printf ("%.*s%*s", bytes, txt, fieldwidth-width, "");
 

[libexif-cvs] exif ChangeLog,1.101,1.102

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/exif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26323

Modified Files:
	ChangeLog 
Log Message:
Fixed alignment of --list-tags header with --width


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/exif/ChangeLog,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -d -r1.101 -r1.102
--- ChangeLog	17 Oct 2009 06:01:09 -0000	1.101
+++ ChangeLog	17 Oct 2009 19:00:42 -0000	1.102
@@ -1,3 +1,7 @@
+2009-10-17  Dan Fandrich <da...@co...>
+
+	* Fixed alignment of --list-tags header with --width
+
 2009-10-16  Dan Fandrich <da...@co...>
 
 	* po/ja.po: Added new Japanese translation by Tadashi Jokagi

[libexif-cvs] exif/po ja.po,NONE,1.1

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/exif/po
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15891/po

Added Files:
	ja.po 
Log Message:
po/ja.po: Added new Japanese translation by Tadashi Jokagi


--- NEW FILE: ja.po ---
# Japanese translation for exif.
# Copyright (C) 2009 Lutz Mueller and others
# This file is distributed under the same license as the exif package.
# Tadashi Jokagi <el...@us...>, 2009.
#
msgid ""
msgstr ""
"Project-Id-Version: exif 0.6.18\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-10-08 18:05-0700\n"
"PO-Revision-Date: 2009-10-13 03:59+0900\n"
"Last-Translator: Tadashi Jokagi <el...@us...>\n"
"Language-Team: Japanese <tra...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"

#: exif/actions.c:57
#, c-format
msgid "Not enough memory."
msgstr "メモリーが足りません。"

#: exif/actions.c:75
#, c-format
msgid "Setting a value for this tag is unsupported!"
msgstr "このタグへの値の設定はサポートしていません!"

#: exif/actions.c:92
#, c-format
msgid "Too few components specified!"
msgstr "コンポーネントのしていが足りません!"

#: exif/actions.c:107
#, c-format
msgid "Internal error. Please contact <%s>."
msgstr "内部エラー。<%s> に連絡してください。"

#: exif/actions.c:146
#, c-format
msgid "Not yet implemented!"
msgstr "まだ実装していません!"

#: exif/actions.c:153
#, c-format
msgid "Warning; Too many components specified!"
msgstr "警告: コンポーネントの指定が多すぎます!"

#: exif/actions.c:175
#, c-format
msgid "Too much EXIF data (%i bytes). Only %i bytes are allowed."
msgstr "あまりにたくさんの EXIF データです(%i バイト)。 %i バイトのみ確保しました。"

#: exif/actions.c:186 exif/actions.c:357
#, c-format
msgid "Wrote file '%s'."
msgstr "ファイル「%s」へ書き込みました。"

#: exif/actions.c:206
#, c-format
msgid "EXIF entry '%s' "
msgstr "EXIF エントリー「%s」"

#: exif/actions.c:208
#, c-format
msgid "(0x%x, '%s') "
msgstr "(0x%x、'%s') "

#: exif/actions.c:211
#, c-format
msgid "exists in IFD '%s':\n"
msgstr "は IFD 「%s」に存在します:\n"

#: exif/actions.c:262
#, c-format
msgid "IFD '%s' does not contain a tag '%s'!"
msgstr "IFD「%s」はタグ「%s」に含まれません!"

#: exif/actions.c:292
#, c-format
msgid "Could not open '%s' (%s)!"
msgstr "「%s」を開けません (%s)!"

#: exif/actions.c:301
#, c-format
msgid "Could not read '%s' (%s)."
msgstr "「%s」を読み込めません (%s)。"

#: exif/actions.c:320
#, c-format
msgid "IFD '%s' does not contain tag '%s'."
msgstr "IFD「%s」はタグ「%s」に含まれません。"

#: exif/actions.c:326
#, c-format
msgid "'%s' does not contain tag '%s'."
msgstr "「%s」はタグ「%s」に含まれません。"

#: exif/actions.c:344
#, c-format
msgid "'%s' does not contain a thumbnail!"
msgstr "「%s」はサムネイルに含まれません!"

#: exif/actions.c:352
#, c-format
msgid "Could not open '%s' for writing (%s)!"
msgstr "書き込むために「%s」を開けません (%s)!"

#: exif/actions.c:374
#, c-format
msgid "EXIF tags in '%s':"
msgstr "「%s」内の EXIF タグ:"

#: exif/actions.c:470
#, c-format
msgid "Unknown format or nonexistent MakerNote.\n"
msgstr "不明な形式か、MakerNote が存在しません。\n"

#: exif/actions.c:477
#, c-format
msgid "MakerNote does not contain any value.\n"
msgstr "MakerNote はいくつかの値を含んでいません。\n"

#: exif/actions.c:480
#, c-format
msgid "MakerNote contains %i value:\n"
msgid_plural "MakerNote contains %i values:\n"
msgstr[0] "MakerNote は %i の値を含みます:\n"

#: exif/actions.c:490
msgid "Unknown tag"
msgstr "不明なタグ"

#: exif/actions.c:499
msgid "Unknown value"
msgstr "不明な値"

#: exif/actions.c:523
#, c-format
msgid "EXIF tags in '%s' ('%s' byte order):"
msgstr "%s の EXIF タグ (%s バイトオーダー):"

#: exif/actions.c:529
msgid "Tag"
msgstr "タグ"

#: exif/actions.c:535
msgid "Value"
msgstr "値"

#: exif/actions.c:550
#, c-format
msgid "EXIF data contains a thumbnail (%i bytes)."
msgstr "EXIF データはサムネイルを含みます (%i バイト)。"

#: exif/actions.c:592
#, c-format
msgid "ThumbnailSize\t%i\n"
msgstr "サムネイルの大きさ\t%i\n"

#: exif/main.c:196
msgid "Display software version"
msgstr "ソフトウェア バージョンの表示"

#: exif/main.c:198
msgid "Show IDs instead of tag names"
msgstr "タグ名の代わりに ID の表示"

#: exif/main.c:200
msgid "Select tag"
msgstr "タグの選択"

#: exif/main.c:200
msgid "tag"
msgstr "タグ"

#: exif/main.c:202
msgid "Select IFD"
msgstr "IFD の選択"

#: exif/main.c:202
msgid "IFD"
msgstr "IFD"

#: exif/main.c:204
msgid "List all EXIF tags"
msgstr "すべての EXIF タグの表示"

#: exif/main.c:206
msgid "Show contents of tag MakerNote"
msgstr "タグ MakerNote の内容の表示"

#: exif/main.c:208
msgid "Remove tag or ifd"
msgstr "ifd のタグの削除"

#: exif/main.c:210
msgid "Show description of tag"
msgstr "タグの説明の表示"

#: exif/main.c:212
msgid "Extract thumbnail"
msgstr "サムネイルの展開"

#: exif/main.c:214
msgid "Remove thumbnail"
msgstr "サムネイルの削除"

#: exif/main.c:216
msgid "Insert FILE as thumbnail"
msgstr "サムネイルとして FILE を挿入する"

#: exif/main.c:216 exif/main.c:220
msgid "FILE"
msgstr "FILE"

#: exif/main.c:218
msgid "Do not fix existing tags in files"
msgstr "ファイル内の依存タグを修正しない"

#: exif/main.c:220
msgid "Write data to FILE"
msgstr "FILE へのデータ書き込み"

#: exif/main.c:222
msgid "Value of tag"
msgstr "タグの値"

#: exif/main.c:224
msgid "Create EXIF data if not existing"
msgstr "EXIF データが存在しない場合、作成する"

#: exif/main.c:226
msgid "Output in a machine-readable (tab delimited) format"
msgstr "可読性のある形式(タブ区切り)の出力"

#: exif/main.c:229
msgid "Width of output"
msgstr "出力の幅"

#: exif/main.c:229
msgid "WIDTH"
msgstr "WIDTH"

#: exif/main.c:231
msgid "Output in a XML format"
msgstr "XML 形式の出力"

#: exif/main.c:234
msgid "Show debugging messages"
msgstr "デバッグメッセージの表示"

#: exif/main.c:240
msgid "Help options:"
msgstr "ヘルプ オプション:"

#: exif/main.c:241
msgid "Show this help message"
msgstr "このヘルプメッセージの表示"

#: exif/main.c:242
msgid "Display brief usage message"
msgstr "短い使い方のメッセージの表示"

#: exif/main.c:262
msgid "[OPTION...] file"
msgstr "[OPTION...] ファイル"

#: exif/main.c:277
#, c-format
msgid "Invalid IFD '%s'. Valid IFDs are '0', '1', 'EXIF', 'GPS', and 'Interoperability'."
msgstr "IFD「%s」が正しくありません。有効な IFD は「0」、「1」、「EXIF」、「GPS」、「Interoperability」です。"

#: exif/main.c:286
#, c-format
msgid "Invalid tag '%s'!"
msgstr "タグ「%s」が正しくありません!"

#: exif/main.c:294
msgid "You need to specify a tag!"
msgstr "タグを指定する必要があります!"

#: exif/main.c:299
msgid "You need to specify an IFD!"
msgstr "IFD を指定する必要があります!"

#: exif/main.c:322
#, c-format
msgid "Tag '%s' "
msgstr "タグ「%s」"

#: exif/main.c:324
#, c-format
msgid "(0x%04x, '%s'): "
msgstr "(0x%04x、'%s'): "

#: exif/main.c:388
#, c-format
msgid "'%s' is not readable or does not contain EXIF data!"
msgstr "「%s」は読み込めないか、EXIF データを含みません!"

[libexif-cvs] exif ChangeLog,1.100,1.101 NEWS,1.35,1.36

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/exif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15891

Modified Files:
	ChangeLog NEWS 
Log Message:
po/ja.po: Added new Japanese translation by Tadashi Jokagi


Index: NEWS
===================================================================
RCS file: /cvsroot/libexif/exif/NEWS,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -d -r1.35 -r1.36
--- NEWS	15 Oct 2009 07:33:55 -0000	1.35
+++ NEWS	17 Oct 2009 06:01:09 -0000	1.36
@@ -1,5 +1,5 @@
 exif-0.6.x:
-  * New translation: fi
+  * New translations: fi, ja
   * Updated translations: sv, vi, zh_CN
 
 exif-0.6.18 (2009-10-08):

Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/exif/ChangeLog,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -d -r1.100 -r1.101
--- ChangeLog	14 Oct 2009 05:37:25 -0000	1.100
+++ ChangeLog	17 Oct 2009 06:01:09 -0000	1.101
@@ -1,3 +1,7 @@
+2009-10-16  Dan Fandrich <da...@co...>
+
+	* po/ja.po: Added new Japanese translation by Tadashi Jokagi
+
 2009-10-13  Dan Fandrich <da...@co...>
 
 	* po/fi.po: Added new Finnish translation by Jorma Karvonen

[libexif-cvs] libexif/libexif exif-entry.h, 1.22, 1.23 exif-loader.h, 1.12, 1.13 exif-mem.h, 1.8, 1.9 exif.h, 1.13, 1.14

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15751/libexif

Modified Files:
	exif-entry.h exif-loader.h exif-mem.h exif.h 
Log Message:
Improved comments


Index: exif-entry.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -d -r1.22 -r1.23
--- exif-entry.h	31 Jan 2009 23:32:37 -0000	1.22
+++ exif-entry.h	17 Oct 2009 06:00:27 -0000	1.23
@@ -61,7 +61,7 @@ struct _ExifEntry {
         unsigned int size;
 
 	/*! #ExifContent containing this entry. 
-	 * \see #exif_entry_get_ifd */
+	 * \see exif_entry_get_ifd */
 	ExifContent *parent;
 
 	/*! Internal data to be used by libexif itself */

Index: exif-mem.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-mem.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -d -r1.8 -r1.9
--- exif-mem.h	27 Nov 2008 06:54:45 -0000	1.8
+++ exif-mem.h	17 Oct 2009 06:00:27 -0000	1.9
@@ -1,6 +1,6 @@
 /*! \file exif-mem.h
  *  \brief Define the ExifMem data type and the associated functions.
- *  ExifMem defines the memory management functions used by the ExifLoader.
+ *  ExifMem defines the memory management functions used within libexif.
  */
 /* exif-mem.h
  *
@@ -77,9 +77,9 @@ void *exif_mem_alloc   (ExifMem *m, Exif
 void *exif_mem_realloc (ExifMem *m, void *p, ExifLong s);
 void  exif_mem_free    (ExifMem *m, void *p);
 
-/*! The default ExifMem for your convenience
+/*! Create a new ExifMem with default values for your convenience
  *
- * \return return the default ExifMem
+ * \return return a new default ExifMem
  */
 ExifMem *exif_mem_new_default (void);
 

Index: exif.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -d -r1.13 -r1.14
--- exif.h	17 Jun 2009 19:07:44 -0000	1.13
+++ exif.h	17 Oct 2009 06:00:27 -0000	1.14
@@ -74,7 +74,7 @@
  * \section thread_safety Thread Safety
  * 
  * libexif is thread safe when the underlying C library is also thread safe.
- * Some libraries may require defining a special macro (like _REENTRANT)
+ * Some C libraries may require defining a special macro (like _REENTRANT)
  * to ensure this, or may require linking to a special thread-safe version of
  * the library.
  *

Index: exif-loader.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-loader.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -d -r1.12 -r1.13
--- exif-loader.h	1 Oct 2009 05:07:14 -0000	1.12
+++ exif-loader.h	17 Oct 2009 06:00:27 -0000	1.13
@@ -90,12 +90,19 @@ void          exif_loader_reset (ExifLoa
  * already contain data from a previous call to #exif_loader_write_file
  * or #exif_loader_write.
  *
+ * \note The #ExifData returned is created using its default options, which
+ * may take effect before the data is returned. If other options are desired,
+ * an #ExifData must be created explicitly and data extracted from the loader
+ * using #exif_loader_get_buf instead.
+ *
  * \param[in] loader the loader
  * \return allocated ExifData
+ *
+ * \see exif_loader_get_buf
  */
 ExifData     *exif_loader_get_data (ExifLoader *loader);
 
-/*! Return the data read by the loader.  The returned pointer is only
+/*! Return the raw data read by the loader.  The returned pointer is only
  * guaranteed to be valid until the next call to a function modifying
  * this #ExifLoader.  Either or both of buf and buf_size may be NULL on
  * entry, in which case that value is not returned.

[libexif-cvs] exif NEWS,1.34,1.35

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/exif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9720

Modified Files:
	NEWS 
Log Message:
Mention translations


Index: NEWS
===================================================================
RCS file: /cvsroot/libexif/exif/NEWS,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -d -r1.34 -r1.35
--- NEWS	9 Oct 2009 00:55:05 -0000	1.34
+++ NEWS	15 Oct 2009 07:33:55 -0000	1.35
@@ -1,4 +1,6 @@
 exif-0.6.x:
+  * New translation: fi
+  * Updated translations: sv, vi, zh_CN
 
 exif-0.6.18 (2009-10-08):
   * New translations: is, it, lv

[libexif-cvs] libexif README,1.23,1.24

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9529

Modified Files:
	README 
Log Message:
Minor message edits


Index: README
===================================================================
RCS file: /cvsroot/libexif/libexif/README,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -d -r1.23 -r1.24
--- README	13 Jan 2009 08:26:39 -0000	1.23
+++ README	15 Oct 2009 07:32:53 -0000	1.24
@@ -133,17 +133,17 @@ by eliminating them.
 INTERNATIONALIZATION
 --------------------
 
-All translations for libexif, except cs, ru and en_CA, are coordinated by
-the Translation Project at http://translationproject.org/.  This means
-that ALL changes to the .po files (except those few exceptions) MUST be
-made through the TP web site, or they will be eventually overwritten
-and lost.  If you are interested in translating libexif into a new
-language, simply join TP and start!  A translation disclaimer is NOT
-required for libexif; by making a translation, you agree implicitly to
-provide it under the same license terms as the rest of libexif (LGPL).
-When a new version of libexif is available for translation, a libexif
-maintainer will contact the Translation Project and all interested TP
-members will be automatically notified.
+All translations for libexif, except cr, cs, pt_BR, ru and en_CA, are
+coordinated by the Translation Project at http://translationproject.org/.
+This means that ALL changes to the .po files (except those few
+exceptions) MUST be made through the TP web site, or they will be
+eventually overwritten and lost.  If you are interested in translating
+libexif into a new language, simply join TP and start!  A translation
+disclaimer is NOT required for libexif; by making a translation, you
+agree implicitly to provide it under the same license terms as the rest
+of libexif (LGPL).  When a new version of libexif is available for
+translation, a libexif maintainer will contact the Translation Project
+and all interested TP members will be automatically notified.
 
 
 AUTHORS

[libexif-cvs] libexif/libexif exif-data.c,1.121,1.122

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9529/libexif

Modified Files:
	exif-data.c 
Log Message:
Minor message edits


Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -d -r1.121 -r1.122
--- exif-data.c	30 Sep 2009 06:56:16 -0000	1.121
+++ exif-data.c	15 Oct 2009 07:32:54 -0000	1.122
@@ -414,7 +414,7 @@ exif_data_load_data_content (ExifData *d
 			 * specific IFD, so exif_tag_get_name_in_ifd won't work
 			 */
 			exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData",
-				  "IFD entry 0x%x at %u.", tag, o);
+				  "Sub-IFD entry 0x%x at %u.", tag, o);
 			switch (tag) {
 			case EXIF_TAG_EXIF_IFD_POINTER:
 				CHECK_REC (EXIF_IFD_EXIF);

[libexif-cvs] libexif-website/static index.html,1.23,1.24

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif-website/static
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6373/static

Modified Files:
	index.html 
Log Message:
Fixed a couple of links


Index: index.html
===================================================================
RCS file: /cvsroot/libexif/libexif-website/static/index.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -d -r1.23 -r1.24
--- index.html	10 Oct 2009 06:41:53 -0000	1.23
+++ index.html	15 Oct 2009 07:13:55 -0000	1.24
@@ -130,7 +130,7 @@ svn co https://libexif.svn.sourceforge.n
 around the world compile the source code and provide binaries for a
 number of platforms. Here is a list of some of the sites you can look.</p>
 <ul>
-	<li>DragonFly BSD: <a href="http://chlamydia.fs.ei.tum.de/pub/DragonFly/packages/DragonFly-2.3.1/graphics/?P=*exif-*">DragonFly project</a></li>
+	<li>DragonFly BSD: <a href="http://chlamydia.fs.ei.tum.de/pub/DragonFly/packages/DragonFly-2.3.2/stable/graphics/?P=*exif-*">DragonFly project</a></li>
 
 	<li>FreeBSD: <a href="ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-current/All/">FreeBSD ports</a></li>
 
@@ -141,7 +141,9 @@ number of platforms. Here is a list of s
         tool to find and install it, or
 	<a href="http://rpmfind.net/linux/rpm2html/search.php?query=exif&amp;submit=Search+...&amp;system=&amp;arch=">search</a>
 	<a href="http://rpmfind.net/linux/rpm2html/search.php?query=libexif&amp;submit=Search+...&amp;system=&amp;arch=">at</a>
-	<a href="http://rpmfind.net/linux/rpm2html/search.php?query=libexif12&amp;submit=Search+...&amp;system=&amp;arch=">rpmfind.net</a>.
+	<a href="http://rpmfind.net/linux/rpm2html/search.php?query=libexif12&amp;submit=Search+...&amp;system=&amp;arch=">rpmfind.net</a>
+	or
+	<a href="http://search.rpmseek.com/search.html?hl=com&amp;cs=exif:PN:0:0:0:0:0">rpmseek.com</a>
 	</li>
 
 	<li>Mac OS X:
@@ -192,7 +194,7 @@ number of platforms. Here is a list of s
       style="border:0;width:88px;height:31px"
       src="http://jigsaw.w3.org/css-validator/images/vcss" 
       alt="Valid CSS!" /></a>
-<span>Last update: 2009-10-09</span>
+<span>Last update: 2009-10-15</span>
 </div>
 
 </body>

[libexif-cvs] libexif NEWS,1.60,1.61 ChangeLog,1.332,1.333

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv30066

Modified Files:
	NEWS ChangeLog 
Log Message:
Changed the various functions searching for tags in ExifTagTable[]
to use a binary search. This single change increases the speed of
a run through the libexif-testsuite by 7%


Index: NEWS
===================================================================
RCS file: /cvsroot/libexif/libexif/NEWS,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -d -r1.60 -r1.61
--- NEWS	9 Oct 2009 19:59:47 -0000	1.60
+++ NEWS	15 Oct 2009 06:15:15 -0000	1.61
@@ -1,4 +1,5 @@
 libexif-0.6.x:
+  * Now using a binary search to make searching through the tag table faster
 
 
 libexif-0.6.18 (2009-10-09):

Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.332
retrieving revision 1.333
diff -u -p -d -r1.332 -r1.333
--- ChangeLog	14 Oct 2009 06:57:06 -0000	1.332
+++ ChangeLog	15 Oct 2009 06:15:15 -0000	1.333
@@ -1,3 +1,9 @@
+2009-10-14  Dan Fandrich <da...@co...>
+
+	* Changed the various functions searching for tags in ExifTagTable[]
+	  to use a binary search. This single change increases the speed of
+	  a run through the libexif-testsuite by 7%
+
 2009-10-13  Dan Fandrich <da...@co...>
 
 	* po/sv.po: Updated Swedish translation by Daniel Nylander

[libexif-cvs] libexif/libexif exif-tag.c,1.57,1.58

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv30066/libexif

Modified Files:
	exif-tag.c 
Log Message:
Changed the various functions searching for tags in ExifTagTable[]
to use a binary search. This single change increases the speed of
a run through the libexif-testsuite by 7%


Index: exif-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -d -r1.57 -r1.58
--- exif-tag.c	14 Oct 2009 06:57:08 -0000	1.57
+++ exif-tag.c	15 Oct 2009 06:15:17 -0000	1.58
@@ -47,7 +47,7 @@
  * The entries MUST be sorted in tag order.
  * The name and title are mandatory, but the description may be NULL.
  */
-static const struct {
+static const struct TagEntry {
 	/*! Tag ID. There may be duplicate tags when the same number is used for
 	 * different meanings in different IFDs. */
 	ExifTag tag;
@@ -877,12 +877,57 @@ exif_tag_table_get_name (unsigned int n)
 	return (n < exif_tag_table_count ()) ? ExifTagTable[n].name : NULL;
 }
 
+/*!
+ * Return the number of entries in the EXIF tag table, including the
+ * terminating NULL entry.
+ */
 unsigned int
 exif_tag_table_count (void)
 {
 	return sizeof (ExifTagTable) / sizeof (ExifTagTable[0]);
 }
 
+
+/*!
+ * Compares the tag with that in entry.
+ * \param[in] tag pointer to integer tag value
+ * \param[in] entry pointer to a struct TagEntry
+ * \return 0 if tags are equal, <0 if tag < entry, >0 if tag > entry
+ */
+static int
+match_tag(const void *tag, const void *entry)
+{
+	return *(int*)tag - ((struct TagEntry *)entry)->tag;
+}
+
+
+/*!
+ * Finds the first entry in the EXIF tag table with the given tag number
+ * using a binary search.
+ * \param[in] tag to find
+ * \return index into table, or -1 if not found
+ */
+static int
+exif_tag_table_first(ExifTag tag)
+{
+	int i;
+	struct TagEntry *entry = bsearch(&tag, ExifTagTable,
+			exif_tag_table_count()-1, sizeof(struct TagEntry), match_tag);
+	if (!entry)
+			return -1;	/* Not found */
+
+	/* Calculate index of found entry */
+	i = entry - ExifTagTable;
+
+	/* There may be other entries with the same tag number, so search
+	 * backwards to find the first
+	 */
+	while ((i > 0) && (ExifTagTable[i-1].tag == tag)) {
+		--i;
+	}
+	return i;
+}
+
 #define RECORDED \
 ((ExifTagTable[i].esl[ifd][EXIF_DATA_TYPE_UNCOMPRESSED_CHUNKY] != EXIF_SUPPORT_LEVEL_NOT_RECORDED) || \
  (ExifTagTable[i].esl[ifd][EXIF_DATA_TYPE_UNCOMPRESSED_PLANAR] != EXIF_SUPPORT_LEVEL_NOT_RECORDED) || \
@@ -893,9 +938,14 @@ const char *
 exif_tag_get_name_in_ifd (ExifTag tag, ExifIfd ifd)
 {
 	unsigned int i;
+	int first;
 
-	if (ifd >= EXIF_IFD_COUNT) return NULL;
-	for (i = 0; ExifTagTable[i].name; i++)
+	if (ifd >= EXIF_IFD_COUNT)
+		return NULL;
+	first = exif_tag_table_first(tag);
+	if (first < 0)
+		return NULL;
+	for (i = first; ExifTagTable[i].name; i++)
 		if ((ExifTagTable[i].tag == tag) && RECORDED) break;
 	return ExifTagTable[i].name;
 }
@@ -904,6 +954,7 @@ const char *
 exif_tag_get_title_in_ifd (ExifTag tag, ExifIfd ifd)
 {
 	unsigned int i;
+	int first;
 
 	/* FIXME: This belongs to somewhere else. */
 	/* libexif should use the default system locale.
@@ -913,8 +964,12 @@ exif_tag_get_title_in_ifd (ExifTag tag, 
 	 * bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	 */
 	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
-	if (ifd >= EXIF_IFD_COUNT) return NULL;
-	for (i = 0; ExifTagTable[i].title; i++)
+	if (ifd >= EXIF_IFD_COUNT)
+		return NULL;
+	first = exif_tag_table_first(tag);
+	if (first < 0)
+		return NULL;
+	for (i = first; ExifTagTable[i].title; i++)
 		if ((ExifTagTable[i].tag == tag) && RECORDED) break;
 	return _(ExifTagTable[i].title);
 }
@@ -923,6 +978,7 @@ const char *
 exif_tag_get_description_in_ifd (ExifTag tag, ExifIfd ifd)
 {
 	unsigned int i;
+	int first;
 
 	/* libexif should use the default system locale.
 	 * If an application specifically requires UTF-8, then we
@@ -932,7 +988,11 @@ exif_tag_get_description_in_ifd (ExifTag
 	 */
 	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 
-	if (ifd >= EXIF_IFD_COUNT) return NULL;
+	if (ifd >= EXIF_IFD_COUNT)
+		return NULL;
+	first = exif_tag_table_first(tag);
+	if (first < 0)
+		return NULL;
 	for (i = 0; ExifTagTable[i].description; i++)
 		if ((ExifTagTable[i].tag == tag) && RECORDED) {
 			/* GNU gettext acts strangely when given an empty string */
@@ -987,7 +1047,7 @@ exif_tag_get_title (ExifTag tag)
 const char *
 exif_tag_get_description (ExifTag tag)
 {
-	return exif_tag_get_stuff (tag, exif_tag_get_description_in_ifd);
+	return exif_tag_get_stuff(tag, exif_tag_get_description_in_ifd);
 }
 
 
@@ -1021,12 +1081,17 @@ static inline ExifSupportLevel
 get_support_level_in_ifd (ExifTag tag, ExifIfd ifd, ExifDataType t)
 {
 	unsigned int i;
-	for (i = 0; ExifTagTable[i].description; i++) {
+	int first = exif_tag_table_first(tag);
+	if (first < 0)
+		return EXIF_SUPPORT_LEVEL_NOT_RECORDED;
+	for (i = first; ExifTagTable[i].name; i++) {
 		if (ExifTagTable[i].tag == tag) {
 			const ExifSupportLevel supp = ExifTagTable[i].esl[ifd][t];
 			if (supp != EXIF_SUPPORT_LEVEL_NOT_RECORDED)
 				return supp;
 			/* Try looking for another entry */
+		} else {
+			break; /* We've reached the end of the matching tags */
 		}
 	}
 	return EXIF_SUPPORT_LEVEL_NOT_RECORDED;
@@ -1045,7 +1110,11 @@ static inline ExifSupportLevel
 get_support_level_any_type (ExifTag tag, ExifIfd ifd)
 {
 	unsigned int i;
-	for (i = 0; ExifTagTable[i].description; i++) {
+	int first = exif_tag_table_first(tag);
+	if (first < 0)
+		return EXIF_SUPPORT_LEVEL_UNKNOWN;
+
+	for (i = first; ExifTagTable[i].name; i++) {
 		if (ExifTagTable[i].tag == tag) {
 			/*
 			 * Check whether the support level is the same for all possible
@@ -1064,6 +1133,8 @@ get_support_level_any_type (ExifTag tag,
 					return supp;
 			}
 			/* Keep searching the table for another tag for our IFD */
+		} else {
+			break; /* We've reached the end of the matching tags */
 		}
 	}
 	return EXIF_SUPPORT_LEVEL_UNKNOWN;

[libexif-cvs] libexif/libexif exif-tag.c, 1.56, 1.57 exif-tag.h, 1.26, 1.27

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4138/libexif

Modified Files:
	exif-tag.c exif-tag.h 
Log Message:
Ensure that ExifTagTable[] is sorted by tag to allow for future
more efficient searching.


Index: exif-tag.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -d -r1.26 -r1.27
--- exif-tag.h	30 Sep 2009 06:56:16 -0000	1.26
+++ exif-tag.h	14 Oct 2009 06:57:08 -0000	1.27
@@ -60,8 +60,8 @@ typedef enum {
 	EXIF_TAG_ARTIST				= 0x013b,
 	EXIF_TAG_WHITE_POINT			= 0x013e,
 	EXIF_TAG_PRIMARY_CHROMATICITIES		= 0x013f,
-	EXIF_TAG_TRANSFER_RANGE			= 0x0156,
 	EXIF_TAG_SUB_IFDS			= 0x014a,
+	EXIF_TAG_TRANSFER_RANGE			= 0x0156,
 	EXIF_TAG_JPEG_PROC			= 0x0200,
 	EXIF_TAG_JPEG_INTERCHANGE_FORMAT	= 0x0201,
 	EXIF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH	= 0x0202,

Index: exif-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -d -r1.56 -r1.57
--- exif-tag.c	30 Sep 2009 06:56:16 -0000	1.56
+++ exif-tag.c	14 Oct 2009 06:57:08 -0000	1.57
@@ -38,6 +38,15 @@
 #define ESL_NNNO { EXIF_SUPPORT_LEVEL_NOT_RECORDED, EXIF_SUPPORT_LEVEL_NOT_RECORDED, EXIF_SUPPORT_LEVEL_NOT_RECORDED, EXIF_SUPPORT_LEVEL_OPTIONAL }
 #define ESL_GPS { ESL_NNNN, ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN }
 
+/*!
+ * Table giving information about each EXIF tag.
+ * There may be more than one entry with the same tag value because some tags
+ * have different meanings depending on the IFD in which they appear.
+ * When there are such duplicate entries, there must be no overlap in their
+ * support levels.
+ * The entries MUST be sorted in tag order.
+ * The name and title are mandatory, but the description may be NULL.
+ */
 static const struct {
 	/*! Tag ID. There may be duplicate tags when the same number is used for
 	 * different meanings in different IFDs. */
@@ -49,10 +58,12 @@ static const struct {
 	ExifSupportLevel esl[EXIF_IFD_COUNT][EXIF_DATA_TYPE_COUNT];
 } ExifTagTable[] = {
 #ifndef NO_VERBOSE_TAG_STRINGS
-	/* Not in EXIF 2.2 */
-	{EXIF_TAG_NEW_SUBFILE_TYPE, "NewSubfileType",
-	 N_("New Subfile Type"), N_("A general indication of the kind of data "
-	    "contained in this subfile.")},
+	{EXIF_TAG_GPS_VERSION_ID, "GPSVersionID", N_("GPS tag version"),
+	 N_("Indicates the version of <GPSInfoIFD>. The version is given "
+	    "as 2.0.0.0. This tag is mandatory when <GPSInfo> tag is "
+	    "present. (Note: The <GPSVersionID> tag is given in bytes, "
+	    "unlike the <ExifVersion> tag. When the version is "
+	    "2.0.0.0, the tag value is 02000000.H)."), ESL_GPS},
 	{EXIF_TAG_INTEROPERABILITY_INDEX, "InteroperabilityIndex",
 	 N_("Interoperability Index"),
 	 N_("Indicates the identification of the Interoperability rule. "
@@ -61,9 +72,152 @@ static const struct {
 	    "volume of Recommended Exif Interoperability Rules (ExifR98) "
 	    "for other tags used for ExifR98."),
 	 { ESL_NNNN, ESL_NNNN, ESL_NNNN, ESL_NNNN, ESL_OOOO } },
+	{EXIF_TAG_GPS_LATITUDE_REF, "GPSLatitudeRef", N_("North or South Latitude"),
+	 N_("Indicates whether the latitude is north or south latitude. The "
+	    "ASCII value 'N' indicates north latitude, and 'S' is south "
+	    "latitude."), ESL_GPS},
 	{EXIF_TAG_INTEROPERABILITY_VERSION, "InteroperabilityVersion",
 	 N_("Interoperability Version"), "",
 	 { ESL_NNNN, ESL_NNNN, ESL_NNNN, ESL_NNNN, ESL_OOOO } },
+	{EXIF_TAG_GPS_LATITUDE, "GPSLatitude", N_("Latitude"),
+	 N_("Indicates the latitude. The latitude is expressed as three "
+	    "RATIONAL values giving the degrees, minutes, and seconds, "
+	    "respectively. When degrees, minutes and seconds are expressed, "
+	    "the format is dd/1,mm/1,ss/1. When degrees and minutes are used "
+	    "and, for example, fractions of minutes are given up to two "
+	    "decimal places, the format is dd/1,mmmm/100,0/1."),
+	 ESL_GPS},
+	{EXIF_TAG_GPS_LONGITUDE_REF, "GPSLongitudeRef", N_("East or West Longitude"),
+	 N_("Indicates whether the longitude is east or west longitude. "
+	    "ASCII 'E' indicates east longitude, and 'W' is west "
+	    "longitude."), ESL_GPS},
+	{EXIF_TAG_GPS_LONGITUDE, "GPSLongitude", N_("Longitude"),
+	 N_("Indicates the longitude. The longitude is expressed as three "
+	    "RATIONAL values giving the degrees, minutes, and seconds, "
+	    "respectively. When degrees, minutes and seconds are expressed, "
+	    "the format is ddd/1,mm/1,ss/1. When degrees and minutes are "
+	    "used and, for example, fractions of minutes are given up to "
+	    "two decimal places, the format is ddd/1,mmmm/100,0/1."),
+	 ESL_GPS},
+	{EXIF_TAG_GPS_ALTITUDE_REF, "GPSAltitudeRef", N_("Altitude reference"),
+	 N_("Indicates the altitude used as the reference altitude. If the "
+	    "reference is sea level and the altitude is above sea level, 0 "
+	    "is given. If the altitude is below sea level, a value of 1 is given "
+	    "and the altitude is indicated as an absolute value in the "
+	    "GSPAltitude tag. The reference unit is meters. Note that this tag "
+	    "is BYTE type, unlike other reference tags."), ESL_GPS},
+	{EXIF_TAG_GPS_ALTITUDE, "GPSAltitude", N_("Altitude"),
+	 N_("Indicates the altitude based on the reference in GPSAltitudeRef. "
+	    "Altitude is expressed as one RATIONAL value. The reference unit "
+	    "is meters."), ESL_GPS},
+	{EXIF_TAG_GPS_TIME_STAMP, "GPSTimeStamp", N_("GPS time (atomic clock)"),
+         N_("Indicates the time as UTC (Coordinated Universal Time). "
+	    "TimeStamp is expressed as three RATIONAL values giving "
+            "the hour, minute, and second."), ESL_GPS},
+	{EXIF_TAG_GPS_SATELLITES, "GPSSatellites", N_("GPS satellites used for measurement"),
+         N_("Indicates the GPS satellites used for measurements. This "
+            "tag can be used to describe the number of satellites, their ID "
+            "number, angle of elevation, azimuth, SNR and other information "
+            "in ASCII notation. The format is not specified. If the GPS "
+            "receiver is incapable of taking measurements, value of the tag "
+            "shall be set to NULL."), ESL_GPS},
+	{EXIF_TAG_GPS_STATUS, "GPSStatus", N_("GPS receiver status"),
+         N_("Indicates the status of the GPS receiver when the image is "
+            "recorded. 'A' means measurement is in progress, and 'V' means "
+            "the measurement is Interoperability."), ESL_GPS},
+	{EXIF_TAG_GPS_MEASURE_MODE, "GPSMeasureMode", N_("GPS measurement mode"),
+         N_("Indicates the GPS measurement mode. '2' means "
+            "two-dimensional measurement and '3' means three-dimensional "
+            "measurement is in progress."), ESL_GPS},
+	{EXIF_TAG_GPS_DOP, "GPSDOP", N_("Measurement precision"),
+         N_("Indicates the GPS DOP (data degree of precision). An HDOP "
+            "value is written during two-dimensional measurement, and PDOP "
+            "during three-dimensional measurement."), ESL_GPS},
+	{EXIF_TAG_GPS_SPEED_REF, "GPSSpeedRef", N_("Speed unit"),
+         N_("Indicates the unit used to express the GPS receiver speed "
+            "of movement. 'K', 'M' and 'N' represent kilometers per hour, "
+            "miles per hour, and knots."), ESL_GPS},
+	{EXIF_TAG_GPS_SPEED, "GPSSpeed", N_("Speed of GPS receiver"),
+	 N_("Indicates the speed of GPS receiver movement."), ESL_GPS},
+	{EXIF_TAG_GPS_TRACK_REF, "GPSTrackRef", N_("Reference for direction of movement"),
+         N_("Indicates the reference for giving the direction of GPS "
+            "receiver movement. 'T' denotes true direction and 'M' is "
+            "magnetic direction."), ESL_GPS},
+	{EXIF_TAG_GPS_TRACK, "GPSTrack", N_("Direction of movement"),
+         N_("Indicates the direction of GPS receiver movement. The range "
+            "of values is from 0.00 to 359.99."), ESL_GPS},
+	{EXIF_TAG_GPS_IMG_DIRECTION_REF, "GPSImgDirectionRef", N_("GPS Img Direction Reference"),
+	 N_("Indicates the reference for giving the direction of the image when it is captured. "
+	    "'T' denotes true direction and 'M' is magnetic direction."), ESL_GPS},
+	{EXIF_TAG_GPS_IMG_DIRECTION, "GPSImgDirection", N_("GPS Img Direction"),
+	 N_("Indicates the direction of the image when it was captured. The range of values is "
+	    "from 0.00 to 359.99."), ESL_GPS},
+	{EXIF_TAG_GPS_MAP_DATUM, "GPSMapDatum", N_("Geodetic survey data used"),
+         N_("Indicates the geodetic survey data used by the GPS "
+            "receiver. If the survey data is restricted to Japan, the value "
+            "of this tag is 'TOKYO' or 'WGS-84'. If a GPS Info tag is "
+            "recorded, it is strongly recommended that this tag be recorded."), ESL_GPS},
+	{EXIF_TAG_GPS_DEST_LATITUDE_REF, "GPSDestLatitudeRef", N_("Reference for latitude of destination"),
+         N_("Indicates whether the latitude of the destination point is "
+            "north or south latitude. The ASCII value 'N' indicates north "
+            "latitude, and 'S' is south latitude."), ESL_GPS},
+	{EXIF_TAG_GPS_DEST_LATITUDE, "GPSDestLatitude", N_("Latitude of destination"),
+         N_("Indicates the latitude of the destination point. The "
+            "latitude is expressed as three RATIONAL values giving the "
+            "degrees, minutes, and seconds, respectively. If latitude is "
+            "expressed as degrees, minutes and seconds, a typical format "
+            "would be dd/1,mm/1,ss/1. When degrees and minutes are used and, "
+            "for example, fractions of minutes are given up to two decimal "
+            "places, the format would be dd/1,mmmm/100,0/1."), ESL_GPS},
+	{EXIF_TAG_GPS_DEST_LONGITUDE_REF, "GPSDestLongitudeRef", N_("Reference for longitude of destination"),
+         N_("Indicates whether the longitude of the destination point is "
+            "east or west longitude. ASCII 'E' indicates east longitude, and "
+            "'W' is west longitude."), ESL_GPS},
+	{EXIF_TAG_GPS_DEST_LONGITUDE, "GPSDestLongitude", N_("Longitude of destination"),
+         N_("Indicates the longitude of the destination point. The "
+            "longitude is expressed as three RATIONAL values giving the "
+            "degrees, minutes, and seconds, respectively. If longitude is "
+            "expressed as degrees, minutes and seconds, a typical format "
+            "would be ddd/1,mm/1,ss/1. When degrees and minutes are used "
+            "and, for example, fractions of minutes are given up to two "
+            "decimal places, the format would be ddd/1,mmmm/100,0/1."),
+         ESL_GPS},
+	{EXIF_TAG_GPS_DEST_BEARING_REF, "GPSDestBearingRef", N_("Reference for bearing of destination"),
+         N_("Indicates the reference used for giving the bearing to "
+            "the destination point. 'T' denotes true direction and 'M' is "
+            "magnetic direction."), ESL_GPS},
+	{EXIF_TAG_GPS_DEST_BEARING, "GPSDestBearing", N_("Bearing of destination"),
+         N_("Indicates the bearing to the destination point. The range "
+            "of values is from 0.00 to 359.99."), ESL_GPS},
+	{EXIF_TAG_GPS_DEST_DISTANCE_REF, "GPSDestDistanceRef", N_("Reference for distance to destination"),
+         N_("Indicates the unit used to express the distance to the "
+            "destination point. 'K', 'M' and 'N' represent kilometers, miles "
+            "and knots."), ESL_GPS},
+	{EXIF_TAG_GPS_DEST_DISTANCE, "GPSDestDistance", N_("Distance to destination"),
+	 N_("Indicates the distance to the destination point."), ESL_GPS},
+	{EXIF_TAG_GPS_PROCESSING_METHOD, "GPSProcessingMethod", N_("Name of GPS processing method"),
+         N_("A character string recording the name of the method used "
+            "for location finding. The first byte indicates the character "
+            "code used, and this is followed by the name "
+            "of the method. Since the Type is not ASCII, NULL termination is "
+            "not necessary."), ESL_GPS},
+	{EXIF_TAG_GPS_AREA_INFORMATION, "GPSAreaInformation", N_("Name of GPS area"),
+         N_("A character string recording the name of the GPS area. The "
+            "first byte indicates the character code used, "
+            "and this is followed by the name of the GPS area. Since "
+            "the Type is not ASCII, NULL termination is not necessary."), ESL_GPS},
+	{EXIF_TAG_GPS_DATE_STAMP, "GPSDateStamp", N_("GPS date"),
+         N_("A character string recording date and time information "
+            "relative to UTC (Coordinated Universal Time). The format is "
+            "\"YYYY:MM:DD\". The length of the string is 11 bytes including "
+            "NULL."), ESL_GPS},
+	{EXIF_TAG_GPS_DIFFERENTIAL, "GPSDifferential", N_("GPS differential correction"),
+         N_("Indicates whether differential correction is applied to the "
+            "GPS receiver."), ESL_GPS},
+	/* Not in EXIF 2.2 */
+	{EXIF_TAG_NEW_SUBFILE_TYPE, "NewSubfileType",
+	 N_("New Subfile Type"), N_("A general indication of the kind of data "
+	    "contained in this subfile.")},
 	{EXIF_TAG_IMAGE_WIDTH, "ImageWidth", N_("Image Width"),
 	 N_("The number of columns of image data, equal to the number of "
 	    "pixels per row. In JPEG compressed data a JPEG marker is "
@@ -201,11 +355,11 @@ static const struct {
 	    "specified in the color space information tag (<ColorSpace>)."),
 	 { ESL_OOOO, ESL_OOOO, ESL_NNNN, ESL_NNNN, ESL_NNNN } },
 	/* Not in EXIF 2.2 */
-	{EXIF_TAG_TRANSFER_RANGE, "TransferRange", N_("Transfer Range"), ""},
-	/* Not in EXIF 2.2 */
 	{EXIF_TAG_SUB_IFDS, "SubIFDs", "SubIFD Offsets", N_("Defined by Adobe Corporation "
 	    "to enable TIFF Trees within a TIFF file.")},
 	/* Not in EXIF 2.2 */
+	{EXIF_TAG_TRANSFER_RANGE, "TransferRange", N_("Transfer Range"), ""},
+	/* Not in EXIF 2.2 */
 	{EXIF_TAG_JPEG_PROC, "JPEGProc", "JPEGProc", ""},
 	{EXIF_TAG_JPEG_INTERCHANGE_FORMAT, "JPEGInterchangeFormat",
 	 N_("JPEG Interchange Format"),
@@ -344,152 +498,6 @@ static const struct {
 	    "Exif IFD, has no image data."),
 	 { ESL_NNNN, ESL_NNNN, ESL_NNNN, ESL_NNNN, ESL_NNNN } },
 
-	{EXIF_TAG_GPS_VERSION_ID, "GPSVersionID", N_("GPS tag version"),
-	 N_("Indicates the version of <GPSInfoIFD>. The version is given "
-	    "as 2.0.0.0. This tag is mandatory when <GPSInfo> tag is "
-	    "present. (Note: The <GPSVersionID> tag is given in bytes, "
-	    "unlike the <ExifVersion> tag. When the version is "
-	    "2.0.0.0, the tag value is 02000000.H)."), ESL_GPS},
-	{EXIF_TAG_GPS_LATITUDE_REF, "GPSLatitudeRef", N_("North or South Latitude"),
-	 N_("Indicates whether the latitude is north or south latitude. The "
-	    "ASCII value 'N' indicates north latitude, and 'S' is south "
-	    "latitude."), ESL_GPS},
-	{EXIF_TAG_GPS_LATITUDE, "GPSLatitude", N_("Latitude"),
-	 N_("Indicates the latitude. The latitude is expressed as three "
-	    "RATIONAL values giving the degrees, minutes, and seconds, "
-	    "respectively. When degrees, minutes and seconds are expressed, "
-	    "the format is dd/1,mm/1,ss/1. When degrees and minutes are used "
-	    "and, for example, fractions of minutes are given up to two "
-	    "decimal places, the format is dd/1,mmmm/100,0/1."),
-	 ESL_GPS},
-	{EXIF_TAG_GPS_LONGITUDE_REF, "GPSLongitudeRef", N_("East or West Longitude"),
-	 N_("Indicates whether the longitude is east or west longitude. "
-	    "ASCII 'E' indicates east longitude, and 'W' is west "
-	    "longitude."), ESL_GPS},
-	{EXIF_TAG_GPS_LONGITUDE, "GPSLongitude", N_("Longitude"),
-	 N_("Indicates the longitude. The longitude is expressed as three "
-	    "RATIONAL values giving the degrees, minutes, and seconds, "
-	    "respectively. When degrees, minutes and seconds are expressed, "
-	    "the format is ddd/1,mm/1,ss/1. When degrees and minutes are "
-	    "used and, for example, fractions of minutes are given up to "
-	    "two decimal places, the format is ddd/1,mmmm/100,0/1."),
-	 ESL_GPS},
-	{EXIF_TAG_GPS_ALTITUDE_REF, "GPSAltitudeRef", N_("Altitude reference"),
-	 N_("Indicates the altitude used as the reference altitude. If the "
-	    "reference is sea level and the altitude is above sea level, 0 "
-	    "is given. If the altitude is below sea level, a value of 1 is given "
-	    "and the altitude is indicated as an absolute value in the "
-	    "GSPAltitude tag. The reference unit is meters. Note that this tag "
-	    "is BYTE type, unlike other reference tags."), ESL_GPS},
-	{EXIF_TAG_GPS_ALTITUDE, "GPSAltitude", N_("Altitude"),
-	 N_("Indicates the altitude based on the reference in GPSAltitudeRef. "
-	    "Altitude is expressed as one RATIONAL value. The reference unit "
-	    "is meters."), ESL_GPS},
-	{EXIF_TAG_GPS_TIME_STAMP, "GPSTimeStamp", N_("GPS time (atomic clock)"),
-         N_("Indicates the time as UTC (Coordinated Universal Time). "
-	    "TimeStamp is expressed as three RATIONAL values giving "
-            "the hour, minute, and second."), ESL_GPS},
-	{EXIF_TAG_GPS_SATELLITES, "GPSSatellites", N_("GPS satellites used for measurement"),
-         N_("Indicates the GPS satellites used for measurements. This "
-            "tag can be used to describe the number of satellites, their ID "
-            "number, angle of elevation, azimuth, SNR and other information "
-            "in ASCII notation. The format is not specified. If the GPS "
-            "receiver is incapable of taking measurements, value of the tag "
-            "shall be set to NULL."), ESL_GPS},
-	{EXIF_TAG_GPS_STATUS, "GPSStatus", N_("GPS receiver status"),
-         N_("Indicates the status of the GPS receiver when the image is "
-            "recorded. 'A' means measurement is in progress, and 'V' means "
-            "the measurement is Interoperability."), ESL_GPS},
-	{EXIF_TAG_GPS_MEASURE_MODE, "GPSMeasureMode", N_("GPS measurement mode"),
-         N_("Indicates the GPS measurement mode. '2' means "
-            "two-dimensional measurement and '3' means three-dimensional "
-            "measurement is in progress."), ESL_GPS},
-	{EXIF_TAG_GPS_DOP, "GPSDOP", N_("Measurement precision"),
-         N_("Indicates the GPS DOP (data degree of precision). An HDOP "
-            "value is written during two-dimensional measurement, and PDOP "
-            "during three-dimensional measurement."), ESL_GPS},
-	{EXIF_TAG_GPS_SPEED_REF, "GPSSpeedRef", N_("Speed unit"),
-         N_("Indicates the unit used to express the GPS receiver speed "
-            "of movement. 'K', 'M' and 'N' represent kilometers per hour, "
-            "miles per hour, and knots."), ESL_GPS},
-	{EXIF_TAG_GPS_SPEED, "GPSSpeed", N_("Speed of GPS receiver"),
-	 N_("Indicates the speed of GPS receiver movement."), ESL_GPS},
-	{EXIF_TAG_GPS_TRACK_REF, "GPSTrackRef", N_("Reference for direction of movement"),
-         N_("Indicates the reference for giving the direction of GPS "
-            "receiver movement. 'T' denotes true direction and 'M' is "
-            "magnetic direction."), ESL_GPS},
-	{EXIF_TAG_GPS_TRACK, "GPSTrack", N_("Direction of movement"),
-         N_("Indicates the direction of GPS receiver movement. The range "
-            "of values is from 0.00 to 359.99."), ESL_GPS},
-	{EXIF_TAG_GPS_IMG_DIRECTION_REF, "GPSImgDirectionRef", N_("GPS Img Direction Reference"),
-	 N_("Indicates the reference for giving the direction of the image when it is captured. "
-	    "'T' denotes true direction and 'M' is magnetic direction."), ESL_GPS},
-	{EXIF_TAG_GPS_IMG_DIRECTION, "GPSImgDirection", N_("GPS Img Direction"),
-	 N_("Indicates the direction of the image when it was captured. The range of values is "
-	    "from 0.00 to 359.99."), ESL_GPS},
-	{EXIF_TAG_GPS_MAP_DATUM, "GPSMapDatum", N_("Geodetic survey data used"),
-         N_("Indicates the geodetic survey data used by the GPS "
-            "receiver. If the survey data is restricted to Japan, the value "
-            "of this tag is 'TOKYO' or 'WGS-84'. If a GPS Info tag is "
-            "recorded, it is strongly recommended that this tag be recorded."), ESL_GPS},
-	{EXIF_TAG_GPS_DEST_LATITUDE_REF, "GPSDestLatitudeRef", N_("Reference for latitude of destination"),
-         N_("Indicates whether the latitude of the destination point is "
-            "north or south latitude. The ASCII value 'N' indicates north "
-            "latitude, and 'S' is south latitude."), ESL_GPS},
-	{EXIF_TAG_GPS_DEST_LATITUDE, "GPSDestLatitude", N_("Latitude of destination"),
-         N_("Indicates the latitude of the destination point. The "
-            "latitude is expressed as three RATIONAL values giving the "
-            "degrees, minutes, and seconds, respectively. If latitude is "
-            "expressed as degrees, minutes and seconds, a typical format "
-            "would be dd/1,mm/1,ss/1. When degrees and minutes are used and, "
-            "for example, fractions of minutes are given up to two decimal "
-            "places, the format would be dd/1,mmmm/100,0/1."), ESL_GPS},
-	{EXIF_TAG_GPS_DEST_LONGITUDE_REF, "GPSDestLongitudeRef", N_("Reference for longitude of destination"),
-         N_("Indicates whether the longitude of the destination point is "
-            "east or west longitude. ASCII 'E' indicates east longitude, and "
-            "'W' is west longitude."), ESL_GPS},
-	{EXIF_TAG_GPS_DEST_LONGITUDE, "GPSDestLongitude", N_("Longitude of destination"),
-         N_("Indicates the longitude of the destination point. The "
-            "longitude is expressed as three RATIONAL values giving the "
-            "degrees, minutes, and seconds, respectively. If longitude is "
-            "expressed as degrees, minutes and seconds, a typical format "
-            "would be ddd/1,mm/1,ss/1. When degrees and minutes are used "
-            "and, for example, fractions of minutes are given up to two "
-            "decimal places, the format would be ddd/1,mmmm/100,0/1."),
-         ESL_GPS},
-	{EXIF_TAG_GPS_DEST_BEARING_REF, "GPSDestBearingRef", N_("Reference for bearing of destination"),
-         N_("Indicates the reference used for giving the bearing to "
-            "the destination point. 'T' denotes true direction and 'M' is "
-            "magnetic direction."), ESL_GPS},
-	{EXIF_TAG_GPS_DEST_BEARING, "GPSDestBearing", N_("Bearing of destination"),
-         N_("Indicates the bearing to the destination point. The range "
-            "of values is from 0.00 to 359.99."), ESL_GPS},
-	{EXIF_TAG_GPS_DEST_DISTANCE_REF, "GPSDestDistanceRef", N_("Reference for distance to destination"),
-         N_("Indicates the unit used to express the distance to the "
-            "destination point. 'K', 'M' and 'N' represent kilometers, miles "
-            "and knots."), ESL_GPS},
-	{EXIF_TAG_GPS_DEST_DISTANCE, "GPSDestDistance", N_("Distance to destination"),
-	 N_("Indicates the distance to the destination point."), ESL_GPS},
-	{EXIF_TAG_GPS_PROCESSING_METHOD, "GPSProcessingMethod", N_("Name of GPS processing method"),
-         N_("A character string recording the name of the method used "
-            "for location finding. The first byte indicates the character "
-            "code used, and this is followed by the name "
-            "of the method. Since the Type is not ASCII, NULL termination is "
-            "not necessary."), ESL_GPS},
-	{EXIF_TAG_GPS_AREA_INFORMATION, "GPSAreaInformation", N_("Name of GPS area"),
-         N_("A character string recording the name of the GPS area. The "
-            "first byte indicates the character code used, "
-            "and this is followed by the name of the GPS area. Since "
-            "the Type is not ASCII, NULL termination is not necessary."), ESL_GPS},
-	{EXIF_TAG_GPS_DATE_STAMP, "GPSDateStamp", N_("GPS date"),
-         N_("A character string recording date and time information "
-            "relative to UTC (Coordinated Universal Time). The format is "
-            "\"YYYY:MM:DD\". The length of the string is 11 bytes including "
-            "NULL."), ESL_GPS},
-	{EXIF_TAG_GPS_DIFFERENTIAL, "GPSDifferential", N_("GPS differential correction"),
-         N_("Indicates whether differential correction is applied to the "
-            "GPS receiver."), ESL_GPS},
-
 	{EXIF_TAG_ISO_SPEED_RATINGS, "ISOSpeedRatings",
 	 N_("ISO Speed Ratings"),
 	 N_("Indicates the ISO Speed and ISO Latitude of the camera or "
@@ -573,6 +581,12 @@ static const struct {
 	 N_("The actual focal length of the lens, in mm. Conversion is not "
 	    "made to the focal length of a 35 mm film camera."),
 	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
+	{EXIF_TAG_SUBJECT_AREA, "SubjectArea", N_("Subject Area"),
+	 N_("This tag indicates the location and area of the main subject "
+	    "in the overall scene."),
+	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
+	/* Not in EXIF 2.2 */
+	{EXIF_TAG_TIFF_EP_STANDARD_ID, "TIFF/EPStandardID", N_("TIFF/EP Standard ID"), ""},
 	{EXIF_TAG_MAKER_NOTE, "MakerNote", N_("Maker Note"),
 	 N_("A tag for manufacturers of Exif writers to record any desired "
 	    "information. The contents are up to the manufacturer."),
@@ -772,12 +786,6 @@ static const struct {
 	    "image sensor when a one-chip color area sensor is used. "
 	    "It does not apply to all sensing methods."),
 	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
-	{EXIF_TAG_SUBJECT_AREA, "SubjectArea", N_("Subject Area"),
-	 N_("This tag indicates the location and area of the main subject "
-	    "in the overall scene."),
-	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
-	/* Not in EXIF 2.2 */
-	{EXIF_TAG_TIFF_EP_STANDARD_ID, "TIFF/EPStandardID", N_("TIFF/EP Standard ID"), ""},
 	{EXIF_TAG_CUSTOM_RENDERED, "CustomRendered", N_("Custom Rendered"),
 	 N_("This tag indicates the use of special processing on image "
 	    "data, such as rendering geared to output. When special "

[libexif-cvs] libexif ChangeLog,1.331,1.332

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4138

Modified Files:
	ChangeLog 
Log Message:
Ensure that ExifTagTable[] is sorted by tag to allow for future
more efficient searching.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.331
retrieving revision 1.332
diff -u -p -d -r1.331 -r1.332
--- ChangeLog	14 Oct 2009 05:58:34 -0000	1.331
+++ ChangeLog	14 Oct 2009 06:57:06 -0000	1.332
@@ -4,6 +4,8 @@
 	* po/vi.po: Updated Vietnamese translation by Clytie Siddall
 	* Fixed an inverted logic condition that prevented the bug
 	  report address from appearing in the .pot file
+	* Ensure that ExifTagTable[] is sorted by tag to allow for future
+	  more efficient searching.
 
 2009-10-09  Dan Fandrich <da...@co...>
 

[libexif-cvs] libexif/test test-sorted.c, NONE, 1.1 Makefile.am, 1.22, 1.23

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif/test
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4138/test

Modified Files:
	Makefile.am 
Added Files:
	test-sorted.c 
Log Message:
Ensure that ExifTagTable[] is sorted by tag to allow for future
more efficient searching.


--- NEW FILE: test-sorted.c ---
/* test-sorted.c
 *
 * This test ensures that the ExifTagTable[] array is stored in sorted
 * order. If that were not so, then it a binary search of the array would
 * not give correct results.
 *
 * Copyright 2009 Dan Fandrich <da...@co...>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the
 * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 * Boston, MA  02110-1301  USA
 */

#include <libexif/exif-tag.h>
#include <stdio.h>

int
main (void)
{
	int rc = 0;
	unsigned int i, num;
	ExifTag last = 0, current;
	num = exif_tag_table_count() - 1; /* last entry is a NULL terminator */
	for (i=0; i < num; ++i) {
		current = exif_tag_table_get_tag(i);
		if (current < last) {
			printf("Tag 0x%04x in ExifTagTable[] is out of order\n",
				current);
			rc = 1;
		}
		if (exif_tag_table_get_name(i) == NULL) {
			printf("Tag 0x%04x has a NULL name\n", current);
			rc = 1;
		}
		last = current;
	}

	return rc;
}

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif/test/Makefile.am,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -d -r1.22 -r1.23
--- Makefile.am	23 Jan 2009 00:12:27 -0000	1.22
+++ Makefile.am	14 Oct 2009 06:57:08 -0000	1.23
@@ -10,20 +10,12 @@ SUBDIRS = nls
 #      And this is just the lib - we don't have the program available
 #      here yet.
 
-TESTS = test-mem test-value test-integers test-parse test-tagtable
+TESTS = test-mem test-value test-integers test-parse test-tagtable test-sorted
 
 TEST_IMAGES = $(top_srcdir)/daniel-andrews-sample.jpg
 export TEST_IMAGES
 
 check_PROGRAMS = test-mem test-mnote test-value test-integers test-parse \
-	test-tagtable
-
-test_mem_LDADD   = $(top_builddir)/libexif/libexif.la $(LTLIBINTL)
-
-test_mnote_LDADD = $(top_builddir)/libexif/libexif.la $(LTLIBINTL)
-
-test_value_LDADD = $(top_builddir)/libexif/libexif.la $(LTLIBINTL)
-
-test_parse_LDADD = $(top_builddir)/libexif/libexif.la $(LTLIBINTL)
+	test-tagtable test-sorted
 
-test_tagtable_LDADD = $(top_builddir)/libexif/libexif.la $(LTLIBINTL)
+LDADD = $(top_builddir)/libexif/libexif.la $(LTLIBINTL)

[libexif-cvs] libexif-testsuite/tests check-readwrite-identity-nofixup.sh, NONE, 1.1 Makefile.am, 1.24, 1.25 check-readwrite-identity.sh, 1.1, 1.2

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif-testsuite/tests
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2796/tests

Modified Files:
	Makefile.am check-readwrite-identity.sh 
Added Files:
	check-readwrite-identity-nofixup.sh 
Log Message:
Added check-readwrite-identity-nofixup.sh that uses --no-fixup on the
check-readwrite-identity.sh tests


Index: check-readwrite-identity.sh
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/tests/check-readwrite-identity.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -d -r1.1 -r1.2
--- check-readwrite-identity.sh	19 Sep 2009 05:23:46 -0000	1.1
+++ check-readwrite-identity.sh	14 Oct 2009 06:50:56 -0000	1.2
@@ -36,7 +36,7 @@ canonicalize () {
 	  "$1"
 }
 
-echo Testing "$EXIFEXE"
+echo Testing "$EXIFEXE" "$@"
 
 errors=0
 total=0
@@ -56,19 +56,19 @@ do
 	# Create a copy of the image that has been processed by exif
 	# Force this by attempting deleting a nonexistent tag
 	echo -n "Copying image \`${img}'..."
-	"$EXIFEXE" --remove --tag=0xbeef --output="${tmpimg}" "${img}" > "$tmpfile" 2>&1
+	"$EXIFEXE" "$@" --remove --tag=0xbeef --output="${tmpimg}" "${img}" > "$tmpfile" 2>&1
 	check_result
 
 	# Listing original EXIF info
 	echo -n "Listing EXIF info..."
 	# Run this in the C language locale so the messages are known
-	env LANG=C LANGUAGE=C "$EXIFEXE" --ids "${img}" > "$tmpfile" 2>&1
+	env LANG=C LANGUAGE=C "$EXIFEXE" "$@" --ids "${img}" > "$tmpfile" 2>&1
 	check_result
 
 	# Listing copied EXIF info
 	echo -n "Listing EXIF info..."
 	# Run this in the C language locale so the messages are known
-	env LANG=C LANGUAGE=C "$EXIFEXE" --ids "${tmpimg}" > "$tmpfile2" 2>&1
+	env LANG=C LANGUAGE=C "$EXIFEXE" "$@" --ids "${tmpimg}" > "$tmpfile2" 2>&1
 	check_result $tmpfile2
 
 	canonicalize "$tmpfile"
@@ -80,13 +80,13 @@ do
 	# Listing original MakerNote info
 	echo -n "Listing MakerNote info..."
 	# Run this in the C language locale so the messages are known
-	env LANG=C LANGUAGE=C "$EXIFEXE" --ids --show-mnote "${img}" > "$tmpfile" 2>&1
+	env LANG=C LANGUAGE=C "$EXIFEXE" "$@" --ids --show-mnote "${img}" > "$tmpfile" 2>&1
 	check_result
 
 	# Listing copied MakerNote info
 	echo -n "Listing MakerNote info..."
 	# Run this in the C language locale so the messages are known
-	env LANG=C LANGUAGE=C "$EXIFEXE" --ids --show-mnote "${tmpimg}" > "$tmpfile2" 2>&1
+	env LANG=C LANGUAGE=C "$EXIFEXE" "$@" --ids --show-mnote "${tmpimg}" > "$tmpfile2" 2>&1
 	check_result $tmpfile2
 
 	canonicalize "$tmpfile"

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/tests/Makefile.am,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -d -r1.24 -r1.25
--- Makefile.am	19 Sep 2009 05:23:45 -0000	1.24
+++ Makefile.am	14 Oct 2009 06:50:56 -0000	1.25
@@ -10,6 +10,7 @@ EXTRA_DIST = \
 	check-exif-executable.sh \
 	check-general-images.sh \
 	check-readwrite-identity.sh \
+	check-readwrite-identity-nofixup.sh \
 	check-no-unknown-tags.sh \
 	check-all-mandatory-tags.sh \
 	check-994706.sh check-994706.b.patch \
@@ -31,6 +32,7 @@ check_SCRIPTS = \
 # These check scripts may take a little long - but are invaluable. :)
 check_SCRIPTS += check-general-images.sh \
 	check-readwrite-identity.sh \
+	check-readwrite-identity-nofixup.sh \
 	check-no-unknown-tags.sh \
 	check-all-mandatory-tags.sh
 

--- NEW FILE: check-readwrite-identity-nofixup.sh ---
#!/bin/sh
# Read then write (unmodified) each image through exif, using the --no-fixup
# option. Check that the written image contains the same data as the original.

script=`dirname $0`
newscript="$script/check-readwrite-identity.sh"
exec $newscript --no-fixup

[libexif-cvs] libexif-testsuite NEWS,1.12,1.13

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif-testsuite
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2796

Modified Files:
	NEWS 
Log Message:
Added check-readwrite-identity-nofixup.sh that uses --no-fixup on the
check-readwrite-identity.sh tests


Index: NEWS
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/NEWS,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -d -r1.12 -r1.13
--- NEWS	10 Oct 2009 08:08:53 -0000	1.12
+++ NEWS	14 Oct 2009 06:50:57 -0000	1.13
@@ -1,4 +1,6 @@
 New in 0.7.x:
+  * Added check-readwrite-identity-nofixup.sh that uses --no-fixup on the
+    check-readwrite-identity.sh tests
 
 New in 0.7.14:
   * Working with libexif and exif ver. 0.6.18

[libexif-cvs] libexif ChangeLog,1.330,1.331

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24459

Modified Files:
	ChangeLog 
Log Message:
Fixed an inverted logic condition that prevented the bug
report address from appearing in the .pot file


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -p -d -r1.330 -r1.331
--- ChangeLog	14 Oct 2009 04:36:12 -0000	1.330
+++ ChangeLog	14 Oct 2009 05:58:34 -0000	1.331
@@ -2,6 +2,8 @@
 
 	* po/sv.po: Updated Swedish translation by Daniel Nylander
 	* po/vi.po: Updated Vietnamese translation by Clytie Siddall
+	* Fixed an inverted logic condition that prevented the bug
+	  report address from appearing in the .pot file
 
 2009-10-09  Dan Fandrich <da...@co...>
 

[libexif-cvs] m4m gp-gettext-hack.m4,1.4,1.5

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/m4m
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24459/m4m

Modified Files:
	gp-gettext-hack.m4 
Log Message:
Fixed an inverted logic condition that prevented the bug
report address from appearing in the .pot file


Index: gp-gettext-hack.m4
===================================================================
RCS file: /cvsroot/libexif/m4m/gp-gettext-hack.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -d -r1.4 -r1.5
--- gp-gettext-hack.m4	26 Jun 2007 01:57:08 -0000	1.4
+++ gp-gettext-hack.m4	14 Oct 2009 05:58:35 -0000	1.5
@@ -31,6 +31,8 @@ AC_SUBST([GETTEXT_PACKAGE])
 sed_cmds="s|^DOMAIN.*|DOMAIN = ${GETTEXT_PACKAGE}|"
 m4_if([$2],[],[],[sed_cmds="${sed_cmds};s|^COPYRIGHT_HOLDER.*|COPYRIGHT_HOLDER = $2|"])
 m4_ifval([$3],[
+sed_mb="$3"
+],[
 if test -n "$PACKAGE_BUGREPORT"; then
    sed_mb="${PACKAGE_BUGREPORT}"
 else
@@ -41,8 +43,6 @@ else
 ***
 ])
 fi
-],[
-sed_mb="$3"
 ])
 sed_cmds="${sed_cmds};s|^MSGID_BUGS_ADDRESS.*|MSGID_BUGS_ADDRESS = ${sed_mb}|"
 # Not so sure whether this hack is all *that* evil...

[libexif-cvs] exif/po fi.po, NONE, 1.1 sv.po, 1.4, 1.5 vi.po, 1.4, 1.5 zh_CN.po, 1.4, 1.5

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/exif/po
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20092/po

Modified Files:
	sv.po vi.po zh_CN.po 
Added Files:
	fi.po 
Log Message:
po/fi.po: Added new Finnish translation by Jorma Karvonen
po/sv.po: Updated Swedish translation by Daniel Nylander
po/vi.po: Updated Vietnamese translation by Clytie Siddall
po/zh_CN.po: Updated Chinese (simplified) translation by Ji ZhengYu


Index: sv.po
===================================================================
RCS file: /cvsroot/libexif/exif/po/sv.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -d -r1.4 -r1.5
--- sv.po	19 Sep 2009 04:12:21 -0000	1.4
+++ sv.po	14 Oct 2009 05:37:27 -0000	1.5
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: exif 0.6.18-pre1\n"
+"Project-Id-Version: exif 0.6.18-pre2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 22:23-0700\n"
-"PO-Revision-Date: 2009-09-18 10:55+0100\n"
+"POT-Creation-Date: 2009-10-01 22:56-0700\n"
+"PO-Revision-Date: 2009-10-10 11:30+0100\n"
 "Last-Translator: Daniel Nylander <po...@da...>\n"
 "Language-Team: Swedish <tp...@li...>\n"
 "MIME-Version: 1.0\n"
@@ -16,274 +16,286 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: exif/actions.c:59
+#: exif/actions.c:57
 #, c-format
 msgid "Not enough memory."
 msgstr "Inte tillräckligt med minne."
 
-#: exif/actions.c:77
+#: exif/actions.c:75
 #, c-format
 msgid "Setting a value for this tag is unsupported!"
 msgstr "Inställning av ett värde för denna tagg stöds inte!"
 
-#: exif/actions.c:94
+#: exif/actions.c:92
 #, c-format
 msgid "Too few components specified!"
 msgstr "För få komponenter angivna!"
 
-#: exif/actions.c:109
+#: exif/actions.c:107
 #, c-format
 msgid "Internal error. Please contact <%s>."
 msgstr "Internt fel. Kontakta <%s>."
 
-#: exif/actions.c:148
+#: exif/actions.c:146
 #, c-format
 msgid "Not yet implemented!"
 msgstr "Ännu inte implementerat!"
 
-#: exif/actions.c:155
+#: exif/actions.c:153
 #, c-format
 msgid "Warning; Too many components specified!"
 msgstr "Varning: För många komponenter angivna!"
 
-#: exif/actions.c:177
+#: exif/actions.c:175
 #, c-format
 msgid "Too much EXIF data (%i bytes). Only %i bytes are allowed."
 msgstr "För mycket EXIF-data (%i byte). Endast %i byte tillåts."
 
-#: exif/actions.c:188 exif/actions.c:359
+#: exif/actions.c:186 exif/actions.c:357
 #, c-format
 msgid "Wrote file '%s'."
 msgstr "Skrev filen \"%s\"."
 
-#: exif/actions.c:208
+#: exif/actions.c:206
 #, c-format
 msgid "EXIF entry '%s' "
-msgstr "EXIF-post \"%s\" "
+msgstr "EXIF-posten \"%s\" "
 
-#: exif/actions.c:210
+#: exif/actions.c:208
 #, c-format
 msgid "(0x%x, '%s') "
 msgstr "(0x%x, \"%s\") "
 
-#: exif/actions.c:213
+#: exif/actions.c:211
 #, c-format
 msgid "exists in IFD '%s':\n"
 msgstr "finns i IFD \"%s\":\n"
 
-#: exif/actions.c:264
+#: exif/actions.c:262
 #, c-format
 msgid "IFD '%s' does not contain a tag '%s'!"
 msgstr "IFD:n \"%s\" innehåller inte taggen \"%s\"!"
 
-#: exif/actions.c:294
+#: exif/actions.c:292
 #, c-format
 msgid "Could not open '%s' (%s)!"
 msgstr "Kunde inte öppna \"%s\" (%s)!"
 
-#: exif/actions.c:303
+#: exif/actions.c:301
 #, c-format
 msgid "Could not read '%s' (%s)."
 msgstr "Kunde inte läsa \"%s\" (%s)."
 
-#: exif/actions.c:322
+#: exif/actions.c:320
 #, c-format
 msgid "IFD '%s' does not contain tag '%s'."
 msgstr "IFD:n \"%s\" innehåller inte taggen \"%s\"."
 
-#: exif/actions.c:328
+#: exif/actions.c:326
 #, c-format
 msgid "'%s' does not contain tag '%s'."
 msgstr "\"%s\" innehåller inte taggen \"%s\"."
 
-#: exif/actions.c:346
+#: exif/actions.c:344
 #, c-format
 msgid "'%s' does not contain a thumbnail!"
 msgstr "\"%s\" innehåller inte en miniatyrbild!"
 
-#: exif/actions.c:354
+#: exif/actions.c:352
 #, c-format
 msgid "Could not open '%s' for writing (%s)!"
 msgstr "Kunde inte öppna \"%s\" för skrivning (%s)!"
 
-#: exif/actions.c:376
+#: exif/actions.c:374
 #, c-format
 msgid "EXIF tags in '%s':"
 msgstr "EXIF-taggar i \"%s\":"
 
-#: exif/actions.c:472
+#: exif/actions.c:470
 #, c-format
 msgid "Unknown format or nonexistent MakerNote.\n"
 msgstr "Okänt format eller icke-existerande MakerNote.\n"
 
-#: exif/actions.c:479
+#: exif/actions.c:477
 #, c-format
 msgid "MakerNote does not contain any value.\n"
 msgstr "MakerNote innehåller inget värde.\n"
 
-#: exif/actions.c:482
+#: exif/actions.c:480
 #, c-format
 msgid "MakerNote contains %i value:\n"
 msgid_plural "MakerNote contains %i values:\n"
 msgstr[0] "MakerNote innehåller %i värde:\n"
 msgstr[1] "MakerNote innehåller %i värden:\n"
 
-#: exif/actions.c:492
+#: exif/actions.c:490
 msgid "Unknown tag"
 msgstr "Okänd tagg"
 
-#: exif/actions.c:501
+#: exif/actions.c:499
 msgid "Unknown value"
 msgstr "Okänt värde"
 
-#: exif/actions.c:525
+#: exif/actions.c:523
 #, c-format
 msgid "EXIF tags in '%s' ('%s' byte order):"
 msgstr "EXIF-taggar i \"%s\" (\"%s\" byteordning):"
 
-#: exif/actions.c:531
+#: exif/actions.c:529
 msgid "Tag"
 msgstr "Tagg"
 
-#: exif/actions.c:537
+#: exif/actions.c:535
 msgid "Value"
 msgstr "Värde"
 
-#: exif/actions.c:552
+#: exif/actions.c:550
 #, c-format
 msgid "EXIF data contains a thumbnail (%i bytes)."
 msgstr "EXIF-data innehåller en miniatyrbild (%i byte)."
 
-#: exif/actions.c:594
+#: exif/actions.c:592
 #, c-format
 msgid "ThumbnailSize\t%i\n"
 msgstr "Miniatyrbildsstorlek\t%i\n"
 
-#: exif/main.c:189
+#: exif/main.c:196
 msgid "Display software version"
 msgstr "Visa programvaruversion"
 
-#: exif/main.c:191
+#: exif/main.c:198
 msgid "Show IDs instead of tag names"
 msgstr "Visa id:n istället för taggnamn"
 
-#: exif/main.c:193
+#: exif/main.c:200
 msgid "Select tag"
 msgstr "Välj tagg"
 
-#: exif/main.c:193
+#: exif/main.c:200
 msgid "tag"
 msgstr "tagg"
 
-#: exif/main.c:195
+#: exif/main.c:202
 msgid "Select IFD"
 msgstr "Välj IFD"
 
-#: exif/main.c:195
+#: exif/main.c:202
 msgid "IFD"
 msgstr "IFD"
 
-#: exif/main.c:197
+#: exif/main.c:204
 msgid "List all EXIF tags"
 msgstr "Lista alla EXIF-taggar"
 
-#: exif/main.c:199
+#: exif/main.c:206
 msgid "Show contents of tag MakerNote"
 msgstr "Visa innehållet i taggen MakerNote"
 
-#: exif/main.c:201
+#: exif/main.c:208
 msgid "Remove tag or ifd"
 msgstr "Ta bort tagg eller ifd"
 
-#: exif/main.c:203
+#: exif/main.c:210
 msgid "Show description of tag"
 msgstr "Visa beskrivning av tagg"
 
-#: exif/main.c:205
+#: exif/main.c:212
 msgid "Extract thumbnail"
 msgstr "Extrahera miniatyrbild"
 
-#: exif/main.c:207
+#: exif/main.c:214
 msgid "Remove thumbnail"
 msgstr "Ta bort miniatyrbild"
 
-#: exif/main.c:209
+#: exif/main.c:216
 msgid "Insert FILE as thumbnail"
 msgstr "Infoga FIL som miniatyrbild"
 
-#: exif/main.c:209 exif/main.c:211
+#: exif/main.c:216 exif/main.c:220
 msgid "FILE"
 msgstr "FIL"
 
-#: exif/main.c:211
+#: exif/main.c:218
+msgid "Do not fix existing tags in files"
+msgstr "Rätta inte till befintliga taggar i filer"
+
+#: exif/main.c:220
 msgid "Write data to FILE"
 msgstr "Skriv data till FIL"
 
-#: exif/main.c:213
+#: exif/main.c:222
 msgid "Value of tag"
 msgstr "Värde för tagg"
 
-#: exif/main.c:215
+#: exif/main.c:224
 msgid "Create EXIF data if not existing"
 msgstr "Skapa EXIF-data om den inte finns"
 
-#: exif/main.c:217
+#: exif/main.c:226
 msgid "Output in a machine-readable (tab delimited) format"
 msgstr "Skriv ut i ett läsbart format (tabulatoravgränsat)"
 
-#: exif/main.c:220
+#: exif/main.c:229
+msgid "Width of output"
+msgstr "Bredd för utdata"
+
+#: exif/main.c:229
+msgid "WIDTH"
+msgstr "BREDD"
+
+#: exif/main.c:231
 msgid "Output in a XML format"
 msgstr "Skriv ut i ett XML-format"
 
-#: exif/main.c:223
+#: exif/main.c:234
 msgid "Show debugging messages"
 msgstr "Visa felsökningsmeddelanden"
 
-#: exif/main.c:229
+#: exif/main.c:240
 msgid "Help options:"
 msgstr "Hjälpflaggor:"
 
-#: exif/main.c:230
+#: exif/main.c:241
 msgid "Show this help message"
 msgstr "Visa detta hjälpmeddelande"
 
-#: exif/main.c:231
+#: exif/main.c:242
 msgid "Display brief usage message"
 msgstr "Visa ett kort användningsmeddelande"
 
-#: exif/main.c:251
+#: exif/main.c:262
 msgid "[OPTION...] file"
 msgstr "[FLAGGA...] fil"
 
-#: exif/main.c:263
+#: exif/main.c:277
 #, c-format
 msgid "Invalid IFD '%s'. Valid IFDs are '0', '1', 'EXIF', 'GPS', and 'Interoperability'."
 msgstr "Ogiltig IFD \"%s\". Giltiga IFD:er är \"0\", \"1\", \"EXIF\", \"GPS\" och \"Interoperability\"."
 
-#: exif/main.c:272
+#: exif/main.c:286
 #, c-format
 msgid "Invalid tag '%s'!"
 msgstr "Ogiltig tagg \"%s\"!"
 
-#: exif/main.c:280
+#: exif/main.c:294
 msgid "You need to specify a tag!"
 msgstr "Du måste ange en tagg!"
 
-#: exif/main.c:285
+#: exif/main.c:299
 msgid "You need to specify an IFD!"
 msgstr "Du måste ange en IFD!"
 
-#: exif/main.c:308
+#: exif/main.c:322
 #, c-format
 msgid "Tag '%s' "
 msgstr "Tagg \"%s\" "
 
-#: exif/main.c:310
+#: exif/main.c:324
 #, c-format
 msgid "(0x%04x, '%s'): "
 msgstr "(0x%04x, \"%s\"): "
 
-#: exif/main.c:368
+#: exif/main.c:388
 #, c-format
 msgid "'%s' is not readable or does not contain EXIF data!"
 msgstr "\"%s\" är inte läsbar eller innehåller inget EXIF-data!"

Index: vi.po
===================================================================
RCS file: /cvsroot/libexif/exif/po/vi.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -d -r1.4 -r1.5
--- vi.po	6 Oct 2009 05:59:49 -0000	1.4
+++ vi.po	14 Oct 2009 05:37:27 -0000	1.5
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: exif 0.6.18-pre2\n"
+"Project-Id-Version: exif 0.6.18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-01 22:56-0700\n"
-"PO-Revision-Date: 2009-10-03 21:22+0930\n"
+"POT-Creation-Date: 2009-10-08 18:05-0700\n"
+"PO-Revision-Date: 2009-10-11 17:33+1030\n"
 "Last-Translator: Clytie Siddall <cl...@ri...>\n"
 "Language-Team: Vietnamese <vi...@go...>\n"
 "MIME-Version: 1.0\n"

--- NEW FILE: fi.po ---
(This appears to be a binary file; contents omitted.)

Index: zh_CN.po
===================================================================
RCS file: /cvsroot/libexif/exif/po/zh_CN.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -d -r1.4 -r1.5
--- zh_CN.po	19 Sep 2009 04:12:21 -0000	1.4
+++ zh_CN.po	14 Oct 2009 05:37:27 -0000	1.5
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: exif 0.6.18-pre1\n"
+"Project-Id-Version: exif 0.6.18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 22:23-0700\n"
-"PO-Revision-Date: 2009-09-18 14:17中国标准时间\n"
+"POT-Creation-Date: 2009-10-08 18:05-0700\n"
+"PO-Revision-Date: 2009-10-12 11:42中国标准时间\n"
 "Last-Translator: Ji ZhengYu <zhe...@gm...>\n"
 "Language-Team: Chinese (simplified) <tra...@li...>\n"
 "MIME-Version: 1.0\n"
@@ -17,273 +17,285 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: exif/actions.c:59
+#: exif/actions.c:57
 #, c-format
 msgid "Not enough memory."
 msgstr "没有足够的内存。"
 
-#: exif/actions.c:77
+#: exif/actions.c:75
 #, c-format
 msgid "Setting a value for this tag is unsupported!"
 msgstr "不支持设定此标识的值！"
 
-#: exif/actions.c:94
+#: exif/actions.c:92
 #, c-format
 msgid "Too few components specified!"
 msgstr "参数太少！"
 
-#: exif/actions.c:109
+#: exif/actions.c:107
 #, c-format
 msgid "Internal error. Please contact <%s>."
 msgstr "内部错误。请联系 <%s>。"
 
-#: exif/actions.c:148
+#: exif/actions.c:146
 #, c-format
 msgid "Not yet implemented!"
 msgstr "不支持的功能！"
 
-#: exif/actions.c:155
+#: exif/actions.c:153
 #, c-format
 msgid "Warning; Too many components specified!"
 msgstr "警告：指定了太多参数！"
 
-#: exif/actions.c:177
+#: exif/actions.c:175
 #, c-format
 msgid "Too much EXIF data (%i bytes). Only %i bytes are allowed."
 msgstr "EXIF 数据太多(%i 个字节)。只允许 %i 个字节。"
 
-#: exif/actions.c:188 exif/actions.c:359
+#: exif/actions.c:186 exif/actions.c:357
 #, c-format
 msgid "Wrote file '%s'."
 msgstr "写入文件‘%s’。"
 
-#: exif/actions.c:208
+#: exif/actions.c:206
 #, c-format
 msgid "EXIF entry '%s' "
 msgstr "EXIF 记录‘%s’"
 
-#: exif/actions.c:210
+#: exif/actions.c:208
 #, c-format
 msgid "(0x%x, '%s') "
 msgstr "(0x%x，‘%s’) "
 
-#: exif/actions.c:213
+#: exif/actions.c:211
 #, c-format
 msgid "exists in IFD '%s':\n"
 msgstr "存在于 IFD‘%s’中:\n"
 
-#: exif/actions.c:264
+#: exif/actions.c:262
 #, c-format
 msgid "IFD '%s' does not contain a tag '%s'!"
 msgstr "IFD‘%s’中没有 EXIF 信息标识‘%s’！"
 
-#: exif/actions.c:294
+#: exif/actions.c:292
 #, c-format
 msgid "Could not open '%s' (%s)!"
 msgstr "无法打开‘%s’(%s)！"
 
-#: exif/actions.c:303
+#: exif/actions.c:301
 #, c-format
 msgid "Could not read '%s' (%s)."
 msgstr "无法读取‘%s’(%s)。"
 
-#: exif/actions.c:322
+#: exif/actions.c:320
 #, c-format
 msgid "IFD '%s' does not contain tag '%s'."
 msgstr "IFD ‘%s’中不含 EXIF 信息标识‘%s’。"
 
-#: exif/actions.c:328
+#: exif/actions.c:326
 #, c-format
 msgid "'%s' does not contain tag '%s'."
 msgstr "‘%s’中不含标识‘%s’。"
 
-#: exif/actions.c:346
+#: exif/actions.c:344
 #, c-format
 msgid "'%s' does not contain a thumbnail!"
 msgstr "‘%s’中不含缩略图！"
 
-#: exif/actions.c:354
+#: exif/actions.c:352
 #, c-format
 msgid "Could not open '%s' for writing (%s)!"
 msgstr "无法以写方式打开‘%s’(%s)！"
 
-#: exif/actions.c:376
+#: exif/actions.c:374
 #, c-format
 msgid "EXIF tags in '%s':"
 msgstr "‘%s’中的 EXIF 信息标识为:"
 
-#: exif/actions.c:472
+#: exif/actions.c:470
 #, c-format
 msgid "Unknown format or nonexistent MakerNote.\n"
 msgstr "未知格式或者 MakerNote 不存在。\n"
 
-#: exif/actions.c:479
+#: exif/actions.c:477
 #, c-format
 msgid "MakerNote does not contain any value.\n"
 msgstr "MakerNote 没有任何内容。\n"
 
-#: exif/actions.c:482
+#: exif/actions.c:480
 #, c-format
 msgid "MakerNote contains %i value:\n"
 msgid_plural "MakerNote contains %i values:\n"
 msgstr[0] "MakerNote 含有 %i 个值:\n"
 
-#: exif/actions.c:492
+#: exif/actions.c:490
 msgid "Unknown tag"
 msgstr "未知的信息标识"
 
-#: exif/actions.c:501
+#: exif/actions.c:499
 msgid "Unknown value"
 msgstr "未知值"
 
-#: exif/actions.c:525
+#: exif/actions.c:523
 #, c-format
 msgid "EXIF tags in '%s' ('%s' byte order):"
 msgstr "‘%s’中的EXIF 信息标识(‘%s’字节顺序):"
 
-#: exif/actions.c:531
+#: exif/actions.c:529
 msgid "Tag"
 msgstr "信息标识"
 
-#: exif/actions.c:537
+#: exif/actions.c:535
 msgid "Value"
 msgstr "值"
 
-#: exif/actions.c:552
+#: exif/actions.c:550
 #, c-format
 msgid "EXIF data contains a thumbnail (%i bytes)."
 msgstr "EXIF 数据中含有缩略图(%i 个字节)。"
 
-#: exif/actions.c:594
+#: exif/actions.c:592
 #, c-format
 msgid "ThumbnailSize\t%i\n"
 msgstr "缩略图尺寸\t%i\n"
 
-#: exif/main.c:189
+#: exif/main.c:196
 msgid "Display software version"
 msgstr "显示软件版本"
 
-#: exif/main.c:191
+#: exif/main.c:198
 msgid "Show IDs instead of tag names"
 msgstr "显示 IDs，以代替信息标识名称"
 
-#: exif/main.c:193
+#: exif/main.c:200
 msgid "Select tag"
 msgstr "选择信息标识"
 
-#: exif/main.c:193
+#: exif/main.c:200
 msgid "tag"
 msgstr "信息标识"
 
-#: exif/main.c:195
+#: exif/main.c:202
 msgid "Select IFD"
 msgstr "选择 IFD"
 
-#: exif/main.c:195
+#: exif/main.c:202
 msgid "IFD"
 msgstr "IFD"
 
-#: exif/main.c:197
+#: exif/main.c:204
 msgid "List all EXIF tags"
 msgstr "列出所有 EXIF 信息标识"
 
-#: exif/main.c:199
+#: exif/main.c:206
 msgid "Show contents of tag MakerNote"
 msgstr "显示 MakerNote 的内容"
 
-#: exif/main.c:201
+#: exif/main.c:208
 msgid "Remove tag or ifd"
 msgstr "删除信息标识或是 ifd"
 
-#: exif/main.c:203
+#: exif/main.c:210
 msgid "Show description of tag"
 msgstr "显示信息标识说明"
 
-#: exif/main.c:205
+#: exif/main.c:212
 msgid "Extract thumbnail"
 msgstr "解出缩略图"
 
-#: exif/main.c:207
+#: exif/main.c:214
 msgid "Remove thumbnail"
 msgstr "删除缩略图"
 
-#: exif/main.c:209
+#: exif/main.c:216
 msgid "Insert FILE as thumbnail"
 msgstr "将 FILE 作为缩略图插入"
 
-#: exif/main.c:209 exif/main.c:211
+#: exif/main.c:216 exif/main.c:220
 msgid "FILE"
 msgstr "FILE"
 
-#: exif/main.c:211
+#: exif/main.c:218
+msgid "Do not fix existing tags in files"
+msgstr "不修复文件中存在的标识信息"
+
+#: exif/main.c:220
 msgid "Write data to FILE"
 msgstr "将数据写入 FILE"
 
-#: exif/main.c:213
+#: exif/main.c:222
 msgid "Value of tag"
 msgstr "tag 值"
 
-#: exif/main.c:215
+#: exif/main.c:224
 msgid "Create EXIF data if not existing"
 msgstr "如果 EXIF 数据不存在就创建它"
 
-#: exif/main.c:217
+#: exif/main.c:226
 msgid "Output in a machine-readable (tab delimited) format"
 msgstr "以机器可读的格式(tab 分隔)输出"
 
-#: exif/main.c:220
+#: exif/main.c:229
+msgid "Width of output"
+msgstr "输出宽度"
+
+#: exif/main.c:229
+msgid "WIDTH"
+msgstr "宽度"
+
+#: exif/main.c:231
 msgid "Output in a XML format"
 msgstr "以 XML 格式输出"
 
-#: exif/main.c:223
+#: exif/main.c:234
 msgid "Show debugging messages"
 msgstr "显示调示信息"
 
-#: exif/main.c:229
+#: exif/main.c:240
 msgid "Help options:"
 msgstr "帮助选项："
 
-#: exif/main.c:230
+#: exif/main.c:241
 msgid "Show this help message"
 msgstr "显示此帮助信息"
 
-#: exif/main.c:231
+#: exif/main.c:242
 msgid "Display brief usage message"
 msgstr "显示简短的使用信息"
 
-#: exif/main.c:251
+#: exif/main.c:262
 msgid "[OPTION...] file"
 msgstr "[选项...] 文件"
 
-#: exif/main.c:263
+#: exif/main.c:277
 #, c-format
 msgid "Invalid IFD '%s'. Valid IFDs are '0', '1', 'EXIF', 'GPS', and 'Interoperability'."
 msgstr "无效的 IFD‘%s’。有效的 IFDs 是‘0’,‘1’,‘EXIF’，‘GPS’，以及‘Interoperability’。"
 
-#: exif/main.c:272
+#: exif/main.c:286
 #, c-format
 msgid "Invalid tag '%s'!"
 msgstr "无效的 EXIF 信息标识‘%s’！"
 
-#: exif/main.c:280
+#: exif/main.c:294
 msgid "You need to specify a tag!"
 msgstr "您需要指定一个 EXIF 信息标识！"
 
-#: exif/main.c:285
+#: exif/main.c:299
 msgid "You need to specify an IFD!"
 msgstr "您需要指定一个IFD！"
 
-#: exif/main.c:308
+#: exif/main.c:322
 #, c-format
 msgid "Tag '%s' "
 msgstr "信息标识‘%s’"
 
-#: exif/main.c:310
+#: exif/main.c:324
 #, c-format
 msgid "(0x%04x, '%s'): "
 msgstr "(0x%04x，‘%s’): "
 
-#: exif/main.c:368
+#: exif/main.c:388
 #, c-format
 msgid "'%s' is not readable or does not contain EXIF data!"
 msgstr "‘%s’不可读或者是没有 EXIF 数据！"

[libexif-cvs] exif ChangeLog,1.99,1.100 configure.ac,1.29,1.30

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/exif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20092

Modified Files:
	ChangeLog configure.ac 
Log Message:
po/fi.po: Added new Finnish translation by Jorma Karvonen
po/sv.po: Updated Swedish translation by Daniel Nylander
po/vi.po: Updated Vietnamese translation by Clytie Siddall
po/zh_CN.po: Updated Chinese (simplified) translation by Ji ZhengYu


Index: configure.ac
===================================================================
RCS file: /cvsroot/libexif/exif/configure.ac,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -d -r1.29 -r1.30
--- configure.ac	9 Oct 2009 00:55:05 -0000	1.29
+++ configure.ac	14 Oct 2009 05:37:25 -0000	1.30
@@ -39,7 +39,7 @@ GP_PKG_CONFIG
 # i18n support
 # ---------------------------------------------------------------------------
 GP_GETTEXT_HACK([${PACKAGE}],[Lutz Mueller and others])
-ALL_LINGUAS="da de es fr id is it lv nl pl sk sv vi zh_CN"
+ALL_LINGUAS="da de es fi fr id is it lv nl pl sk sv vi zh_CN"
 AM_GNU_GETTEXT_VERSION([0.14.1])
 AM_GNU_GETTEXT([external])
 AM_PO_SUBDIRS()

Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/exif/ChangeLog,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -d -r1.99 -r1.100
--- ChangeLog	13 Oct 2009 03:11:30 -0000	1.99
+++ ChangeLog	14 Oct 2009 05:37:25 -0000	1.100
@@ -1,3 +1,10 @@
+2009-10-13  Dan Fandrich <da...@co...>
+
+	* po/fi.po: Added new Finnish translation by Jorma Karvonen
+	* po/sv.po: Updated Swedish translation by Daniel Nylander
+	* po/vi.po: Updated Vietnamese translation by Clytie Siddall
+	* po/zh_CN.po: Updated Chinese (simplified) translation by Ji ZhengYu
+
 2009-10-12  Dan Fandrich <da...@co...>
 
 	* Added argument description for --set-value and a missing translation

[libexif-cvs] libexif/po sv.po,1.3,1.4 vi.po,1.22,1.23

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif/po
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7916/po

Modified Files:
	sv.po vi.po 
Log Message:
po/sv.po: Updated Swedish translation by Daniel Nylander
po/vi.po: Updated Vietnamese translation by Clytie Siddall


Index: sv.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/sv.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -d -r1.3 -r1.4
--- sv.po	19 Sep 2009 04:07:41 -0000	1.3
+++ sv.po	14 Oct 2009 04:36:14 -0000	1.4
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libexif 0.6.18-pre1\n"
+"Project-Id-Version: libexif 0.6.18-pre2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 22:05-0700\n"
-"PO-Revision-Date: 2009-09-18 11:43+0100\n"
+"POT-Creation-Date: 2009-10-01 22:54-0700\n"
+"PO-Revision-Date: 2009-10-10 11:37+0100\n"
 "Last-Translator: Daniel Nylander <po...@da...>\n"
[...1452 lines suppressed...]
 msgid "Date"
@@ -5168,6 +5148,18 @@ msgstr "Fast"
 msgid "[DO_NOT_TRANSLATE_THIS_MARKER]"
 msgstr ""
 
+#~ msgid "%i"
+#~ msgstr "%i"
+
+#~ msgid "%d"
+#~ msgstr "%d"
+
+#~ msgid "Ascii"
+#~ msgstr "Ascii"
+
+#~ msgid "%li"
+#~ msgstr "%li"
+
 #~ msgid "Firmware version"
 #~ msgstr "Version av fast programvara"
 

Index: vi.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/vi.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -d -r1.22 -r1.23
--- vi.po	6 Oct 2009 06:23:28 -0000	1.22
+++ vi.po	14 Oct 2009 04:36:14 -0000	1.23
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libexif 0.6.18-pre2\n"
+"Project-Id-Version: libexif 0.6.18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-01 22:54-0700\n"
-"PO-Revision-Date: 2009-10-03 21:25+0930\n"
+"POT-Creation-Date: 2009-10-09 14:52-0700\n"
+"PO-Revision-Date: 2009-10-11 17:35+1030\n"
 "Last-Translator: Clytie Siddall <cl...@ri...>\n"
 "Language-Team: Vietnamese <vi...@go...>\n"
 "MIME-Version: 1.0\n"
@@ -3639,7 +3639,7 @@ msgid "%2.2f mm"
 msgstr "%2.2f mm"
 
 #: libexif/fuji/mnote-fuji-entry.c:298 libexif/pentax/mnote-pentax-entry.c:399
-#: libexif/pentax/mnote-pentax-entry.c:439
+#: libexif/pentax/mnote-pentax-entry.c:451
 #, c-format
 msgid "%i bytes unknown data"
 msgstr "%i byte dữ liệu lạ"

[libexif-cvs] libexif ChangeLog,1.329,1.330

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7916

Modified Files:
	ChangeLog 
Log Message:
po/sv.po: Updated Swedish translation by Daniel Nylander
po/vi.po: Updated Vietnamese translation by Clytie Siddall


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.329
retrieving revision 1.330
diff -u -p -d -r1.329 -r1.330
--- ChangeLog	9 Oct 2009 19:50:33 -0000	1.329
+++ ChangeLog	14 Oct 2009 04:36:12 -0000	1.330
@@ -1,3 +1,8 @@
+2009-10-13  Dan Fandrich <da...@co...>
+
+	* po/sv.po: Updated Swedish translation by Daniel Nylander
+	* po/vi.po: Updated Vietnamese translation by Clytie Siddall
+
 2009-10-09  Dan Fandrich <da...@co...>
 
 	* Released 0.6.18

[libexif-cvs] exif/exif actions.c,1.45,1.46 main.c,1.75,1.76

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/exif/exif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20395/exif

Modified Files:
	actions.c main.c 
Log Message:
Added argument description for --set-value and a missing translation
(pointed out by Jorma Karvonen)


Index: main.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/main.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -d -r1.75 -r1.76
--- main.c	1 Oct 2009 06:50:34 -0000	1.75
+++ main.c	13 Oct 2009 03:11:33 -0000	1.76
@@ -219,7 +219,7 @@ main (int argc, const char **argv)
 		{"output", 'o', POPT_ARG_STRING, &output, 0,
 		 N_("Write data to FILE"), N_("FILE")},
 		{"set-value", '\0', POPT_ARG_STRING, &p.set_value, 0,
-		 N_("Value of tag"), NULL},
+		 N_("Value of tag"), N_("STRING")},
 		{"create-exif", 'c', POPT_ARG_NONE, &create_exif, 0,
 		 N_("Create EXIF data if not existing"), NULL},
 		{"machine-readable", 'm', POPT_ARG_NONE, &p.machine_readable, 0,

Index: actions.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/actions.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -d -r1.45 -r1.46
--- actions.c	1 Oct 2009 06:50:34 -0000	1.45
+++ actions.c	13 Oct 2009 03:11:33 -0000	1.46
@@ -221,7 +221,7 @@ action_create_value (ExifData *ed, ExifL
 	ExifEntry *e;
 
 	if (!((e = exif_content_get_entry (ed->ifd[ifd], tag)))) {
-	    exif_log (log, EXIF_LOG_CODE_DEBUG, "exif", "Adding entry...");
+	    exif_log (log, EXIF_LOG_CODE_DEBUG, "exif", _("Adding entry..."));
 	    e = exif_entry_new ();
 	    exif_content_add_entry (ed->ifd[ifd], e);
 	    exif_entry_initialize (e, tag);

[libexif-cvs] exif ChangeLog,1.98,1.99

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/exif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20395

Modified Files:
	ChangeLog 
Log Message:
Added argument description for --set-value and a missing translation
(pointed out by Jorma Karvonen)


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/exif/ChangeLog,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -d -r1.98 -r1.99
--- ChangeLog	9 Oct 2009 00:50:53 -0000	1.98
+++ ChangeLog	13 Oct 2009 03:11:30 -0000	1.99
@@ -1,3 +1,8 @@
+2009-10-12  Dan Fandrich <da...@co...>
+
+	* Added argument description for --set-value and a missing translation
+	  (pointed out by Jorma Karvonen)
+
 2009-10-08  Dan Fandrich <da...@co...>
 
 	* Released 0.6.18

[libexif-cvs] libexif-testsuite NEWS, 1.11, 1.12 configure.ac, 1.27, 1.28

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif-testsuite
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv8374

Modified Files:
	NEWS configure.ac 
Log Message:
Prepare for continued development                                        


Index: NEWS
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/NEWS,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -d -r1.11 -r1.12
--- NEWS	10 Oct 2009 08:06:14 -0000	1.11
+++ NEWS	10 Oct 2009 08:08:53 -0000	1.12
@@ -1,3 +1,5 @@
+New in 0.7.x:
+
 New in 0.7.14:
   * Working with libexif and exif ver. 0.6.18
   * Created check-vars.sh script to eliminate the need to generate all

Index: configure.ac
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/configure.ac,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -d -r1.27 -r1.28
--- configure.ac	10 Oct 2009 08:06:14 -0000	1.27
+++ configure.ac	10 Oct 2009 08:08:53 -0000	1.28
@@ -3,7 +3,7 @@ dnl Use a short version and package name
 dnl packaging [...]/libgphoto2_port/gphoto2-port-portability-os2.h
 dnl because tar only handles 99 chars per file path. Oh, and GNU tar 1.13
 dnl will fail silently.
-AC_INIT([libexif test suite],[0.7.14],[lib...@li...],[lets])
+AC_INIT([libexif test suite],[0.7.14.1],[lib...@li...],[lets])
 AC_CONFIG_SRCDIR([tests/Makefile.am])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([auto-m4])