[libexif-cvs] libexif/libexif/pentax exif-mnote-data-pentax.c,1.6,1.7

[Jan P. <pa...@us...>]

Update of /cvsroot/libexif/libexif/libexif/pentax
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29889/libexif/pentax

Modified Files:
	exif-mnote-data-pentax.c 
Log Message:
2004-07-13  Jan Patera <pa...@us...>

	* libexif/exif-mnote-*.*: added exif_mnote_data_get_id()
	  returning actual mnote entry tag ID (suggested by Serge
	  Droz <ser...@ps...>)



Index: exif-mnote-data-pentax.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/pentax/exif-mnote-data-pentax.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- exif-mnote-data-pentax.c	15 Mar 2004 23:14:49 -0000	1.6
+++ exif-mnote-data-pentax.c	13 Jul 2004 15:16:38 -0000	1.7
@@ -117,6 +117,16 @@
 	return n ? ((ExifMnoteDataPentax *) n)->count : 0;
 }
 
+static unsigned int
+exif_mnote_data_pentax_get_id (ExifMnoteData *d, unsigned int n)
+{
+	ExifMnoteDataPentax *note = (ExifMnoteDataPentax *) d;
+
+	if (!note) return 0;
+	if (note->count <= n) return 0;
+	return note->entries[n].tag;
+}
+
 static const char *
 exif_mnote_data_pentax_get_name (ExifMnoteData *d, unsigned int n)
 {
@@ -225,24 +235,24 @@
 ExifMnoteData *
 exif_mnote_data_pentax_new (void)
 {
-	ExifMnoteData *n;
+	ExifMnoteData *d;
 
-	n = malloc (sizeof (ExifMnoteDataPentax));
-	if (!n) return NULL;
-	memset (n, 0, sizeof (ExifMnoteDataPentax));
+	d = calloc (1, sizeof (ExifMnoteDataPentax));
+	if (!d) return NULL;
 
-	exif_mnote_data_construct (n);
+	exif_mnote_data_construct (d);
 
 	/* Set up function pointers */
-	n->methods.free            = exif_mnote_data_pentax_free;
-	n->methods.set_byte_order  = exif_mnote_data_pentax_set_byte_order;
-	n->methods.set_offset      = exif_mnote_data_pentax_set_offset;
-	n->methods.load            = exif_mnote_data_pentax_load;
-	n->methods.count           = exif_mnote_data_pentax_count;
-	n->methods.get_name        = exif_mnote_data_pentax_get_name;
-	n->methods.get_title       = exif_mnote_data_pentax_get_title;
-	n->methods.get_description = exif_mnote_data_pentax_get_description;
-	n->methods.get_value       = exif_mnote_data_pentax_get_value;
+	d->methods.free            = exif_mnote_data_pentax_free;
+	d->methods.set_byte_order  = exif_mnote_data_pentax_set_byte_order;
+	d->methods.set_offset      = exif_mnote_data_pentax_set_offset;
+	d->methods.load            = exif_mnote_data_pentax_load;
+	d->methods.count           = exif_mnote_data_pentax_count;
+	d->methods.get_id          = exif_mnote_data_pentax_get_id;
+	d->methods.get_name        = exif_mnote_data_pentax_get_name;
+	d->methods.get_title       = exif_mnote_data_pentax_get_title;
+	d->methods.get_description = exif_mnote_data_pentax_get_description;
+	d->methods.get_value       = exif_mnote_data_pentax_get_value;
 
-	return n;
+	return d;
 }