2004-12-17 Lutz Mueller <lutz@users.sourceforge.net>

	* libexif/exif-loader.c: Work towards a non-recursive version of
	  (exif_loader_write).

diff --git a/ChangeLog b/ChangeLog
index 074495f..0834945 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-12-17  Lutz Mueller <lutz@users.sourceforge.net>
 
+       * libexif/exif-loader.c: Work towards a non-recursive version of
+         (exif_loader_write).
+
+2004-12-17  Lutz Mueller <lutz@users.sourceforge.net>
+
        Lars Ellenberg <l.g.e@web.de> fixed a bug that I introduced
        in the last commit:
 

diff --git a/libexif/exif-loader.c b/libexif/exif-loader.c
index 9dc9898..d5ec3c1 100644 (file)
--- a/libexif/exif-loader.c
+++ b/libexif/exif-loader.c
@@ -173,9 +173,9 @@ exif_loader_write (ExifLoader *eld, unsigned char *buf, unsigned int len)
        for (i = 0; i < sizeof (eld->b); i++)
                switch (eld->state) {
                case EL_EXIF_FOUND:
-                       if (!exif_loader_write (eld, eld->b + i,
+                       if (!exif_loader_copy (eld, eld->b + i,
                                        sizeof (eld->b) - i)) return 0;
-                       return exif_loader_write (eld, buf, len);
+                       return exif_loader_copy (eld, buf, len);
                case EL_SKIP_BYTES:
                        eld->size--;
                        if (!eld->size) eld->state = EL_READ;