Fix image handler to give jp2image code higher priority than the next…

… isobmff code.
Exiv2 · Jan 24, 2021 · 460a802 · 460a802
1 parent 92469f4
commit 460a802
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/include/exiv2/jp2image.hpp b/include/exiv2/jp2image.hpp
@@ -42,7 +42,7 @@ namespace Exiv2
     // Add JPEG-2000 to the supported image formats
     namespace ImageType
     {
-        const int jp2 = 16;                     //!< JPEG-2000 image type
+        const int jp2 = 19;                     //!< JPEG-2000 image type
     }
 
     /*!

diff --git a/src/image.cpp b/src/image.cpp
@@ -133,10 +133,10 @@ namespace {
         { ImageType::psd,  newPsdInstance,  isPsdType,  amReadWrite, amReadWrite, amReadWrite, amNone      },
         { ImageType::tga,  newTgaInstance,  isTgaType,  amNone,      amNone,      amNone,      amNone      },
         { ImageType::bmp,  newBmpInstance,  isBmpType,  amNone,      amNone,      amNone,      amNone      },
+        { ImageType::jp2,  newJp2Instance,  isJp2Type,  amReadWrite, amReadWrite, amReadWrite, amNone      },
 #ifdef EXV_ENABLE_ISOBMFF
         { ImageType::bmff, newBmffInstance, isBmffType, amRead,      amRead,      amRead,      amNone      },
 #endif // EXV_ENABLE_ISOBMFF
-        { ImageType::jp2,  newJp2Instance,  isJp2Type,  amReadWrite, amReadWrite, amReadWrite, amNone      },
 #ifdef EXV_ENABLE_VIDEO
         { ImageType::qtime,newQTimeInstance,isQTimeType,amRead,      amNone,      amRead,      amNone      },
         { ImageType::riff, newRiffInstance, isRiffType, amRead,      amNone,      amRead,      amNone      },