diff --git a/modules/imgcodecs/src/exif.cpp b/modules/imgcodecs/src/exif.cpp index 5ca3cc315d..8ed9760556 100644 --- a/modules/imgcodecs/src/exif.cpp +++ b/modules/imgcodecs/src/exif.cpp @@ -165,7 +165,7 @@ void ExifReader::parseExif() * * @return INTEL, MOTO or NONE */ -Endianess_t ExifReader::getFormat() const +Endianness_t ExifReader::getFormat() const { if (m_data.size() < 1) return NONE; diff --git a/modules/imgcodecs/src/exif.hpp b/modules/imgcodecs/src/exif.hpp index 6cc95afb1a..a8914bec03 100644 --- a/modules/imgcodecs/src/exif.hpp +++ b/modules/imgcodecs/src/exif.hpp @@ -79,7 +79,7 @@ enum ExifTagName INVALID_TAG = 0xFFFF ///< Shows that the tag was not recognized }; -enum Endianess_t +enum Endianness_t { INTEL = 0x49, MOTO = 0x4D, @@ -179,7 +179,7 @@ public: private: std::vector m_data; std::map m_exif; - Endianess_t m_format; + Endianness_t m_format; void parseExif(); bool checkTagMark() const; @@ -193,7 +193,7 @@ private: uint16_t getResolutionUnit( const size_t offset ) const; uint16_t getYCbCrPos( const size_t offset ) const; - Endianess_t getFormat() const; + Endianness_t getFormat() const; ExifEntry_t parseExifEntry( const size_t offset ); diff --git a/modules/imgcodecs/src/grfmt_pfm.cpp b/modules/imgcodecs/src/grfmt_pfm.cpp index 97cf07b27e..addae34b4f 100644 --- a/modules/imgcodecs/src/grfmt_pfm.cpp +++ b/modules/imgcodecs/src/grfmt_pfm.cpp @@ -27,7 +27,7 @@ bool is_byte_order_swapped(double scale) #endif } -void swap_endianess(uint32_t& ui) +void swap_endianness(uint32_t& ui) { static const uint32_t A(0x000000ffU); static const uint32_t B(0x0000ff00U); @@ -137,7 +137,7 @@ bool PFMDecoder::readData(Mat& mat) for (int i = 0; i < m_width * buffer.channels(); ++i) { static_assert( sizeof(uint32_t) == sizeof(float), "uint32_t and float must have same size." ); - swap_endianess(buffer.ptr(y)[i]); + swap_endianness(buffer.ptr(y)[i]); } } }