[libexif-cvs] libexif/libexif exif-entry.c,1.34,1.35

[<lu...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory sc8-pr-cvs1:/tmp/cvs-serv9111/libexif

Modified Files:
	exif-entry.c 
Log Message:

2003-05-01  Lutz Mueller <lu...@us...>

	Suggestion by Gernot Jander <ge...@bi...>:

	* libexif/exif-entry.c: Ignore "   " in EXIF_TAG_COPYRIGHT.


Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- exif-entry.c	29 Apr 2003 04:57:31 -0000	1.34
+++ exif-entry.c	30 Apr 2003 23:51:44 -0000	1.35
@@ -180,7 +180,7 @@
 			strncpy (v, "Exif Version 2.1", sizeof (v) - 1);
 		else if (!memcmp (e->data, "0220", 4))
 			strncpy (v, "Exif Version 2.2", sizeof (v) - 1);
-		else strncpy (v, "Unknown Exif Version", sizeof (v) - 1);
+		else strncpy (v, _("Unknown Exif Version"), sizeof (v) - 1);
 		break;
 	case EXIF_TAG_FLASH_PIX_VERSION:
 		CF (e->format, EXIF_FORMAT_UNDEFINED, v);
@@ -188,22 +188,35 @@
 		if (!memcmp (e->data, "0100", 4))
 			strncpy (v, "FlashPix Version 1.0", sizeof (v));
 		else
-			strncpy (v, "Unknown FlashPix Version", sizeof (v));
+			strncpy (v, _("Unknown FlashPix Version"), sizeof (v));
 		break;
 	case EXIF_TAG_COPYRIGHT:
 		CF (e->format, EXIF_FORMAT_ASCII, v);
-		if (e->size && e->data)
+
+		/* 
+		 * First part: Photographer.
+		 * Some cameras store a string like "   " here. Ignore it. 
+		 */
+		if (e->size && e->data &&
+		    (strspn (e->data, " ") != strlen ((char *) e->data)))
 			strncpy (v, e->data, MIN (sizeof (v) - 1, e->size));
 		else
-			strncpy (v, "[None]", sizeof (v) - 1);
-		strncat (v, " (Photographer) - ", sizeof (v) - 1);
+			strncpy (v, _("[None]"), sizeof (v) - 1);
+		strncat (v, " ", sizeof (v) - 1);
+		strncat (v, _("(Photographer)"), sizeof (v) - 1);
+
+		/* Second part: Editor. */
+		strncat (v, " - ", sizeof (v) - 1);
 		if (e->size && e->data &&
-		    (strlen ((char *) e->data) + 1 < e->size))
+		    (strlen ((char *) e->data) + 1 < e->size) &&
+		    (strspn (e->data, " ") != strlen ((char *) e->data)))
 			strncat (v, e->data + strlen (e->data) + 1,
 				 sizeof (v) - 1);
 		else
-			strncat (v, "[None]", sizeof (v));
-		strncat (v, " (Editor)", sizeof (v));
+			strncat (v, _("[None]"), sizeof (v) - 1);
+		strncat (v, " ", sizeof (v) - 1);
+		strncat (v, _("(Editor)"), sizeof (v) - 1);
+
 		break;
 	case EXIF_TAG_FNUMBER:
 		CF (e->format, EXIF_FORMAT_RATIONAL, v);