[tracker: 23/23] Merge branch 'experiment-with-roi'

[Martyn James Russell <mr src gnome org>]

commit 7032f0894957c16e44cb23dc999125bdc7d03b6b
Merge: cdd5552 bb4af51
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Sep 7 10:10:57 2011 +0100

    Merge branch 'experiment-with-roi'

 data/ontologies/33-nfo.ontology                    |   65 +++++
 src/libtracker-extract/tracker-xmp.c               |  289 +++++++++++++++++++-
 src/libtracker-extract/tracker-xmp.h               |   38 ++-
 src/tracker-extract/tracker-extract-gif.c          |    4 +
 src/tracker-extract/tracker-extract-jpeg.c         |    4 +
 src/tracker-extract/tracker-extract-pdf.c          |    5 +
 src/tracker-extract/tracker-extract-tiff.c         |    4 +
 src/tracker-extract/tracker-extract.c              |   19 +-
 tests/functional-tests/400-extractor.py            |    3 +
 .../test-extraction-data/images/roi.expected       |   12 +
 .../test-extraction-data/images/roi.jpg            |  Bin 0 -> 8604 bytes
 .../test-extraction-data/images/roi2.expected      |   13 +
 .../test-extraction-data/images/roi2.png           |  Bin 0 -> 23289 bytes
 tests/libtracker-extract/Makefile.am               |    2 +-
 tests/libtracker-extract/areas-ns.xmp              |   32 +++
 tests/libtracker-extract/areas-with-contacts.xmp   |   53 ++++
 tests/libtracker-extract/areas.xmp                 |   31 ++
 tests/libtracker-extract/tracker-test-xmp.c        |  172 ++++++++++++-
 18 files changed, 716 insertions(+), 30 deletions(-)
---