From 408d80bce891e89262585ec5173db04422f1d7fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= Date: Thu, 14 Mar 2019 19:50:27 +0100 Subject: [PATCH] Change order of ImageType values --- include/exiv2/image_types.hpp | 53 ++++++++++++++++++----------------- src/image.cpp | 1 + 2 files changed, 29 insertions(+), 25 deletions(-) diff --git a/include/exiv2/image_types.hpp b/include/exiv2/image_types.hpp index 6b9d90d1..afa43808 100644 --- a/include/exiv2/image_types.hpp +++ b/include/exiv2/image_types.hpp @@ -21,37 +21,40 @@ #ifndef IMAGE_TYPES_H #define IMAGE_TYPES_H -namespace Exiv2 { +namespace Exiv2 +{ /// Supported Image Formats - enum class ImageType{ - none, ///< - jpeg, ///< - exv, ///< - crw, ///< - tiff, ///< + enum class ImageType + { + none, + arw, + bigtiff, + bmff, + bmp, ///< Windows bitmap + cr2, + crw, dng, + eps, + exv, + gif, ///< GIF + jp2, ///< JPEG-2000 + jpeg, + mrw, nef, + orf, pef, - arw, + png, + pgf, + psd, ///< Photoshop (PSD) + raf, + rw2, sr2, srw, - mrw, ///< - png, ///< - cr2, ///< - raf, ///< - orf, ///< + tga, + tiff, + webp, xmp, ///< XMP sidecar files - gif, ///< GIF - psd, ///< Photoshop (PSD) - tga, ///< - bmp, ///< Windows bitmap - jp2, ///< JPEG-2000 - rw2, ///< - pgf, ///< - webp, ///< - eps, - bmff, }; -} +} // namespace Exiv2 -#endif // IMAGE_TYPES_H +#endif // IMAGE_TYPES_H diff --git a/src/image.cpp b/src/image.cpp index b1c5882d..5dd7e30d 100644 --- a/src/image.cpp +++ b/src/image.cpp @@ -97,6 +97,7 @@ namespace { AccessMode commentSupport_; }; + /// \todo Use std::unordered_map for implementing the registry. Avoid to use ImageType::none const Registry registry[] = { //image type creation fct type check Exif mode IPTC mode XMP mode Comment mode //--------------- --------------- ---------- ----------- ----------- ----------- ------------