diff --git a/msvc/exiv2/exiv2.vcproj b/msvc/exiv2/exiv2.vcproj index 7e7a604f..30a60a6e 100644 --- a/msvc/exiv2/exiv2.vcproj +++ b/msvc/exiv2/exiv2.vcproj @@ -405,7 +405,7 @@ > + + @@ -522,9 +525,6 @@ copy/y ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.dll $(OutDi - - diff --git a/samples/addmoddel.cpp b/samples/addmoddel.cpp index 7a5f4237..6fb9702e 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 -#include +#include + #include #include #include diff --git a/samples/convert-test.cpp b/samples/convert-test.cpp index 75143069..80e61f28 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 -#include +#include + #include #include #include diff --git a/samples/easyaccess-test.cpp b/samples/easyaccess-test.cpp index 658b2936..20dcd53d 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 -#include -#include +#include + #include #include #include diff --git a/samples/exifcomment.cpp b/samples/exifcomment.cpp index 22f51b24..96c00f26 100644 --- a/samples/exifcomment.cpp +++ b/samples/exifcomment.cpp @@ -11,8 +11,8 @@ */ // ***************************************************************************** // included header files -#include -#include +#include + #include #include diff --git a/samples/exifdata-test.cpp b/samples/exifdata-test.cpp index 39cb8bd7..2a875f6b 100644 --- a/samples/exifdata-test.cpp +++ b/samples/exifdata-test.cpp @@ -10,8 +10,8 @@ */ // ***************************************************************************** // included header files -#include -#include +#include + #include #include #include diff --git a/samples/exifprint.cpp b/samples/exifprint.cpp index 08d60117..ea7fe3fb 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 -#include +#include + #include #include #include diff --git a/samples/iotest.cpp b/samples/iotest.cpp index e37a3133..ecd4fda8 100644 --- a/samples/iotest.cpp +++ b/samples/iotest.cpp @@ -29,10 +29,8 @@ */ // ***************************************************************************** // included header files -#include -#include -#include -#include +#include + #include // for EOF #include #include diff --git a/samples/iptceasy.cpp b/samples/iptceasy.cpp index 8b9fcbe8..78f6e7bc 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 -#include +#include + #include #include #include diff --git a/samples/iptcprint.cpp b/samples/iptcprint.cpp index 84c918a0..f327c018 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 -#include +#include + #include #include #include diff --git a/samples/iptctest.cpp b/samples/iptctest.cpp index ce0c9a9a..0313b525 100644 --- a/samples/iptctest.cpp +++ b/samples/iptctest.cpp @@ -10,10 +10,8 @@ */ // ***************************************************************************** // included header files -#include -#include -#include -#include +#include + #include #include #include diff --git a/samples/key-test.cpp b/samples/key-test.cpp index 60ea35dd..7ce78f38 100644 --- a/samples/key-test.cpp +++ b/samples/key-test.cpp @@ -10,8 +10,8 @@ */ // ***************************************************************************** // included header files -#include -#include +#include + #include #include diff --git a/samples/largeiptc-test.cpp b/samples/largeiptc-test.cpp index 079c83ae..88ba80b8 100644 --- a/samples/largeiptc-test.cpp +++ b/samples/largeiptc-test.cpp @@ -1,10 +1,8 @@ // ***************************************************************** -*- C++ -*- // Test for large (>65535 bytes) IPTC buffer -#include -#include -#include -#include +#include + #include #include diff --git a/samples/mmap-test.cpp b/samples/mmap-test.cpp index 61257b6b..e4f2980e 100644 --- a/samples/mmap-test.cpp +++ b/samples/mmap-test.cpp @@ -2,9 +2,7 @@ // mmap-test.cpp, $Rev$ // Simple mmap tests -#include -#include -#include +#include #include #include diff --git a/samples/prevtest.cpp b/samples/prevtest.cpp index a4b91ad8..a8048e7b 100644 --- a/samples/prevtest.cpp +++ b/samples/prevtest.cpp @@ -2,8 +2,7 @@ // prevtest.cpp, $Rev$ // Test access to preview images -#include -#include +#include #include #include diff --git a/samples/stringto-test.cpp b/samples/stringto-test.cpp index 973dcfcb..d970b3b1 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 -#include +#include + #include #include diff --git a/samples/tiff-test.cpp b/samples/tiff-test.cpp index b1a2a727..cf271720 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 -#include -#include +#include #include #include diff --git a/samples/werror-test.cpp b/samples/werror-test.cpp index 99f3e259..d282b875 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 -#include +#include int main() { diff --git a/samples/write-test.cpp b/samples/write-test.cpp index 1d944c2f..513f0f96 100644 --- a/samples/write-test.cpp +++ b/samples/write-test.cpp @@ -15,8 +15,7 @@ */ // ***************************************************************************** // included header files -#include -#include +#include #include #include diff --git a/samples/write2-test.cpp b/samples/write2-test.cpp index 16dd532f..f8c17df7 100644 --- a/samples/write2-test.cpp +++ b/samples/write2-test.cpp @@ -10,8 +10,8 @@ */ // ***************************************************************************** // included header files -#include -#include +#include + #include #include #include diff --git a/samples/xmpparse.cpp b/samples/xmpparse.cpp index 99a9805c..121955e4 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 -#include -#include +#include #include #include diff --git a/samples/xmpparser-test.cpp b/samples/xmpparser-test.cpp index 15d5258d..1ab16776 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 -#include -#include -#include +#include #include #include diff --git a/samples/xmpsample.cpp b/samples/xmpsample.cpp index f8b2993f..1b53ca98 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 -#include +#include #include #include diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f7e5665b..589aeb3a 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 b14aa861..206cf0bb 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 119c2c9c..d8b2b505 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 3203e04d..b8aff91a 100644 --- a/src/actions.hpp +++ b/src/actions.hpp @@ -37,7 +37,7 @@ #include #include -#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 2f9896f8..6977d9e9 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 5436e792..13b3a7cf 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 71058822..6ae97a8d 100644 --- a/src/canonmn.cpp +++ b/src/canonmn.cpp @@ -26,7 +26,7 @@ Andi Clemens (ac) */ // ***************************************************************************** -#include "rcsid.hpp" +#include "rcsid_int.hpp" EXIV2_RCSID("@(#) $Id$") // ***************************************************************************** diff --git a/src/convert.cpp b/src/convert.cpp index 0db9bb19..4223a640 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 5e41ce91..97fbc4c9 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 4ac9c35d..24a9432a 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 0b36f323..1989f200 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 eebedb49..823940d8 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 abeb7979..6d8aadad 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 ebed871d..6530093a 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 3fb2cf10..b417d80c 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 111f443e..f8aada94 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) ahuggel@gmx.net @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 fab74fe3..0b3ea268 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 9486a070..faa34937 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 ce027491..20a58f23 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 238d3f75..f83befc8 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 03e3983a..b90f2d56 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 1ea4a6b9..8969da4f 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 84457fd6..8a7f0ef5 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 0c627bb7..2d52a16e 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 1886a1a0..b98df0b8 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 73b4d56e..667b5564 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 e2ca8292..683835e9 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 e4844424..d3a1db0c 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 9364ae6d..67dde2e6 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 32539a0f..30b550f1 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 b48278c9..81f0efb6 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 af007d2f..3b72b341 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 312a8c0e..58ae8ef6 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 ebe38cf6..a0e3b10f 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 6020bf5d..2841529d 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 2b57f595..ae13dc37 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 ae7d4652..d783e27a 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 212a7043..852263ba 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 2d3540e3..5f07c4c3 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 72407dcc..66fc5f3a 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 f3a827b1..0ac852f4 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 ACE(TM) distribution. @@ -31,8 +31,8 @@ ahuggel@gmx.net @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 44b793fb..1e7528a4 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 cc1171b3..4d2eb336 100644 --- a/src/sigmamn.cpp +++ b/src/sigmamn.cpp @@ -28,7 +28,7 @@ */ // ***************************************************************************** -#include "rcsid.hpp" +#include "rcsid_int.hpp" EXIV2_RCSID("@(#) $Id$") // ***************************************************************************** diff --git a/src/sonymn.cpp b/src/sonymn.cpp index 100c1072..36d4459a 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 f503dcda..87b749a6 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 4aa14287..83281c2d 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 e85e68ec..b6975dff 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 247f4a08..2d56c229 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 15511f02..f100b5c6 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 488a9910..3116136f 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 e2e17437..b0115d22 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 27da019f..5c63b944 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 d9dbb770..7aa6051a 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 5934fa36..b17375cb 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 80b9a40d..ea20671f 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 9ed11ba7..d5918db4 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$") // *****************************************************************************