2008-10-03 Stephane Delcroix <sdelcroix@novell.com>

* exiv2-ifdid.h: copying the enum locally.

	* exiv2-exiftags.h|.cpp: almost empty so far

svn path=/trunk/exiv2-sharp/; revision=114795

glue/ChangeLog

@@ -1,3 +1,9 @@
+2008-10-03  Stephane Delcroix  <sdelcroix@novell.com>
+
+	* exiv2-ifdid.h: copying the enum locally.
+
+	* exiv2-exiftags.h|.cpp: almost empty so far
+
 2008-10-03  Stephane Delcroix  <sdelcroix@novell.com>
 
 	* exiv2-exifkey.cpp:

glue/Makefile.am

@@ -21,9 +21,12 @@ libexiv2glue_la_SOURCES =			\
 	exiv2-exifkey.cpp			\
 	exiv2-exifkey.h				\
 	exiv2-exifkey-private.h			\
+	exiv2-exiftags.cpp			\
+	exiv2-exiftags.h			\
 	exiv2-exifthumb.cpp			\
 	exiv2-exifthumb.h			\
 	exiv2-exifthumb-private.h		\
+	exiv2-ifdid.h				\
 	exiv2-image.cpp				\
 	exiv2-image.h				\
 	exiv2-image-private.h			\

glue/exiv2-exiftags.cpp

@@ -0,0 +1,55 @@
+/*
+ * exiv2-exiftags.cpp
+ *
+ * Author(s):
+ *	Stephane Delcroix  (stephane@delcroix.org)
+ *
+ * Copyright (c) 2008 Novell
+ *
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#include "exiv2-exiftags.h"
+#include <exiv2/tags.hpp>
+
+G_BEGIN_DECLS
+
+G_DEFINE_TYPE (Exiv2ExifTags, exiv2_exiftags, G_TYPE_OBJECT);
+
+static void
+exiv2_exiftags_init (Exiv2ExifTags *self)
+{
+}
+
+static void
+exiv2_exiftags_class_init (Exiv2ExifTagsClass *klass)
+{
+	
+}
+
+const char*
+exiv2_exiftags_get_tagName (guint16 tag, Exiv2IfdId ifdid)
+{
+	return g_strdup (Exiv2::ExifTags::tagName (tag, (Exiv2::IfdId)ifdid).c_str ());
+}
+
+G_END_DECLS

glue/exiv2-exiftags.h

@@ -0,0 +1,65 @@
+/*
+ * exiv2-exiftags.h
+ *
+ * Author(s):
+ *	Stephane Delcroix  (stephane@delcroix.org)
+ *
+ * Copyright (c) 2008 Novell
+ *
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+#ifndef __EXIV2_EXIFTAGS_H__
+#define __EXIV2_EXIFTAGS_H__
+
+#include <glib-object.h>
+#include "exiv2-ifdid.h"
+
+G_BEGIN_DECLS
+
+#define EXIV2_TYPE_EXIFTAGS			(exiv2_exiftags_get_type ())
+#define EXIV2_EXIFTAGS(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), EXIV2_TYPE_EXIFTAGS, Exiv2ExifTags))
+#define EXIV2_IS_EXIFTAGS(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), EXIV2_TYPE_EXIFTAGS))
+#define EXIV2_EXIFTAGS_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), EXIV2_TYPE_EXIFTAGS, Exiv2ExifTagsClass))
+#define EXIV2_IS_EXIFTAGS_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), EXIV2_TYPE_EXIFTAGS))
+#define EXIV2_EXIFTAGS_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), EXIV2_TYPE_EXIFTAGS, Exiv2ExifTagsClass))
+
+typedef struct _Exiv2ExifTags	Exiv2ExifTags;
+typedef struct _Exiv2ExifTagsClass	Exiv2ExifTagsClass;
+
+struct _Exiv2ExifTags
+{
+	GObject parent_instance;
+
+};
+
+struct _Exiv2ExifTagsClass
+{
+	GObjectClass parent_class;
+
+};
+
+GType 		exiv2_exiftags_get_type 	(void);
+
+const char*	exiv2_exiftags_get_tagName 	(guint16 tag, Exiv2IfdId ifdid);
+
+G_END_DECLS
+#endif /*  __EXIV2_EXIFTAGS_H__ */

glue/exiv2-ifdid.h

@@ -0,0 +1,69 @@
+/*
+ * exiv2-ifdid.h 
+ *
+ * Author(s):
+ *	Stephane Delcroix  (stephane@delcroix.org)
+ *
+ * Copyright (c) 2008 Novell, Inc.
+ *
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#include <exiv2/types.hpp>
+//FIXME: this should be autogenerated from types.hpp
+
+enum Exiv2IfdId { 
+	ifdIdNotSet 	= Exiv2::ifdIdNotSet,
+	ifd0Id		= Exiv2::ifd0Id, 
+	exifIfdId	= Exiv2::exifIfdId, 
+	gpsIfdId	= Exiv2::gpsIfdId, 
+	iopIfdId	= Exiv2::iopIfdId, 
+	ifd1Id		= Exiv2::ifd1Id, 
+	ifd2Id		= Exiv2::ifd2Id,
+	subImage1Id	= Exiv2::subImage1Id, 
+	subImage2Id	= Exiv2::subImage2Id, 
+	subImage3Id	= Exiv2::subImage3Id, 
+	subImage4Id	= Exiv2::subImage4Id,
+	canonIfdId	= Exiv2::canonIfdId, 
+	canonCsIfdId	= Exiv2::canonCsIfdId, 
+	canonSiIfdId	= Exiv2::canonSiIfdId, 
+	canonCfIfdId	= Exiv2::canonCfIfdId,
+	canonPiIfdId	= Exiv2::canonPiIfdId, 
+	canonPaIfdId	= Exiv2::canonPaIfdId,
+	fujiIfdId	= Exiv2::fujiIfdId,
+	minoltaIfdId	= Exiv2::minoltaIfdId, 
+	minoltaCs5DIfdId	= Exiv2::minoltaCs5DIfdId, 
+	minoltaCs7DIfdId	= Exiv2::minoltaCs7DIfdId,
+	minoltaCsOldIfdId	= Exiv2::minoltaCsOldIfdId, 
+	minoltaCsNewIfdId	= Exiv2::minoltaCsNewIfdId,
+	nikon1IfdId	= Exiv2::nikon1IfdId, 
+	nikon2IfdId	= Exiv2::nikon2IfdId, 
+	nikon3IfdId	= Exiv2::nikon3IfdId, 
+	nikonPvIfdId	= Exiv2::nikonPvIfdId,
+	olympusIfdId	= Exiv2::olympusIfdId, 
+	panasonicIfdId	= Exiv2::panasonicIfdId, 
+	pentaxIfdId	= Exiv2::pentaxIfdId, 
+	sigmaIfdId	= Exiv2::sigmaIfdId, 
+	sonyIfdId	= Exiv2::sonyIfdId,
+	lastIfdId	= Exiv2::lastIfdId
+};
+