Skip to content
Snippets Groups Projects
  • Birte Kristina Friesel's avatar
    bb954ff1
    Lots of EXIF mode fixes and improvements by Dennis Real (closes #87) · bb954ff1
    Birte Kristina Friesel authored
    Squashed commit of the following:
    
    commit 58dd2e30
    Merge: cf6f0320 82a976e0
    Author: Dennis Real <github@tildepipe.org>
    Date:   Sat Mar 31 18:43:47 2012 +0200
    
        Merge branch 'master' of git://github.com/derf/feh
    
    commit cf6f0320
    Merge: 10b7b1e3 877e6346
    Author: Dennis Real <github@tildepipe.org>
    Date:   Sun Mar 25 19:07:30 2012 +0200
    
        Merge branch 'master' of git://github.com/derf/feh
    
    commit 10b7b1e3
    Author: Dennis Real <github@tildepipe.org>
    Date:   Sat Mar 24 14:41:15 2012 +0100
    
        Support for Canon Exif makernote tags
    
    commit 3c284dc8
    Author: Dennis Real <github@tildepipe.org>
    Date:   Thu Mar 22 19:44:32 2012 +0100
    
        Support for Active D-Lightning
    
    commit ad5aea8c
    Merge: cc6de200 9c43b648
    Author: Dennis Real <github@tildepipe.org>
    Date:   Thu Mar 22 19:01:38 2012 +0100
    
        Merge remote branch 'upstream/master'
    
    commit cc6de200
    Author: Dennis Real <github@tildepipe.org>
    Date:   Thu Mar 22 19:00:30 2012 +0100
    
        Nikon makernote parts changed
    
    commit e401bd9c
    Author: Dennis Real <github@tildepipe.org>
    Date:   Wed Mar 21 19:47:15 2012 +0100
    
        1. Own module for nikon maker notes
        2. Support for AFInfo2
    
    commit 39cbd1ed
    Merge: 9e1bbf87 a1001232
    Author: Dennis Real <github@tildepipe.org>
    Date:   Fri Mar 16 22:22:28 2012 +0100
    
        Merge remote branch 'upstream/master'
    
    commit 9e1bbf87
    Author: Dennis Real <github@tildepipe.org>
    Date:   Fri Mar 16 22:20:58 2012 +0100
    
        - exif handling changed
        - gps info added if available
    
    commit 8e963828
    Merge: 77fa5aca 29cd8688
    Author: Dennis Real <github@tildepipe.org>
    Date:   Fri Mar 16 19:13:47 2012 +0100
    
        Merge branch 'master' of git://github.com/derf/feh
    
    commit 77fa5aca
    Merge: 93a90e60 3b2756bf
    Author: Dennis Real <github@tildepipe.org>
    Date:   Wed Mar 7 17:18:07 2012 +0100
    
        Merge branch 'master' of git://github.com/derf/feh
    
    commit 93a90e60
    Merge: a81465d0 52d5da9c
    Author: Dennis Real <github@tildepipe.org>
    Date:   Tue Mar 6 21:42:40 2012 +0100
    
        Merge branch 'master' of git://github.com/derf/feh
    
    commit a81465d0
    Merge: a19e50de 31afac45
    Author: Dennis Real <github@tildepipe.org>
    Date:   Mon Mar 5 17:23:40 2012 +0100
    
        Merge branch 'master' of git://github.com/derf/feh
    
    commit a19e50de
    Merge: 1c89da12 fe9a16bc
    Author: Dennis Real <github@tildepipe.org>
    Date:   Sun Mar 4 15:35:45 2012 +0100
    
        Merge branch 'master' of ssh://github.com/reald/feh
    
    commit 1c89da12
    Author: Dennis Real <github@tildepipe.org>
    Date:   Tue Feb 28 22:37:22 2012 +0100
    
        test case adapted to new testfile
    
    commit bb3c9d35
    Author: Dennis Real <github@tildepipe.org>
    Date:   Tue Feb 28 22:34:51 2012 +0100
    
        test file with some exif data added
    
    commit fe9a16bc
    Author: Dennis Real <github@tildepipe.org>
    Date:   Tue Feb 28 22:37:22 2012 +0100
    
        test case adapted to new testfile
    
    commit e0bedc04
    Merge: 46801fee 69ecc5c1
    Author: Dennis Real <github@tildepipe.org>
    Date:   Tue Feb 28 22:36:08 2012 +0100
    
        Merge remote branch 'upstream/master'
    
    commit 46801fee
    Author: Dennis Real <github@tildepipe.org>
    Date:   Tue Feb 28 22:34:51 2012 +0100
    
        test file with some exif data added
    bb954ff1
    History
    Lots of EXIF mode fixes and improvements by Dennis Real (closes #87)
    Birte Kristina Friesel authored
    Squashed commit of the following:
    
    commit 58dd2e30
    Merge: cf6f0320 82a976e0
    Author: Dennis Real <github@tildepipe.org>
    Date:   Sat Mar 31 18:43:47 2012 +0200
    
        Merge branch 'master' of git://github.com/derf/feh
    
    commit cf6f0320
    Merge: 10b7b1e3 877e6346
    Author: Dennis Real <github@tildepipe.org>
    Date:   Sun Mar 25 19:07:30 2012 +0200
    
        Merge branch 'master' of git://github.com/derf/feh
    
    commit 10b7b1e3
    Author: Dennis Real <github@tildepipe.org>
    Date:   Sat Mar 24 14:41:15 2012 +0100
    
        Support for Canon Exif makernote tags
    
    commit 3c284dc8
    Author: Dennis Real <github@tildepipe.org>
    Date:   Thu Mar 22 19:44:32 2012 +0100
    
        Support for Active D-Lightning
    
    commit ad5aea8c
    Merge: cc6de200 9c43b648
    Author: Dennis Real <github@tildepipe.org>
    Date:   Thu Mar 22 19:01:38 2012 +0100
    
        Merge remote branch 'upstream/master'
    
    commit cc6de200
    Author: Dennis Real <github@tildepipe.org>
    Date:   Thu Mar 22 19:00:30 2012 +0100
    
        Nikon makernote parts changed
    
    commit e401bd9c
    Author: Dennis Real <github@tildepipe.org>
    Date:   Wed Mar 21 19:47:15 2012 +0100
    
        1. Own module for nikon maker notes
        2. Support for AFInfo2
    
    commit 39cbd1ed
    Merge: 9e1bbf87 a1001232
    Author: Dennis Real <github@tildepipe.org>
    Date:   Fri Mar 16 22:22:28 2012 +0100
    
        Merge remote branch 'upstream/master'
    
    commit 9e1bbf87
    Author: Dennis Real <github@tildepipe.org>
    Date:   Fri Mar 16 22:20:58 2012 +0100
    
        - exif handling changed
        - gps info added if available
    
    commit 8e963828
    Merge: 77fa5aca 29cd8688
    Author: Dennis Real <github@tildepipe.org>
    Date:   Fri Mar 16 19:13:47 2012 +0100
    
        Merge branch 'master' of git://github.com/derf/feh
    
    commit 77fa5aca
    Merge: 93a90e60 3b2756bf
    Author: Dennis Real <github@tildepipe.org>
    Date:   Wed Mar 7 17:18:07 2012 +0100
    
        Merge branch 'master' of git://github.com/derf/feh
    
    commit 93a90e60
    Merge: a81465d0 52d5da9c
    Author: Dennis Real <github@tildepipe.org>
    Date:   Tue Mar 6 21:42:40 2012 +0100
    
        Merge branch 'master' of git://github.com/derf/feh
    
    commit a81465d0
    Merge: a19e50de 31afac45
    Author: Dennis Real <github@tildepipe.org>
    Date:   Mon Mar 5 17:23:40 2012 +0100
    
        Merge branch 'master' of git://github.com/derf/feh
    
    commit a19e50de
    Merge: 1c89da12 fe9a16bc
    Author: Dennis Real <github@tildepipe.org>
    Date:   Sun Mar 4 15:35:45 2012 +0100
    
        Merge branch 'master' of ssh://github.com/reald/feh
    
    commit 1c89da12
    Author: Dennis Real <github@tildepipe.org>
    Date:   Tue Feb 28 22:37:22 2012 +0100
    
        test case adapted to new testfile
    
    commit bb3c9d35
    Author: Dennis Real <github@tildepipe.org>
    Date:   Tue Feb 28 22:34:51 2012 +0100
    
        test file with some exif data added
    
    commit fe9a16bc
    Author: Dennis Real <github@tildepipe.org>
    Date:   Tue Feb 28 22:37:22 2012 +0100
    
        test case adapted to new testfile
    
    commit e0bedc04
    Merge: 46801fee 69ecc5c1
    Author: Dennis Real <github@tildepipe.org>
    Date:   Tue Feb 28 22:36:08 2012 +0100
    
        Merge remote branch 'upstream/master'
    
    commit 46801fee
    Author: Dennis Real <github@tildepipe.org>
    Date:   Tue Feb 28 22:34:51 2012 +0100
    
        test file with some exif data added
exif_canon.c 1.78 KiB
/* exif_canon.c

Copyright (C) 2012      Dennis Real.

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 of the Software and its documentation and acknowledgment shall be
given in the documentation and software packages that this Software was
used.

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 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.

*/

#ifdef HAVE_LIBEXIF

#include <stdio.h>
#include <libexif/exif-data.h>

#include "feh.h"
#include "debug.h"
#include "exif.h"
#include "exif_canon.h"



/* get interesting canon maker note tags in readable form */
void exc_get_mnote_canon_tags(ExifData *ed, unsigned int tag, char * buffer, unsigned int maxsize)
{
  /* char buf[EXIF_STD_BUF_LEN];

  buf[0] = '\0';
  exif_get_tag(ed, EXIF_IFD_EXIF, EXIF_TAG_FLASH, buf, sizeof(buf));
  exif_trim_spaces(buf); */

  switch(tag)
  {
    default:
    {
      /* normal makernote tags without special treatment */
      exif_get_mnote_tag(ed, tag, buffer, maxsize);
    }
    break;
  }


  return;
}

#endif