[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:39:34 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=0d55992
The following commit has been merged in the master branch:
commit 0d55992e2f5db3683e96dc3a2dcb430d29004cef
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Sat Jun 21 10:28:17 2008 +0000
Merged unstable branch to trunk.
---
samples/Makefile | 5 +-
samples/exifdata-test.cpp | 2 +-
samples/ifd-test.cpp | 209 -----
samples/key-test.cpp | 80 --
samples/largeiptc-test.cpp | 2 +-
samples/makernote-test.cpp | 49 -
samples/tiff-test.cpp | 108 +++
samples/tiffaddpath-test.cpp | 136 +++
samples/write-test.cpp | 4 +-
src/Makefile | 4 -
src/actions.cpp | 51 +-
src/canonmn.cpp | 350 +------
src/canonmn.hpp | 127 +--
src/convert.cpp | 2 +-
src/cr2image.cpp | 205 ++--
src/cr2image.hpp | 82 +-
src/cr2image_int.hpp | 122 +++
src/crwimage.cpp | 9 +-
src/error.cpp | 5 +-
src/exif.cpp | 1284 +++++---------------------
src/exif.hpp | 649 ++++---------
src/fujimn.cpp | 87 --
src/fujimn.hpp | 86 +-
src/ifd.cpp | 788 ----------------
src/ifd.hpp | 616 ------------
src/image.cpp | 51 +-
src/image.hpp | 76 +-
src/iptc.cpp | 253 ++---
src/iptc.hpp | 67 +-
src/jp2image.cpp | 6 +-
src/jpgimage.cpp | 45 +-
src/makernote.cpp | 459 ---------
src/makernote.hpp | 519 -----------
src/makernote2.cpp | 323 +++++--
src/{makernote2.hpp => makernote2_int.hpp} | 225 ++++-
src/minoltamn.cpp | 327 +------
src/minoltamn.hpp | 132 +--
src/mrwimage.cpp | 10 +-
src/mrwthumb.cpp | 49 +
src/nikonmn.cpp | 260 +-----
src/nikonmn.hpp | 194 +---
src/olympusmn.cpp | 85 +-
src/olympusmn.hpp | 86 +-
src/orfimage.cpp | 120 ++-
src/orfimage.hpp | 52 +-
src/orfimage_int.hpp | 72 ++
src/panasonicmn.cpp | 90 +-
src/panasonicmn.hpp | 85 +-
src/pentaxmn.cpp | 105 +--
src/pentaxmn.hpp | 109 +--
src/pngchunk.cpp | 12 +-
src/properties.cpp | 2 +-
src/psdimage.cpp | 6 +-
src/rafimage.cpp | 10 +-
src/sigmamn.cpp | 99 +-
src/sigmamn.hpp | 86 +-
src/sonymn.cpp | 83 --
src/sonymn.hpp | 81 +-
src/taglist.cpp | 1 -
src/tags.cpp | 207 ++---
src/tags.hpp | 126 ++-
src/tiff-test.cpp | 76 ++
src/tiffcomposite.cpp | 1059 ++++++++++++++++++++-
src/tiffcomposite.hpp | 641 -------------
src/tiffcomposite_int.hpp | 1261 +++++++++++++++++++++++++
src/{tifffwd.hpp => tifffwd_int.hpp} | 56 +-
src/tiffimage.cpp | 579 +++++++++++-
src/tiffimage.hpp | 159 ++--
src/tiffimage_int.hpp | 287 ++++++
src/tiffmn-test.cpp | 212 +++++
{samples => src}/tiffparse.cpp | 0
src/tiffparser.cpp | 214 -----
src/tiffparser.hpp | 132 ---
src/tiffvisitor.cpp | 859 +++++++++++++----
src/{tiffvisitor.hpp => tiffvisitor_int.hpp} | 300 +++++-
src/types.hpp | 7 +
src/value.cpp | 5 +-
src/value.hpp | 4 +
samples/convert-test.cpp => src/xmpdump.cpp | 26 +-
test/Makefile | 20 +-
test/data/addmoddel.out | 2 +-
test/data/conversions.out | 4 +-
test/data/exifdata-test.out | 478 +++++-----
test/data/mini9.tif | Bin 0 -> 526 bytes
test/data/modify-test.out | 8 +-
test/data/smiley2.jpg.c1gd | Bin 3315 -> 3309 bytes
test/data/smiley2.jpg.c2gd | Bin 3315 -> 3309 bytes
test/data/tiff-test.out | 138 +++
test/data/write2-test.out | 4 +-
test/ifd-test.sh | 24 -
test/makernote-test.sh | 24 -
test/tiff-test.sh | 35 +
92 files changed, 7138 insertions(+), 9051 deletions(-)
diff --git a/samples/Makefile b/samples/Makefile
index 58c6a49..a346b90 100644
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -58,22 +58,19 @@ BINSRC = addmoddel.cpp \
convert-test.cpp \
crwedit.cpp \
crwparse.cpp \
- dataarea-test.cpp \
exifcomment.cpp \
exifdata-test.cpp \
exifprint.cpp \
- ifd-test.cpp \
iotest.cpp \
iptceasy.cpp \
iptcprint.cpp \
iptctest.cpp \
key-test.cpp \
largeiptc-test.cpp \
- makernote-test.cpp \
stringto-test.cpp \
+ tiff-test.cpp \
write-test.cpp \
write2-test.cpp \
- tiffparse.cpp \
xmpparse.cpp \
xmpparser-test.cpp \
xmpsample.cpp
diff --git a/samples/exifdata-test.cpp b/samples/exifdata-test.cpp
index abb5ec6..39cb8bd 100644
--- a/samples/exifdata-test.cpp
+++ b/samples/exifdata-test.cpp
@@ -75,7 +75,7 @@ try {
ed3["Exif.Photo.DateTimeOriginal"] = "Sunday, 11am";
ed3["Exif.Photo.MeteringMode"] = uint16_t(1);
ed3["Exif.Iop.InteroperabilityIndex"] = "123";
-// ed3["Exif.Thumbnail.Orientation"] = uint16_t(2);
+ ed3["Exif.Thumbnail.Orientation"] = uint16_t(2);
write(file, ed3);
print(file);
std::cout << "----------------------------------------------
";
diff --git a/samples/ifd-test.cpp b/samples/ifd-test.cpp
deleted file mode 100644
index 0507003..0000000
--- a/samples/ifd-test.cpp
+++ /dev/null
@@ -1,209 +0,0 @@
-// ***************************************************************** -*- C++ -*-
-/*
- Abstract : Simple test program to test class Ifd.
-
- File : ifd-test.cpp
- Version : $Rev$
- Author(s): Andreas Huggel (ahu)
- History : 15-Feb-05, ahu
- */
-// *****************************************************************************
-// included header files
-#include <exiv2/ifd.hpp>
-#include <exiv2/error.hpp>
-
-#include <iostream>
-#include <string>
-#include <cstring>
-
-int main()
-try {
- // -------------------------------------------------------------------------
- std::cout << "Read standard Ifd from data buffer
";
-
- const long len = 77;
- Exiv2::byte buf[]
- = { 0xff, // Filler
- // No
- 0x00,0x04,
- // Tag Type Components Offset/Data
- 0x00,0x01, 0x00,0x02, 0x00,0x00,0x00,0x04, 'T', 'h', 'e', '
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list