From 6a4b7afba2eb5f5892248f4f78f87e557760ec99 Mon Sep 17 00:00:00 2001 From: Andreas Huggel Date: Sun, 21 Nov 2010 15:06:26 +0000 Subject: [PATCH] Synchronized wiki and image registry. --- src/image.cpp | 10 ++++++++-- src/tiffimage.hpp | 6 ++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/image.cpp b/src/image.cpp index f83befc8..7e003fdc 100644 --- a/src/image.cpp +++ b/src/image.cpp @@ -106,10 +106,18 @@ namespace { { ImageType::crw, newCrwInstance, isCrwType, amReadWrite, amNone, amNone, amReadWrite }, { ImageType::mrw, newMrwInstance, isMrwType, amRead, amRead, amRead, amNone }, { ImageType::tiff, newTiffInstance, isTiffType, amReadWrite, amReadWrite, amReadWrite, amNone }, + { ImageType::dng, newTiffInstance, isTiffType, amReadWrite, amReadWrite, amReadWrite, amNone }, + { ImageType::nef, newTiffInstance, isTiffType, amReadWrite, amReadWrite, amReadWrite, amNone }, + { ImageType::pef, newTiffInstance, isTiffType, amReadWrite, amReadWrite, amReadWrite, amNone }, + { ImageType::arw, newTiffInstance, isTiffType, amRead, amRead, amRead, amNone }, + { ImageType::rw2, newRw2Instance, isRw2Type, amRead, amRead, amRead, amNone }, + { ImageType::sr2, newTiffInstance, isTiffType, amRead, amRead, amRead, amNone }, + { ImageType::srw, newTiffInstance, isTiffType, amReadWrite, amReadWrite, amReadWrite, amNone }, { ImageType::orf, newOrfInstance, isOrfType, amReadWrite, amReadWrite, amReadWrite, amNone }, #ifdef EXV_HAVE_LIBZ { ImageType::png, newPngInstance, isPngType, amReadWrite, amReadWrite, amReadWrite, amReadWrite }, #endif // EXV_HAVE_LIBZ + { ImageType::pgf, newPgfInstance, isPgfType, amReadWrite, amReadWrite, amReadWrite, amReadWrite }, { ImageType::raf, newRafInstance, isRafType, amRead, amRead, amRead, amNone }, { ImageType::xmp, newXmpInstance, isXmpType, amNone, amNone, amReadWrite, amNone }, { ImageType::gif, newGifInstance, isGifType, amNone, amNone, amNone, amNone }, @@ -117,8 +125,6 @@ namespace { { ImageType::tga, newTgaInstance, isTgaType, amNone, amNone, amNone, amNone }, { ImageType::bmp, newBmpInstance, isBmpType, amNone, amNone, amNone, amNone }, { ImageType::jp2, newJp2Instance, isJp2Type, amReadWrite, amReadWrite, amReadWrite, amNone }, - { ImageType::rw2, newRw2Instance, isRw2Type, amRead, amRead, amRead, amNone }, - { ImageType::pgf, newPgfInstance, isPgfType, amReadWrite, amReadWrite, amReadWrite, amReadWrite }, // End of list marker { ImageType::none, 0, 0, amNone, amNone, amNone, amNone } }; diff --git a/src/tiffimage.hpp b/src/tiffimage.hpp index ea608d4e..0fcc71a3 100644 --- a/src/tiffimage.hpp +++ b/src/tiffimage.hpp @@ -48,6 +48,12 @@ namespace Exiv2 { // Add TIFF to the supported image formats namespace ImageType { const int tiff = 4; //!< TIFF image type (see class TiffImage) + const int dng = 4; //!< DNG image type (see class TiffImage) + const int nef = 4; //!< NEF image type (see class TiffImage) + const int pef = 4; //!< PEF image type (see class TiffImage) + const int arw = 4; //!< ARW image type (see class TiffImage) + const int sr2 = 4; //!< SR2 image type (see class TiffImage) + const int srw = 4; //!< SRW image type (see class TiffImage) } /*!