[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:41:46 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=06ce0d1
The following commit has been merged in the master branch:
commit 06ce0d18b694a08d71948211a38fdb569b30adc9
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Sun Jun 27 10:04:39 2010 +0000
- Introduced exiv2.hpp as a wrapper to include all Exiv2 objects. (Renamed existing exiv2.hpp to exiv2app.hpp)
- Changed Sony/Minolta pretty-print function to print EV value
- Renamed rcsid.hpp to rcsid_int.hpp, do not publish it anymore
---
msvc/exiv2/exiv2.vcproj | 2 +-
msvc/exiv2lib/exiv2lib.vcproj | 6 +++---
samples/addmoddel.cpp | 4 ++--
samples/convert-test.cpp | 4 ++--
samples/easyaccess-test.cpp | 5 ++---
samples/exifcomment.cpp | 4 ++--
samples/exifdata-test.cpp | 4 ++--
samples/exifprint.cpp | 4 ++--
samples/iotest.cpp | 6 ++----
samples/iptceasy.cpp | 4 ++--
samples/iptcprint.cpp | 4 ++--
samples/iptctest.cpp | 6 ++----
samples/key-test.cpp | 4 ++--
samples/largeiptc-test.cpp | 6 ++----
samples/mmap-test.cpp | 4 +---
samples/prevtest.cpp | 3 +--
samples/stringto-test.cpp | 4 ++--
samples/tiff-test.cpp | 4 +---
samples/werror-test.cpp | 2 +-
samples/write-test.cpp | 3 +--
samples/write2-test.cpp | 4 ++--
samples/xmpparse.cpp | 4 +---
samples/xmpparser-test.cpp | 5 +----
samples/xmpsample.cpp | 3 +--
src/CMakeLists.txt | 3 ++-
src/Makefile | 4 ++--
src/actions.cpp | 4 ++--
src/actions.hpp | 2 +-
src/basicio.cpp | 2 +-
src/bmpimage.cpp | 2 +-
src/canonmn.cpp | 2 +-
src/convert.cpp | 2 +-
src/cr2image.cpp | 2 +-
src/crwimage.cpp | 2 +-
src/datasets.cpp | 2 +-
src/easyaccess.cpp | 2 +-
src/error.cpp | 2 +-
src/exif.cpp | 2 +-
src/exiv2.cpp | 4 ++--
src/{exiv2.hpp => exiv2app.hpp} | 8 ++++----
src/fujimn.cpp | 2 +-
src/futils.cpp | 2 +-
src/gifimage.cpp | 2 +-
src/image.cpp | 2 +-
src/iptc.cpp | 2 +-
src/jp2image.cpp | 2 +-
src/jpgimage.cpp | 2 +-
src/makernote.cpp | 2 +-
src/metadatum.cpp | 2 +-
src/minoltamn.cpp | 4 ++--
src/minoltamn.hpp | 3 ---
src/mrwimage.cpp | 2 +-
src/nikonmn.cpp | 2 +-
src/olympusmn.cpp | 2 +-
src/orfimage.cpp | 2 +-
src/panasonicmn.cpp | 2 +-
src/pentaxmn.cpp | 2 +-
src/pgfimage.cpp | 2 +-
src/pngchunk.cpp | 2 +-
src/pngimage.cpp | 2 +-
src/preview.cpp | 2 +-
src/properties.cpp | 2 +-
src/psdimage.cpp | 2 +-
src/rafimage.cpp | 2 +-
src/{rcsid.hpp => rcsid_int.hpp} | 12 ++++++------
src/rw2image.cpp | 2 +-
src/sigmamn.cpp | 2 +-
src/sonymn.cpp | 4 ++--
src/tags.cpp | 2 +-
src/tgaimage.cpp | 2 +-
src/tiffcomposite.cpp | 2 +-
src/tiffimage.cpp | 2 +-
src/tiffvisitor.cpp | 2 +-
src/types.cpp | 2 +-
src/utils.cpp | 2 +-
src/utiltest.cpp | 2 +-
src/value.cpp | 2 +-
src/version.cpp | 2 +-
src/xmp.cpp | 2 +-
src/xmpsidecar.cpp | 2 +-
80 files changed, 109 insertions(+), 130 deletions(-)
diff --git a/msvc/exiv2/exiv2.vcproj b/msvc/exiv2/exiv2.vcproj
index 7e7a604..30a60a6 100644
--- a/msvc/exiv2/exiv2.vcproj
+++ b/msvc/exiv2/exiv2.vcproj
@@ -405,7 +405,7 @@
>
</File>
<File
- RelativePath="..\..\src\exiv2.hpp"
+ RelativePath="..\..\src\exiv2app.hpp"
>
</File>
<File
diff --git a/msvc/exiv2lib/exiv2lib.vcproj b/msvc/exiv2lib/exiv2lib.vcproj
index 200440d..6718dee 100644
--- a/msvc/exiv2lib/exiv2lib.vcproj
+++ b/msvc/exiv2lib/exiv2lib.vcproj
@@ -454,6 +454,9 @@ copy/y ..\..\..\zlib-1.2.3\projects
isualc6\Win32_DLL_Release\zlib1.dll $(OutDi
RelativePath="..\..\src\exif.hpp">
</File>
<File
+ RelativePath="..\..\src\exiv2.hpp">
+ </File>
+ <File
RelativePath="..\..\src
ujimn.hpp">
</File>
<File
@@ -523,9 +526,6 @@ copy/y ..\..\..\zlib-1.2.3\projects
isualc6\Win32_DLL_Release\zlib1.dll $(OutDi
RelativePath="..\..\src
afimage.hpp">
</File>
<File
- RelativePath="..\..\src
csid.hpp">
- </File>
- <File
RelativePath="..\..\src
w2image.hpp">
</File>
<File
diff --git a/samples/addmoddel.cpp b/samples/addmoddel.cpp
index 7a5f423..6fb9702 100644
--- a/samples/addmoddel.cpp
+++ b/samples/addmoddel.cpp
@@ -2,8 +2,8 @@
// addmoddel.cpp, $Rev$
// Sample program showing how to add, modify and delete Exif metadata.
-#include <exiv2/image.hpp>
-#include <exiv2/exif.hpp>
+#include <exiv2/exiv2.hpp>
+
#include <iostream>
#include <iomanip>
#include <cassert>
diff --git a/samples/convert-test.cpp b/samples/convert-test.cpp
index 7514306..80e61f2 100644
--- a/samples/convert-test.cpp
+++ b/samples/convert-test.cpp
@@ -2,8 +2,8 @@
// convert-test.cpp, $Rev$
// Conversion test driver - make sure you have a copy of the input file around!
-#include <exiv2/image.hpp>
-#include <exiv2/convert.hpp>
+#include <exiv2/exiv2.hpp>
+
#include <iostream>
#include <iomanip>
#include <cassert>
diff --git a/samples/easyaccess-test.cpp b/samples/easyaccess-test.cpp
index 658b293..20dcd53 100644
--- a/samples/easyaccess-test.cpp
+++ b/samples/easyaccess-test.cpp
@@ -3,9 +3,8 @@
// Sample program using high-level metadata access functions
// included header files
-#include <exiv2/image.hpp>
-#include <exiv2/exif.hpp>
-#include <exiv2/easyaccess.hpp>
+#include <exiv2/exiv2.hpp>
+
#include <iostream>
#include <iomanip>
#include <cassert>
diff --git a/samples/exifcomment.cpp b/samples/exifcomment.cpp
index 22f51b2..96c00f2 100644
--- a/samples/exifcomment.cpp
+++ b/samples/exifcomment.cpp
@@ -11,8 +11,8 @@
*/
// *****************************************************************************
// included header files
-#include <exiv2/image.hpp>
-#include <exiv2/exif.hpp>
+#include <exiv2/exiv2.hpp>
+
#include <iostream>
#include <cassert>
diff --git a/samples/exifdata-test.cpp b/samples/exifdata-test.cpp
index 39cb8bd..2a875f6 100644
--- a/samples/exifdata-test.cpp
+++ b/samples/exifdata-test.cpp
@@ -10,8 +10,8 @@
*/
// *****************************************************************************
// included header files
-#include <exiv2/image.hpp>
-#include <exiv2/exif.hpp>
+#include <exiv2/exiv2.hpp>
+
#include <iostream>
#include <iomanip>
#include <string>
diff --git a/samples/exifprint.cpp b/samples/exifprint.cpp
index 08d6011..ea7fe3f 100644
--- a/samples/exifprint.cpp
+++ b/samples/exifprint.cpp
@@ -2,8 +2,8 @@
// exifprint.cpp, $Rev$
// Sample program to print the Exif metadata of an image
-#include <exiv2/image.hpp>
-#include <exiv2/exif.hpp>
+#include <exiv2/exiv2.hpp>
+
#include <iostream>
#include <iomanip>
#include <cassert>
diff --git a/samples/iotest.cpp b/samples/iotest.cpp
index e37a313..ecd4fda 100644
--- a/samples/iotest.cpp
+++ b/samples/iotest.cpp
@@ -29,10 +29,8 @@
*/
// *****************************************************************************
// included header files
-#include <exiv2/types.hpp>
-#include <exiv2/error.hpp>
-#include <exiv2/futils.hpp>
-#include <exiv2/basicio.hpp>
+#include <exiv2/exiv2.hpp>
+
#include <cstdio> // for EOF
#include <cstring>
#include <iostream>
diff --git a/samples/iptceasy.cpp b/samples/iptceasy.cpp
index 8b9fcbe..78f6e7b 100644
--- a/samples/iptceasy.cpp
+++ b/samples/iptceasy.cpp
@@ -2,8 +2,8 @@
// iptceasy.cpp, $Rev$
// The quickest way to access, set or modify IPTC metadata.
-#include <exiv2/iptc.hpp>
-#include <exiv2/image.hpp>
+#include <exiv2/exiv2.hpp>
+
#include <iostream>
#include <iomanip>
#include <cassert>
diff --git a/samples/iptcprint.cpp b/samples/iptcprint.cpp
index 84c918a..f327c01 100644
--- a/samples/iptcprint.cpp
+++ b/samples/iptcprint.cpp
@@ -2,8 +2,8 @@
// iptcprint.cpp, $Rev$
// Sample program to print the IPTC metadata of an image
-#include <exiv2/image.hpp>
-#include <exiv2/iptc.hpp>
+#include <exiv2/exiv2.hpp>
+
#include <iostream>
#include <iomanip>
#include <cassert>
diff --git a/samples/iptctest.cpp b/samples/iptctest.cpp
index ce0c9a9..0313b52 100644
--- a/samples/iptctest.cpp
+++ b/samples/iptctest.cpp
@@ -10,10 +10,8 @@
*/
// *****************************************************************************
// included header files
-#include <exiv2/image.hpp>
-#include <exiv2/iptc.hpp>
-#include <exiv2/datasets.hpp>
-#include <exiv2/value.hpp>
+#include <exiv2/exiv2.hpp>
+
#include <iostream>
#include <iomanip>
#include <cassert>
diff --git a/samples/key-test.cpp b/samples/key-test.cpp
index 60ea35d..7ce78f3 100644
--- a/samples/key-test.cpp
+++ b/samples/key-test.cpp
@@ -10,8 +10,8 @@
*/
// *****************************************************************************
// included header files
-#include <exiv2/exif.hpp>
-#include <exiv2/iptc.hpp>
+#include <exiv2/exiv2.hpp>
+
#include <iostream>
#include <string>
diff --git a/samples/largeiptc-test.cpp b/samples/largeiptc-test.cpp
index 079c83a..88ba80b 100644
--- a/samples/largeiptc-test.cpp
+++ b/samples/largeiptc-test.cpp
@@ -1,10 +1,8 @@
// ***************************************************************** -*- C++ -*-
// Test for large (>65535 bytes) IPTC buffer
-#include <exiv2/iptc.hpp>
-#include <exiv2/image.hpp>
-#include <exiv2/jpgimage.hpp>
-#include <exiv2/futils.hpp>
+#include <exiv2/exiv2.hpp>
+
#include <iostream>
#include <cassert>
diff --git a/samples/mmap-test.cpp b/samples/mmap-test.cpp
index 61257b6..e4f2980 100644
--- a/samples/mmap-test.cpp
+++ b/samples/mmap-test.cpp
@@ -2,9 +2,7 @@
// mmap-test.cpp, $Rev$
// Simple mmap tests
-#include <exiv2/basicio.hpp>
-#include <exiv2/error.hpp>
-#include <exiv2/futils.hpp>
+#include <exiv2/exiv2.hpp>
#include <iostream>
#include <cstring>
diff --git a/samples/prevtest.cpp b/samples/prevtest.cpp
index a4b91ad..a8048e7 100644
--- a/samples/prevtest.cpp
+++ b/samples/prevtest.cpp
@@ -2,8 +2,7 @@
// prevtest.cpp, $Rev$
// Test access to preview images
-#include <exiv2/image.hpp>
-#include <exiv2/preview.hpp>
+#include <exiv2/exiv2.hpp>
#include <string>
#include <iostream>
diff --git a/samples/stringto-test.cpp b/samples/stringto-test.cpp
index 973dcfc..d970b3b 100644
--- a/samples/stringto-test.cpp
+++ b/samples/stringto-test.cpp
@@ -2,8 +2,8 @@
// stringto-test.cpp, $Rev$
// Test conversions from string to long, float and Rational types.
-#include <exiv2/types.hpp>
-#include <exiv2/error.hpp>
+#include <exiv2/exiv2.hpp>
+
#include <iostream>
#include <iomanip>
diff --git a/samples/tiff-test.cpp b/samples/tiff-test.cpp
index b1a2a72..cf27172 100644
--- a/samples/tiff-test.cpp
+++ b/samples/tiff-test.cpp
@@ -2,9 +2,7 @@
// tiff-test.cpp, $Rev$
// First and very simple TIFF write test.
-#include <exiv2/tiffimage.hpp>
-#include <exiv2/exif.hpp>
-#include <exiv2/error.hpp>
+#include <exiv2/exiv2.hpp>
#include <string>
#include <iostream>
diff --git a/samples/werror-test.cpp b/samples/werror-test.cpp
index 99f3e25..d282b87 100644
--- a/samples/werror-test.cpp
+++ b/samples/werror-test.cpp
@@ -3,7 +3,7 @@
// Simple tests for the wide-string error class WError
#include <iostream>
-#include <exiv2/error.hpp>
+#include <exiv2/exiv2.hpp>
int main()
{
diff --git a/samples/write-test.cpp b/samples/write-test.cpp
index 1d944c2..513f0f9 100644
--- a/samples/write-test.cpp
+++ b/samples/write-test.cpp
@@ -15,8 +15,7 @@
*/
// *****************************************************************************
// included header files
-#include <exiv2/image.hpp>
-#include <exiv2/exif.hpp>
+#include <exiv2/exiv2.hpp>
#include <iostream>
#include <sstream>
diff --git a/samples/write2-test.cpp b/samples/write2-test.cpp
index 16dd532..f8c17df 100644
--- a/samples/write2-test.cpp
+++ b/samples/write2-test.cpp
@@ -10,8 +10,8 @@
*/
// *****************************************************************************
// included header files
-#include <exiv2/image.hpp>
-#include <exiv2/exif.hpp>
+#include <exiv2/exiv2.hpp>
+
#include <iostream>
#include <iomanip>
#include <string>
diff --git a/samples/xmpparse.cpp b/samples/xmpparse.cpp
index 99a9805..121955e 100644
--- a/samples/xmpparse.cpp
+++ b/samples/xmpparse.cpp
@@ -2,9 +2,7 @@
// xmpparse.cpp, $Rev$
// Read an XMP packet from a file, parse it and print all (known) properties.
-#include <exiv2/basicio.hpp>
-#include <exiv2/xmp.hpp>
-#include <exiv2/error.hpp>
+#include <exiv2/exiv2.hpp>
#include <string>
#include <iostream>
diff --git a/samples/xmpparser-test.cpp b/samples/xmpparser-test.cpp
index 15d5258..1ab1677 100644
--- a/samples/xmpparser-test.cpp
+++ b/samples/xmpparser-test.cpp
@@ -2,10 +2,7 @@
// xmpparser-test.cpp, $Rev$
// Read an XMP packet from a file, parse and re-serialize it.
-#include <exiv2/basicio.hpp>
-#include <exiv2/xmp.hpp>
-#include <exiv2/error.hpp>
-#include <exiv2/futils.hpp>
+#include <exiv2/exiv2.hpp>
#include <string>
#include <iostream>
diff --git a/samples/xmpsample.cpp b/samples/xmpsample.cpp
index f8b2993..1b53ca9 100644
--- a/samples/xmpsample.cpp
+++ b/samples/xmpsample.cpp
@@ -2,8 +2,7 @@
// xmpsample.cpp, $Rev$
// Sample/test for high level XMP classes. See also addmoddel.cpp
-#include <exiv2/xmp.hpp>
-#include <exiv2/error.hpp>
+#include <exiv2/exiv2.hpp>
#include <string>
#include <iostream>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f7e5665..589aeb3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -34,6 +34,7 @@ SET( LIBEXIV2_PRIVATE_HDR cr2image_int.hpp
makernote_int.hpp
orfimage_int.hpp
pngchunk_int.hpp
+ rcsid_int.hpp
rw2image_int.hpp
tiffcomposite_int.hpp
tifffwd_int.hpp
@@ -52,6 +53,7 @@ SET( LIBEXIV2_HDR basicio.hpp
easyaccess.hpp
error.hpp
exif.hpp
+ exiv2.hpp
fujimn.hpp
futils.hpp
gifimage.hpp
@@ -74,7 +76,6 @@ SET( LIBEXIV2_HDR basicio.hpp
properties.hpp
psdimage.hpp
rafimage.hpp
- rcsid.hpp
rw2image.hpp
sigmamn.hpp
sonymn.hpp
diff --git a/src/Makefile b/src/Makefile
index b14aa86..206cf0b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -59,10 +59,10 @@ include $(top_srcdir)/config/config.mk
# Source files
# Add standalone C++ header files to this list
-CCHDR = exv_conf.h \
+CCHDR = exiv2.hpp \
+ exv_conf.h \
exv_msvc.h \
mn.hpp \
- rcsid.hpp \
version.hpp
# Add library C++ source files to this list
diff --git a/src/actions.cpp b/src/actions.cpp
index 119c2c9..d8b2b50 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -26,7 +26,7 @@
30-Apr-06, Roger Larsson: Print filename if processing multiple files
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
@@ -41,7 +41,7 @@ EXIV2_RCSID("@(#) $Id$")
# include "timegm.h"
#endif
#include "actions.hpp"
-#include "exiv2.hpp"
+#include "exiv2app.hpp"
#include "image.hpp"
#include "jpgimage.hpp"
#include "xmpsidecar.hpp"
diff --git a/src/actions.hpp b/src/actions.hpp
index 3203e04..b8aff91 100644
--- a/src/actions.hpp
+++ b/src/actions.hpp
@@ -37,7 +37,7 @@
#include <string>
#include <map>
-#include "exiv2.hpp"
+#include "exiv2app.hpp"
#include "image.hpp"
#include "exif.hpp"
#include "iptc.hpp"
diff --git a/src/basicio.cpp b/src/basicio.cpp
index 2f9896f..6977d9e 100644
--- a/src/basicio.cpp
+++ b/src/basicio.cpp
@@ -25,7 +25,7 @@
History: 04-Dec-04, brad: created
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
diff --git a/src/bmpimage.cpp b/src/bmpimage.cpp
index 5436e79..13b3a7c 100644
--- a/src/bmpimage.cpp
+++ b/src/bmpimage.cpp
@@ -25,7 +25,7 @@
History: 05-Mar-2007, marco: created
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
//#define DEBUG 1
diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 7105882..6ae97a8 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -26,7 +26,7 @@
Andi Clemens (ac) <andi.clemens at gmx.net>
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
diff --git a/src/convert.cpp b/src/convert.cpp
index 0db9bb1..4223a64 100644
--- a/src/convert.cpp
+++ b/src/convert.cpp
@@ -27,7 +27,7 @@
20-May-08, vn: added actual conversion logic
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
diff --git a/src/cr2image.cpp b/src/cr2image.cpp
index 5e41ce9..97fbc4c 100644
--- a/src/cr2image.cpp
+++ b/src/cr2image.cpp
@@ -26,7 +26,7 @@
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
diff --git a/src/crwimage.cpp b/src/crwimage.cpp
index 4ac9c35..24a9432 100644
--- a/src/crwimage.cpp
+++ b/src/crwimage.cpp
@@ -26,7 +26,7 @@
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// Define DEBUG to output debug information to std::cerr, e.g, by calling make
diff --git a/src/datasets.cpp b/src/datasets.cpp
index 0b36f32..1989f20 100644
--- a/src/datasets.cpp
+++ b/src/datasets.cpp
@@ -26,7 +26,7 @@
History: 24-Jul-04, brad: created
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
diff --git a/src/easyaccess.cpp b/src/easyaccess.cpp
index eebedb4..823940d 100644
--- a/src/easyaccess.cpp
+++ b/src/easyaccess.cpp
@@ -26,7 +26,7 @@
History: 28-Feb-09, gis: created
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
diff --git a/src/error.cpp b/src/error.cpp
index abeb797..6d8aada 100644
--- a/src/error.cpp
+++ b/src/error.cpp
@@ -25,7 +25,7 @@
History: 02-Apr-05, ahu: created
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
diff --git a/src/exif.cpp b/src/exif.cpp
index ebed871..6530093 100644
--- a/src/exif.cpp
+++ b/src/exif.cpp
@@ -26,7 +26,7 @@
11-Feb-04, ahu: isolated as a component
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
diff --git a/src/exiv2.cpp b/src/exiv2.cpp
index 3fb2cf1..b417d80 100644
--- a/src/exiv2.cpp
+++ b/src/exiv2.cpp
@@ -27,7 +27,7 @@
History: 10-Dec-03, ahu: created
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
@@ -38,7 +38,7 @@ EXIV2_RCSID("@(#) $Id$")
# include "exv_conf.h"
#endif
-#include "exiv2.hpp"
+#include "exiv2app.hpp"
#include "actions.hpp"
#include "utils.hpp"
#include "convert.hpp"
diff --git a/src/exiv2.hpp b/src/exiv2app.hpp
similarity index 98%
rename from src/exiv2.hpp
rename to src/exiv2app.hpp
index 111f443..f8aada9 100644
--- a/src/exiv2.hpp
+++ b/src/exiv2app.hpp
@@ -19,15 +19,15 @@
* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
*/
/*!
- @file exiv2.hpp
+ @file exiv2app.hpp
@brief Defines class Params, used for the command line handling of exiv2
@version $Rev$
@author Andreas Huggel (ahu)
<a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
@date 08-Dec-03, ahu: created
*/
-#ifndef EXIV2_HPP_
-#define EXIV2_HPP_
+#ifndef EXIV2APP_HPP_
+#define EXIV2APP_HPP_
// *****************************************************************************
// included header files
@@ -292,4 +292,4 @@ public:
void version(std::ostream& os =std::cout) const;
}; // class Params
-#endif // #ifndef EXIV2_HPP_
+#endif // #ifndef EXIV2APP_HPP_
diff --git a/src/fujimn.cpp b/src/fujimn.cpp
index fab74fe..0b3ea26 100644
--- a/src/fujimn.cpp
+++ b/src/fujimn.cpp
@@ -28,7 +28,7 @@
Credits: See header file.
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
diff --git a/src/futils.cpp b/src/futils.cpp
index 9486a07..faa3493 100644
--- a/src/futils.cpp
+++ b/src/futils.cpp
@@ -26,7 +26,7 @@
02-Apr-05, ahu: moved to Exiv2 namespace
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
diff --git a/src/gifimage.cpp b/src/gifimage.cpp
index ce02749..20a58f2 100644
--- a/src/gifimage.cpp
+++ b/src/gifimage.cpp
@@ -25,7 +25,7 @@
History: 26-Feb-2007, marco: created
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
//#define DEBUG 1
diff --git a/src/image.cpp b/src/image.cpp
index 238d3f7..f83befc 100644
--- a/src/image.cpp
+++ b/src/image.cpp
@@ -29,7 +29,7 @@
15-Jan-05, brad: inside-out design changes
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
diff --git a/src/iptc.cpp b/src/iptc.cpp
index 03e3983..b90f2d5 100644
--- a/src/iptc.cpp
+++ b/src/iptc.cpp
@@ -25,7 +25,7 @@
History: 31-July-04, brad: created
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
diff --git a/src/jp2image.cpp b/src/jp2image.cpp
index 1ea4a6b..8969da4 100644
--- a/src/jp2image.cpp
+++ b/src/jp2image.cpp
@@ -26,7 +26,7 @@
History: 12-Mar-2007, marco: created
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
diff --git a/src/jpgimage.cpp b/src/jpgimage.cpp
index 84457fd..8a7f0ef 100644
--- a/src/jpgimage.cpp
+++ b/src/jpgimage.cpp
@@ -28,7 +28,7 @@
History: 15-Jan-05, brad: split out from image.cpp
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
diff --git a/src/makernote.cpp b/src/makernote.cpp
index 0c627bb..2d52a16 100644
--- a/src/makernote.cpp
+++ b/src/makernote.cpp
@@ -25,7 +25,7 @@
History: 11-Apr-06, ahu: created
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
diff --git a/src/metadatum.cpp b/src/metadatum.cpp
index 1886a1a..b98df0b 100644
--- a/src/metadatum.cpp
+++ b/src/metadatum.cpp
@@ -27,7 +27,7 @@
31-Jul-04, brad: isolated as a component
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp
index 73b4d56..667b556 100644
--- a/src/minoltamn.cpp
+++ b/src/minoltamn.cpp
@@ -28,7 +28,7 @@
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
@@ -138,7 +138,7 @@ namespace Exiv2 {
TagInfo(0x0104, "FlashExposureComp", N_("Flash Exposure Compensation"),
N_("Flash exposure compensation in EV"),
- minoltaIfdId, makerTags, signedRational, printMinoltaSonyFlashExposureComp),
+ minoltaIfdId, makerTags, signedRational, print0x9204),
TagInfo(0x0105, "Teleconverter", N_("Teleconverter Model"),
N_("Teleconverter Model"),
minoltaIfdId, makerTags, unsignedLong, printMinoltaSonyTeleconverterModel),
diff --git a/src/minoltamn.hpp b/src/minoltamn.hpp
index e2ca829..683835e 100644
--- a/src/minoltamn.hpp
+++ b/src/minoltamn.hpp
@@ -151,9 +151,6 @@ namespace Exiv2 {
//! Print Minolta/Sony ZoneMatching values to readable labels.
EXIV2API std::ostream& printMinoltaSonyZoneMatching(std::ostream&, const Value&, const ExifData*);
- //! Print Minolta/Sony Flash Exposure Compensation values to readable labels.
- EXIV2API std::ostream& printMinoltaSonyFlashExposureComp(std::ostream&, const Value&, const ExifData*);
-
// TODO: Added shared methods here.
} // namespace Exiv2
diff --git a/src/mrwimage.cpp b/src/mrwimage.cpp
index e484442..d3a1db0 100644
--- a/src/mrwimage.cpp
+++ b/src/mrwimage.cpp
@@ -26,7 +26,7 @@
Credits: See header file
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index 9364ae6..67dde2e 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -31,7 +31,7 @@
25-May-04, ahu: combined all Nikon formats in one component
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
diff --git a/src/olympusmn.cpp b/src/olympusmn.cpp
index 32539a0..30b550f 100644
--- a/src/olympusmn.cpp
+++ b/src/olympusmn.cpp
@@ -29,7 +29,7 @@
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
diff --git a/src/orfimage.cpp b/src/orfimage.cpp
index b48278c..81f0efb 100644
--- a/src/orfimage.cpp
+++ b/src/orfimage.cpp
@@ -26,7 +26,7 @@
Credits: See header file
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
diff --git a/src/panasonicmn.cpp b/src/panasonicmn.cpp
index af007d2..3b72b34 100644
--- a/src/panasonicmn.cpp
+++ b/src/panasonicmn.cpp
@@ -27,7 +27,7 @@
Credits: See header file
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp
index 312a8c0..58ae8ef 100644
--- a/src/pentaxmn.cpp
+++ b/src/pentaxmn.cpp
@@ -29,7 +29,7 @@
Credits: See header file.
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
diff --git a/src/pgfimage.cpp b/src/pgfimage.cpp
index ebe38cf..a0e3b10 100644
--- a/src/pgfimage.cpp
+++ b/src/pgfimage.cpp
@@ -26,7 +26,7 @@
Credits: See header file
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
diff --git a/src/pngchunk.cpp b/src/pngchunk.cpp
index 6020bf5..2841529 100644
--- a/src/pngchunk.cpp
+++ b/src/pngchunk.cpp
@@ -26,7 +26,7 @@
Credits: See header file
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
diff --git a/src/pngimage.cpp b/src/pngimage.cpp
index 2b57f59..ae13dc3 100644
--- a/src/pngimage.cpp
+++ b/src/pngimage.cpp
@@ -26,7 +26,7 @@
Credits: See header file
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
diff --git a/src/preview.cpp b/src/preview.cpp
index ae7d465..d783e27 100644
--- a/src/preview.cpp
+++ b/src/preview.cpp
@@ -25,7 +25,7 @@
History: 18-Sep-08, vn: created
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
diff --git a/src/properties.cpp b/src/properties.cpp
index 212a704..852263b 100644
--- a/src/properties.cpp
+++ b/src/properties.cpp
@@ -26,7 +26,7 @@
History: 13-July-07, ahu: created
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
diff --git a/src/psdimage.cpp b/src/psdimage.cpp
index 2d3540e..5f07c4c 100644
--- a/src/psdimage.cpp
+++ b/src/psdimage.cpp
@@ -26,7 +26,7 @@
History: 05-Mar-2007, marco: created
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
//#define DEBUG 1
diff --git a/src/rafimage.cpp b/src/rafimage.cpp
index 72407dc..66fc5f3 100644
--- a/src/rafimage.cpp
+++ b/src/rafimage.cpp
@@ -26,7 +26,7 @@
Credits: See header file
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
diff --git a/src/rcsid.hpp b/src/rcsid_int.hpp
similarity index 92%
rename from src/rcsid.hpp
rename to src/rcsid_int.hpp
index f3a827b..0ac852f 100644
--- a/src/rcsid.hpp
+++ b/src/rcsid_int.hpp
@@ -19,9 +19,9 @@
* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
*/
/*!
- @file rcsid.hpp
+ @file rcsid_int.hpp
@brief Define an RCS id string in every object file compiled from a source
- file that includes rcsid.hpp.
+ file that includes rcsid_int.hpp.
This is a simplified version of the ACE_RCSID macro that is used in the
<a href="http://www.cs.wustl.edu/~schmidt/ACE.html">ACE(TM)</a> distribution.
@@ -31,8 +31,8 @@
<a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
@date 02-Feb-04, ahu: created
*/
-#ifndef RCSID_HPP_
-#define RCSID_HPP_
+#ifndef RCSID_INT_HPP_
+#define RCSID_INT_HPP_
#if !defined (EXIV2_RCSID)
/*!
@@ -42,7 +42,7 @@
each *.cpp file. See the ident(1) manual pages for more information.
@code
- #include "rcsid.hpp"
+ #include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$");
@endcode
@@ -59,4 +59,4 @@
}
#endif // #if !defined (EXIV2_RCSID)
-#endif // #ifndef RCSID_HPP_
+#endif // #ifndef RCSID_INT_HPP_
diff --git a/src/rw2image.cpp b/src/rw2image.cpp
index 44b793f..1e7528a 100644
--- a/src/rw2image.cpp
+++ b/src/rw2image.cpp
@@ -26,7 +26,7 @@
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
diff --git a/src/sigmamn.cpp b/src/sigmamn.cpp
index cc1171b..4d2eb33 100644
--- a/src/sigmamn.cpp
+++ b/src/sigmamn.cpp
@@ -28,7 +28,7 @@
<http://www.x3f.info/technotes/FileDocs/MakerNoteDoc.html>
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
diff --git a/src/sonymn.cpp b/src/sonymn.cpp
index 100c107..36d4459 100644
--- a/src/sonymn.cpp
+++ b/src/sonymn.cpp
@@ -25,7 +25,7 @@
History: 18-Apr-05, ahu: created
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
@@ -274,7 +274,7 @@ namespace Exiv2 {
sony1IfdId, makerTags, unsignedLong, printMinoltaSonyImageQuality),
TagInfo(0x0104, "FlashExposureComp", N_("Flash Exposure Compensation"),
N_("Flash exposure compensation in EV"),
- sony1IfdId, makerTags, signedRational, printMinoltaSonyFlashExposureComp),
+ sony1IfdId, makerTags, signedRational, print0x9204),
TagInfo(0x0105, "Teleconverter", N_("Teleconverter Model"),
N_("Teleconverter Model"),
sony1IfdId, makerTags, unsignedLong, printMinoltaSonyTeleconverterModel),
diff --git a/src/tags.cpp b/src/tags.cpp
index f503dcd..87b749a 100644
--- a/src/tags.cpp
+++ b/src/tags.cpp
@@ -27,7 +27,7 @@
21-Jan-05, ahu: added MakerNote TagInfo registry and related code
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
diff --git a/src/tgaimage.cpp b/src/tgaimage.cpp
index 4aa1428..83281c2 100644
--- a/src/tgaimage.cpp
+++ b/src/tgaimage.cpp
@@ -25,7 +25,7 @@
History: 05-Mar-2007, marco: created
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
//#define DEBUG 1
diff --git a/src/tiffcomposite.cpp b/src/tiffcomposite.cpp
index e85e68e..b6975df 100644
--- a/src/tiffcomposite.cpp
+++ b/src/tiffcomposite.cpp
@@ -25,7 +25,7 @@
History: 11-Apr-06, ahu: created
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
diff --git a/src/tiffimage.cpp b/src/tiffimage.cpp
index 247f4a0..2d56c22 100644
--- a/src/tiffimage.cpp
+++ b/src/tiffimage.cpp
@@ -26,7 +26,7 @@
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
diff --git a/src/tiffvisitor.cpp b/src/tiffvisitor.cpp
index 15511f0..f100b5c 100644
--- a/src/tiffvisitor.cpp
+++ b/src/tiffvisitor.cpp
@@ -25,7 +25,7 @@
History: 11-Apr-06, ahu: created
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
diff --git a/src/types.cpp b/src/types.cpp
index 488a991..3116136 100644
--- a/src/types.cpp
+++ b/src/types.cpp
@@ -26,7 +26,7 @@
11-Feb-04, ahu: isolated as a component
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
diff --git a/src/utils.cpp b/src/utils.cpp
index e2e1743..b0115d2 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -25,7 +25,7 @@
History: 08-Dec-03, ahu: created
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
diff --git a/src/utiltest.cpp b/src/utiltest.cpp
index 27da019..5c63b94 100644
--- a/src/utiltest.cpp
+++ b/src/utiltest.cpp
@@ -10,7 +10,7 @@
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$");
// *****************************************************************************
diff --git a/src/value.cpp b/src/value.cpp
index d9dbb77..7aa6051 100644
--- a/src/value.cpp
+++ b/src/value.cpp
@@ -27,7 +27,7 @@
31-Jul-04, brad: added Time, Date and String values
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
diff --git a/src/version.cpp b/src/version.cpp
index 5934fa3..b17375c 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -26,7 +26,7 @@
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
diff --git a/src/xmp.cpp b/src/xmp.cpp
index 80b9a40..ea20671 100644
--- a/src/xmp.cpp
+++ b/src/xmp.cpp
@@ -25,7 +25,7 @@
History: 13-July-07, ahu: created
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
diff --git a/src/xmpsidecar.cpp b/src/xmpsidecar.cpp
index 9ed11ba..d5918db 100644
--- a/src/xmpsidecar.cpp
+++ b/src/xmpsidecar.cpp
@@ -26,7 +26,7 @@
Credits: See header file
*/
// *****************************************************************************
-#include "rcsid.hpp"
+#include "rcsid_int.hpp"
EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list