#819: Changed PentaxId to PentaxDngId and some formatting tweaks.

src/makernote.cpp

@@ -865,14 +865,14 @@ namespace Exiv2 {
                                uint32_t    size,
                                ByteOrder   /*byteOrder*/)
     {
-	if (size > 8 && std::string(reinterpret_cast<const char*>(pData), 8)
+        if (   size > 8
-                        == std::string("PENTAX \0", 8)) {
+            && std::string(reinterpret_cast<const char*>(pData), 8) == std::string("PENTAX \0", 8)) {
             // Require at least the header and an IFD with 1 entry
             if (size < PentaxDngMnHeader::sizeOfSignature() + 18) return 0;
-		return newPentaxDngMn2(tag, group, pentaxId);
+            return newPentaxDngMn2(tag, group, pentaxDngId);
-	} else
+        }
-	if (size > 4 && std::string(reinterpret_cast<const char*>(pData), 4)
+        else if (   size > 4
-                        == std::string("AOC\0", 4)) {
+                 && std::string(reinterpret_cast<const char*>(pData), 4) == std::string("AOC\0", 4)) {
             // Require at least the header and an IFD with 1 entry
             if (size < PentaxMnHeader::sizeOfSignature() + 18) return 0;
             return newPentaxMn2(tag, group, pentaxId);