2008-09-30 Stephane Delcroix <sdelcroix@novell.com>

less custom code with gapi 2.12.5

svn path=/trunk/exiv2-sharp/; revision=114500
This commit is contained in:
Stephane Delcroix 2008-09-30 18:40:07 +00:00
Родитель 02c2c5937e
Коммит e395067ba4
5 изменённых файлов: 10 добавлений и 82 удалений

Просмотреть файл

@ -1,3 +1,7 @@
2008-09-30 Stephane Delcroix <sdelcroix@novell.com>
less custom code with gapi 2.12.5
2008-09-23 Stephane Delcroix <sdelcroix@novell.com>
* Exiv2.metadata:

Просмотреть файл

@ -28,24 +28,6 @@
*
*/
[DllImport("libexiv2glue.dll")]
static extern IntPtr exiv2_exifdata_begin(IntPtr raw);
private Exiv2.ExifDatumIterator Begin() {
IntPtr raw_ret = exiv2_exifdata_begin(Handle);
Exiv2.ExifDatumIterator ret = GLib.Object.GetObject(raw_ret) as Exiv2.ExifDatumIterator;
return ret;
}[DllImport("libexiv2glue.dll")]
static extern IntPtr exiv2_exifdata_end(IntPtr raw);
private Exiv2.ExifDatumIterator End() {
IntPtr raw_ret = exiv2_exifdata_end(Handle);
Exiv2.ExifDatumIterator ret = GLib.Object.GetObject(raw_ret) as Exiv2.ExifDatumIterator;
return ret;
}
public IEnumerator GetEnumerator ()
{
return new Enumerator (this);
@ -88,17 +70,6 @@ class Enumerator : IEnumerator
}
}
[DllImport("libexiv2glue.dll")]
static extern IntPtr exiv2_exifdata_get_this(IntPtr raw, IntPtr key);
private Exiv2.ExifDatum GetThis(string key) {
IntPtr native_key = GLib.Marshaller.StringToPtrGStrdup (key);
IntPtr raw_ret = exiv2_exifdata_get_this(Handle, native_key);
Exiv2.ExifDatum ret = GLib.Object.GetObject(raw_ret) as Exiv2.ExifDatum;
GLib.Marshaller.Free (native_key);
return ret;
}
public object this [string key]
{
get { return GetThis (key); }

Просмотреть файл

@ -1,47 +0,0 @@
/*
* ExifDatumIterator.custom - customization to Exiv2.ExifData
*
* 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.
*
*/
[DllImport("libexiv2glue.dll")]
static extern bool exiv2_exifdatumiterator_equals(IntPtr raw, IntPtr other);
internal bool Equals(Exiv2.ExifDatumIterator other) {
bool raw_ret = exiv2_exifdatumiterator_equals(Handle, other == null ? IntPtr.Zero : other.Handle);
bool ret = raw_ret;
return ret;
}
[DllImport("libexiv2glue.dll")]
static extern void exiv2_exifdatumiterator_next(IntPtr raw);
internal void Next() {
exiv2_exifdatumiterator_next(Handle);
}

Просмотреть файл

@ -3,11 +3,12 @@
<add-node path="/api/namespace/object[@cname='Exiv2ExifData']"><implements><interface name="IEnumerable"/></implements></add-node>"
<attr path="/api/namespace/object[@cname='Exiv2ImageFactory']/method[@cname='exiv2_imagefactory_open_buf']/*/*[@name='data']" name="array">1</attr>
<attr path="/api/namespace/object[@cname='Exiv2ImageFactory']/method[@cname='exiv2_imagefactory_open_buf']" name="name">Open</attr>
<attr path="/api/namespace/object[@cname='Exiv2ExifDatumIterator']/method[@name='Next']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='Exiv2ExifDatumIterator']/method[@name='Equals']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='Exiv2ExifData']/method[@name='Begin']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='Exiv2ExifData']/method[@name='End']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='Exiv2ExifData']/method[@name='GetThis']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='Exiv2DataBuf']" name="internal">1</attr>
<attr path="/api/namespace/object[@cname='Exiv2ExifDatumIterator']/method[@name='Next']" name="accessibility">internal</attr>
<attr path="/api/namespace/object[@cname='Exiv2ExifDatumIterator']/method[@name='Equals']" name="accessibility">internal</attr>
<attr path="/api/namespace/object[@cname='Exiv2ExifData']/method[@name='Begin']" name="accessibility">private</attr>
<attr path="/api/namespace/object[@cname='Exiv2ExifData']/method[@name='End']" name="accessibility">private</attr>
<attr path="/api/namespace/object[@cname='Exiv2ExifData']/method[@name='GetThis']" name="accessibility">private</attr>
<attr path="/api/namespace/object[@cname='Exiv2ExifThumb']/method[@cname='exiv2_exifthumb_jpegThumbnailPath']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='Exiv2ExifThumb']/method[@cname='exiv2_exifthumb_jpegThumbnailPathSimple']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='Exiv2ExifThumb']/method[@cname='exiv2_exifthumb_jpegThumbnailBuf']" name="hidden">1</attr>

Просмотреть файл

@ -15,7 +15,6 @@ CUSTOMS = \
$(srcdir)/DataBuf.custom \
$(srcdir)/ExifData.custom \
$(srcdir)/ExifDatum.custom \
$(srcdir)/ExifDatumIterator.custom \
$(srcdir)/ExifThumb.custom \
$(srcdir)/ImageFactory.custom \
$(srcdir)/XmpData.custom