diff --git a/include/exiv2/bmffimage.hpp b/include/exiv2/bmffimage.hpp
index 7d96a095..40128e44 100644
--- a/include/exiv2/bmffimage.hpp
+++ b/include/exiv2/bmffimage.hpp
@@ -51,7 +51,7 @@ namespace Exiv2
     // Add Base Media File Format to the supported image formats
     namespace ImageType
     {
-        const int bmff = 15;  //!< BMFF (bmff) image type (see class BMFF)
+        const int bmff = 19;  //!< BMFF (bmff) image type (see class BMFF)
     }
 
     /*!
diff --git a/include/exiv2/jp2image.hpp b/include/exiv2/jp2image.hpp
index 511c8b7b..308c76bf 100644
--- 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 = 19;                     //!< JPEG-2000 image type
+        const int jp2 = 15;                     //!< JPEG-2000 image type
     }
 
     /*!
diff --git a/src/bmffimage.cpp b/src/bmffimage.cpp
index 77a73a16..30aa4c62 100644
--- a/src/bmffimage.cpp
+++ b/src/bmffimage.cpp
@@ -172,7 +172,7 @@ namespace Exiv2
         return result;
     }
 
-    long BmffImage::boxHandler(std::ostream& out /* = std::cout*/ , Exiv2::PrintStructureOption option /* = kpsNone */,int depth /* =0 */)
+    long BmffImage::boxHandler(std::ostream& out, Exiv2::PrintStructureOption option,int depth)
     {
         long result  = (long)io_->size();
         long address = (long)io_->tell();