Packman Build Service PMBS

makemkv.changes Changed

makemkv.spec Changed

makemkv-bin-1.15.1.tar.xz/Makefile -> makemkv-bin-1.15.2.tar.xz/Makefile Changed

makemkv-bin-1.15.1.tar.xz/bin/amd64/makemkvcon -> makemkv-bin-1.15.2.tar.xz/bin/amd64/makemkvcon Changed

makemkv-bin-1.15.1.tar.xz/bin/i386/makemkvcon -> makemkv-bin-1.15.2.tar.xz/bin/i386/makemkvcon Changed

makemkv-bin-1.15.1.tar.xz/src/share/appdata.tar -> makemkv-bin-1.15.2.tar.xz/src/share/appdata.tar Changed

makemkv-bin-1.15.1.tar.xz/src/share/blues.jar -> makemkv-bin-1.15.2.tar.xz/src/share/blues.jar Changed

makemkv-oss-1.15.1.tar.xz/libabi/src/sys_linux.c -> makemkv-oss-1.15.2.tar.xz/libabi/src/sys_linux.c Changed

makemkv-oss-1.15.1.tar.xz/libdriveio/inc/driveio/driveio.h -> makemkv-oss-1.15.2.tar.xz/libdriveio/inc/driveio/driveio.h Changed

@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include "scsicmd.h"
 
-#define LIBDRIVEIO_VERSION "2.01"
+#define LIBDRIVEIO_VERSION "2.3"
 
 //
 // All values in enums below are fixed, new values may be added
@@ -173,15 +173,16 @@
 int             DIO_CDECL   DriveInfoList_GetItemById(DIO_INFOLIST List,DriveInfoId Id,DriveInfoItem *Item);
 int             DIO_CDECL   DriveInfoList_AddItem(DIO_INFOLIST List,DriveInfoId Id,const void* Data,size_t Size);
 int             DIO_CDECL   DriveInfoList_AddOrUpdateItem(DIO_INFOLIST List, DriveInfoId Id, const void* Data, size_t Size);
+int             DIO_CDECL   DriveInfoList_CopyAllItemsFrom(DIO_INFOLIST List, const DIO_INFOLIST Src);
+int             DIO_CDECL   DriveInfoList_MoveAllItemsFrom(DIO_INFOLIST List, DIO_INFOLIST Src);
 size_t          DIO_CDECL   DriveInfoList_Serialize(DIO_INFOLIST List, void* Buffer, size_t BufferSize);
 DIO_INFOLIST    DIO_CDECL   DriveInfoList_Deserialize(const void* Buffer,size_t BufferSize);
-size_t          DIO_CDECL   DriveInfoList_GetSerializedChunkSize(const void* Buffer);
-void            DIO_CDECL   DriveInfoList_GetSerializedChunkInfo(const void* Buffer,DriveInfoItem *Item);
 
 //
 // Query API
 //
-int             DIO_CDECL   DriveIoQuery(DriveIoExecScsiCmdFunc ScsiProc,void* ScsiContext,DriveIoQueryType QueryType,DIO_INFOLIST* InfoList);
+int             DIO_CDECL   DriveIoQueryCreate(DriveIoExecScsiCmdFunc ScsiProc,void* ScsiContext,DriveIoQueryType QueryType,DIO_INFOLIST* InfoList);
+int             DIO_CDECL   DriveIoQueryAdd(DriveIoExecScsiCmdFunc ScsiProc,void* ScsiContext,DriveIoQueryType QueryType,DIO_INFOLIST InfoList);
 
 //
 // Utility
@@ -215,36 +216,43 @@
     return ((ISimpleScsiTarget*)Context)->Exec(Cmd,CmdResult);
 }
 
-static inline int DriveIoQuery(ISimpleScsiTarget* ScsiTarget,DriveIoQueryType QueryType,DIO_INFOLIST* InfoList)
+static inline int DriveIoQueryCreate(ISimpleScsiTarget* ScsiTarget,DriveIoQueryType QueryType,DIO_INFOLIST* InfoList)
+{
+    return DriveIoQueryCreate(&DriveIoSimpleScsiWrapperExecScsiCmdFunc,(void*)ScsiTarget,QueryType,InfoList);
+}
+
+static inline int DriveIoQueryAdd(ISimpleScsiTarget* ScsiTarget, DriveIoQueryType QueryType, DIO_INFOLIST InfoList)
 {
-    return DriveIoQuery(&DriveIoSimpleScsiWrapperExecScsiCmdFunc,(void*)ScsiTarget,QueryType,InfoList);
+    return DriveIoQueryAdd(&DriveIoSimpleScsiWrapperExecScsiCmdFunc, (void*)ScsiTarget, QueryType, InfoList);
 }
 
 //
-// C++ wrapper classes
+// Serialized DriveInfoList manipulation
 //
-class CDriveInfoList
+#include <lgpl/byteorder.h>
+
+static inline size_t DriveInfoList_GetSerializedChunkSize(const void* Buffer)
+{
+    uint32_t sz = rd32be(((const uint8_t*)Buffer) + 4);
+    sz += 8;
+    return sz;
+}
+
+static inline void DriveInfoList_GetSerializedChunkInfo(const void* Buffer, DriveInfoItem *Item)
 {
-private:
-    DIO_INFOLIST    m_list;
-public:
-    inline CDriveInfoList(DIO_INFOLIST List) : m_list(List)
-    {
-    }
-    inline void Destroy()
-    {
-        if (NULL!=m_list)
-        {
-            DriveInfoList_Destroy(m_list);
-            m_list=NULL;
-        }
-    }
-    inline bool Create()
-    {
-        Destroy();
-        m_list = DriveInfoList_Create();
-        return (NULL!=m_list);
-    }
+    Item->Data = ((const uint8_t*)Buffer) + 8;
+    Item->Id = (DriveInfoId)rd32be(((const uint8_t*)Buffer) + 0);
+    Item->Size = rd32be(((const uint8_t*)Buffer) + 4);
+}
+
+#else
+
+//
+// Serialized DriveInfoList manipulation (C API)
+//
+extern "C" {
+size_t          DIO_CDECL   DriveInfoList_GetSerializedChunkSize(const void* Buffer);
+void            DIO_CDECL   DriveInfoList_GetSerializedChunkInfo(const void* Buffer, DriveInfoItem *Item);
 };
 
 #endif

makemkv-oss-1.15.1.tar.xz/libdriveio/inc/driveio/error.h -> makemkv-oss-1.15.2.tar.xz/libdriveio/inc/driveio/error.h Changed

@@ -30,6 +30,7 @@
 #define DRIVEIO_ERR_SCSI_SENSE(sense)           DRIVEIO_ERROR(2,(sense))
 #define DRIVEIO_ERR_NO_MEMORY                   DRIVEIO_ERROR(3,0)
 #define DRIVEIO_ERR_FILE_NOT_FOUND              DRIVEIO_ERROR(3,1)
+#define DRIVEIO_ERR_NOT_READY                   DRIVEIO_ERROR(3,2)
 
 // sdfw errors (comparable)
 #define SDFRUN_INVALID_OUT_LENGTH(length)       DRIVEIO_ERROR(11,(length))
@@ -46,9 +47,10 @@
 #define SDFRUN_INVALID_DATA                     DRIVEIO_ERROR_INTERNAL(10,2)
 #define SDFRUN_INVALID_PARAMETER                DRIVEIO_ERROR_INTERNAL(10,3)
 #define SDFRUN_VM_ERROR                         DRIVEIO_ERROR_INTERNAL(14,0)
-#define DRIVEIO_TCPIP_ERROR(code)               DRIVEIO_ERROR_INTERNAL(20,code)
-#define DRIVEIO_TIPS_ERROR(code)                DRIVEIO_ERROR_INTERNAL(21,code)
-#define DRIVEIO_IO_ERROR(code)                  DRIVEIO_ERROR_INTERNAL(23,code)
+
+#define DRIVEIO_TCPIP_ERROR(code)               DRIVEIO_ERROR(20,code)
+#define DRIVEIO_TIPS_ERROR(code)                DRIVEIO_ERROR(21,code)
+#define DRIVEIO_IO_ERROR(code)                  DRIVEIO_ERROR(23,code)
 #define DRIVEIO_ERROR_BAD_DATA                  DRIVEIO_ERROR_INTERNAL(24,1)
 #define DRIVEIO_ERROR_INVALID_ARG               DRIVEIO_ERROR_INTERNAL(24,2)

makemkv-oss-1.15.1.tar.xz/libdriveio/inc/driveio/scsihlp.h -> makemkv-oss-1.15.2.tar.xz/libdriveio/inc/driveio/scsihlp.h Changed

@@ -33,44 +33,8 @@
 int BuildDriveInfo(ISimpleScsiTarget* ScsiTarget,DIO_INFOLIST List,ScsiDriveInfo *DriveInfo);
 int QueryInquiryInfo(ISimpleScsiTarget* ScsiTarget,uint8_t Evpd,uint8_t *Buffer,unsigned int *BufferSize);
 void BuildDriveId(ScsiDriveId* DriveId,const ScsiDriveInfo *DriveInfo);
+int IsScsiMmcDeviceNonBlacklisted(ISimpleScsiTarget* Target);
 int ScsiErrorFromResult(const ScsiCmdResponse *CmdResult);
 
-
-static inline uint32_t uint32_get_be(const void *Buf)
-{
-    uint32_t v=0;
-
-    v |= (((uint32_t)(((uint8_t*)Buf)[0]))<<(3*8));
-    v |= (((uint32_t)(((uint8_t*)Buf)[1]))<<(2*8));
-    v |= (((uint32_t)(((uint8_t*)Buf)[2]))<<(1*8));
-    v |= (((uint32_t)(((uint8_t*)Buf)[3]))<<(0*8));
-
-    return v;
-}
-
-static inline uint16_t uint16_get_be(const void *Buf)
-{
-    uint16_t v=0;
-
-    v |= (((uint16_t)(((uint8_t*)Buf)[0]))<<(1*8));
-    v |= (((uint16_t)(((uint8_t*)Buf)[1]))<<(0*8));
-
-    return v;
-}
-
-static inline void uint32_put_be(void* Buf,uint32_t Value)
-{
-    ((uint8_t*)Buf)[0] = (uint8_t)(Value>>(3*8));
-    ((uint8_t*)Buf)[1] = (uint8_t)(Value>>(2*8));
-    ((uint8_t*)Buf)[2] = (uint8_t)(Value>>(1*8));
-    ((uint8_t*)Buf)[3] = (uint8_t)(Value>>(0*8));
-}
-
-static inline void uint16_put_be(void* Buf,uint16_t Value)
-{
-    ((uint8_t*)Buf)[0] = (uint8_t)(Value>>(1*8));
-    ((uint8_t*)Buf)[1] = (uint8_t)(Value>>(0*8));
-}
-
 }
 using namespace LibDriveIo;

makemkv-oss-1.15.2.tar.xz/libdriveio/inc/lgpl/byteorder.h Added

@@ -0,0 +1,285 @@
+/*
+    Written by GuinpinSoft inc <oss@makemkv.com>
+
+    This file is hereby placed into public domain,
+    no copyright is claimed.
+
+*/
+#ifndef LGPL_BYTEORDER_H_INCLUDED
+#define LGPL_BYTEORDER_H_INCLUDED
+
+#include <string.h>
+#include <stdint.h>
+
+#if defined(_MSC_VER)
+
+#include <stdlib.h>
+#pragma intrinsic(_byteswap_ulong, _byteswap_uint64, _byteswap_ushort)
+
+#define _LITTLE_ENDIAN  1234
+#define _BIG_ENDIAN     4321
+#define _PDP_ENDIAN     3412
+
+#define _BYTE_ORDER     _LITTLE_ENDIAN
+
+#define __bswap16(x)    _byteswap_ushort(x)
+#define __bswap32(x)    _byteswap_ulong(x)
+#define __bswap64(x)    _byteswap_uint64(x)
+
+#if defined(_M_IX86) || defined (_M_X64)
+#define BYTEORDER_ARCH_ALLOWS_UNALIGNED_ACCESS 1
+#endif
+
+#elif defined(_linux_)
+
+#include <endian.h>
+
+#define __bswap64(x)    __bswap_64(x)
+#define __bswap32(x)    __bswap_32(x)
+#define __bswap16(x)    __bswap_16(x)
+
+#elif defined(_darwin_)
+
+#include <machine/endian.h>
+
+#define __bswap64(x)    _OSSwapInt64(x)
+#define __bswap32(x)    _OSSwapInt32(x)
+#define __bswap16(x)    _OSSwapInt16(x)
+
+#elif defined(__BSD_VISIBLE)
+
+#include <machine/endian.h>
+
+#else
+
+#error "Unknown platform"
+
+#endif
+
+#if ( (defined(__GNUC__) || defined (__clang__)) && (defined(__i386__) || defined(__x86_64)) )
+#define BYTEORDER_ARCH_ALLOWS_UNALIGNED_ACCESS 1
+#endif
+
+#ifdef BYTEORDER_ARCH_ALLOWS_UNALIGNED_ACCESS
+
+// arch allows unaligned access
+
+static inline uint16_t rd16ua(const uint8_t* Data)
+{
+    return *(const uint16_t*)Data;
+}
+
+static inline uint32_t rd32ua(const uint8_t* Data)
+{
+    return *(const uint32_t*)Data;
+}
+
+static inline uint64_t rd64ua(const uint8_t* Data)
+{
+    return *(const uint64_t*)Data;
+}
+
+static inline void wr16ua(uint8_t* Data,uint16_t Value)
+{
+    *((uint16_t*)Data) = Value;
+}
+
+static inline void wr32ua(uint8_t* Data,uint32_t Value)
+{
+    *((uint32_t*)Data) = Value;
+}
+
+static inline void wr64ua(uint8_t* Data,uint64_t Value)
+{
+    *((uint64_t*)Data) = Value;
+}
+
+#else
+
+// true unaligned
+
+static inline uint16_t rd16ua(const uint8_t* Data)
+{
+    uint16_t t;
+    if (0==(((unsigned int)(uintptr_t)(void*)Data)&1))
+    {
+        t = *(const uint16_t*)Data;
+    } else {
+        uint8_t* p = (uint8_t*)&t;
+        p[0]=Data[0];
+        p[1]=Data[1];
+    }
+    return t;
+}
+
+static inline uint32_t rd32ua(const uint8_t* Data)
+{
+    uint32_t t;
+    if (0==(((unsigned int)(uintptr_t)(void*)Data)&3))
+    {
+        t = *(const uint32_t*)Data;
+    } else {
+        uint8_t* p = (uint8_t*)&t;
+        p[0]=Data[0];
+        p[1]=Data[1];
+        p[2]=Data[2];
+        p[3]=Data[3];
+    }
+    return t;
+}
+
+static inline uint64_t rd64ua(const uint8_t* Data)
+{
+    uint64_t t;
+    if (0==(((unsigned int)(uintptr_t)(void*)Data)&7))
+    {
+        t = *(const uint64_t*)Data;
+    } else {
+        uint8_t* p = (uint8_t*)&t;
+        p[0]=Data[0];
+        p[1]=Data[1];
+        p[2]=Data[2];
+        p[3]=Data[3];
+        p[4]=Data[4];
+        p[5]=Data[5];
+        p[6]=Data[6];
+        p[7]=Data[7];
+    }
+    return t;
+}
+
+static inline void wr16ua(uint8_t* Data,uint16_t Value)
+{
+    uint16_t t = Value;
+    const uint8_t* p = (uint8_t*)&t;
+
+    Data[0]=p[0];
+    Data[1]=p[1];
+}
+
+static inline void wr32ua(uint8_t* Data,uint32_t Value)
+{
+    uint32_t t = Value;
+    const uint8_t* p = (uint8_t*)&t;
+
+    Data[0]=p[0];
+    Data[1]=p[1];
+    Data[2]=p[2];
+    Data[3]=p[3];
+}
+
+static inline void wr64ua(uint8_t* Data,uint64_t Value)
+{
+    uint64_t t = Value;
+    const uint8_t* p = (uint8_t*)&t;
+
+    Data[0]=p[0];
+    Data[1]=p[1];
+    Data[2]=p[2];
+    Data[3]=p[3];
+    Data[4]=p[4];
+    Data[5]=p[5];
+    Data[6]=p[6];
+    Data[7]=p[7];
+}
+
+#endif
+
+#if _BYTE_ORDER == _LITTLE_ENDIAN
+
+#define bswap_cpu_to_le64(x) (x)
+#define bswap_cpu_to_le32(x) (x)
+#define bswap_cpu_to_le16(x) (x)
+
+#define bswap_cpu_to_be64(x) __bswap64(x)
+#define bswap_cpu_to_be32(x) __bswap32(x)
+#define bswap_cpu_to_be16(x) __bswap16(x)
+
+#else
+

makemkv-oss-1.15.1.tar.xz/libdriveio/src/infolist.cpp -> makemkv-oss-1.15.2.tar.xz/libdriveio/src/infolist.cpp Changed

@@ -75,6 +75,8 @@
     ~CDriveInfoList();
     bool AddItem(DriveInfoId Id,const void* Data,size_t Size);
     bool AddOrUpdateItem(DriveInfoId Id, const void* Data, size_t Size);
+    bool CopyAllItemsFrom(const CDriveInfoList* Src);
+    void MoveAllItemsFrom(CDriveInfoList* Src);
     size_t GetCount();
     void GetItem(size_t Index,DriveInfoItem *Item);
     bool GetItemById(DriveInfoId Id,DriveInfoItem *Item);
@@ -87,6 +89,8 @@
     void operator delete(void*,CDriveInfoList*)
     {
     }
+private:
+    void AddItem(CDriveInfoItem* pitem);
 };
 
 CDriveInfoItem* CDriveInfoItem::Create(size_t Size)
@@ -124,9 +128,17 @@
 
     memcpy( (void*) pitem->m_item.Data,Data,Size);
     pitem->m_item.Id = Id;
+
+    AddItem(pitem);
+
+    return true;
+}
+
+void CDriveInfoList::AddItem(CDriveInfoItem* pitem)
+{
     pitem->m_next = NULL;
 
-    if (NULL==m_first)
+    if (NULL == m_first)
     {
         m_first = pitem;
     } else {
@@ -134,9 +146,7 @@
     }
 
     m_last = pitem;
-    m_count ++;
-
-    return true;
+    m_count++;
 }
 
 size_t CDriveInfoList::GetCount()
@@ -204,6 +214,47 @@
     return AddItem(Id,Data,Size);
 }
 
+bool CDriveInfoList::CopyAllItemsFrom(const CDriveInfoList* Src)
+{
+    CDriveInfoItem* pitem;
+    CDriveInfoList  temp;
+    bool r = true;
+
+    for (pitem = Src->m_first; pitem != NULL; pitem = pitem->m_next)
+    {
+        if (pitem->m_item.Id == diid_DriveioTag) continue;
+        if (false == temp.AddItem(pitem->m_item.Id, pitem->m_item.Data, pitem->m_item.Size))
+        {
+            r = false;
+            break;
+        }
+    }
+    if (r)
+    {
+        MoveAllItemsFrom(&temp);
+    }
+
+    return r;
+}
+
+void CDriveInfoList::MoveAllItemsFrom(CDriveInfoList* Src)
+{
+    CDriveInfoItem *pitem,*pnext;
+
+    pnext = Src->m_first;
+    while (pnext != NULL)
+    {
+        pitem = pnext;
+        pnext = pnext->m_next;
+
+        if (pitem->m_item.Id == diid_DriveioTag) continue;
+        this->AddItem(pitem);
+    }
+
+    Src->m_first = Src->m_last = NULL;
+    Src->m_count = 0;
+}
+
 static void uint32_put_ns(uint32_t Value,void *Buf)
 {
     ((uint8_t*)Buf)[0] = (uint8_t)(Value>>(3*8));
@@ -347,6 +398,21 @@
     return plist->GetItemById(Id,Item) ? 0 : -1;
 }
 
+extern "C" int DIO_CDECL DriveInfoList_CopyAllItemsFrom(DIO_INFOLIST List, const DIO_INFOLIST Src)
+{
+    LibDriveIo::CDriveInfoList* plist = (LibDriveIo::CDriveInfoList*) List;
+    const LibDriveIo::CDriveInfoList* psrc = (const LibDriveIo::CDriveInfoList*) Src;
+    return plist->CopyAllItemsFrom(psrc) ? 0 : DRIVEIO_ERR_NO_MEMORY;
+}
+
+extern "C" int DIO_CDECL DriveInfoList_MoveAllItemsFrom(DIO_INFOLIST List, DIO_INFOLIST Src)
+{
+    LibDriveIo::CDriveInfoList* plist = (LibDriveIo::CDriveInfoList*) List;
+    LibDriveIo::CDriveInfoList* psrc = (LibDriveIo::CDriveInfoList*) Src;
+    plist->MoveAllItemsFrom(psrc);
+    return 0;
+}
+
 extern "C" size_t DIO_CDECL DriveInfoList_Serialize(DIO_INFOLIST List,void* Buffer,size_t BufferSize)
 {
     LibDriveIo::CDriveInfoList* plist = (LibDriveIo::CDriveInfoList*) List;

makemkv-oss-1.15.1.tar.xz/libdriveio/src/libdriveio.def -> makemkv-oss-1.15.2.tar.xz/libdriveio/src/libdriveio.def Changed

makemkv-oss-1.15.1.tar.xz/libdriveio/src/libdriveio.vers -> makemkv-oss-1.15.2.tar.xz/libdriveio/src/libdriveio.vers Changed

makemkv-oss-1.15.1.tar.xz/libdriveio/src/scsihlp.cpp -> makemkv-oss-1.15.2.tar.xz/libdriveio/src/scsihlp.cpp Changed

makemkv-oss-1.15.1.tar.xz/libdriveio/src/srlist.cpp -> makemkv-oss-1.15.2.tar.xz/libdriveio/src/srlist.cpp Changed

@@ -9,24 +9,16 @@
 */
 #include <stddef.h>
 #include <stdint.h>
-#include <driveio/scsicmd.h>
-#include <driveio/driveio.h>
-
-static uint32_t uint32_get_ns(const void *Buf)
-{
-    uint32_t v=0;
+#include <lgpl/byteorder.h>
 
-    v |= (((uint32_t)(((uint8_t*)Buf)[0]))<<(3*8));
-    v |= (((uint32_t)(((uint8_t*)Buf)[1]))<<(2*8));
-    v |= (((uint32_t)(((uint8_t*)Buf)[2]))<<(1*8));
-    v |= (((uint32_t)(((uint8_t*)Buf)[3]))<<(0*8));
-
-    return v;
-}
+#ifndef LIBDRIVEIO_NO_CPP
+#define LIBDRIVEIO_NO_CPP 1
+#endif
+#include <driveio/driveio.h>
 
 extern "C" size_t DIO_CDECL DriveInfoList_GetSerializedChunkSize(const void* Buffer)
 {
-    uint32_t sz = uint32_get_ns( ((const char*)Buffer) + 4 );
+    uint32_t sz = rd32be(((const uint8_t*)Buffer) + 4);
     sz += 8;
     if (sz >= 0x40000000)
     {
@@ -38,7 +30,7 @@
 extern "C" void DIO_CDECL DriveInfoList_GetSerializedChunkInfo(const void* Buffer,DriveInfoItem *Item)
 {
     Item->Data = ((const uint8_t*)Buffer) + 8;
-    Item->Id = (DriveInfoId) uint32_get_ns(((const char*)Buffer) + 0);
-    Item->Size = uint32_get_ns(((const char*)Buffer) + 4);
+    Item->Id = (DriveInfoId)rd32be(((const uint8_t*)Buffer) + 0);
+    Item->Size = rd32be(((const uint8_t*)Buffer) + 4);
 }

makemkv-oss-1.15.1.tar.xz/libdriveio/src/stdquery.cpp -> makemkv-oss-1.15.2.tar.xz/libdriveio/src/stdquery.cpp Changed

@@ -24,6 +24,7 @@
 #include <driveio/driveio.h>
 #include <driveio/scsihlp.h>
 #include <driveio/error.h>
+#include <lgpl/byteorder.h>
 #include <errno.h>
 #include <string.h>
 
@@ -84,7 +85,7 @@
         if (res.Status!=0) break;
         len = res.Transferred;
 
-        slen = uint32_get_be(data_buffer);
+        slen = rd32be(data_buffer);
 
         slen +=4;
         if (slen > len) slen = len;
@@ -102,7 +103,7 @@
         {
             unsigned int feature_code, feature_len;
 
-            feature_code = uint16_get_be(dptr);
+            feature_code = rd16be(dptr);
 
             if (first_feature && (feature_code<current_feature))
             {
@@ -210,9 +211,9 @@
     {
         *StructureLength = 0;
     } else {
-        if (uint16_get_be(Buffer+2)==0)
+        if (rd16be(Buffer+2)==0)
         {
-            *StructureLength = uint16_get_be(Buffer) + 2;
+            *StructureLength = rd16be(Buffer) + 2;
         } else {
             *StructureLength = 0;
         }
@@ -243,7 +244,7 @@
         if (res.Status==0)
         {
             len = res.Transferred;
-            slen = uint32_get_be(data_buffer);
+            slen = rd32be(data_buffer);
             slen +=4;
             if (slen > len) slen = len;
             if (slen<8) return DRIVEIO_ERROR_BAD_DATA;
@@ -316,7 +317,7 @@
         if (res.Status==0)
         {
             len = res.Transferred;
-            slen = uint16_get_be(data_buffer)+2;
+            slen = rd16be(data_buffer)+2;
             if (slen>len) continue;
             if (DriveInfoList_AddItem(List, (DriveInfoId) (((unsigned int)diid_TOC) + layer_id),data_buffer,slen)) return DRIVEIO_ERR_NO_MEMORY;
         }
@@ -349,7 +350,7 @@
         if (res.Status==0)
         {
             len = res.Transferred;
-            slen = uint16_get_be(data_buffer)+2;
+            slen = rd16be(data_buffer)+2;
 
             if ( (layer_id==0) && (slen>34) )
             {
@@ -380,11 +381,11 @@
         if (err) return err;
         if (res.Status!=0)
         {
-            return EIO;
+            return DRIVEIO_ERR_SCSI_STATUS(res.Status);
         }
         if (res.Transferred!=8)
         {
-             return ERANGE;
+            return DRIVEIO_ERROR_BAD_DATA;
         }
         if (DriveInfoList_AddItem(List, diid_DiscCapacity,data_buffer,8)) return DRIVEIO_ERR_NO_MEMORY;
     }
@@ -400,7 +401,7 @@
     if (0!=(err=TestUnitReady(ScsiTarget,&ready))) return err;
     if (false==ready)
     {
-        return FailIfNotReady?EBUSY:0;
+        return FailIfNotReady?DRIVEIO_ERR_NOT_READY:0;
     }
 
     if (0!=(err=QueryStandardDiscInfo(ScsiTarget,List))) return err;
@@ -411,16 +412,9 @@
 namespace LibDriveIo
 {
 
-static int DriveIoQuery(ISimpleScsiTarget* ScsiTarget,DriveIoQueryType QueryType,DIO_INFOLIST* InfoList)
+static int DriveIoQuery(ISimpleScsiTarget* ScsiTarget,DriveIoQueryType QueryType,DIO_INFOLIST list)
 {
-    DIO_INFOLIST list;
-    int err=0;
-
-    list = DriveInfoList_Create();
-    if (NULL==list)
-    {
-        return DRIVEIO_ERR_NO_MEMORY;
-    }
+    int err;
 
     switch(QueryType)
     {
@@ -437,6 +431,21 @@
     default:
         break;
     }
+    return err;
+}
+
+static int DriveIoQuery(ISimpleScsiTarget* ScsiTarget, DriveIoQueryType QueryType, DIO_INFOLIST* InfoList)
+{
+    DIO_INFOLIST list;
+    int err;
+
+    list = DriveInfoList_Create();
+    if (NULL == list)
+    {
+        return DRIVEIO_ERR_NO_MEMORY;
+    }
+
+    err = DriveIoQuery(ScsiTarget, QueryType, list);
 
     if (err)
     {
@@ -474,7 +483,13 @@
 // API
 //
 
-extern "C" int DIO_CDECL DriveIoQuery(DriveIoExecScsiCmdFunc ScsiProc,void* ScsiContext,DriveIoQueryType QueryType,DIO_INFOLIST* InfoList)
+extern "C" int DIO_CDECL DriveIoQueryCreate(DriveIoExecScsiCmdFunc ScsiProc,void* ScsiContext,DriveIoQueryType QueryType,DIO_INFOLIST* InfoList)
+{
+    CFwdScsiTarget t(ScsiProc,ScsiContext);
+    return LibDriveIo::DriveIoQuery(&t,QueryType,InfoList);
+}
+
+extern "C" int DIO_CDECL DriveIoQueryAdd(DriveIoExecScsiCmdFunc ScsiProc,void* ScsiContext,DriveIoQueryType QueryType,DIO_INFOLIST InfoList)
 {
     CFwdScsiTarget t(ScsiProc,ScsiContext);
     return LibDriveIo::DriveIoQuery(&t,QueryType,InfoList);

makemkv-oss-1.15.1.tar.xz/libdriveio/src/tipclient.cpp -> makemkv-oss-1.15.2.tar.xz/libdriveio/src/tipclient.cpp Changed

@@ -25,6 +25,7 @@
 #include <driveio/scsihlp.h>
 #include <driveio/error.h>
 #include <lgpl/tcpip.h>
+#include <lgpl/byteorder.h>
 #include <string.h>
 #include <errno.h>
 #include "tipcommon.h"
@@ -316,8 +317,8 @@
 
     data[0] = 0x80 | Cmd->CdbLen; len = 3;
     memcpy(data+len,Cmd->Cdb,Cmd->CdbLen);  len += Cmd->CdbLen;
-    uint32_put_be(data+len,Cmd->InputLen);  len += 4;
-    uint32_put_be(data+len,Cmd->OutputLen);  len += 4;
+    wr32be(data+len,Cmd->InputLen);  len += 4;
+    wr32be(data+len,Cmd->OutputLen);  len += 4;
 
     if ((Cmd->InputLen<=MaxSmallDataLen) && (Cmd->InputLen!=0))
     {
@@ -325,7 +326,7 @@
         len += Cmd->InputLen;
     }
 
-    uint16_put_be(data+1,len);
+    wr16be(data+1,len);
 
     err=snd_data(m_socket,data,len);
     if (err<0) return err;
@@ -351,7 +352,7 @@
         rlen = len;
     }
 
-    len = uint16_get_be(data);
+    len = rd16be(data);
     if ( (len<(2+4+1+1)) || (len>MaxDataBufferSizeIn) )
     {
         return DRIVEIO_TIPS_ERROR(ERANGE);
@@ -363,7 +364,7 @@
         rlen = len;
     }
 
-    CmdResult->Transferred=uint32_get_be(data+2);
+    CmdResult->Transferred=rd32be(data+2);
     CmdResult->Status = data[2+4];
     CmdResult->SenseLen=data[2+4+1];

makemkv-oss-1.15.1.tar.xz/libdriveio/src/tipserver.cpp -> makemkv-oss-1.15.2.tar.xz/libdriveio/src/tipserver.cpp Changed

@@ -25,6 +25,7 @@
 #include <driveio/scsihlp.h>
 #include <driveio/error.h>
 #include <lgpl/tcpip.h>
+#include <lgpl/byteorder.h>
 #include "tipcommon.h"
 #include <stdlib.h>
 #include <string.h>
@@ -198,8 +199,8 @@
     CmdResult.Status=0xff;
     CmdResult.SenseLen=1+2+4;
     CmdResult.SenseData[0]=0xfe;
-    uint16_put_be(CmdResult.SenseData+1,Type);
-    uint32_put_be(CmdResult.SenseData+1+2,Error);
+    wr16be(CmdResult.SenseData+1,Type);
+    wr32be(CmdResult.SenseData+1+2,Error);
 }
 
 static int ProcessCommandV1(v1_state_t* state,unsigned int rlen,SOCKET s,DriveIoExecScsiCmdFunc ScsiProc,void* ScsiContext)
@@ -218,7 +219,7 @@
         rlen = 3;
     }
 
-    len = uint16_get_be(data+1);
+    len = rd16be(data+1);
     if (len>MaxDataBufferSizeOut) return DRIVEIO_TIPS_ERROR(ERANGE);
     if (rlen<len)
     {
@@ -238,8 +239,8 @@
     memcpy(Cmd.Cdb,data+clen,Cmd.CdbLen); clen += Cmd.CdbLen;
 
     if ((clen+4+4)>len) return DRIVEIO_TIPS_ERROR(ERANGE);
-    Cmd.InputLen = uint32_get_be(data+clen); clen += 4;
-    Cmd.OutputLen = uint32_get_be(data+clen); clen += 4;
+    Cmd.InputLen = rd32be(data+clen); clen += 4;
+    Cmd.OutputLen = rd32be(data+clen); clen += 4;
 
     if ((Cmd.InputLen!=0) && (Cmd.OutputLen!=0))
     {
@@ -295,7 +296,7 @@
     }
 
     len = 2;
-    uint32_put_be(data+len,CmdResult.Transferred); len+=4;
+    wr32be(data+len,CmdResult.Transferred); len+=4;
     data[len]=CmdResult.Status; len+=1;
     data[len]=(uint8_t)CmdResult.SenseLen; len+=1;
 
@@ -311,7 +312,7 @@
         len += olen;
     }
 
-    uint16_put_be(data+0,len);
+    wr16be(data+0,len);
 
     err=snd_data(s,data,len);
     if (err<0) return err;

makemkv-oss-1.15.1.tar.xz/libebml/inc/ebml/Debug.h -> makemkv-oss-1.15.2.tar.xz/libebml/inc/ebml/Debug.h Changed

makemkv-oss-1.15.1.tar.xz/libebml/inc/ebml/EbmlBinary.h -> makemkv-oss-1.15.2.tar.xz/libebml/inc/ebml/EbmlBinary.h Changed

makemkv-oss-1.15.1.tar.xz/libebml/inc/ebml/EbmlConfig.h -> makemkv-oss-1.15.2.tar.xz/libebml/inc/ebml/EbmlConfig.h Changed

@@ -40,6 +40,9 @@
 #include "config.h"
 #endif
 
+//#include "ebml_export.h"
+#define EBML_DLL_API
+
 #if defined(__linux__)
 #include <endian.h>
 #if __BYTE_ORDER == __LITTLE_ENDIAN
@@ -67,32 +70,10 @@
 # define END_LIBEBML_NAMESPACE
 #else // NO_NAMESPACE
 # define START_LIBEBML_NAMESPACE namespace LIBEBML_NAMESPACE {
-# define END_LIBEBML_NAMESPACE   };
+# define END_LIBEBML_NAMESPACE   }
 #endif // NO_NAMESPACE
 
 
-// There are special implementations for certain platforms. For example on Windows
-// we use the Win32 file API. here we set the appropriate macros.
-#if defined(_WIN32)||defined(WIN32)
-
-# if defined(EBML_DLL)
-#  if defined(EBML_DLL_EXPORT)
-#   define EBML_DLL_API __declspec(dllexport)
-#  else // EBML_DLL_EXPORT
-#   define EBML_DLL_API __declspec(dllimport)
-#  endif // EBML_DLL_EXPORT
-# else // EBML_DLL
-#  define EBML_DLL_API
-# endif // EBML_DLL
-
-# ifdef _MSC_VER
-#  pragma warning(disable:4786)  // length of internal identifiers
-# endif // _MSC_VER
-#else
-# define EBML_DLL_API
-#endif // WIN32 || _WIN32
-
-
 #ifndef countof
 #define countof(x) (sizeof(x)/sizeof(x[0]))
 #endif

makemkv-oss-1.15.1.tar.xz/libebml/inc/ebml/EbmlCrc32.h -> makemkv-oss-1.15.2.tar.xz/libebml/inc/ebml/EbmlCrc32.h Changed

@@ -47,6 +47,7 @@
 DECLARE_EBML_BINARY(EbmlCrc32)
   public:
     EbmlCrc32(const EbmlCrc32 & ElementToClone);
+    EbmlCrc32 &operator =(const EbmlCrc32 &) = default;
     virtual bool ValidateSize() const {return IsFiniteSize() && (GetSize() == 4);}
     filepos_t RenderData(IOCallback & output, bool bForceRender, bool bWithDefault = false);
     filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA);
@@ -81,7 +82,7 @@
     */
     uint32 GetCrc32() const {
       return m_crc_final;
-    };
+    }
 
     void ForceCrc32(uint32 NewValue) { m_crc_final = NewValue; SetValueIsSet();}
 
@@ -101,7 +102,7 @@
 };
 
 template <class T>
-inline unsigned int GetAlignment(T * /* dummy */=NULL) // VC60 workaround
+inline unsigned int GetAlignment(T * /* dummy */=nullptr) // VC60 workaround
 {
 #if defined(_MSC_VER) && (_MSC_VER >= 1300)
   return __alignof(T);
@@ -131,7 +132,7 @@
 }
 
 template <class T>
-inline bool IsAligned(const void *p, T * /* dummy */=NULL)	// VC60 workaround
+inline bool IsAligned(const void *p, T * /* dummy */=nullptr)  // VC60 workaround
 {
   return IsAlignedOn(p, GetAlignment<T>());
 }

makemkv-oss-1.15.1.tar.xz/libebml/inc/ebml/EbmlElement.h -> makemkv-oss-1.15.2.tar.xz/libebml/inc/ebml/EbmlElement.h Changed

@@ -81,7 +81,7 @@
 extern const EbmlSemanticContext Context_EbmlGlobal;
 
 #define DEFINE_xxx_CONTEXT(x,global) \
-    const EbmlSemanticContext Context_##x = EbmlSemanticContext(countof(ContextList_##x), ContextList_##x, NULL, global, NULL); \
+    const EbmlSemanticContext Context_##x = EbmlSemanticContext(countof(ContextList_##x), ContextList_##x, nullptr, global, nullptr); \
 
 #define DEFINE_xxx_MASTER(x,id,idl,parent,name,global) \
     const EbmlId Id_##x    (id, idl); \
@@ -96,41 +96,41 @@
 
 #define DEFINE_xxx_MASTER_ORPHAN(x,id,idl,name,global) \
     const EbmlId Id_##x    (id, idl); \
-    const EbmlSemanticContext Context_##x = EbmlSemanticContext(countof(ContextList_##x), ContextList_##x, NULL, global, &EBML_INFO(x)); \
+    const EbmlSemanticContext Context_##x = EbmlSemanticContext(countof(ContextList_##x), ContextList_##x, nullptr, global, &EBML_INFO(x)); \
     const EbmlCallbacks x::ClassInfos(x::Create, Id_##x, name, Context_##x); \
 
 #define DEFINE_xxx_CLASS(x,id,idl,parent,name,global) \
     const EbmlId Id_##x    (id, idl); \
-    const EbmlSemanticContext Context_##x = EbmlSemanticContext(0, NULL, &Context_##parent, global, &EBML_INFO(x)); \
+    const EbmlSemanticContext Context_##x = EbmlSemanticContext(0, nullptr, &Context_##parent, global, &EBML_INFO(x)); \
     const EbmlCallbacks x::ClassInfos(x::Create, Id_##x, name, Context_##x); \
     x::x() {}
 
 #define DEFINE_xxx_CLASS_CONS(x,id,idl,parent,name,global) \
     const EbmlId Id_##x    (id, idl); \
-    const EbmlSemanticContext Context_##x = EbmlSemanticContext(0, NULL, &Context_##parent, global, &EBML_INFO(x)); \
+    const EbmlSemanticContext Context_##x = EbmlSemanticContext(0, nullptr, &Context_##parent, global, &EBML_INFO(x)); \
     const EbmlCallbacks x::ClassInfos(x::Create, Id_##x, name, Context_##x);
 
 #define DEFINE_xxx_UINTEGER_DEF(x,id,idl,parent,name,global,defval) \
     const EbmlId Id_##x    (id, idl); \
-    const EbmlSemanticContext Context_##x = EbmlSemanticContext(0, NULL, &Context_##parent, global, &EBML_INFO(x)); \
+    const EbmlSemanticContext Context_##x = EbmlSemanticContext(0, nullptr, &Context_##parent, global, &EBML_INFO(x)); \
     const EbmlCallbacks x::ClassInfos(x::Create, Id_##x, name, Context_##x); \
     x::x() :EbmlUInteger(defval) {}
 
 #define DEFINE_xxx_SINTEGER_DEF(x,id,idl,parent,name,global,defval) \
     const EbmlId Id_##x    (id, idl); \
-    const EbmlSemanticContext Context_##x = EbmlSemanticContext(0, NULL, &Context_##parent, global, &EBML_INFO(x)); \
+    const EbmlSemanticContext Context_##x = EbmlSemanticContext(0, nullptr, &Context_##parent, global, &EBML_INFO(x)); \
     const EbmlCallbacks x::ClassInfos(x::Create, Id_##x, name, Context_##x); \
     x::x() :EbmlSInteger(defval) {}
 
 #define DEFINE_xxx_STRING_DEF(x,id,idl,parent,name,global,defval) \
     const EbmlId Id_##x    (id, idl); \
-    const EbmlSemanticContext Context_##x = EbmlSemanticContext(0, NULL, &Context_##parent, global, &EBML_INFO(x)); \
+    const EbmlSemanticContext Context_##x = EbmlSemanticContext(0, nullptr, &Context_##parent, global, &EBML_INFO(x)); \
     const EbmlCallbacks x::ClassInfos(x::Create, Id_##x, name, Context_##x); \
     x::x() :EbmlString(defval) {}
 
 #define DEFINE_xxx_FLOAT_DEF(x,id,idl,parent,name,global,defval) \
     const EbmlId Id_##x    (id, idl); \
-    const EbmlSemanticContext Context_##x = EbmlSemanticContext(0, NULL, &Context_##parent, global, &EBML_INFO(x)); \
+    const EbmlSemanticContext Context_##x = EbmlSemanticContext(0, nullptr, &Context_##parent, global, &EBML_INFO(x)); \
     const EbmlCallbacks x::ClassInfos(x::Create, Id_##x, name, Context_##x); \
     x::x() :EbmlFloat(defval) {}
 
@@ -140,7 +140,7 @@
 
 #define DEFINE_xxx_CLASS_ORPHAN(x,id,idl,name,global) \
     const EbmlId Id_##x    (id, idl); \
-    const EbmlSemanticContext Context_##x = EbmlSemanticContext(0, NULL, NULL, global, NULL); \
+    const EbmlSemanticContext Context_##x = EbmlSemanticContext(0, nullptr, nullptr, global, nullptr); \
     const EbmlCallbacks x::ClassInfos(x::Create, Id_##x, name, Context_##x); \
 
 #define DEFINE_EBML_CONTEXT(x)                             DEFINE_xxx_CONTEXT(x,*GetEbmlGlobal_Context)
@@ -187,7 +187,7 @@
 
 #define EBML_CONCRETE_DUMMY_CLASS(Type) \
     public: \
-        virtual const EbmlSemanticContext &Context() const {return *static_cast<EbmlSemanticContext*>(NULL);} \
+        virtual const EbmlSemanticContext &Context() const {return *static_cast<EbmlSemanticContext*>(nullptr);} \
         virtual const char *DebugName() const {return "DummyElement";} \
     virtual operator const EbmlId &(); \
         virtual EbmlElement & CreateElement() const {return Create();} \
@@ -384,11 +384,11 @@
     */
     EbmlElement * FindNext(IOCallback & DataStream, uint64 MaxDataSize);
 
-    EbmlElement * SkipData(EbmlStream & DataStream, const EbmlSemanticContext & Context, EbmlElement * TestReadElt = NULL, bool AllowDummyElt = false);
+    EbmlElement * SkipData(EbmlStream & DataStream, const EbmlSemanticContext & Context, EbmlElement * TestReadElt = nullptr, bool AllowDummyElt = false);
 
     /*!
       \brief Give a copy of the element, all data inside the element is copied
-      \return NULL if there is not enough memory
+      \return nullptr if there is not enough memory
     */
     virtual EbmlElement * Clone() const = 0;
 
@@ -445,18 +445,18 @@
     */
     bool ForceSize(uint64 NewSize);
 
-	filepos_t OverwriteHead(IOCallback & output, bool bKeepPosition = false);
-	filepos_t OverwriteData(IOCallback & output, bool bKeepPosition = false);
+    filepos_t OverwriteHead(IOCallback & output, bool bKeepPosition = false);
+    filepos_t OverwriteData(IOCallback & output, bool bKeepPosition = false);
 
     /*!
       \brief void the content of the element (replace by EbmlVoid)
     */
     uint64 VoidMe(IOCallback & output, bool bWithDefault = false);
 
-	bool DefaultISset() const {return DefaultIsSet;}
-	void ForceNoDefault() {SetDefaultIsSet(false);}
-	virtual bool IsDefaultValue() const = 0;
-	bool IsFiniteSize() const {return bSizeIsFinite;}
+    bool DefaultISset() const {return DefaultIsSet;}
+    void ForceNoDefault() {SetDefaultIsSet(false);}
+    virtual bool IsDefaultValue() const = 0;
+    bool IsFiniteSize() const {return bSizeIsFinite;}
 
     /*!
       \brief set the default size of an element
@@ -473,7 +473,7 @@
   protected:
     /*!
       \brief find any element in the stream
-      \return a DummyRawElement if the element is unknown or NULL if the element dummy is not allowed
+      \return a DummyRawElement if the element is unknown or nullptr if the element dummy is not allowed
     */
     static EbmlElement *CreateElementUsingContext(const EbmlId & aID, const EbmlSemanticContext & Context, int & LowLevel, bool IsGlobalContext, bool bAllowDummy = false, unsigned int MaxLowerLevel = 1);
 
@@ -488,7 +488,7 @@
     /*!
       \brief special constructor for cloning
     */
-    EbmlElement(const EbmlElement & ElementToClone);
+    EbmlElement(const EbmlElement & ElementToClone) = default;
 
         inline uint64 GetDefaultSize() const {return DefaultSize;}
         inline void SetSize_(uint64 aSize) {Size = aSize;}

makemkv-oss-1.15.1.tar.xz/libebml/inc/ebml/EbmlEndian.h -> makemkv-oss-1.15.2.tar.xz/libebml/inc/ebml/EbmlEndian.h Changed

makemkv-oss-1.15.1.tar.xz/libebml/inc/ebml/EbmlFloat.h -> makemkv-oss-1.15.2.tar.xz/libebml/inc/ebml/EbmlFloat.h Changed

makemkv-oss-1.15.1.tar.xz/libebml/inc/ebml/EbmlMaster.h -> makemkv-oss-1.15.2.tar.xz/libebml/inc/ebml/EbmlMaster.h Changed

makemkv-oss-1.15.1.tar.xz/libebml/inc/ebml/EbmlSInteger.h -> makemkv-oss-1.15.2.tar.xz/libebml/inc/ebml/EbmlSInteger.h Changed

makemkv-oss-1.15.1.tar.xz/libebml/inc/ebml/EbmlStream.h -> makemkv-oss-1.15.2.tar.xz/libebml/inc/ebml/EbmlStream.h Changed

makemkv-oss-1.15.1.tar.xz/libebml/inc/ebml/EbmlString.h -> makemkv-oss-1.15.2.tar.xz/libebml/inc/ebml/EbmlString.h Changed

makemkv-oss-1.15.1.tar.xz/libebml/inc/ebml/EbmlUInteger.h -> makemkv-oss-1.15.2.tar.xz/libebml/inc/ebml/EbmlUInteger.h Changed

makemkv-oss-1.15.1.tar.xz/libebml/inc/ebml/EbmlUnicodeString.h -> makemkv-oss-1.15.2.tar.xz/libebml/inc/ebml/EbmlUnicodeString.h Changed

@@ -45,6 +45,7 @@
 
 START_LIBEBML_NAMESPACE
 
+#if 0
 /*!
   \class UTFstring
   A class storing strings in a wchar_t (ie, in UCS-2 or UCS-4)
@@ -57,7 +58,7 @@
   UTFstring();
   UTFstring(const wchar_t *); // should be NULL terminated
   UTFstring(const UTFstring &);
-  //UTFstring(std::wstring const &);
+  UTFstring(std::wstring const &);
 
   virtual ~UTFstring();
   bool operator==(const UTFstring&) const;
@@ -91,6 +92,46 @@
   void UpdateFromUCS2();
 };
 
+#else
+
+/*!
+  \class UTFstring
+  A class storing strings in a chars as UTF-8
+  \note inspired by joy of not needing any unicode handling whatsoever
+*/
+class EBML_DLL_API UTFstring {
+public:
+  UTFstring() = default;
+  UTFstring(const UTFstring &src) = default;
+  UTFstring(UTFstring &&src) = default;
+  bool operator==(const UTFstring& that) const
+  {
+      return (this->data == that.data);
+  }
+  inline bool operator!=(const UTFstring &cmp) const
+  {
+    return !(*this == cmp);
+  }
+  UTFstring & operator=(const UTFstring &src) = default;
+
+  /// Return length of string
+  size_t length() const {return data.length();}
+
+  const ref::string & GetUTF8() const {return data;}
+  void SetUTF8(const ccc::string & src)
+  {
+      data = src;
+  }
+
+#if defined(EBML_STRICT_API)
+    private:
+#else
+    protected:
+#endif
+  buf::string data;
+};
+
+#endif
 
 /*!
     \class EbmlUnicodeString
@@ -101,9 +142,9 @@
   public:
     EbmlUnicodeString();
     EbmlUnicodeString(const UTFstring & DefaultValue);
-    EbmlUnicodeString(const EbmlUnicodeString & ElementToClone);
+    EbmlUnicodeString(const EbmlUnicodeString & ElementToClone) = default;
 
-    virtual ~EbmlUnicodeString() {}
+    virtual ~EbmlUnicodeString() = default;
 
     virtual bool ValidateSize() const {return IsFiniteSize();} // any size is possible
     filepos_t RenderData(IOCallback & output, bool bForceRender, bool bWithDefault = false);

makemkv-oss-1.15.1.tar.xz/libebml/inc/ebml/EbmlVersion.h -> makemkv-oss-1.15.2.tar.xz/libebml/inc/ebml/EbmlVersion.h Changed

makemkv-oss-1.15.1.tar.xz/libebml/inc/ebml/IOCallback.h -> makemkv-oss-1.15.2.tar.xz/libebml/inc/ebml/IOCallback.h Changed

makemkv-oss-1.15.1.tar.xz/libebml/inc/ebml/MemIOCallback.h -> makemkv-oss-1.15.2.tar.xz/libebml/inc/ebml/MemIOCallback.h Changed

@@ -77,18 +77,18 @@
 
     If an error occurs, an exception should be thrown.
   */
-  virtual uint64 getFilePointer() {return dataBufferPos;};
+  virtual uint64 getFilePointer() {return dataBufferPos;}
 
   /*!
     The close callback flushes the file buffers to disk and closes the file. When using the stdio
     library, this is equivalent to calling fclose. When the close is not successful, an exception
     should be thrown.
   */
-  void close() {};
+  void close() {}
 
-  binary *GetDataBuffer() const {return dataBuffer;};
-  uint64 GetDataBufferSize() {return dataBufferTotalSize;};
-  void SetDataBufferSize(uint64 newDataBufferSize) {dataBufferTotalSize = newDataBufferSize;};
+  binary *GetDataBuffer() const {return dataBuffer;}
+  uint64 GetDataBufferSize() const {return dataBufferTotalSize;}
+  void SetDataBufferSize(uint64 newDataBufferSize) {dataBufferTotalSize = newDataBufferSize;}
   /*!
     Use this to write some data from another IOCallback
   */
@@ -96,8 +96,8 @@
   uint32 write(IOCallback & IOToRead, size_t Size);
 #endif
 
-  bool IsOk() { return mOk; };
-  const ref::string &GetLastErrorStr() { return mLastErrorStr; };
+  bool IsOk() { return mOk; }
+  const ref::string &GetLastErrorStr() { return mLastErrorStr; }
 protected:
   bool mOk;
   buf::string mLastErrorStr;

makemkv-oss-1.15.1.tar.xz/libebml/inc/ebml/MemReadIOCallback.h -> makemkv-oss-1.15.2.tar.xz/libebml/inc/ebml/MemReadIOCallback.h Changed

makemkv-oss-1.15.1.tar.xz/libebml/inc/ebml/SafeReadIOCallback.h -> makemkv-oss-1.15.2.tar.xz/libebml/inc/ebml/SafeReadIOCallback.h Changed

makemkv-oss-1.15.1.tar.xz/libebml/inc/ebml/StdIOCallback.h -> makemkv-oss-1.15.2.tar.xz/libebml/inc/ebml/StdIOCallback.h Changed

makemkv-oss-1.15.1.tar.xz/libebml/inc/ebml/c/libebml_t.h -> makemkv-oss-1.15.2.tar.xz/libebml/inc/ebml/c/libebml_t.h Changed

makemkv-oss-1.15.1.tar.xz/libebml/src/Debug.cpp -> makemkv-oss-1.15.2.tar.xz/libebml/src/Debug.cpp Changed

makemkv-oss-1.15.1.tar.xz/libebml/src/EbmlBinary.cpp -> makemkv-oss-1.15.2.tar.xz/libebml/src/EbmlBinary.cpp Changed

@@ -42,22 +42,22 @@
 START_LIBEBML_NAMESPACE
 
 EbmlBinary::EbmlBinary()
-  :EbmlElement(0, false), Data(NULL)
+  :EbmlElement(0, false), Data(nullptr)
 {}
 
 EbmlBinary::EbmlBinary(const EbmlBinary & ElementToClone)
   :EbmlElement(ElementToClone)
 {
-  if (ElementToClone.Data == NULL)
-    Data = NULL;
+  if (ElementToClone.Data == nullptr)
+    Data = nullptr;
   else {
-    Data = (binary *)malloc(GetSize() * sizeof(binary));
-    assert(Data != NULL);
+    Data = static_cast<binary *>(malloc(GetSize() * sizeof(binary)));
+    assert(Data != nullptr);
     memcpy(Data, ElementToClone.Data, GetSize());
   }
 }
 
-EbmlBinary::~EbmlBinary(void) {
+EbmlBinary::~EbmlBinary() {
   if(Data)
     free(Data);
 }
@@ -83,16 +83,22 @@
 #ifndef EBML_NO_READ
 filepos_t EbmlBinary::ReadData(IOCallback & input, ScopeMode ReadFully)
 {
-  if (Data != NULL)
+  if (Data != nullptr)
     free(Data);
 
-  if (ReadFully == SCOPE_NO_DATA || !GetSize()) {
-    Data = NULL;
+  if (ReadFully == SCOPE_NO_DATA) {
+    Data = nullptr;
     return GetSize();
   }
 
-  Data = (binary *)malloc(GetSize());
-  if (Data == NULL)
+  if (!GetSize()) {
+    SetValueIsSet();
+    Data = nullptr;
+    return 0;
+  }
+
+  Data = static_cast<binary *>(malloc(GetSize()));
+  if (Data == nullptr)
     throw CRTError(std::string("Error allocating data"));
   SetValueIsSet();
   return input.read(Data, GetSize());
@@ -101,7 +107,7 @@
 
 bool EbmlBinary::operator==(const EbmlBinary & ElementToCompare) const
 {
-  return ((GetSize() == ElementToCompare.GetSize()) && !memcmp(Data, ElementToCompare.Data, GetSize()));
+  return ((GetSize() == ElementToCompare.GetSize()) && (GetSize() == 0 || !memcmp(Data, ElementToCompare.Data, GetSize())));
 }
 
 END_LIBEBML_NAMESPACE

makemkv-oss-1.15.1.tar.xz/libebml/src/EbmlContexts.cpp -> makemkv-oss-1.15.2.tar.xz/libebml/src/EbmlContexts.cpp Changed

makemkv-oss-1.15.1.tar.xz/libebml/src/EbmlCrc32.cpp -> makemkv-oss-1.15.2.tar.xz/libebml/src/EbmlCrc32.cpp Changed

@@ -50,7 +50,7 @@
 
 START_LIBEBML_NAMESPACE
 
-DEFINE_EBML_CLASS_GLOBAL(EbmlCrc32, 0xBF, 1, "EBMLCrc32\0ratamadabapa");
+DEFINE_EBML_CLASS_GLOBAL(EbmlCrc32, 0xBF, 1, "EBMLCrc32\0ratamadabapa")
 
 const uint32 EbmlCrc32::m_tab[] = {
 #ifdef WORDS_BIGENDIAN
@@ -197,7 +197,7 @@
 
   Update(memoryBuffer.GetDataBuffer(), memoryBuffer.GetDataBufferSize());
   //  Finalize();
-};
+}
 
 bool EbmlCrc32::CheckElementCRC32(EbmlElement &ElementToCRC)
 {
@@ -205,7 +205,7 @@
   ElementToCRC.Render(memoryBuffer);
 
   return CheckCRC(m_crc_final, memoryBuffer.GetDataBuffer(), memoryBuffer.GetDataBufferSize());
-};
+}
 
 filepos_t EbmlCrc32::RenderData(IOCallback & output, bool /* bForceRender */, bool /* bWithDefault */)
 {
@@ -217,8 +217,8 @@
 
   if (Result < GetDefaultSize()) {
     // pad the rest with 0
-    binary *Pad = new (std::nothrow) binary[GetDefaultSize() - Result];
-    if (Pad != NULL) {
+    auto Pad = new (std::nothrow) binary[GetDefaultSize() - Result];
+    if (Pad != nullptr) {
       memset(Pad, 0x00, GetDefaultSize() - Result);
       output.writeFully(Pad, GetDefaultSize() - Result);
 
@@ -234,8 +234,8 @@
 filepos_t EbmlCrc32::ReadData(IOCallback & input, ScopeMode ReadFully)
 {
   if (ReadFully != SCOPE_NO_DATA) {
-    binary *Buffer = new (std::nothrow) binary[GetSize()];
-    if (Buffer == NULL) {
+    auto Buffer = new (std::nothrow) binary[GetSize()];
+    if (Buffer == nullptr) {
       // impossible to read, skip it
       input.setFilePointer(GetSize(), seek_current);
     } else {
@@ -259,7 +259,7 @@
     crc = m_tab[CRC32_INDEX(crc) ^ *input++] ^ CRC32_SHIFTED(crc);
 
   while (length >= 4) {
-    crc ^= *(const uint32 *)input;
+    crc ^= *reinterpret_cast<const uint32 *>(input);
     crc = m_tab[CRC32_INDEX(crc)] ^ CRC32_SHIFTED(crc);
     crc = m_tab[CRC32_INDEX(crc)] ^ CRC32_SHIFTED(crc);
     crc = m_tab[CRC32_INDEX(crc)] ^ CRC32_SHIFTED(crc);
@@ -274,16 +274,13 @@
   //Now we finalize the CRC32
   crc ^= CRC32_NEGL;
 
-  if (crc == inputCRC)
-    return true;
-
-  return false;
-};
+  return crc == inputCRC;
+}
 
-void EbmlCrc32::FillCRC32(const binary *s, uint32 n)
+void EbmlCrc32::FillCRC32(const binary *input, uint32 length)
 {
   ResetCRC();
-  Update(s, n);
+  Update(input, length);
   Finalize();
 
   /*uint32 crc = CRC32_NEGL;
@@ -322,7 +319,7 @@
     crc = m_tab[CRC32_INDEX(crc) ^ *input++] ^ CRC32_SHIFTED(crc);
 
   while (length >= 4) {
-    crc ^= *(const uint32 *)input;
+    crc ^= *reinterpret_cast<const uint32 *>(input);
     crc = m_tab[CRC32_INDEX(crc)] ^ CRC32_SHIFTED(crc);
     crc = m_tab[CRC32_INDEX(crc)] ^ CRC32_SHIFTED(crc);
     crc = m_tab[CRC32_INDEX(crc)] ^ CRC32_SHIFTED(crc);

makemkv-oss-1.15.1.tar.xz/libebml/src/EbmlDate.cpp -> makemkv-oss-1.15.2.tar.xz/libebml/src/EbmlDate.cpp Changed

makemkv-oss-1.15.1.tar.xz/libebml/src/EbmlDummy.cpp -> makemkv-oss-1.15.2.tar.xz/libebml/src/EbmlDummy.cpp Changed

makemkv-oss-1.15.1.tar.xz/libebml/src/EbmlElement.cpp -> makemkv-oss-1.15.2.tar.xz/libebml/src/EbmlElement.cpp Changed

@@ -48,10 +48,10 @@
 /*!
   \todo handle more than CodedSize of 5
 */
-int CodedSizeLength(uint64 Length, unsigned int SizeLength, bool bSizeFinite)
+int CodedSizeLength(uint64 Length, unsigned int SizeLength, bool bSizeIsFinite)
 {
   unsigned int CodedSize;
-  if (bSizeFinite) {
+  if (bSizeIsFinite) {
     // prepare the head of the size (000...01xxxxxx)
     // optimal size
     if (Length < 127) // 2^7 - 1
@@ -214,7 +214,7 @@
   ,DebugName(aDebugName)
   ,Context(aContext)
 {
-  assert((Create!=NULL) || !strcmp(aDebugName, "DummyElement"));
+  assert((Create!=nullptr) || !strcmp(aDebugName, "DummyElement"));
 }
 
 const EbmlSemantic & EbmlSemanticContext::GetSemantic(size_t i) const
@@ -242,19 +242,6 @@
   Size = DefaultSize;
 }
 
-EbmlElement::EbmlElement(const EbmlElement & ElementToClone)
-  :Size(ElementToClone.Size)
-  ,DefaultSize(ElementToClone.DefaultSize)
-  ,SizeLength(ElementToClone.SizeLength)
-  ,bSizeIsFinite(ElementToClone.bSizeIsFinite)
-  ,ElementPosition(ElementToClone.ElementPosition)
-  ,SizePosition(ElementToClone.SizePosition)
-  ,bValueIsSet(ElementToClone.bValueIsSet)
-  ,DefaultIsSet(ElementToClone.DefaultIsSet)
-  ,bLocked(ElementToClone.bLocked)
-{
-}
-
 EbmlElement::~EbmlElement()
 {
   assert(!bLocked);
@@ -282,14 +269,13 @@
     aElementPosition = DataStream.getFilePointer();
     uint32 ReadSize = 0;
     BitMask = 1 << 7;
-    while (1) {
-      ReadSize += DataStream.read(&PossibleId[PossibleID_Length], 1);
-      if (ReadSize == uint32(PossibleID_Length)) {
-        return NULL; // no more data ?
-      }
-      if (++PossibleID_Length > 4) {
-        return NULL; // we don't support element IDs over class D
-      }
+    while (PossibleID_Length < 4) {
+      if (!DataStream.read(&PossibleId[PossibleID_Length], 1))
+        return nullptr;            // no more data
+
+      ++ReadSize;
+      ++PossibleID_Length;
+
       if (PossibleId[0] & BitMask) {
         // this is the last octet of the ID
         // check wether that's the one we're looking for
@@ -304,13 +290,16 @@
       BitMask >>= 1;
     }
 
+    if (!bElementFound)
+      return nullptr;
+
     // read the data size
     aSizePosition = DataStream.getFilePointer();
     uint32 _SizeLength;
     do {
       if (PossibleSizeLength >= 8)
         // Size is larger than 8 bytes
-        return NULL;
+        return nullptr;
 
       ReadSize += DataStream.read(&PossibleSize[PossibleSizeLength++], 1);
       _SizeLength = PossibleSizeLength;
@@ -318,7 +307,7 @@
     } while (_SizeLength == 0);
   }
 
-  EbmlElement *Result = NULL;
+  EbmlElement *Result = nullptr;
   EbmlId PossibleID(PossibleId, PossibleID_Length);
   if (PossibleID == EBML_INFO_ID(ClassInfos)) {
     // the element is the one expected
@@ -326,8 +315,8 @@
   } else {
     /// \todo find the element in the context
     Result = new (std::nothrow) EbmlDummy(PossibleID);
-    if(Result == NULL)
-      return NULL;
+    if(Result == nullptr)
+      return nullptr;
   }
 
   Result->SetSizeLength(PossibleSizeLength);
@@ -336,7 +325,7 @@
 
   if (!Result->ValidateSize() || (SizeFound != SizeUnknown && MaxDataSize < Result->Size)) {
     delete Result;
-    return NULL;
+    return nullptr;
   }
 
   // check if the size is not all 1s
@@ -346,7 +335,7 @@
     if (!Result->SetSizeInfinite()) {
       /// \todo the element is not allowed to be infinite
       delete Result;
-      return NULL;
+      return nullptr;
     }
   } else Result->SetSizeInfinite(false);
   Result->ElementPosition = aElementPosition;
@@ -370,11 +359,12 @@
   int PossibleSizeLength;
   uint64 SizeUnknown;
   int ReadIndex = 0; // trick for the algo, start index at 0
-  uint32 ReadSize = 0;
+  uint32 ReadSize = 0, IdStart = 0;
   uint64 SizeFound;
   int SizeIdx;
   bool bFound;
   int UpperLevel_original = UpperLevel;
+  uint64 ParseStart = DataStream.getFilePointer();
 
   do {
     // read a potential ID
@@ -400,18 +390,21 @@
         // ID not found
         // shift left the read octets
         memmove(&PossibleIdNSize[0],&PossibleIdNSize[1], --ReadIndex);
+        IdStart++;
       }
 
+      if (MaxDataSize <= ReadSize)
+        break;
       if (DataStream.read(&PossibleIdNSize[ReadIndex++], 1) == 0) {
-        return NULL; // no more data ?
+        return nullptr; // no more data ?
       }
       ReadSize++;
 
-    } while (!bFound && MaxDataSize > ReadSize);
+    } while (!bFound);
 
     if (!bFound)
       // we reached the maximum we could read without a proper ID
-      return NULL;
+      return nullptr;
 
     SizeIdx = ReadIndex;
     ReadIndex -= PossibleID_Length;
@@ -419,7 +412,7 @@
     // read the data size
     uint32 _SizeLength;
     PossibleSizeLength = ReadIndex;
-    while (1) {
+    while (true) {
       _SizeLength = PossibleSizeLength;
       SizeFound = ReadCodedSizeValue(&PossibleIdNSize[PossibleID_Length], _SizeLength, SizeUnknown);
       if (_SizeLength != 0) {
@@ -430,8 +423,12 @@
         bFound = false;
         break;
       }
+      if (MaxDataSize <= ReadSize) {
+        bFound = false;
+        break;
+      }
       if( DataStream.read( &PossibleIdNSize[SizeIdx++], 1 ) == 0 ) {
-        return NULL; // no more data ?
+        return nullptr; // no more data ?
       }
       ReadSize++;
       PossibleSizeLength++;
@@ -442,7 +439,7 @@
       EbmlId PossibleID(PossibleIdNSize, PossibleID_Length);
       EbmlElement * Result = CreateElementUsingContext(PossibleID, Context, UpperLevel, false, AllowDummyElt, MaxLowerLevel);
       ///< \todo continue is misplaced
-      if (Result != NULL) {
+      if (Result != nullptr) {
         if (AllowDummyElt || !Result->IsDummy()) {
           Result->SetSizeLength(_SizeLength);
 
@@ -452,16 +449,15 @@
           //  0 : child
           //  1 : same level
           //  + : further parent
-          if (Result->ValidateSize() && (SizeFound == SizeUnknown || UpperLevel > 0 || MaxDataSize == 0 || MaxDataSize >= (PossibleID_Length + PossibleSizeLength + SizeFound))) {
-            if (SizeFound == SizeUnknown) {
-              Result->SetSizeInfinite();
+          if (Result->ValidateSize() && (SizeFound == SizeUnknown || UpperLevel > 0 || MaxDataSize == 0 ||
+                                         MaxDataSize >= (IdStart + PossibleID_Length + _SizeLength + SizeFound))) {

makemkv-oss-1.15.1.tar.xz/libebml/src/EbmlFloat.cpp -> makemkv-oss-1.15.2.tar.xz/libebml/src/EbmlFloat.cpp Changed

@@ -53,13 +53,6 @@
   SetPrecision(prec);
 }
 
-EbmlFloat::EbmlFloat(const EbmlFloat & ElementToClone)
-  :EbmlElement(ElementToClone)
-  ,Value(ElementToClone.Value)
-  ,DefaultValue(ElementToClone.DefaultValue)
-{
-}
-
 void EbmlFloat::SetDefaultValue(double aValue)
 {
   assert(!DefaultISset());
@@ -128,15 +121,15 @@
     if (GetSize() == 4) {
       big_int32 TmpRead;
       TmpRead.Eval(Buffer);
-      int32 tmpp = int32(TmpRead);
+      auto tmpp = int32(TmpRead);
       float val;
       memcpy(&val, &tmpp, 4);
-      Value = val;
+      Value = static_cast<double>(val);
       SetValueIsSet();
     } else if (GetSize() == 8) {
       big_int64 TmpRead;
       TmpRead.Eval(Buffer);
-      int64 tmpp = int64(TmpRead);
+      auto tmpp = int64(TmpRead);
       double val;
       memcpy(&val, &tmpp, 8);
       Value = val;
@@ -152,8 +145,8 @@
 {
   if (EbmlId(*this) == EbmlId(*Cmp))
     return this->Value < static_cast<const EbmlFloat *>(Cmp)->Value;
-  else
-    return false;
+
+  return false;
 }
 
 END_LIBEBML_NAMESPACE

makemkv-oss-1.15.1.tar.xz/libebml/src/EbmlHead.cpp -> makemkv-oss-1.15.2.tar.xz/libebml/src/EbmlHead.cpp Changed

makemkv-oss-1.15.1.tar.xz/libebml/src/EbmlMaster.cpp -> makemkv-oss-1.15.2.tar.xz/libebml/src/EbmlMaster.cpp Changed

@@ -60,8 +60,8 @@
  ,Checksum(ElementToClone.Checksum)
 {
   // add a clone of the list
-  std::vector<EbmlElement *>::const_iterator Itr = ElementToClone.ElementList.begin();
-  std::vector<EbmlElement *>::iterator myItr = ElementList.begin();
+  auto Itr = ElementToClone.ElementList.begin();
+  auto myItr = ElementList.begin();
   while (Itr != ElementToClone.ElementList.end())
   {
     *myItr = (*Itr)->Clone();
@@ -74,11 +74,9 @@
 {
   assert(!IsLocked()); // you're trying to delete a locked element !!!
 
-  size_t Index;
-
-  for (Index = 0; Index < ElementList.size(); Index++) {
-    if (!(*ElementList[Index]).IsLocked())  {
-      delete ElementList[Index];
+  for (auto Element : ElementList) {
+    if (!Element->IsLocked())  {
+      delete Element;
     }
   }
 }
@@ -90,24 +88,23 @@
 filepos_t EbmlMaster::RenderData(IOCallback & output, bool bForceRender, bool bWithDefault)
 {
   filepos_t Result = 0;
-  size_t Index;
 
   if (!bForceRender) {
     assert(CheckMandatory());
   }
 
   if (!bChecksumUsed) { // old school
-    for (Index = 0; Index < ElementList.size(); Index++) {
-      if (!bWithDefault && (ElementList[Index])->IsDefaultValue())
+    for (auto Element : ElementList) {
+      if (!bWithDefault && Element->IsDefaultValue())
         continue;
-      Result += (ElementList[Index])->Render(output, bWithDefault, false ,bForceRender);
+      Result += Element->Render(output, bWithDefault, false ,bForceRender);
     }
   } else { // new school
     MemIOCallback TmpBuf(GetSize() - 6);
-    for (Index = 0; Index < ElementList.size(); Index++) {
-      if (!bWithDefault && (ElementList[Index])->IsDefaultValue())
+    for (auto Element : ElementList) {
+      if (!bWithDefault && Element->IsDefaultValue())
         continue;
-      (ElementList[Index])->Render(TmpBuf, bWithDefault, false ,bForceRender);
+      Element->Render(TmpBuf, bWithDefault, false ,bForceRender);
     }
     Checksum.FillCRC32(TmpBuf.GetDataBuffer(), TmpBuf.GetDataBufferSize());
     Result += Checksum.Render(output, true, false ,bForceRender);
@@ -138,13 +135,11 @@
     assert(CheckMandatory());
     }
 
-  size_t Index;
-
-  for (Index = 0; Index < ElementList.size(); Index++) {
-    if (!bWithDefault && (ElementList[Index])->IsDefaultValue())
+  for (auto Element : ElementList) {
+    if (!bWithDefault && Element->IsDefaultValue())
       continue;
-    (ElementList[Index])->UpdateSize(bWithDefault, bForceRender);
-    uint64 SizeToAdd = (ElementList[Index])->ElementSize(bWithDefault);
+    Element->UpdateSize(bWithDefault, bForceRender);
+    uint64 SizeToAdd = Element->ElementSize(bWithDefault);
 #if defined(LIBEBML_DEBUG)
     if (static_cast<int64>(SizeToAdd) == (0-1))
       return (0-1);
@@ -205,7 +200,7 @@
   unsigned int EltIdx;
   for (EltIdx = 0; EltIdx < EBML_CTX_SIZE(Context); EltIdx++) {
     if (EBML_CTX_IDX(Context,EltIdx).IsMandatory()) {
-      if (FindElt(EBML_CTX_IDX_INFO(Context,EltIdx)) == NULL) {
+      if (FindElt(EBML_CTX_IDX_INFO(Context,EltIdx)) == nullptr) {
         EbmlElement *testElement = &EBML_CTX_IDX(Context,EltIdx).Create();
         bool hasDefaultValue     = testElement->DefaultISset();
         delete testElement;
@@ -230,8 +225,7 @@
 
   std::vector<std::string> missingElements;
 
-  for (size_t ChildElementNo = 0; ChildElementNo < ElementList.size(); ChildElementNo++) {
-       EbmlElement *childElement = ElementList[ChildElementNo];
+  for (auto childElement : ElementList) {
     if (!childElement->ValueIsSet()) {
       std::string missingValue;
       missingValue = "The Child Element \"";
@@ -243,22 +237,21 @@
     }
 
     if (childElement->IsMaster()) {
-      EbmlMaster *childMaster = (EbmlMaster *)childElement;
+      auto childMaster = reinterpret_cast<EbmlMaster *>(childElement);
 
       std::vector<std::string> childMissingElements = childMaster->FindAllMissingElements();
-      for (size_t s = 0; s < childMissingElements.size(); s++)
-        missingElements.push_back(childMissingElements[s]);
+      std::copy(childMissingElements.begin(), childMissingElements.end(), std::back_inserter(missingElements));
     }
   }
   unsigned int EltIdx;
   for (EltIdx = 0; EltIdx < EBML_CTX_SIZE(Context); EltIdx++) {
     if (EBML_CTX_IDX(Context,EltIdx).IsMandatory()) {
-      if (FindElt(EBML_CTX_IDX_INFO(Context,EltIdx)) == NULL) {
+      if (FindElt(EBML_CTX_IDX_INFO(Context,EltIdx)) == nullptr) {
         std::string missingElement;
         missingElement = "Missing element \"";
-                missingElement.append(EBML_INFO_NAME(EBML_CTX_IDX_INFO(Context,EltIdx)));
+        missingElement.append(EBML_INFO_NAME(EBML_CTX_IDX_INFO(Context,EltIdx)));
         missingElement.append("\" in EbmlMaster \"");
-                missingElement.append(EBML_INFO_NAME(*EBML_CTX_MASTER(Context)));
+        missingElement.append(EBML_INFO_NAME(*EBML_CTX_MASTER(Context)));
         missingElement.append("\"");
         missingElements.push_back(missingElement);
       }
@@ -271,52 +264,42 @@
 
 EbmlElement *EbmlMaster::FindElt(const EbmlCallbacks & Callbacks) const
 {
-  size_t Index;
-
-  for (Index = 0; Index < ElementList.size(); Index++) {
-    EbmlElement * tmp = ElementList[Index];
-    if (EbmlId(*tmp) == EBML_INFO_ID(Callbacks))
-      return tmp;
-  }
+  auto it = std::find_if(ElementList.begin(), ElementList.end(), [&](const EbmlElement *Element)
+    { return EbmlId(*Element) == EBML_INFO_ID(Callbacks); });
 
-  return NULL;
+  return it != ElementList.end() ? *it : nullptr;
 }
 
 EbmlElement *EbmlMaster::FindFirstElt(const EbmlCallbacks & Callbacks, bool bCreateIfNull)
 {
-  size_t Index;
+  auto it = std::find_if(ElementList.begin(), ElementList.end(), [&](const EbmlElement *Element)
+    { return Element && EbmlId(*Element) == EBML_INFO_ID(Callbacks); });
 
-  for (Index = 0; Index < ElementList.size(); Index++) {
-    if (ElementList[Index] && EbmlId(*(ElementList[Index])) == EBML_INFO_ID(Callbacks))
-      return ElementList[Index];
-  }
+  if (it != ElementList.end())
+    return *it;
 
   if (bCreateIfNull) {
     // add the element
     EbmlElement *NewElt = &EBML_INFO_CREATE(Callbacks);
-    if (NewElt == NULL)
-      return NULL;
+    if (NewElt == nullptr)
+      return nullptr;
 
     if (!PushElement(*NewElt)) {
       delete NewElt;
-      NewElt = NULL;
+      NewElt = nullptr;
     }
     return NewElt;
   }
 
-  return NULL;
+  return nullptr;
 }
 
 EbmlElement *EbmlMaster::FindFirstElt(const EbmlCallbacks & Callbacks) const
 {
-  size_t Index;
+  auto it = std::find_if(ElementList.begin(), ElementList.end(), [&](const EbmlElement *Element)
+    { return EbmlId(*Element) == EBML_INFO_ID(Callbacks); });
 
-  for (Index = 0; Index < ElementList.size(); Index++) {
-    if (EbmlId(*(ElementList[Index])) == EBML_INFO_ID(Callbacks))
-      return ElementList[Index];
-  }
-
-  return NULL;
+  return it != ElementList.end() ? *it : nullptr;
 }
 
 /*!
@@ -336,7 +319,7 @@
   }
 
   while (Index < ElementList.size()) {
-    if ((EbmlId)PastElt == (EbmlId)(*ElementList[Index]))
+    if (EbmlId(PastElt) == EbmlId(*ElementList[Index]))
       break;
     Index++;
   }
@@ -347,17 +330,17 @@
   if (bCreateIfNull) {

makemkv-oss-1.15.1.tar.xz/libebml/src/EbmlSInteger.cpp -> makemkv-oss-1.15.2.tar.xz/libebml/src/EbmlSInteger.cpp Changed

@@ -33,9 +33,26 @@
   \author Moritz Bunkus <moritz @ bunkus.org>
 */
 #include <lgpl/cassert>
+#include <lgpl/stl.h>
 
 #include "ebml/EbmlSInteger.h"
 
+// Converting unsigned int types to signed ints assuming the
+// underlying bits in memory should represent the 2's complement of a
+// signed integer. See https://stackoverflow.com/a/13208789/507077
+
+namespace {
+
+int64
+ToSigned(uint64 u) {
+  if (u <= static_cast<uint64>(std::numeric_limits<int64>::max()))
+    return static_cast<int64>(u);
+
+  return static_cast<int64>(u - std::numeric_limits<int64>::min()) + std::numeric_limits<int64>::min();
+}
+
+} // namespace
+
 START_LIBEBML_NAMESPACE
 
 EbmlSInteger::EbmlSInteger()
@@ -48,13 +65,6 @@
   SetDefaultIsSet();
 }
 
-EbmlSInteger::EbmlSInteger(const EbmlSInteger & ElementToClone)
-  :EbmlElement(ElementToClone)
-  ,Value(ElementToClone.Value)
-  ,DefaultValue(ElementToClone.DefaultValue)
-{
-}
-
 EbmlSInteger::operator int8() const {return  int8(Value);}
 EbmlSInteger::operator int16() const {return int16(Value);}
 EbmlSInteger::operator int32() const {return int32(Value);}
@@ -128,15 +138,15 @@
     binary Buffer[8];
     input.readFully(Buffer, GetSize());
 
-    if (Buffer[0] & 0x80)
-      Value = -1; // this is a negative value
-    else
-      Value = 0; // this is a positive value
+    uint64 TempValue = Buffer[0] & 0x80 ? std::numeric_limits<uint64>::max() : 0;
 
     for (unsigned int i=0; i<GetSize(); i++) {
-      Value <<= 8;
-      Value |= Buffer[i];
+      TempValue <<= 8;
+      TempValue |= Buffer[i];
     }
+
+    Value = ToSigned(TempValue);
+
     SetValueIsSet();
   }
 
@@ -148,8 +158,8 @@
 {
   if (EbmlId(*this) == EbmlId(*Cmp))
     return this->Value < static_cast<const EbmlSInteger *>(Cmp)->Value;
-  else
-    return false;
+
+  return false;
 }
 
 END_LIBEBML_NAMESPACE

makemkv-oss-1.15.1.tar.xz/libebml/src/EbmlStream.cpp -> makemkv-oss-1.15.2.tar.xz/libebml/src/EbmlStream.cpp Changed

makemkv-oss-1.15.1.tar.xz/libebml/src/EbmlString.cpp -> makemkv-oss-1.15.2.tar.xz/libebml/src/EbmlString.cpp Changed

@@ -63,13 +63,6 @@
 /*!
   \todo Cloning should be on the same exact type !
 */
-EbmlString::EbmlString(const EbmlString & ElementToClone)
-  :EbmlElement(ElementToClone)
-  ,Value(ElementToClone.Value)
-  ,DefaultValue(ElementToClone.DefaultValue)
-{
-}
-
 void EbmlString::SetDefaultValue(ccc::string & aValue)
 {
   assert(!DefaultISset());
@@ -95,8 +88,8 @@
 
   if (Result < GetDefaultSize()) {
     // pad the rest with 0
-    binary *Pad = new (std::nothrow) binary[GetDefaultSize() - Result];
-    if (Pad == NULL) {
+    auto Pad = new (std::nothrow) binary[GetDefaultSize() - Result];
+    if (Pad == nullptr) {
       return Result;
     }
     memset(Pad, 0x00, GetDefaultSize() - Result);
@@ -150,8 +143,8 @@
       Value = "";
       SetValueIsSet();
     } else {
-      char *Buffer = new (std::nothrow) char[GetSize() + 1];
-      if (Buffer == NULL) {
+      auto Buffer = new (std::nothrow) char[GetSize() + 1];
+      if (Buffer == nullptr) {
         // unable to store the data, skip it
         input.setFilePointer(GetSize(), seek_current);
       } else {

makemkv-oss-1.15.1.tar.xz/libebml/src/EbmlSubHead.cpp -> makemkv-oss-1.15.2.tar.xz/libebml/src/EbmlSubHead.cpp Changed

@@ -38,12 +38,12 @@
 
 START_LIBEBML_NAMESPACE
 
-DEFINE_EBML_UINTEGER_DEF(EVersion,            0x4286, 2, EbmlHead, "EBMLVersion", 1);
-DEFINE_EBML_UINTEGER_DEF(EReadVersion,        0x42F7, 2, EbmlHead, "EBMLReadVersion", 1);
-DEFINE_EBML_UINTEGER_DEF(EMaxIdLength,        0x42F2, 2, EbmlHead, "EBMLMaxIdLength", 4);
-DEFINE_EBML_UINTEGER_DEF(EMaxSizeLength,      0x42F3, 2, EbmlHead, "EBMLMaxSizeLength", 8);
-DEFINE_EBML_STRING_DEF  (EDocType,            0x4282, 2, EbmlHead, "EBMLDocType", "matroska");
-DEFINE_EBML_UINTEGER_DEF(EDocTypeVersion,     0x4287, 2, EbmlHead, "EBMLDocTypeVersion", 1);
-DEFINE_EBML_UINTEGER_DEF(EDocTypeReadVersion, 0x4285, 2, EbmlHead, "EBMLDocTypeReadVersion", 1);
+DEFINE_EBML_UINTEGER_DEF(EVersion,            0x4286, 2, EbmlHead, "EBMLVersion", 1)
+DEFINE_EBML_UINTEGER_DEF(EReadVersion,        0x42F7, 2, EbmlHead, "EBMLReadVersion", 1)
+DEFINE_EBML_UINTEGER_DEF(EMaxIdLength,        0x42F2, 2, EbmlHead, "EBMLMaxIdLength", 4)
+DEFINE_EBML_UINTEGER_DEF(EMaxSizeLength,      0x42F3, 2, EbmlHead, "EBMLMaxSizeLength", 8)
+DEFINE_EBML_STRING_DEF  (EDocType,            0x4282, 2, EbmlHead, "EBMLDocType", "matroska")
+DEFINE_EBML_UINTEGER_DEF(EDocTypeVersion,     0x4287, 2, EbmlHead, "EBMLDocTypeVersion", 1)
+DEFINE_EBML_UINTEGER_DEF(EDocTypeReadVersion, 0x4285, 2, EbmlHead, "EBMLDocTypeReadVersion", 1)
 
 END_LIBEBML_NAMESPACE

makemkv-oss-1.15.1.tar.xz/libebml/src/EbmlUInteger.cpp -> makemkv-oss-1.15.2.tar.xz/libebml/src/EbmlUInteger.cpp Changed

makemkv-oss-1.15.1.tar.xz/libebml/src/EbmlUnicodeString.cpp -> makemkv-oss-1.15.2.tar.xz/libebml/src/EbmlUnicodeString.cpp Changed

@@ -37,51 +37,33 @@
 
 #include <lgpl/cassert>
 
-#if __GNUC__ == 2 && ! defined ( __OpenBSD__ )
-#include <wchar.h>
-#endif
-
 #include "ebml/EbmlUnicodeString.h"
 
+//#include "lib/utf8-cpp/source/utf8/checked.h"
+
 START_LIBEBML_NAMESPACE
 
+#if 0
 // ===================== UTFstring class ===================
 
-static unsigned int UTFCharLength(uint8 lead)
-{
-  if (lead < 0x80)
-    return 1;
-  else if ((lead >> 5) == 0x6)
-    return 2;
-  else if ((lead >> 4) == 0xe)
-    return 3;
-  else if ((lead >> 3) == 0x1e)
-    return 4;
-  else
-    // Invalid size?
-    return 0;
-}
-
 UTFstring::UTFstring()
   :_Length(0)
-  ,_Data(NULL)
+  ,_Data(nullptr)
 {}
 
 UTFstring::UTFstring(const wchar_t * _aBuf)
   :_Length(0)
-  ,_Data(NULL)
+  ,_Data(nullptr)
 {
   *this = _aBuf;
 }
 
-#if 0
 UTFstring::UTFstring(std::wstring const &_aBuf)
   :_Length(0)
-  ,_Data(NULL)
+  ,_Data(nullptr)
 {
   *this = _aBuf.c_str();
 }
-#endif
 
 UTFstring::~UTFstring()
 {
@@ -90,7 +72,7 @@
 
 UTFstring::UTFstring(const UTFstring & _aBuf)
   :_Length(0)
-  ,_Data(NULL)
+  ,_Data(nullptr)
 {
   *this = _aBuf.c_str();
 }
@@ -107,7 +89,7 @@
 UTFstring & UTFstring::operator=(const wchar_t * _aBuf)
 {
   delete [] _Data;
-  if (_aBuf == NULL) {
+  if (_aBuf == nullptr) {
     _Data = new wchar_t[1];
     _Data[0] = 0;
     UpdateFromUCS2();
@@ -139,9 +121,9 @@
 
 bool UTFstring::operator==(const UTFstring& _aStr) const
 {
-  if ((_Data == NULL) && (_aStr._Data == NULL))
+  if ((_Data == nullptr) && (_aStr._Data == nullptr))
     return true;
-  if ((_Data == NULL) || (_aStr._Data == NULL))
+  if ((_Data == nullptr) || (_aStr._Data == nullptr))
     return false;
   return wcscmp_internal(_Data, _aStr._Data);
 }
@@ -157,76 +139,56 @@
 */
 void UTFstring::UpdateFromUTF8()
 {
-  delete [] _Data;
-  // find the size of the final UCS-2 string
-  size_t i;
-  const size_t SrcLength = UTF8string.length();
-  for (_Length=0, i=0; i<SrcLength; _Length++) {
-    const unsigned int CharLength = UTFCharLength(static_cast<uint8>(UTF8string[i]));
-    if ((CharLength >= 1) && (CharLength <= 4))
-      i += CharLength;
+  // Only convert up to the first \0 character if present.
+  std::string::iterator End = UTF8string.end(), Current = UTF8string.begin();
+  while ((Current != End) && *Current)
+    ++Current;
+
+  std::wstring Temp;
+  try {
+    // Even though the function names hint at UCS2, the internal
+    // representation must actually be compatible with the C++
+    // library's implementation. Implementations with sizeof(wchar_t)
+    // == 4 are using UCS4.
+    if (sizeof(wchar_t) == 2)
+      ::utf8::utf8to16(UTF8string.begin(), Current, std::back_inserter(Temp));
     else
-      // Invalid size?
-      break;
+      ::utf8::utf8to32(UTF8string.begin(), Current, std::back_inserter(Temp));
+  } catch (::utf8::invalid_code_point &) {
+  } catch (::utf8::invalid_utf8 &) {
   }
-  _Data = new wchar_t[_Length+1];
-  size_t j;
-  for (j=0, i=0; i<SrcLength; j++) {
-    const uint8 lead              = static_cast<uint8>(UTF8string[i]);
-    const unsigned int CharLength = UTFCharLength(lead);
-    if ((CharLength < 1) || (CharLength > 4))
-      // Invalid char?
-      break;
-
-    if ((i + CharLength) > SrcLength)
-      // Guard against invalid memory access beyond the end of the
-      // source buffer.
-      break;
-
-    if (CharLength == 1)
-      _Data[j] = lead;
-    else if (CharLength == 2)
-      _Data[j] = ((lead & 0x1F) << 6) + (UTF8string[i+1] & 0x3F);
-    else if (CharLength == 3)
-      _Data[j] = ((lead & 0x0F) << 12) + ((UTF8string[i+1] & 0x3F) << 6) + (UTF8string[i+2] & 0x3F);
-    else if (CharLength == 4)
-      _Data[j] = ((lead & 0x07) << 18) + ((UTF8string[i+1] & 0x3F) << 12) + ((UTF8string[i+2] & 0x3F) << 6) + (UTF8string[i+3] & 0x3F);
-
-    i += CharLength;
-  }
-  _Data[j] = 0;
+
+  delete [] _Data;
+  _Length = Temp.length();
+  _Data   = new wchar_t[_Length + 1];
+
+  std::memcpy(_Data, Temp.c_str(), sizeof(wchar_t) * (_Length + 1));
 }
 
 void UTFstring::UpdateFromUCS2()
 {
-  // find the size of the final UTF-8 string
-  size_t i,Size=0;
-  for (i=0; i<_Length; i++) {
-    if (_Data[i] < 0x80) {
-      Size++;
-    } else if (_Data[i] < 0x800) {
-      Size += 2;
-    } else {
-      Size += 3;
-    }
-  }
-  char *tmpStr = new char[Size+1];
-  for (i=0, Size=0; i<_Length; i++) {
-    if (_Data[i] < 0x80) {
-      tmpStr[Size++] = _Data[i];
-    } else if (_Data[i] < 0x800) {
-      tmpStr[Size++] = 0xC0 | (_Data[i] >> 6);
-      tmpStr[Size++] = 0x80 | (_Data[i] & 0x3F);
-    } else {
-      tmpStr[Size++] = 0xE0 | (_Data[i] >> 12);
-      tmpStr[Size++] = 0x80 | ((_Data[i] >> 6) & 0x3F);
-      tmpStr[Size++] = 0x80 | (_Data[i] & 0x3F);
-    }
+  UTF8string.clear();
+
+  if (!_Data)
+    return;
+
+  // Only convert up to the first \0 character if present.
+  size_t Current = 0;
+  while ((Current < _Length) && _Data[Current])
+    ++Current;
+
+  try {
+    // Even though the function is called UCS2, the internal
+    // representation must actually be compatible with the C++
+    // library's implementation. Implementations with sizeof(wchar_t)
+    // == 4 are using UCS4.
+    if (sizeof(wchar_t) == 2)
+      ::utf8::utf16to8(_Data, _Data + Current, std::back_inserter(UTF8string));
+    else
+      ::utf8::utf32to8(_Data, _Data + Current, std::back_inserter(UTF8string));
+  } catch (::utf8::invalid_code_point &) {
+  } catch (::utf8::invalid_utf16 &) {

makemkv-oss-1.15.1.tar.xz/libebml/src/EbmlVersion.cpp -> makemkv-oss-1.15.2.tar.xz/libebml/src/EbmlVersion.cpp Changed

makemkv-oss-1.15.1.tar.xz/libebml/src/EbmlVoid.cpp -> makemkv-oss-1.15.2.tar.xz/libebml/src/EbmlVoid.cpp Changed

makemkv-oss-1.15.1.tar.xz/libebml/src/IOCallback.cpp -> makemkv-oss-1.15.2.tar.xz/libebml/src/IOCallback.cpp Changed

makemkv-oss-1.15.1.tar.xz/libebml/src/MemIOCallback.cpp -> makemkv-oss-1.15.2.tar.xz/libebml/src/MemIOCallback.cpp Changed

@@ -41,8 +41,8 @@
 MemIOCallback::MemIOCallback(uint64 DefaultSize)
 {
   //The default size of the buffer is 128 bytes
-  dataBuffer = (binary *)malloc(DefaultSize);
-  if (dataBuffer == NULL) {
+  dataBuffer = static_cast<binary *>(malloc(DefaultSize));
+  if (dataBuffer == nullptr) {
     mOk = false;
     //std::stringstream Msg;
     //Msg << "Failed to alloc memory block of size ";
@@ -59,13 +59,13 @@
 
 MemIOCallback::~MemIOCallback()
 {
-  if (dataBuffer != NULL)
+  if (dataBuffer != nullptr)
     free(dataBuffer);
 }
 
 uint32 MemIOCallback::read(void *Buffer, size_t Size)
 {
-  if (Buffer == NULL || Size < 1)
+  if (Buffer == nullptr || Size < 1)
     return 0;
   //If the size is larger than than the amount left in the buffer
   if (Size + dataBufferPos > dataBufferTotalSize) {
@@ -97,7 +97,7 @@
 {
   if (dataBufferMemorySize < dataBufferPos + Size) {
     //We need more memory!
-    dataBuffer = (binary *)realloc((void *)dataBuffer, dataBufferPos + Size);
+    dataBuffer = static_cast<binary *>(realloc((void *)dataBuffer, dataBufferPos + Size));
   }
   memcpy(dataBuffer+dataBufferPos, Buffer, Size);
   dataBufferPos += Size;
@@ -112,7 +112,7 @@
 {
   if (dataBufferMemorySize < dataBufferPos + Size) {
     //We need more memory!
-    dataBuffer = (binary *)realloc((void *)dataBuffer, dataBufferPos + Size);
+    dataBuffer = static_cast<binary *>(realloc((void *)dataBuffer, dataBufferPos + Size));
   }
   IOToRead.readFully(&dataBuffer[dataBufferPos], Size);
   dataBufferTotalSize = Size;

makemkv-oss-1.15.1.tar.xz/libebml/src/StdIOCallback.cpp -> makemkv-oss-1.15.2.tar.xz/libebml/src/StdIOCallback.cpp Changed

@@ -62,7 +62,7 @@
 
 StdIOCallback::StdIOCallback(const char*Path, const open_mode aMode)
 {
-  assert(Path!=0);
+  assert(Path!=nullptr);
 
   const char *Mode;
   switch (aMode) {
@@ -83,7 +83,7 @@
   }
 
   File=fopen(Path,Mode);
-  if(File==0) {
+  if(File==nullptr) {
 #if !defined(__GNUC__) || (__GNUC__ > 2)
     stringstream Msg;
     Msg<<"Can't open stdio file \""<<Path<<"\" in mode \""<<Mode<<"\"";
@@ -94,7 +94,7 @@
 }
 
 
-StdIOCallback::~StdIOCallback()throw()
+StdIOCallback::~StdIOCallback() noexcept
 {
   close();
 }
@@ -103,7 +103,7 @@
 
 uint32 StdIOCallback::read(void*Buffer,size_t Size)
 {
-  assert(File!=0);
+  assert(File!=nullptr);
 
   size_t result = fread(Buffer, 1, Size, File);
   mCurrentPosition += result;
@@ -112,7 +112,7 @@
 
 void StdIOCallback::setFilePointer(int64 Offset,seek_mode Mode)
 {
-  assert(File!=0);
+  assert(File!=nullptr);
 
   // There is a numeric cast in the boost library, which would be quite nice for this checking
   /*
@@ -129,7 +129,7 @@
   if(fseek(File,Offset,Mode)!=0) {
 #if !defined(__GNUC__) || (__GNUC__ > 2)
     ostringstream Msg;
-    Msg<<"Failed to seek file "<<File<<" to offset "<<(unsigned long)Offset<<" in mode "<<Mode;
+    Msg<<"Failed to seek file "<<File<<" to offset "<<static_cast<unsigned long>(Offset)<<" in mode "<<Mode;
     throw CRTError(Msg.str());
 #else // GCC2
     mCurrentPosition = ftell(File);
@@ -151,7 +151,7 @@
 
 size_t StdIOCallback::write(const void*Buffer,size_t Size)
 {
-  assert(File!=0);
+  assert(File!=nullptr);
   uint32 Result = fwrite(Buffer,1,Size,File);
   mCurrentPosition += Result;
   return Result;
@@ -159,7 +159,7 @@
 
 uint64 StdIOCallback::getFilePointer()
 {
-  assert(File!=0);
+  assert(File!=nullptr);
 
 #if 0
   long Result=ftell(File);
@@ -177,7 +177,7 @@
 
 void StdIOCallback::close()
 {
-  if(File==0)
+  if(File==nullptr)
     return;
 
   if(fclose(File)!=0) {
@@ -188,7 +188,7 @@
 #endif // GCC2
   }
 
-  File=0;
+  File=nullptr;
 }
 
 END_LIBEBML_NAMESPACE

makemkv-oss-1.15.1.tar.xz/libebml/src/platform/win32/WinIOCallback.cpp -> makemkv-oss-1.15.2.tar.xz/libebml/src/platform/win32/WinIOCallback.cpp Changed

makemkv-oss-1.15.1.tar.xz/libmakemkv/inc/lgpl/stdstring.h -> makemkv-oss-1.15.2.tar.xz/libmakemkv/inc/lgpl/stdstring.h Changed

@@ -31,6 +31,7 @@
     inline const char* c_str() const { return data; }
     inline size_t length() const { return strlen(data); }
     inline bool operator==(const StringPointer& value) const { return(0==strcmp(data,value.data)); }
+    inline bool operator!=(const StringPointer& value) const { return(0!=strcmp(data,value.data)); }
     inline char operator[](size_t pos) const { return data[pos]; }
 };
 
@@ -46,8 +47,8 @@
     public:
         inline string(const StringPointer& value) { data=(char*)value.c_str(); }
     private:
-        inline string();
-        inline string(const char* value);
+        inline string() = delete;
+        inline string(const char* value) = delete;
     };
 };
 
@@ -62,10 +63,13 @@
         inline string() { data=(char*)emptyString; }
         inline string(const char* value) { data=(char*)emptyString; assign(value); }
         inline string(const StringPointer& value) { data=(char*)emptyString; assign(value.c_str()); }
+        inline string(const string& value) { data = (char*)emptyString; assign(value.c_str()); }
+        inline string(string&& value) { data = value.data; value.data = (char*)emptyString; }
         inline ~string() { assign(emptyString); }
     public:
         inline void operator=(const char* value) { assign(value); }
         inline void operator=(const StringPointer& value) { assign(value.c_str()); }
+        inline void operator=(const string& value) { assign(value.c_str()); }
         inline operator ref::string const & () const
         {
             const StringPointer *p=this;

makemkv-oss-1.15.1.tar.xz/libmakemkv/inc/lgpl/stl.h -> makemkv-oss-1.15.2.tar.xz/libmakemkv/inc/lgpl/stl.h Changed

makemkv-oss-1.15.1.tar.xz/libmakemkv/inc/lgpl/world.h -> makemkv-oss-1.15.2.tar.xz/libmakemkv/inc/lgpl/world.h Changed

makemkv-oss-1.15.1.tar.xz/libmakemkv/inc/libmkv/libmkv.h -> makemkv-oss-1.15.2.tar.xz/libmakemkv/inc/libmkv/libmkv.h Changed

makemkv-oss-1.15.1.tar.xz/libmakemkv/src/libmkv.cpp -> makemkv-oss-1.15.2.tar.xz/libmakemkv/src/libmkv.cpp Changed

makemkv-oss-1.15.1.tar.xz/libmatroska/inc/matroska/FileKax.h -> makemkv-oss-1.15.2.tar.xz/libmatroska/inc/matroska/FileKax.h Changed

makemkv-oss-1.15.1.tar.xz/libmatroska/inc/matroska/KaxBlock.h -> makemkv-oss-1.15.2.tar.xz/libmatroska/inc/matroska/KaxBlock.h Changed

@@ -143,7 +143,7 @@
 
 DECLARE_MKX_MASTER(KaxBlockGroup)
   public:
-    ~KaxBlockGroup();
+    ~KaxBlockGroup() = default;
 
     /*!
       \brief Addition of a frame without references
@@ -205,7 +205,7 @@
     const KaxTrackEntry * ParentTrack;
 };
 
-class KaxInternalBlock : public EbmlBinary {
+class MATROSKA_DLL_API KaxInternalBlock : public EbmlBinary {
   public:
     KaxInternalBlock(EBML_DEF_CONS EBML_DEF_SEP bool bSimple EBML_DEF_SEP EBML_EXTRA_PARAM) :EBML_DEF_BINARY_INIT EBML_DEF_SEP bLocalTimecodeUsed(false), mLacing(LACING_AUTO), mInvisible(false)
       ,ParentCluster(NULL), bIsSimple(bSimple), bIsKeyframe(true), bIsDiscardable(false)
@@ -286,15 +286,14 @@
     bool       bIsDiscardable;
 };
 
-DECLARE_MKX_CONTEXT(KaxBlock);
+DECLARE_MKX_CONTEXT(KaxBlock)
 class MATROSKA_DLL_API KaxBlock : public KaxInternalBlock {
   public:
     KaxBlock(EBML_EXTRA_PARAM) :KaxInternalBlock(EBML_DEF_BINARY_CTX(KaxBlock)EBML_DEF_SEP false EBML_DEF_SEP EBML_EXTRA_CALL) {}
         EBML_CONCRETE_CLASS(KaxBlock)
 };
 
-#if MATROSKA_VERSION >= 2
-DECLARE_MKX_CONTEXT(KaxSimpleBlock);
+DECLARE_MKX_CONTEXT(KaxSimpleBlock)
 class MATROSKA_DLL_API KaxSimpleBlock : public KaxInternalBlock {
   public:
     KaxSimpleBlock(EBML_EXTRA_PARAM) :KaxInternalBlock(EBML_DEF_BINARY_CTX(KaxSimpleBlock)EBML_DEF_SEP true EBML_DEF_SEP EBML_EXTRA_CALL) {}
@@ -309,7 +308,6 @@
 
         EBML_CONCRETE_CLASS(KaxSimpleBlock)
 };
-#endif // MATROSKA_VERSION
 
 /// Placeholder class for either a BlockGroup or a SimpleBlock
 class MATROSKA_DLL_API KaxBlockBlob {
@@ -320,19 +318,15 @@
   }
 
   ~KaxBlockBlob() {
-#if MATROSKA_VERSION >= 2
     if (bUseSimpleBlock)
       delete Block.simpleblock;
     else
-#endif // MATROSKA_VERSION
       delete Block.group;
   }
 
   operator KaxBlockGroup &();
   operator const KaxBlockGroup &() const;
-#if MATROSKA_VERSION >= 2
   operator KaxSimpleBlock &();
-#endif
   operator KaxInternalBlock &();
   operator const KaxInternalBlock &() const;
 
@@ -350,15 +344,12 @@
   KaxCluster * ParentCluster;
   union {
     KaxBlockGroup *group;
-#if MATROSKA_VERSION >= 2
     KaxSimpleBlock *simpleblock;
-#endif // MATROSKA_VERSION
   } Block;
   bool bUseSimpleBlock;
   BlockBlobType SimpleBlockMode;
 };
 
-#if MATROSKA_VERSION >= 2
 DECLARE_MKX_BINARY_CONS(KaxBlockVirtual)
   public:
     ~KaxBlockVirtual();
@@ -381,7 +372,6 @@
 
     const KaxCluster * ParentCluster;
 };
-#endif // MATROSKA_VERSION
 
 END_LIBMATROSKA_NAMESPACE

makemkv-oss-1.15.1.tar.xz/libmatroska/inc/matroska/KaxConfig.h -> makemkv-oss-1.15.2.tar.xz/libmatroska/inc/matroska/KaxConfig.h Changed

@@ -41,30 +41,19 @@
 # define END_LIBMATROSKA_NAMESPACE
 #else // NO_NAMESPACE
 # define START_LIBMATROSKA_NAMESPACE namespace LIBMATROSKA_NAMESPACE {
-# define END_LIBMATROSKA_NAMESPACE   };
+# define END_LIBMATROSKA_NAMESPACE   }
 #endif // NO_NAMESPACE
 
-// There are special implementations for certain platforms. For example on Windows
-// we use the Win32 file API. here we set the appropriate macros.
-#if defined(_WIN32)||defined(WIN32)
-
-# if defined(MATROSKA_DLL)
-#  if defined(MATROSKA_DLL_EXPORT)
-#   define MATROSKA_DLL_API __declspec(dllexport)
-#  else // MATROSKA_DLL_EXPORT
-#   define MATROSKA_DLL_API __declspec(dllimport)
-#  endif // MATROSKA_DLL_EXPORT
-# else // MATROSKA_DLL
-#  define MATROSKA_DLL_API
-# endif // MATROSKA_DLL
-
-#else
-# define MATROSKA_DLL_API
-#endif
+//#include "matroska_export.h"
+#define MATROSKA_DLL_API
 
 #if !defined(MATROSKA_VERSION)
 #define MATROSKA_VERSION  2
 #endif // MATROSKA_VERSION
 
+#if defined(MATROSKA_VERSION) && MATROSKA_VERSION < 2
+#error MATROSKA_VERSION <= 2 no longer supported, update your code accordingly
+#endif // MATROSKA_VERSION
+
 
 #endif // LIBMATROSKA_CONFIG_H

makemkv-oss-1.15.1.tar.xz/libmatroska/inc/matroska/KaxCuesData.h -> makemkv-oss-1.15.2.tar.xz/libmatroska/inc/matroska/KaxCuesData.h Changed

makemkv-oss-1.15.1.tar.xz/libmatroska/inc/matroska/KaxInfoData.h -> makemkv-oss-1.15.2.tar.xz/libmatroska/inc/matroska/KaxInfoData.h Changed

makemkv-oss-1.15.1.tar.xz/libmatroska/inc/matroska/KaxSemantic.h -> makemkv-oss-1.15.2.tar.xz/libmatroska/inc/matroska/KaxSemantic.h Changed

@@ -88,9 +88,13 @@
 
 
 DECLARE_MKX_UINTEGER(KaxChapterTranslateEditionUID)
+public:
+  filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
 };
 
 DECLARE_MKX_UINTEGER(KaxChapterTranslateCodec)
+public:
+  filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
 };
 
 DECLARE_MKX_BINARY (KaxChapterTranslateID)
@@ -150,7 +154,6 @@
 DECLARE_MKX_UINTEGER(KaxReferencePriority)
 };
 
-#if MATROSKA_VERSION >= 2
 DECLARE_MKX_SINTEGER(KaxReferenceVirtual)
 public:
   filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
@@ -161,20 +164,22 @@
 
 DECLARE_MKX_SINTEGER(KaxDiscardPadding)
 };
-#endif
 
 DECLARE_MKX_MASTER(KaxSlices)
 };
 
 
 DECLARE_MKX_MASTER(KaxTimeSlice)
+public:
+  filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
 };
 
 
 DECLARE_MKX_UINTEGER(KaxSliceLaceNumber)
+public:
+  filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
 };
 
-#if MATROSKA_VERSION >= 2
 DECLARE_MKX_UINTEGER(KaxSliceFrameNumber)
 public:
   filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
@@ -210,8 +215,6 @@
   filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
 };
 
-#endif
-
 DECLARE_MKX_MASTER(KaxTracks)
 };
 
@@ -225,10 +228,8 @@
 DECLARE_MKX_UINTEGER(KaxTrackType)
 };
 
-#if MATROSKA_VERSION >= 2
 DECLARE_MKX_UINTEGER(KaxTrackFlagEnabled)
 };
-#endif
 
 DECLARE_MKX_UINTEGER(KaxTrackFlagDefault)
 };
@@ -248,36 +249,43 @@
 DECLARE_MKX_UINTEGER(KaxTrackDefaultDuration)
 };
 
-#if MATROSKA_VERSION >= 2
 DECLARE_MKX_UINTEGER(KaxTrackDefaultDecodedFieldDuration)
 };
-#endif
 
 DECLARE_MKX_FLOAT(KaxTrackTimecodeScale)
-public:
-  filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
 };
 
-#if MATROSKA_VERSION >= 2
 DECLARE_MKX_SINTEGER(KaxTrackOffset)
 public:
   filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
 };
-#endif
 
 DECLARE_MKX_UINTEGER(KaxMaxBlockAdditionID)
 };
 
+DECLARE_MKX_MASTER(KaxBlockAdditionMapping)
+};
+
+DECLARE_MKX_UINTEGER(KaxBlockAddIDValue)
+};
+
+DECLARE_MKX_STRING(KaxBlockAddIDName)
+};
+
+DECLARE_MKX_UINTEGER(KaxBlockAddIDType)
+};
+
+DECLARE_MKX_BINARY (KaxBlockAddIDExtraData)
+};
+
 DECLARE_MKX_UNISTRING(KaxTrackName)
 };
 
 DECLARE_MKX_STRING(KaxTrackLanguage)
 };
 
-#if MATROSKA_VERSION >= 2
 DECLARE_MKX_STRING(KaxLanguageIETF)
 };
-#endif
 
 DECLARE_MKX_STRING(KaxCodecID)
 };
@@ -289,9 +297,10 @@
 };
 
 DECLARE_MKX_UINTEGER(KaxTrackAttachmentLink)
+public:
+  filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
 };
 
-#if MATROSKA_VERSION >= 2
 DECLARE_MKX_UNISTRING(KaxCodecSettings)
 public:
   filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
@@ -309,18 +318,15 @@
 
 DECLARE_MKX_UINTEGER(KaxCodecDecodeAll)
 };
-#endif
 
 DECLARE_MKX_UINTEGER(KaxTrackOverlay)
 };
 
-#if MATROSKA_VERSION >= 2
 DECLARE_MKX_UINTEGER(KaxCodecDelay)
 };
 
 DECLARE_MKX_UINTEGER(KaxSeekPreRoll)
 };
-#endif
 
 DECLARE_MKX_MASTER(KaxTrackTranslate)
 };
@@ -339,7 +345,6 @@
 };
 
 
-#if MATROSKA_VERSION >= 2
 DECLARE_MKX_UINTEGER(KaxVideoFlagInterlaced)
 };
 
@@ -356,7 +361,6 @@
 public:
   filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
 };
-#endif
 
 DECLARE_MKX_UINTEGER(KaxVideoPixelWidth)
 };
@@ -393,7 +397,6 @@
   virtual bool ValidateSize() const {return IsFiniteSize() && GetSize() == 4;}
 };
 
-#if MATROSKA_VERSION >= 2
 DECLARE_MKX_FLOAT(KaxVideoGamma)
 public:
   filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
@@ -500,7 +503,6 @@
 DECLARE_MKX_FLOAT(KaxVideoProjectionPoseRoll)
 };
 
-#endif
 
 DECLARE_MKX_MASTER(KaxTrackAudio)
 };
@@ -515,17 +517,14 @@
 DECLARE_MKX_UINTEGER(KaxAudioChannels)
 };
 
-#if MATROSKA_VERSION >= 2
 DECLARE_MKX_BINARY (KaxAudioPosition)
 public:
   filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
 };
-#endif
 
 DECLARE_MKX_UINTEGER(KaxAudioBitDepth)
 };
 
-#if MATROSKA_VERSION >= 2
 DECLARE_MKX_MASTER(KaxTrackOperation)
 };

makemkv-oss-1.15.1.tar.xz/libmatroska/inc/matroska/KaxVersion.h -> makemkv-oss-1.15.2.tar.xz/libmatroska/inc/matroska/KaxVersion.h Changed

makemkv-oss-1.15.1.tar.xz/libmatroska/src/FileKax.cpp -> makemkv-oss-1.15.2.tar.xz/libmatroska/src/FileKax.cpp Changed

makemkv-oss-1.15.1.tar.xz/libmatroska/src/KaxBlock.cpp -> makemkv-oss-1.15.2.tar.xz/libmatroska/src/KaxBlock.cpp Changed

@@ -51,19 +51,19 @@
 
 DataBuffer * DataBuffer::Clone()
 {
-  binary *ClonedData = (binary *)malloc(mySize * sizeof(binary));
-  assert(ClonedData != NULL);
+  auto ClonedData = static_cast<binary *>(malloc(mySize * sizeof(binary)));
+  assert(ClonedData != nullptr);
   memcpy(ClonedData, myBuffer ,mySize );
 
-  SimpleDataBuffer * result = new SimpleDataBuffer(ClonedData, mySize, 0);
+  auto result = new SimpleDataBuffer(ClonedData, mySize, 0);
   result->bValidValue = bValidValue;
   return result;
 }
 
 SimpleDataBuffer::SimpleDataBuffer(const SimpleDataBuffer & ToClone)
-  :DataBuffer((binary *)malloc(ToClone.mySize * sizeof(binary)), ToClone.mySize, myFreeBuffer)
+  :DataBuffer(static_cast<binary *>(malloc(ToClone.mySize * sizeof(binary))), ToClone.mySize, myFreeBuffer)
 {
-  assert(myBuffer != NULL);
+  assert(myBuffer != nullptr);
   memcpy(myBuffer, ToClone.myBuffer ,mySize );
   bValidValue = ToClone.bValidValue;
 }
@@ -88,8 +88,8 @@
   ,ParentCluster(ElementToClone.ParentCluster) ///< \todo not exactly
 {
   // add a clone of the list
-  std::vector<DataBuffer *>::const_iterator Itr = ElementToClone.myBuffers.begin();
-  std::vector<DataBuffer *>::iterator myItr = myBuffers.begin();
+  auto Itr = ElementToClone.myBuffers.begin();
+  auto myItr = myBuffers.begin();
   while (Itr != ElementToClone.myBuffers.end()) {
     *myItr = (*Itr)->Clone();
     ++Itr; ++myItr;
@@ -97,15 +97,15 @@
 }
 
 
-KaxBlockGroup::~KaxBlockGroup()
+/* KaxBlockGroup::~KaxBlockGroup()
 {
   //NOTE("KaxBlockGroup::~KaxBlockGroup");
-}
+} */
 
 KaxBlockGroup::KaxBlockGroup(EBML_EXTRA_DEF)
   :EbmlMaster(EBML_CLASS_SEMCONTEXT(KaxBlockGroup) EBML_DEF_SEP EBML_EXTRA_CALL)
-  ,ParentCluster(NULL)
-  ,ParentTrack(NULL)
+  ,ParentCluster(nullptr)
+  ,ParentTrack(nullptr)
 {}
 
 /*!
@@ -116,7 +116,7 @@
 bool KaxInternalBlock::AddFrame(const KaxTrackEntry & track, uint64 timecode, DataBuffer & buffer, LacingType lacing, bool invisible)
 {
   SetValueIsSet();
-  if (myBuffers.size() == 0) {
+  if (myBuffers.empty()) {
     // first frame
     Timecode = timecode;
     TrackNumber = track.TrackNumber();
@@ -134,8 +134,8 @@
     // a frame in a lace is not efficient when the place necessary to code it in a lace is bigger
     // than the size of a simple Block. That means more than 6 bytes (4 in struct + 2 for EBML) to code the size
     return (buffer.Size() < 6*0xFF);
-  else
-    return true;
+
+  return true;
 }
 
 /*!
@@ -150,26 +150,26 @@
 
   XiphLacingSize = 1; // Number of laces is stored in 1 byte.
   EbmlLacingSize = 1;
-  for (i = 0; i < (int)myBuffers.size() - 1; i++) {
+  for (i = 0; i < static_cast<int>(myBuffers.size()) - 1; i++) {
     if (myBuffers[i]->Size() != myBuffers[i + 1]->Size())
       SameSize = false;
     XiphLacingSize += myBuffers[i]->Size() / 255 + 1;
   }
   EbmlLacingSize += CodedSizeLength(myBuffers[0]->Size(), 0, IsFiniteSize());
-  for (i = 1; i < (int)myBuffers.size() - 1; i++)
+  for (i = 1; i < static_cast<int>(myBuffers.size()) - 1; i++)
     EbmlLacingSize += CodedSizeLengthSigned(int64(myBuffers[i]->Size()) - int64(myBuffers[i - 1]->Size()), 0);
   if (SameSize)
     return LACING_FIXED;
-  else if (XiphLacingSize < EbmlLacingSize)
+  if (XiphLacingSize < EbmlLacingSize)
     return LACING_XIPH;
-  else
-    return LACING_EBML;
+
+  return LACING_EBML;
 }
 
 filepos_t KaxInternalBlock::UpdateSize(bool /* bSaveDefault */, bool /* bForceRender */)
 {
   LacingType LacingHere;
-  assert(EbmlBinary::GetBuffer() == NULL); // Data is not used for KaxInternalBlock
+  assert(EbmlBinary::GetBuffer() == nullptr); // Data is not used for KaxInternalBlock
   assert(TrackNumber < 0x4000); // no more allowed for the moment
   unsigned int i;
 
@@ -219,7 +219,6 @@
   return GetSize();
 }
 
-#if MATROSKA_VERSION >= 2
 KaxBlockVirtual::KaxBlockVirtual(const KaxBlockVirtual & ElementToClone)
   :EbmlBinary(ElementToClone)
   ,Timecode(ElementToClone.Timecode)
@@ -231,7 +230,7 @@
 }
 
 KaxBlockVirtual::KaxBlockVirtual(EBML_EXTRA_DEF)
-  :EBML_DEF_BINARY(KaxBlockVirtual)EBML_DEF_SEP ParentCluster(NULL)
+  :EBML_DEF_BINARY(KaxBlockVirtual)EBML_DEF_SEP ParentCluster(nullptr)
 {
   SetBuffer(DataBlock,sizeof(DataBlock));
   SetValueIsSet(false);
@@ -240,7 +239,7 @@
 KaxBlockVirtual::~KaxBlockVirtual()
 {
   if(GetBuffer() == DataBlock)
-    SetBuffer( NULL, 0 );
+    SetBuffer( nullptr, 0 );
 }
 
 filepos_t KaxBlockVirtual::UpdateSize(bool /* bSaveDefault */, bool /* bForceRender */)
@@ -257,7 +256,7 @@
     *cursor++ = TrackNumber & 0xFF;
   }
 
-  assert(ParentCluster != NULL);
+  assert(ParentCluster != nullptr);
   int16 ActualTimecode = ParentCluster->GetBlockLocalTimecode(Timecode);
   big_int16 b16(ActualTimecode);
   b16.Fill(cursor);
@@ -267,7 +266,6 @@
 
   return GetSize();
 }
-#endif // MATROSKA_VERSION
 
 /*!
   \todo more optimisation is possible (render the Block head and don't copy the buffer in memory, care should be taken with the allocation of Data)
@@ -275,7 +273,7 @@
 */
 filepos_t KaxInternalBlock::RenderData(IOCallback & output, bool /* bForceRender */, bool /* bSaveDefault */)
 {
-  if (myBuffers.size() == 0) {
+  if (myBuffers.empty()) {
     return 0;
   } else {
     assert(TrackNumber < 0x4000);
@@ -301,7 +299,7 @@
       *cursor++ = TrackNumber & 0xFF;
     }
 
-    assert(ParentCluster != NULL);
+    assert(ParentCluster != nullptr);
     int16 ActualTimecode = ParentCluster->GetBlockLocalTimecode(Timecode);
     big_int16 b16(ActualTimecode);
     b16.Fill(cursor);
@@ -341,7 +339,7 @@
         assert(0);
     }
 
-    output.writeFully(BlockHead, 4 + ((TrackNumber > 0x80) ? 1 : 0));
+    output.writeFully(BlockHead, 4 + ((TrackNumber >= 0x80) ? 1 : 0));
 
     binary tmpValue;
     switch (mLacing) {
@@ -439,7 +437,7 @@
 
   big_int16 b16;
   b16.Eval(cursor);
-  assert(ParentCluster != NULL);
+  assert(ParentCluster != nullptr);
   Timecode = ParentCluster->GetBlockGlobalTimecode(int16(b16));
   bLocalTimecodeUsed = false;
   cursor += 2;
@@ -498,7 +496,7 @@
       // put all Frames in the list
       if (mLacing == LACING_NONE) {
         FirstFrameLocation += Mem.GetPosition();
-        DataBuffer * soloFrame = new DataBuffer(BufferStart + Mem.GetPosition(), GetSize() - BlockHeadSize);
+        auto soloFrame = new DataBuffer(BufferStart + Mem.GetPosition(), GetSize() - BlockHeadSize);
         myBuffers.push_back(soloFrame);
         SizeList.resize(1);
         SizeList[0] = GetSize() - BlockHeadSize;
@@ -565,7 +563,7 @@
         FirstFrameLocation += Mem.GetPosition();

makemkv-oss-1.15.1.tar.xz/libmatroska/src/KaxBlockData.cpp -> makemkv-oss-1.15.2.tar.xz/libmatroska/src/KaxBlockData.cpp Changed

@@ -44,14 +44,14 @@
 
 const KaxBlockBlob & KaxReferenceBlock::RefBlock() const
 {
-  assert(RefdBlock != NULL);
+  assert(RefdBlock != nullptr);
   return *RefdBlock;
 }
 
 KaxReferenceBlock::KaxReferenceBlock(EBML_EXTRA_DEF)
   :EBML_DEF_SINTEGER(KaxReferenceBlock)EBML_DEF_SEP
-  RefdBlock(NULL)
-  ,ParentBlock(NULL)
+  RefdBlock(nullptr)
+  ,ParentBlock(nullptr)
   ,bTimecodeSet(false)
   ,bOurBlob(false)
 {
@@ -60,8 +60,8 @@
 
 KaxReferenceBlock::KaxReferenceBlock(const KaxReferenceBlock & ElementToClone)
   :EbmlSInteger(ElementToClone)
-  ,RefdBlock(NULL)
-  ,ParentBlock(NULL)
+  ,RefdBlock(nullptr)
+  ,ParentBlock(nullptr)
   ,bTimecodeSet(ElementToClone.bTimecodeSet)
   ,bOurBlob(false)
 {
@@ -74,16 +74,16 @@
 
 void KaxReferenceBlock::FreeBlob()
 {
-  if (bOurBlob && RefdBlock!=NULL)
+  if (bOurBlob && RefdBlock!=nullptr)
     delete RefdBlock;
-  RefdBlock = NULL;
+  RefdBlock = nullptr;
 }
 
 filepos_t KaxReferenceBlock::UpdateSize(bool bSaveDefault, bool bForceRender)
 {
   if (!bTimecodeSet) {
-    assert(RefdBlock != NULL);
-    assert(ParentBlock != NULL);
+    assert(RefdBlock != nullptr);
+    assert(ParentBlock != nullptr);
 
     const KaxInternalBlock &block = *RefdBlock;
     *static_cast<EbmlSInteger*>(this) = (int64(block.GlobalTimecode()) - int64(ParentBlock->GlobalTimecode())) / int64(ParentBlock->GlobalTimecodeScale());
@@ -93,8 +93,8 @@
 
 void KaxReferenceBlock::SetReferencedBlock(const KaxBlockBlob * aRefdBlock)
 {
-  assert(RefdBlock == NULL);
-  assert(aRefdBlock != NULL);
+  assert(RefdBlock == nullptr);
+  assert(aRefdBlock != nullptr);
   FreeBlob();
   RefdBlock = aRefdBlock;
   bOurBlob = true;
@@ -104,7 +104,7 @@
 void KaxReferenceBlock::SetReferencedBlock(const KaxBlockGroup & aRefdBlock)
 {
   FreeBlob();
-  KaxBlockBlob *block_blob = new KaxBlockBlob(BLOCK_BLOB_NO_SIMPLE);
+  auto block_blob = new KaxBlockBlob(BLOCK_BLOB_NO_SIMPLE);
   block_blob->SetBlockGroup(*const_cast<KaxBlockGroup*>(&aRefdBlock));
   RefdBlock = block_blob;
   bOurBlob = true;

makemkv-oss-1.15.1.tar.xz/libmatroska/src/KaxCluster.cpp -> makemkv-oss-1.15.2.tar.xz/libmatroska/src/KaxCluster.cpp Changed

@@ -41,8 +41,8 @@
 
 KaxCluster::KaxCluster(EBML_EXTRA_DEF)
   :EbmlMaster(EBML_CLASS_SEMCONTEXT(KaxCluster) EBML_DEF_SEP EBML_EXTRA_CALL)
-  ,currentNewBlock(NULL)
-  ,ParentSegment(NULL)
+  ,currentNewBlock(nullptr)
+  ,ParentSegment(nullptr)
   ,bFirstFrameInside(false)
   ,bPreviousTimecodeIsSet(false)
   ,bTimecodeScaleIsSet(false)
@@ -54,16 +54,14 @@
   ,bSilentTracksUsed(ElementToClone.bSilentTracksUsed)
 {
   // update the parent of each children
-  EBML_MASTER_ITERATOR Itr = begin();
+  auto Itr = begin();
   while (Itr != end()) {
     if (EbmlId(**Itr) == EBML_ID(KaxBlockGroup)) {
       static_cast<KaxBlockGroup   *>(*Itr)->SetParent(*this);
     } else if (EbmlId(**Itr) == EBML_ID(KaxBlock)) {
       static_cast<KaxBlock        *>(*Itr)->SetParent(*this);
-#if MATROSKA_VERSION >= 2
     } else if (EbmlId(**Itr) == EBML_ID(KaxBlockVirtual)) {
       static_cast<KaxBlockVirtual *>(*Itr)->SetParent(*this);
-#endif // MATROSKA_VERSION
     }
     ++Itr;
   }
@@ -87,62 +85,60 @@
       MaxTimecode = timecode;
   }
 
-  MyNewBlock = NULL;
+  MyNewBlock = nullptr;
 
   if (lacing == LACING_NONE || !track.LacingEnabled()) {
-    currentNewBlock = NULL;
+    currentNewBlock = nullptr;
   }
 
   // force creation of a new block
-  if (currentNewBlock == NULL || uint32(track.TrackNumber()) != uint32(currentNewBlock->TrackNumber()) || PastBlock != NULL || ForwBlock != NULL) {
+  if (currentNewBlock == nullptr || uint32(track.TrackNumber()) != uint32(currentNewBlock->TrackNumber()) || PastBlock != nullptr || ForwBlock != nullptr) {
     KaxBlockGroup & aNewBlock = GetNewBlock();
     MyNewBlock = currentNewBlock = &aNewBlock;
   }
 
-  if (PastBlock != NULL) {
-    if (ForwBlock != NULL) {
+  if (PastBlock != nullptr) {
+    if (ForwBlock != nullptr) {
       if (currentNewBlock->AddFrame(track, timecode, buffer, *PastBlock, *ForwBlock, lacing)) {
         // more data are allowed in this Block
         return true;
-      } else {
-        currentNewBlock = NULL;
-        return false;
       }
-    } else {
-      if (currentNewBlock->AddFrame(track, timecode, buffer, *PastBlock, lacing)) {
+
+      currentNewBlock = nullptr;
+      return false;
+    }
+    if (currentNewBlock->AddFrame(track, timecode, buffer, *PastBlock, lacing)) {
         // more data are allowed in this Block
         return true;
-      } else {
-        currentNewBlock = NULL;
-        return false;
       }
-    }
-  } else {
-    if (currentNewBlock->AddFrame(track, timecode, buffer, lacing)) {
-      // more data are allowed in this Block
-      return true;
-    } else {
-      currentNewBlock = NULL;
-      return false;
-    }
+    currentNewBlock = nullptr;
+    return false;
   }
+
+  if (currentNewBlock->AddFrame(track, timecode, buffer, lacing)) {
+    // more data are allowed in this Block
+    return true;
+  }
+
+  currentNewBlock = nullptr;
+  return false;
 }
 
 bool KaxCluster::AddFrame(const KaxTrackEntry & track, uint64 timecode, DataBuffer & buffer, KaxBlockGroup * & MyNewBlock, LacingType lacing)
 {
-  assert(Blobs.size() == 0); // mutually exclusive for the moment
-  return AddFrameInternal(track, timecode, buffer, MyNewBlock, NULL, NULL, lacing);
+  assert(Blobs.empty()); // mutually exclusive for the moment
+  return AddFrameInternal(track, timecode, buffer, MyNewBlock, nullptr, nullptr, lacing);
 }
 
 bool KaxCluster::AddFrame(const KaxTrackEntry & track, uint64 timecode, DataBuffer & buffer, KaxBlockGroup * & MyNewBlock, const KaxBlockGroup & PastBlock, LacingType lacing)
 {
-  assert(Blobs.size() == 0); // mutually exclusive for the moment
-  return AddFrameInternal(track, timecode, buffer, MyNewBlock, &PastBlock, NULL, lacing);
+  assert(Blobs.empty()); // mutually exclusive for the moment
+  return AddFrameInternal(track, timecode, buffer, MyNewBlock, &PastBlock, nullptr, lacing);
 }
 
 bool KaxCluster::AddFrame(const KaxTrackEntry & track, uint64 timecode, DataBuffer & buffer, KaxBlockGroup * & MyNewBlock, const KaxBlockGroup & PastBlock, const KaxBlockGroup & ForwBlock, LacingType lacing)
 {
-  assert(Blobs.size() == 0); // mutually exclusive for the moment
+  assert(Blobs.empty()); // mutually exclusive for the moment
   return AddFrameInternal(track, timecode, buffer, MyNewBlock, &PastBlock, &ForwBlock, lacing);
 }
 
@@ -156,10 +152,10 @@
   EBML_MASTER_ITERATOR TrkItr, Itr;
 
   // update the Timecode of the Cluster before writing
-  KaxClusterTimecode * Timecode = static_cast<KaxClusterTimecode *>(this->FindElt(EBML_INFO(KaxClusterTimecode)));
+  auto Timecode = static_cast<KaxClusterTimecode *>(this->FindElt(EBML_INFO(KaxClusterTimecode)));
   *static_cast<EbmlUInteger *>(Timecode) = GlobalTimecode() / GlobalTimecodeScale();
 
-  if (Blobs.size() == 0) {
+  if (Blobs.empty()) {
     // old-school direct KaxBlockGroup
 
     // SilentTracks handling
@@ -179,9 +175,9 @@
           }
           // the track wasn't found in this cluster
           if (Itr == end()) {
-            KaxClusterSilentTracks * SilentTracks = static_cast<KaxClusterSilentTracks *>(this->FindFirstElt(EBML_INFO(KaxClusterSilentTracks)));
-            assert(SilentTracks != NULL); // the flag bSilentTracksUsed should be set when creating the Cluster
-            KaxClusterSilentTrackNumber * trackelt = static_cast<KaxClusterSilentTrackNumber *>(SilentTracks->AddNewElt(EBML_INFO(KaxClusterSilentTrackNumber)));
+            auto SilentTracks = static_cast<KaxClusterSilentTracks *>(this->FindFirstElt(EBML_INFO(KaxClusterSilentTracks)));
+            assert(SilentTracks != nullptr); // the flag bSilentTracksUsed should be set when creating the Cluster
+            auto trackelt = static_cast<KaxClusterSilentTrackNumber *>(SilentTracks->AddNewElt(EBML_INFO(KaxClusterSilentTrackNumber)));
             *static_cast<EbmlUInteger *>(trackelt) = tracknum;
           }
         }
@@ -199,11 +195,9 @@
   } else {
     // new school, using KaxBlockBlob
     for (Index = 0; Index<Blobs.size(); Index++) {
-#if MATROSKA_VERSION >= 2
       if (Blobs[Index]->IsSimpleBlock())
         PushElement( (KaxSimpleBlock&) *Blobs[Index] );
       else
-#endif
         PushElement( (KaxBlockGroup&) *Blobs[Index] );
     }
 
@@ -221,9 +215,9 @@
           }
           // the track wasn't found in this cluster
           if (Index == ListSize()) {
-            KaxClusterSilentTracks * SilentTracks = static_cast<KaxClusterSilentTracks *>(this->FindFirstElt(EBML_INFO(KaxClusterSilentTracks)));
-            assert(SilentTracks != NULL); // the flag bSilentTracksUsed should be set when creating the Cluster
-            KaxClusterSilentTrackNumber * trackelt = static_cast<KaxClusterSilentTrackNumber *>(SilentTracks->AddNewElt(EBML_INFO(KaxClusterSilentTrackNumber)));
+            auto SilentTracks = static_cast<KaxClusterSilentTracks *>(this->FindFirstElt(EBML_INFO(KaxClusterSilentTracks)));
+            assert(SilentTracks != nullptr); // the flag bSilentTracksUsed should be set when creating the Cluster
+            auto trackelt = static_cast<KaxClusterSilentTrackNumber *>(SilentTracks->AddNewElt(EBML_INFO(KaxClusterSilentTrackNumber)));
             *static_cast<EbmlUInteger *>(trackelt) = tracknum;
           }
         }
@@ -268,21 +262,21 @@
   return int16(TimecodeDelay);
 }
 
-uint64 KaxCluster::GetBlockGlobalTimecode(int16 GlobalSavedTimecode)
+uint64 KaxCluster::GetBlockGlobalTimecode(int16 LocalTimecode)
 {
   if (!bFirstFrameInside) {
-    KaxClusterTimecode * Timecode = static_cast<KaxClusterTimecode *>(this->FindElt(EBML_INFO(KaxClusterTimecode)));
+    auto Timecode = static_cast<KaxClusterTimecode *>(this->FindElt(EBML_INFO(KaxClusterTimecode)));
     assert (bFirstFrameInside); // use the InitTimecode() hack for now
     MinTimecode = MaxTimecode = PreviousTimecode = *static_cast<EbmlUInteger *>(Timecode);
     bFirstFrameInside = true;
     bPreviousTimecodeIsSet = true;
   }
-  return int64(GlobalSavedTimecode * GlobalTimecodeScale()) + GlobalTimecode();
+  return int64(LocalTimecode * GlobalTimecodeScale()) + GlobalTimecode();
 }
 
 KaxBlockGroup & KaxCluster::GetNewBlock()
 {
-  KaxBlockGroup & MyBlock = AddNewChild<KaxBlockGroup>(*this);
+  auto & MyBlock = AddNewChild<KaxBlockGroup>(*this);
   MyBlock.SetParent(*this);
   return MyBlock;
 }
@@ -299,7 +293,7 @@
 
 uint64 KaxCluster::GetPosition() const
 {
-  assert(ParentSegment != NULL);
+  assert(ParentSegment != nullptr);

makemkv-oss-1.15.1.tar.xz/libmatroska/src/KaxCues.cpp -> makemkv-oss-1.15.2.tar.xz/libmatroska/src/KaxCues.cpp Changed

@@ -44,7 +44,7 @@
 
 KaxCues::~KaxCues()
 {
-  assert(myTempReferences.size() == 0); // otherwise that means you have added references and forgot to set the position
+  assert(myTempReferences.empty()); // otherwise that means you have added references and forgot to set the position
 }
 /* deprecated and wrong
 bool KaxCues::AddBlockGroup(const KaxBlockGroup & BlockRef)
@@ -67,11 +67,11 @@
 bool KaxCues::AddBlockBlob(const KaxBlockBlob & BlockReference)
 {
   // Do not add the element if it's already present.
-  std::vector<const KaxBlockBlob *>::iterator ListIdx;
-
-  for (ListIdx = myTempReferences.begin(); ListIdx != myTempReferences.end(); ++ListIdx)
-    if (*ListIdx == &BlockReference)
-      return true;
+  bool present = std::any_of(myTempReferences.begin(), myTempReferences.end(),
+    [&](const KaxBlockBlob *myTempReference) { return myTempReference == &BlockReference; });
+  if (present) {
+    return true;
+  }
 
   myTempReferences.push_back(&BlockReference);
   return true;
@@ -80,34 +80,31 @@
 void KaxCues::PositionSet(const KaxBlockBlob & BlockReference)
 {
   // look for the element in the temporary references
-  std::vector<const KaxBlockBlob *>::iterator ListIdx;
-
-  for (ListIdx = myTempReferences.begin(); ListIdx != myTempReferences.end(); ++ListIdx) {
-    if (*ListIdx == &BlockReference) {
-      // found, now add the element to the entry list
-      KaxCuePoint & NewPoint = AddNewChild<KaxCuePoint>(*this);
-      NewPoint.PositionSet(BlockReference, GlobalTimecodeScale());
-      myTempReferences.erase(ListIdx);
-      break;
-    }
+  auto it = std::find_if(myTempReferences.begin(), myTempReferences.end(),
+    [&](const KaxBlockBlob *myTempReference){ return myTempReference == &BlockReference; });
+
+  if (it != myTempReferences.end()) {
+    // found, now add the element to the entry list
+    auto & NewPoint = AddNewChild<KaxCuePoint>(*this);
+    NewPoint.PositionSet(BlockReference, GlobalTimecodeScale());
+    myTempReferences.erase(it);
   }
 }
 
 void KaxCues::PositionSet(const KaxBlockGroup & BlockRef)
 {
   // look for the element in the temporary references
-  std::vector<const KaxBlockBlob *>::iterator ListIdx;
-
-  for (ListIdx = myTempReferences.begin(); ListIdx != myTempReferences.end(); ++ListIdx) {
-    const KaxInternalBlock &refTmp = **ListIdx;
-    if (refTmp.GlobalTimecode() == BlockRef.GlobalTimecode() &&
-        refTmp.TrackNum() == BlockRef.TrackNumber()) {
-      // found, now add the element to the entry list
-      KaxCuePoint & NewPoint = AddNewChild<KaxCuePoint>(*this);
-      NewPoint.PositionSet(**ListIdx, GlobalTimecodeScale());
-      myTempReferences.erase(ListIdx);
-      break;
-    }
+  auto it = std::find_if(myTempReferences.begin(), myTempReferences.end(),
+    [&](const KaxBlockBlob *myTempReference)
+      { const KaxInternalBlock &refTmp = *myTempReference;
+        return refTmp.GlobalTimecode() == BlockRef.GlobalTimecode()
+            && refTmp.TrackNum() == BlockRef.TrackNumber(); });
+
+  if(it != myTempReferences.end()) {
+    // found, now add the element to the entry list
+    auto & NewPoint = AddNewChild<KaxCuePoint>(*this);
+    NewPoint.PositionSet(**it, GlobalTimecodeScale());
+    myTempReferences.erase(it);
   }
 }
 
@@ -117,18 +114,18 @@
 const KaxCuePoint * KaxCues::GetTimecodePoint(uint64 aTimecode) const
 {
   uint64 TimecodeToLocate = aTimecode / GlobalTimecodeScale();
-  const KaxCuePoint * aPointPrev = NULL;
+  const KaxCuePoint * aPointPrev = nullptr;
   uint64 aPrevTime = 0;
   uint64 aNextTime = EBML_PRETTYLONGINT(0xFFFFFFFFFFFF);
 
   EBML_MASTER_CONST_ITERATOR Itr;
   for (Itr = begin(); Itr != end(); ++Itr) {
     if (EbmlId(*(*Itr)) == EBML_ID(KaxCuePoint)) {
-      const KaxCuePoint *tmp = static_cast<const KaxCuePoint *>(*Itr);
+      auto tmp = static_cast<const KaxCuePoint *>(*Itr);
       // check the tile
-      const KaxCueTime *aTime = static_cast<const KaxCueTime *>(tmp->FindFirstElt(EBML_INFO(KaxCueTime)));
-      if (aTime != NULL) {
-        uint64 _Time = uint64(*aTime);
+      auto aTime = static_cast<const KaxCueTime *>(tmp->FindFirstElt(EBML_INFO(KaxCueTime)));
+      if (aTime != nullptr) {
+        auto _Time = uint64(*aTime);
         if (_Time > aPrevTime && _Time < TimecodeToLocate) {
           aPrevTime = _Time;
           aPointPrev = tmp;
@@ -146,11 +143,11 @@
 uint64 KaxCues::GetTimecodePosition(uint64 aTimecode) const
 {
   const KaxCuePoint * aPoint = GetTimecodePoint(aTimecode);
-  if (aPoint == NULL)
+  if (aPoint == nullptr)
     return 0;
 
   const KaxCueTrackPositions * aTrack = aPoint->GetSeekPosition();
-  if (aTrack == NULL)
+  if (aTrack == nullptr)
     return 0;
 
   return aTrack->ClusterPosition();

makemkv-oss-1.15.1.tar.xz/libmatroska/src/KaxCuesData.cpp -> makemkv-oss-1.15.2.tar.xz/libmatroska/src/KaxCuesData.cpp Changed

@@ -50,32 +50,30 @@
 void KaxCuePoint::PositionSet(const KaxBlockGroup & BlockReference, uint64 GlobalTimecodeScale)
 {
   // fill me
-  KaxCueTime & NewTime = GetChild<KaxCueTime>(*this);
+  auto & NewTime = GetChild<KaxCueTime>(*this);
   *static_cast<EbmlUInteger*>(&NewTime) = BlockReference.GlobalTimecode() / GlobalTimecodeScale;
 
-  KaxCueTrackPositions & NewPositions = AddNewChild<KaxCueTrackPositions>(*this);
-  KaxCueTrack & TheTrack = GetChild<KaxCueTrack>(NewPositions);
+  auto & NewPositions = AddNewChild<KaxCueTrackPositions>(*this);
+  auto & TheTrack = GetChild<KaxCueTrack>(NewPositions);
   *static_cast<EbmlUInteger*>(&TheTrack) = BlockReference.TrackNumber();
 
-  KaxCueClusterPosition & TheClustPos = GetChild<KaxCueClusterPosition>(NewPositions);
+  auto & TheClustPos = GetChild<KaxCueClusterPosition>(NewPositions);
   *static_cast<EbmlUInteger*>(&TheClustPos) = BlockReference.ClusterPosition();
 
-#if MATROSKA_VERSION >= 2
   // handle reference use
   if (BlockReference.ReferenceCount() != 0) {
     unsigned int i;
     for (i=0; i<BlockReference.ReferenceCount(); i++) {
-      KaxCueReference & NewRefs = AddNewChild<KaxCueReference>(NewPositions);
+      auto & NewRefs = AddNewChild<KaxCueReference>(NewPositions);
       NewRefs.AddReference(BlockReference.Reference(i).RefBlock(), GlobalTimecodeScale);
     }
   }
 
-  KaxCodecState *CodecState = static_cast<KaxCodecState *>(BlockReference.FindFirstElt(EBML_INFO(KaxCodecState)));
-  if (CodecState != NULL) {
-    KaxCueCodecState &CueCodecState = AddNewChild<KaxCueCodecState>(NewPositions);
+  auto CodecState = static_cast<KaxCodecState *>(BlockReference.FindFirstElt(EBML_INFO(KaxCodecState)));
+  if (CodecState != nullptr) {
+    auto &CueCodecState = AddNewChild<KaxCueCodecState>(NewPositions);
     *static_cast<EbmlUInteger*>(&CueCodecState) = BlockReference.GetParentCluster()->GetParentSegment()->GetRelativePosition(CodecState->GetElementPosition());
   }
-#endif // MATROSKA_VERSION
 
   SetValueIsSet();
 }
@@ -83,30 +81,30 @@
 void KaxCuePoint::PositionSet(const KaxBlockBlob & BlobReference, uint64 GlobalTimecodeScale)
 {
   const KaxInternalBlock &BlockReference = BlobReference;
-  const KaxBlockGroup* BlockGroupPointer = NULL;
+  const KaxBlockGroup *BlockGroupPointer = nullptr;
 
   if (!BlobReference.IsSimpleBlock()) {
     const KaxBlockGroup &BlockGroup = BlobReference;
     BlockGroupPointer = & BlockGroup;
   }
-  PositionSet(BlockReference,BlockGroupPointer,GlobalTimecodeScale);
+  PositionSet(BlockReference, BlockGroupPointer, GlobalTimecodeScale);
 }
 
 void KaxCuePoint::PositionSet(const KaxSimpleBlock & BlockReference, uint64 GlobalTimecodeScale)
 {
-  PositionSet(BlockReference,NULL,GlobalTimecodeScale);
+  PositionSet(BlockReference, nullptr, GlobalTimecodeScale);
 }
 
-void KaxCuePoint::PositionSet(const KaxInternalBlock & BlockReference, const KaxBlockGroup* BlockGroup, uint64 GlobalTimecodeScale)
+void KaxCuePoint::PositionSet(const KaxInternalBlock & BlockReference, const KaxBlockGroup *BlockGroup, uint64 GlobalTimecodeScale)
 {
   // fill me
-  KaxCueTime & NewTime = GetChild<KaxCueTime>(*this);
+  auto & NewTime = GetChild<KaxCueTime>(*this);
   *static_cast<EbmlUInteger*>(&NewTime) = BlockReference.GlobalTimecode() / GlobalTimecodeScale;
-  KaxCueTrackPositions & NewPositions = AddNewChild<KaxCueTrackPositions>(*this);
-  KaxCueTrack & TheTrack = GetChild<KaxCueTrack>(NewPositions);
+  auto & NewPositions = AddNewChild<KaxCueTrackPositions>(*this);
+  auto & TheTrack = GetChild<KaxCueTrack>(NewPositions);
   *static_cast<EbmlUInteger*>(&TheTrack) = BlockReference.TrackNum();
 
-  KaxCueClusterPosition & TheClustPos = GetChild<KaxCueClusterPosition>(NewPositions);
+  auto & TheClustPos = GetChild<KaxCueClusterPosition>(NewPositions);
   *static_cast<EbmlUInteger*>(&TheClustPos) = BlockReference.ClusterPosition();
 
 #if 0 // MATROSKA_VERSION >= 2
@@ -120,30 +118,27 @@
   }
 #endif // MATROSKA_VERSION
 
-#if MATROSKA_VERSION >= 2
-  if (BlockGroup!=NULL) {
+  if (BlockGroup != nullptr) {
     const KaxCodecState *CodecState = static_cast<KaxCodecState *>(BlockGroup->FindFirstElt(EBML_INFO(KaxCodecState)));
-    if (CodecState != NULL) {
-      KaxCueCodecState &CueCodecState = AddNewChild<KaxCueCodecState>(NewPositions);
+    if (CodecState != nullptr) {
+      auto &CueCodecState = AddNewChild<KaxCueCodecState>(NewPositions);
       *static_cast<EbmlUInteger*>(&CueCodecState) = BlockGroup->GetParentCluster()->GetParentSegment()->GetRelativePosition(CodecState->GetElementPosition());
     }
   }
-#endif // MATROSKA_VERSION
 
   SetValueIsSet();
 }
 
-#if MATROSKA_VERSION >= 2
 /*!
   \todo handle codec state checking
 */
 void KaxCueReference::AddReference(const KaxBlockBlob & BlockReference, uint64 GlobalTimecodeScale)
 {
   const KaxInternalBlock & theBlock = BlockReference;
-  KaxCueRefTime & NewTime = GetChild<KaxCueRefTime>(*this);
+  auto & NewTime = GetChild<KaxCueRefTime>(*this);
   *static_cast<EbmlUInteger*>(&NewTime) = theBlock.GlobalTimecode() / GlobalTimecodeScale;
 
-  KaxCueRefCluster & TheClustPos = GetChild<KaxCueRefCluster>(*this);
+  auto & TheClustPos = GetChild<KaxCueRefCluster>(*this);
   *static_cast<EbmlUInteger*>(&TheClustPos) = theBlock.ClusterPosition();
 
 #ifdef OLD
@@ -156,22 +151,21 @@
   }
 #endif /* OLD */
 }
-#endif
 
-bool KaxCuePoint::IsSmallerThan(const EbmlElement * EltB) const
+bool KaxCuePoint::IsSmallerThan(const EbmlElement * Cmp) const
 {
   assert(EbmlId(*this) == EBML_ID(KaxCuePoint));
-  assert(EbmlId(*EltB) == EBML_ID(KaxCuePoint));
+  assert(EbmlId(*Cmp)  == EBML_ID(KaxCuePoint));
 
-  const KaxCuePoint & theEltB = *static_cast<const KaxCuePoint *>(EltB);
+  const KaxCuePoint & theCmp = *static_cast<const KaxCuePoint *>(Cmp);
 
   // compare timecode
-  const KaxCueTime * TimeCodeA = static_cast<const KaxCueTime *>(FindElt(EBML_INFO(KaxCueTime)));
-  if (TimeCodeA == NULL)
+  auto TimeCodeA = static_cast<const KaxCueTime *>(FindElt(EBML_INFO(KaxCueTime)));
+  if (TimeCodeA == nullptr)
     return false;
 
-  const KaxCueTime * TimeCodeB = static_cast<const KaxCueTime *>(theEltB.FindElt(EBML_INFO(KaxCueTime)));
-  if (TimeCodeB == NULL)
+  auto TimeCodeB = static_cast<const KaxCueTime *>(theCmp.FindElt(EBML_INFO(KaxCueTime)));
+  if (TimeCodeB == nullptr)
     return false;
 
   if (TimeCodeA->IsSmallerThan(TimeCodeB))
@@ -181,12 +175,12 @@
     return false;
 
   // compare tracks (timecodes are equal)
-  const KaxCueTrack * TrackA = static_cast<const KaxCueTrack *>(FindElt(EBML_INFO(KaxCueTrack)));
-  if (TrackA == NULL)
+  auto TrackA = static_cast<const KaxCueTrack *>(FindElt(EBML_INFO(KaxCueTrack)));
+  if (TrackA == nullptr)
     return false;
 
-  const KaxCueTrack * TrackB = static_cast<const KaxCueTrack *>(theEltB.FindElt(EBML_INFO(KaxCueTrack)));
-  if (TrackB == NULL)
+  auto TrackB = static_cast<const KaxCueTrack *>(theCmp.FindElt(EBML_INFO(KaxCueTrack)));
+  if (TrackB == nullptr)
     return false;
 
   if (TrackA->IsSmallerThan(TrackB))
@@ -200,8 +194,8 @@
 
 bool KaxCuePoint::Timecode(uint64 & aTimecode, uint64 GlobalTimecodeScale) const
 {
-  const KaxCueTime *aTime = static_cast<const KaxCueTime *>(FindFirstElt(EBML_INFO(KaxCueTime)));
-  if (aTime == NULL)
+  auto aTime = static_cast<const KaxCueTime *>(FindFirstElt(EBML_INFO(KaxCueTime)));
+  if (aTime == nullptr)
     return false;
   aTimecode = uint64(*aTime) * GlobalTimecodeScale;
   return true;
@@ -212,13 +206,13 @@
 */
 const KaxCueTrackPositions * KaxCuePoint::GetSeekPosition() const
 {
-  const KaxCueTrackPositions * result = NULL;
+  const KaxCueTrackPositions * result = nullptr;
   uint64 aPosition = EBML_PRETTYLONGINT(0xFFFFFFFFFFFFFFF);
   // find the position of the "earlier" Cluster
-  const KaxCueTrackPositions *aPoss = static_cast<const KaxCueTrackPositions *>(FindFirstElt(EBML_INFO(KaxCueTrackPositions)));
-  while (aPoss != NULL) {
-    const KaxCueClusterPosition *aPos = static_cast<const KaxCueClusterPosition *>(aPoss->FindFirstElt(EBML_INFO(KaxCueClusterPosition)));
-    if (aPos != NULL && uint64(*aPos) < aPosition) {
+  auto aPoss = static_cast<const KaxCueTrackPositions *>(FindFirstElt(EBML_INFO(KaxCueTrackPositions)));
+  while (aPoss != nullptr) {
+    auto aPos = static_cast<const KaxCueClusterPosition *>(aPoss->FindFirstElt(EBML_INFO(KaxCueClusterPosition)));
+    if (aPos != nullptr && uint64(*aPos) < aPosition) {
       aPosition = uint64(*aPos);
       result = aPoss;
     }
@@ -230,8 +224,8 @@
 
 uint64 KaxCueTrackPositions::ClusterPosition() const
 {
-  const KaxCueClusterPosition *aPos = static_cast<const KaxCueClusterPosition *>(FindFirstElt(EBML_INFO(KaxCueClusterPosition)));
-  if (aPos == NULL)
+  auto aPos = static_cast<const KaxCueClusterPosition *>(FindFirstElt(EBML_INFO(KaxCueClusterPosition)));

makemkv-oss-1.15.1.tar.xz/libmatroska/src/KaxInfoData.cpp -> makemkv-oss-1.15.2.tar.xz/libmatroska/src/KaxInfoData.cpp Changed

makemkv-oss-1.15.1.tar.xz/libmatroska/src/KaxSeekHead.cpp -> makemkv-oss-1.15.2.tar.xz/libmatroska/src/KaxSeekHead.cpp Changed

@@ -49,40 +49,40 @@
 KaxSeek * KaxSeekHead::IndexThis(const EbmlElement & aElt, const KaxSegment & ParentSegment)
 {
   // create a new point
-  KaxSeek & aNewPoint = AddNewChild<KaxSeek>(*this);
+  auto & aNewPoint = AddNewChild<KaxSeek>(*this);
 
   // add the informations to this element
-  KaxSeekPosition & aNewPos = GetChild<KaxSeekPosition>(aNewPoint);
+  auto & aNewPos = GetChild<KaxSeekPosition>(aNewPoint);
   *static_cast<EbmlUInteger *>(&aNewPos) = ParentSegment.GetRelativePosition(aElt);
 
-  KaxSeekID & aNewID = GetChild<KaxSeekID>(aNewPoint);
+  auto & aNewID = GetChild<KaxSeekID>(aNewPoint);
   binary ID[4];
   ((const EbmlId&)aElt).Fill(ID);
   aNewID.CopyBuffer(ID, EBML_ID_LENGTH((const EbmlId&)aElt));
+
   return &aNewPoint;
 }
 
 KaxSeek * KaxSeekHead::FindFirstOf(const EbmlCallbacks & Callbacks) const
 {
   // parse all the Entries and find the first to match the type
-  KaxSeek * aElt = static_cast<KaxSeek *>(FindFirstElt(EBML_INFO(KaxSeek)));
-  while (aElt != NULL) {
-    KaxSeekID * aId = NULL;
+  auto aElt = static_cast<KaxSeek *>(FindFirstElt(EBML_INFO(KaxSeek)));
+  while (aElt != nullptr) {
+    KaxSeekID * aId = nullptr;
     EBML_MASTER_ITERATOR Itr;
-    for (Itr = aElt->begin(); Itr != aElt->end(); ++Itr) {
-      if (EbmlId(*(*Itr)) == EBML_ID(KaxSeekID)) {
-        aId = static_cast<KaxSeekID*>(*Itr);
-        EbmlId aEbmlId(aId->GetBuffer(), (unsigned int)aId->GetSize());
-        if (aEbmlId == EBML_INFO_ID(Callbacks)) {
-          return aElt;
-        }
-        break;
+    auto it = std::find_if(aElt->begin(), aElt->end(), [&](EbmlElement *Elt)
+      { return (EbmlId(*Elt) == EBML_ID(KaxSeekID)); });
+    if (it != aElt->end()) {
+      aId = static_cast<KaxSeekID*>(*it);
+      EbmlId aEbmlId(aId->GetBuffer(), aId->GetSize());
+      if (aEbmlId == EBML_INFO_ID(Callbacks)) {
+        return aElt;
       }
     }
     aElt = static_cast<KaxSeek *>(FindNextElt(*aElt));
   }
 
-  return NULL;
+  return nullptr;
 }
 
 KaxSeek * KaxSeekHead::FindNextOf(const KaxSeek &aPrev) const
@@ -107,21 +107,21 @@
     }
   }
 
-  return NULL;
+  return nullptr;
 }
 
 int64 KaxSeek::Location() const
 {
-  KaxSeekPosition *aPos = static_cast<KaxSeekPosition*>(FindFirstElt(EBML_INFO(KaxSeekPosition)));
-  if (aPos == NULL)
+  auto aPos = static_cast<KaxSeekPosition*>(FindFirstElt(EBML_INFO(KaxSeekPosition)));
+  if (aPos == nullptr)
     return 0;
   return uint64(*aPos);
 }
 
 bool KaxSeek::IsEbmlId(const EbmlId & aId) const
 {
-  KaxSeekID *_Id = static_cast<KaxSeekID*>(FindFirstElt(EBML_INFO(KaxSeekID)));
-  if (_Id == NULL)
+  auto _Id = static_cast<KaxSeekID*>(FindFirstElt(EBML_INFO(KaxSeekID)));
+  if (_Id == nullptr)
     return false;
   EbmlId aEbmlId(_Id->GetBuffer(), (unsigned int)_Id->GetSize());
   return (aId == aEbmlId);
@@ -129,11 +129,11 @@
 
 bool KaxSeek::IsEbmlId(const KaxSeek & aPoint) const
 {
-  KaxSeekID *_IdA = static_cast<KaxSeekID*>(FindFirstElt(EBML_INFO(KaxSeekID)));
-  if (_IdA == NULL)
+  auto _IdA = static_cast<KaxSeekID*>(FindFirstElt(EBML_INFO(KaxSeekID)));
+  if (_IdA == nullptr)
     return false;
-  KaxSeekID *_IdB = static_cast<KaxSeekID*>(aPoint.FindFirstElt(EBML_INFO(KaxSeekID)));
-  if (_IdB == NULL)
+  auto _IdB = static_cast<KaxSeekID*>(aPoint.FindFirstElt(EBML_INFO(KaxSeekID)));
+  if (_IdB == nullptr)
     return false;
   EbmlId aEbmlIdA(_IdA->GetBuffer(), _IdA->GetSize());
   EbmlId aEbmlIdB(_IdB->GetBuffer(), _IdB->GetSize());

makemkv-oss-1.15.1.tar.xz/libmatroska/src/KaxSegment.cpp -> makemkv-oss-1.15.2.tar.xz/libmatroska/src/KaxSegment.cpp Changed

makemkv-oss-1.15.1.tar.xz/libmatroska/src/KaxSemantic.cpp -> makemkv-oss-1.15.2.tar.xz/libmatroska/src/KaxSemantic.cpp Changed

@@ -53,22 +53,22 @@
 DEFINE_SEMANTIC_ITEM(false, false, KaxTags)
 DEFINE_END_SEMANTIC(KaxSegment)
 
-DEFINE_MKX_MASTER_ORPHAN(KaxSegment, 0x18538067, 4, "Segment");
+DEFINE_MKX_MASTER_ORPHAN(KaxSegment, 0x18538067, 4, "Segment")
 
 DEFINE_START_SEMANTIC(KaxSeekHead)
 DEFINE_SEMANTIC_ITEM(true, false, KaxSeek)
 DEFINE_END_SEMANTIC(KaxSeekHead)
 
-DEFINE_MKX_MASTER(KaxSeekHead, 0x114D9B74, 4, KaxSegment, "SeekHeader");
+DEFINE_MKX_MASTER(KaxSeekHead, 0x114D9B74, 4, KaxSegment, "SeekHeader")
 
 DEFINE_START_SEMANTIC(KaxSeek)
 DEFINE_SEMANTIC_ITEM(true, true, KaxSeekID)
 DEFINE_SEMANTIC_ITEM(true, true, KaxSeekPosition)
 DEFINE_END_SEMANTIC(KaxSeek)
 
-DEFINE_MKX_MASTER(KaxSeek, 0x4DBB, 2, KaxSeekHead, "SeekPoint");
-DEFINE_MKX_BINARY (KaxSeekID, 0x53AB, 2, KaxSeek, "SeekID");
-DEFINE_MKX_UINTEGER(KaxSeekPosition, 0x53AC, 2, KaxSeek, "SeekPosition");
+DEFINE_MKX_MASTER(KaxSeek, 0x4DBB, 2, KaxSeekHead, "SeekPoint")
+DEFINE_MKX_BINARY (KaxSeekID, 0x53AB, 2, KaxSeek, "SeekID")
+DEFINE_MKX_UINTEGER(KaxSeekPosition, 0x53AC, 2, KaxSeek, "SeekPosition")
 
 DEFINE_START_SEMANTIC(KaxInfo)
 DEFINE_SEMANTIC_ITEM(false, true, KaxSegmentUID)
@@ -87,14 +87,14 @@
 DEFINE_SEMANTIC_ITEM(true, true, KaxWritingApp)
 DEFINE_END_SEMANTIC(KaxInfo)
 
-DEFINE_MKX_MASTER(KaxInfo, 0x1549A966, 4, KaxSegment, "Info");
-DEFINE_MKX_BINARY (KaxSegmentUID, 0x73A4, 2, KaxInfo, "SegmentUID");
-DEFINE_MKX_UNISTRING(KaxSegmentFilename, 0x7384, 2, KaxInfo, "SegmentFilename");
-DEFINE_MKX_BINARY_CONS(KaxPrevUID, 0x3CB923, 3, KaxInfo, "PrevUID");
-DEFINE_MKX_UNISTRING(KaxPrevFilename, 0x3C83AB, 3, KaxInfo, "PrevFilename");
-DEFINE_MKX_BINARY_CONS(KaxNextUID, 0x3EB923, 3, KaxInfo, "NextUID");
-DEFINE_MKX_UNISTRING(KaxNextFilename, 0x3E83BB, 3, KaxInfo, "NextFilename");
-DEFINE_MKX_BINARY (KaxSegmentFamily, 0x4444, 2, KaxInfo, "SegmentFamily");
+DEFINE_MKX_MASTER(KaxInfo, 0x1549A966, 4, KaxSegment, "Info")
+DEFINE_MKX_BINARY (KaxSegmentUID, 0x73A4, 2, KaxInfo, "SegmentUID")
+DEFINE_MKX_UNISTRING(KaxSegmentFilename, 0x7384, 2, KaxInfo, "SegmentFilename")
+DEFINE_MKX_BINARY_CONS(KaxPrevUID, 0x3CB923, 3, KaxInfo, "PrevUID")
+DEFINE_MKX_UNISTRING(KaxPrevFilename, 0x3C83AB, 3, KaxInfo, "PrevFilename")
+DEFINE_MKX_BINARY_CONS(KaxNextUID, 0x3EB923, 3, KaxInfo, "NextUID")
+DEFINE_MKX_UNISTRING(KaxNextFilename, 0x3E83BB, 3, KaxInfo, "NextFilename")
+DEFINE_MKX_BINARY (KaxSegmentFamily, 0x4444, 2, KaxInfo, "SegmentFamily")
 
 DEFINE_START_SEMANTIC(KaxChapterTranslate)
 DEFINE_SEMANTIC_ITEM(false, false, KaxChapterTranslateEditionUID)
@@ -102,232 +102,200 @@
 DEFINE_SEMANTIC_ITEM(true, true, KaxChapterTranslateID)
 DEFINE_END_SEMANTIC(KaxChapterTranslate)
 
-DEFINE_MKX_MASTER(KaxChapterTranslate, 0x6924, 2, KaxInfo, "ChapterTranslate");
-DEFINE_MKX_UINTEGER(KaxChapterTranslateEditionUID, 0x69FC, 2, KaxChapterTranslate, "ChapterTranslateEditionUID");
-DEFINE_MKX_UINTEGER(KaxChapterTranslateCodec, 0x69BF, 2, KaxChapterTranslate, "ChapterTranslateCodec");
-DEFINE_MKX_BINARY (KaxChapterTranslateID, 0x69A5, 2, KaxChapterTranslate, "ChapterTranslateID");
-DEFINE_MKX_UINTEGER_DEF(KaxTimecodeScale, 0x2AD7B1, 3, KaxInfo, "TimecodeScale", 1000000);
-DEFINE_MKX_FLOAT(KaxDuration, 0x4489, 2, KaxInfo, "Duration");
-DEFINE_MKX_DATE    (KaxDateUTC, 0x4461, 2, KaxInfo, "DateUTC");
-DEFINE_MKX_UNISTRING(KaxTitle, 0x7BA9, 2, KaxInfo, "Title");
-DEFINE_MKX_UNISTRING(KaxMuxingApp, 0x4D80, 2, KaxInfo, "MuxingApp");
-DEFINE_MKX_UNISTRING(KaxWritingApp, 0x5741, 2, KaxInfo, "WritingApp");
+DEFINE_MKX_MASTER(KaxChapterTranslate, 0x6924, 2, KaxInfo, "ChapterTranslate")
+DEFINE_MKX_UINTEGER(KaxChapterTranslateEditionUID, 0x69FC, 2, KaxChapterTranslate, "ChapterTranslateEditionUID")
+DEFINE_MKX_UINTEGER(KaxChapterTranslateCodec, 0x69BF, 2, KaxChapterTranslate, "ChapterTranslateCodec")
+DEFINE_MKX_BINARY (KaxChapterTranslateID, 0x69A5, 2, KaxChapterTranslate, "ChapterTranslateID")
+DEFINE_MKX_UINTEGER_DEF(KaxTimecodeScale, 0x2AD7B1, 3, KaxInfo, "TimecodeScale", 1000000)
+DEFINE_MKX_FLOAT(KaxDuration, 0x4489, 2, KaxInfo, "Duration")
+DEFINE_MKX_DATE    (KaxDateUTC, 0x4461, 2, KaxInfo, "DateUTC")
+DEFINE_MKX_UNISTRING(KaxTitle, 0x7BA9, 2, KaxInfo, "Title")
+DEFINE_MKX_UNISTRING(KaxMuxingApp, 0x4D80, 2, KaxInfo, "MuxingApp")
+DEFINE_MKX_UNISTRING(KaxWritingApp, 0x5741, 2, KaxInfo, "WritingApp")
 
 DEFINE_START_SEMANTIC(KaxCluster)
 DEFINE_SEMANTIC_ITEM(true, true, KaxClusterTimecode)
 DEFINE_SEMANTIC_ITEM(false, true, KaxClusterSilentTracks)
 DEFINE_SEMANTIC_ITEM(false, true, KaxClusterPosition)
 DEFINE_SEMANTIC_ITEM(false, true, KaxClusterPrevSize)
-#if MATROSKA_VERSION >= 2
 DEFINE_SEMANTIC_ITEM(false, false, KaxSimpleBlock)
-#endif // MATROSKA_VERSION
 DEFINE_SEMANTIC_ITEM(false, false, KaxBlockGroup)
-#if MATROSKA_VERSION >= 2
 DEFINE_SEMANTIC_ITEM(false, false, KaxEncryptedBlock) // not supported
-#endif // MATROSKA_VERSION
 DEFINE_END_SEMANTIC(KaxCluster)
 
-DEFINE_MKX_MASTER_CONS(KaxCluster, 0x1F43B675, 4, KaxSegment, "Cluster");
-DEFINE_MKX_UINTEGER(KaxClusterTimecode, 0xE7, 1, KaxCluster, "ClusterTimecode");
+DEFINE_MKX_MASTER_CONS(KaxCluster, 0x1F43B675, 4, KaxSegment, "Cluster")
+DEFINE_MKX_UINTEGER(KaxClusterTimecode, 0xE7, 1, KaxCluster, "ClusterTimecode")
 
 DEFINE_START_SEMANTIC(KaxClusterSilentTracks)
 DEFINE_SEMANTIC_ITEM(false, false, KaxClusterSilentTrackNumber)
 DEFINE_END_SEMANTIC(KaxClusterSilentTracks)
 
-DEFINE_MKX_MASTER(KaxClusterSilentTracks, 0x5854, 2, KaxCluster, "ClusterSilentTracks");
-DEFINE_MKX_UINTEGER(KaxClusterSilentTrackNumber, 0x58D7, 2, KaxClusterSilentTracks, "ClusterSilentTrackNumber");
-DEFINE_MKX_UINTEGER(KaxClusterPosition, 0xA7, 1, KaxCluster, "ClusterPosition");
-DEFINE_MKX_UINTEGER(KaxClusterPrevSize, 0xAB, 1, KaxCluster, "ClusterPrevSize");
-#if MATROSKA_VERSION >= 2
-DEFINE_MKX_BINARY_CONS(KaxSimpleBlock, 0xA3, 1, KaxCluster, "SimpleBlock");
-#endif
+DEFINE_MKX_MASTER(KaxClusterSilentTracks, 0x5854, 2, KaxCluster, "ClusterSilentTracks")
+DEFINE_MKX_UINTEGER(KaxClusterSilentTrackNumber, 0x58D7, 2, KaxClusterSilentTracks, "ClusterSilentTrackNumber")
+DEFINE_MKX_UINTEGER(KaxClusterPosition, 0xA7, 1, KaxCluster, "ClusterPosition")
+DEFINE_MKX_UINTEGER(KaxClusterPrevSize, 0xAB, 1, KaxCluster, "ClusterPrevSize")
+DEFINE_MKX_BINARY_CONS(KaxSimpleBlock, 0xA3, 1, KaxCluster, "SimpleBlock")
 
 DEFINE_START_SEMANTIC(KaxBlockGroup)
 DEFINE_SEMANTIC_ITEM(true, true, KaxBlock)
-#if MATROSKA_VERSION >= 2
 DEFINE_SEMANTIC_ITEM(false, true, KaxBlockVirtual) // not supported
-#endif // MATROSKA_VERSION
 DEFINE_SEMANTIC_ITEM(false, true, KaxBlockAdditions)
 DEFINE_SEMANTIC_ITEM(false, true, KaxBlockDuration)
 DEFINE_SEMANTIC_ITEM(true, true, KaxReferencePriority)
 DEFINE_SEMANTIC_ITEM(false, false, KaxReferenceBlock)
-#if MATROSKA_VERSION >= 2
 DEFINE_SEMANTIC_ITEM(false, true, KaxReferenceVirtual) // not supported
 DEFINE_SEMANTIC_ITEM(false, true, KaxCodecState)
 DEFINE_SEMANTIC_ITEM(false, true, KaxDiscardPadding)
-#endif // MATROSKA_VERSION
 DEFINE_SEMANTIC_ITEM(false, true, KaxSlices)
-#if MATROSKA_VERSION >= 2
 DEFINE_SEMANTIC_ITEM(false, true, KaxReferenceFrame) // DivX specific
-#endif // MATROSKA_VERSION
 DEFINE_END_SEMANTIC(KaxBlockGroup)
 
-DEFINE_MKX_MASTER_CONS(KaxBlockGroup, 0xA0, 1, KaxCluster, "BlockGroup");
-DEFINE_MKX_BINARY_CONS(KaxBlock, 0xA1, 1, KaxBlockGroup, "Block");
-#if MATROSKA_VERSION >= 2
-DEFINE_MKX_BINARY_CONS(KaxBlockVirtual, 0xA2, 1, KaxBlockGroup, "BlockVirtual");
-#endif
+DEFINE_MKX_MASTER_CONS(KaxBlockGroup, 0xA0, 1, KaxCluster, "BlockGroup")
+DEFINE_MKX_BINARY_CONS(KaxBlock, 0xA1, 1, KaxBlockGroup, "Block")
+DEFINE_MKX_BINARY_CONS(KaxBlockVirtual, 0xA2, 1, KaxBlockGroup, "BlockVirtual")
 
 DEFINE_START_SEMANTIC(KaxBlockAdditions)
 DEFINE_SEMANTIC_ITEM(true, false, KaxBlockMore)
 DEFINE_END_SEMANTIC(KaxBlockAdditions)
 
-DEFINE_MKX_MASTER(KaxBlockAdditions, 0x75A1, 2, KaxBlockGroup, "BlockAdditions");
+DEFINE_MKX_MASTER(KaxBlockAdditions, 0x75A1, 2, KaxBlockGroup, "BlockAdditions")
 
 DEFINE_START_SEMANTIC(KaxBlockMore)
 DEFINE_SEMANTIC_ITEM(true, true, KaxBlockAddID)
 DEFINE_SEMANTIC_ITEM(true, true, KaxBlockAdditional)
 DEFINE_END_SEMANTIC(KaxBlockMore)
 
-DEFINE_MKX_MASTER(KaxBlockMore, 0xA6, 1, KaxBlockAdditions, "BlockMore");
-DEFINE_MKX_UINTEGER_DEF(KaxBlockAddID, 0xEE, 1, KaxBlockMore, "BlockAddID", 1);
-DEFINE_MKX_BINARY (KaxBlockAdditional, 0xA5, 1, KaxBlockMore, "BlockAdditional");
-DEFINE_MKX_UINTEGER(KaxBlockDuration, 0x9B, 1, KaxBlockGroup, "BlockDuration");
-DEFINE_MKX_UINTEGER_DEF(KaxReferencePriority, 0xFA, 1, KaxBlockGroup, "FlagReferenced", 0);
-DEFINE_MKX_SINTEGER_CONS(KaxReferenceBlock, 0xFB, 1, KaxBlockGroup, "ReferenceBlock");
-#if MATROSKA_VERSION >= 2
-DEFINE_MKX_SINTEGER(KaxReferenceVirtual, 0xFD, 1, KaxBlockGroup, "ReferenceVirtual");
-DEFINE_MKX_BINARY (KaxCodecState, 0xA4, 1, KaxBlockGroup, "CodecState");
-DEFINE_MKX_SINTEGER(KaxDiscardPadding, 0x75A2, 2, KaxBlockGroup, "DiscardPadding");
-#endif
+DEFINE_MKX_MASTER(KaxBlockMore, 0xA6, 1, KaxBlockAdditions, "BlockMore")
+DEFINE_MKX_UINTEGER_DEF(KaxBlockAddID, 0xEE, 1, KaxBlockMore, "BlockAddID", 1)
+DEFINE_MKX_BINARY (KaxBlockAdditional, 0xA5, 1, KaxBlockMore, "BlockAdditional")
+DEFINE_MKX_UINTEGER(KaxBlockDuration, 0x9B, 1, KaxBlockGroup, "BlockDuration")
+DEFINE_MKX_UINTEGER_DEF(KaxReferencePriority, 0xFA, 1, KaxBlockGroup, "FlagReferenced", 0)
+DEFINE_MKX_SINTEGER_CONS(KaxReferenceBlock, 0xFB, 1, KaxBlockGroup, "ReferenceBlock")
+DEFINE_MKX_SINTEGER(KaxReferenceVirtual, 0xFD, 1, KaxBlockGroup, "ReferenceVirtual")
+DEFINE_MKX_BINARY (KaxCodecState, 0xA4, 1, KaxBlockGroup, "CodecState")
+DEFINE_MKX_SINTEGER(KaxDiscardPadding, 0x75A2, 2, KaxBlockGroup, "DiscardPadding")
 
 DEFINE_START_SEMANTIC(KaxSlices)
 DEFINE_SEMANTIC_ITEM(false, false, KaxTimeSlice)
 DEFINE_END_SEMANTIC(KaxSlices)
 
-DEFINE_MKX_MASTER(KaxSlices, 0x8E, 1, KaxBlockGroup, "Slices");
+DEFINE_MKX_MASTER(KaxSlices, 0x8E, 1, KaxBlockGroup, "Slices")
 
 DEFINE_START_SEMANTIC(KaxTimeSlice)
 DEFINE_SEMANTIC_ITEM(false, true, KaxSliceLaceNumber)
-#if MATROSKA_VERSION >= 2
 DEFINE_SEMANTIC_ITEM(false, true, KaxSliceFrameNumber) // not supported
 DEFINE_SEMANTIC_ITEM(false, true, KaxSliceBlockAddID) // not supported
 DEFINE_SEMANTIC_ITEM(false, true, KaxSliceDelay) // not supported
 DEFINE_SEMANTIC_ITEM(false, true, KaxSliceDuration) // not supported
-#endif // MATROSKA_VERSION
 DEFINE_END_SEMANTIC(KaxTimeSlice)
 
-DEFINE_MKX_MASTER(KaxTimeSlice, 0xE8, 1, KaxSlices, "TimeSlice");
-DEFINE_MKX_UINTEGER_DEF(KaxSliceLaceNumber, 0xCC, 1, KaxTimeSlice, "SliceLaceNumber", 0);
-#if MATROSKA_VERSION >= 2
-DEFINE_MKX_UINTEGER_DEF(KaxSliceFrameNumber, 0xCD, 1, KaxTimeSlice, "SliceFrameNumber", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxSliceBlockAddID, 0xCB, 1, KaxTimeSlice, "SliceBlockAddID", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxSliceDelay, 0xCE, 1, KaxTimeSlice, "SliceDelay", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxSliceDuration, 0xCF, 1, KaxTimeSlice, "SliceDuration", 0);
+DEFINE_MKX_MASTER(KaxTimeSlice, 0xE8, 1, KaxSlices, "TimeSlice")
+DEFINE_MKX_UINTEGER_DEF(KaxSliceLaceNumber, 0xCC, 1, KaxTimeSlice, "SliceLaceNumber", 0)

makemkv-oss-1.15.1.tar.xz/libmatroska/src/KaxTracks.cpp -> makemkv-oss-1.15.2.tar.xz/libmatroska/src/KaxTracks.cpp Changed

makemkv-oss-1.15.1.tar.xz/libmatroska/src/KaxVersion.cpp -> makemkv-oss-1.15.2.tar.xz/libmatroska/src/KaxVersion.cpp Changed

makemkv-oss-1.15.1.tar.xz/libmmbd/src/mmconn.cpp -> makemkv-oss-1.15.2.tar.xz/libmmbd/src/mmconn.cpp Changed

makemkv-oss-1.15.1.tar.xz/libmmbd/src/mmconn.h -> makemkv-oss-1.15.2.tar.xz/libmmbd/src/mmconn.h Changed

@@ -93,26 +93,26 @@
     int open_auto(mmbd_read_file_proc_t read_file_proc);
     int close();
     void terminate();
-    int decrypt_unit(uint32_t name_flags,uint64_t file_offset,uint8_t* buf);
+    int decrypt_unit(uint32_t name_flags,uint64_t file_offset,uint8_t* buf) override;
     unsigned int get_mkb_version();
     const uint8_t* get_disc_id();
     void reset_cpsid();
-    int mmbdipc_version();
+    int mmbdipc_version() override;
     const uint8_t* get_encoded_ipc_handle();
     int get_busenc();
     inline void** user_data() { return m_user_data; }
 private:
-    void SetTotalName(unsigned long Name);
-    void UpdateCurrentBar(unsigned int Value);
-    void UpdateTotalBar(unsigned int Value);
-    void UpdateLayout(unsigned long CurrentName,unsigned int NameSubindex,unsigned int Flags,unsigned int Size,const unsigned long* Names);
-    void UpdateCurrentInfo(unsigned int Index,const utf16_t* Value);
-    void EnterJobMode(unsigned int Flags);
-    void LeaveJobMode();
-    void ExitApp();
-    void UpdateDrive(unsigned int Index,const utf16_t *DriveName,AP_DriveState DriveState,const utf16_t *DiskName,const utf16_t *DeviceName,AP_DiskFsFlags DiskFlags,const void* DiskData,unsigned int DiskDataSize);
-    int  ReportUiMessage(unsigned long Code,unsigned long Flags,const utf16_t* Text);
-    int  ReportUiDialog(unsigned long Code,unsigned long Flags,unsigned int Count,const utf16_t* Text[],utf16_t* Buffer);
+    void SetTotalName(unsigned long Name) override;
+    void UpdateCurrentBar(unsigned int Value) override;
+    void UpdateTotalBar(unsigned int Value) override;
+    void UpdateLayout(unsigned long CurrentName,unsigned int NameSubindex,unsigned int Flags,unsigned int Size,const unsigned long* Names) override;
+    void UpdateCurrentInfo(unsigned int Index,const utf16_t* Value) override;
+    void EnterJobMode(unsigned int Flags) override;
+    void LeaveJobMode() override;
+    void ExitApp() override;
+    void UpdateDrive(unsigned int Index,const utf16_t *DriveName,AP_DriveState DriveState,const utf16_t *DiskName,const utf16_t *DeviceName,AP_DiskFsFlags DiskFlags,const void* DiskData,unsigned int DiskDataSize) override;
+    int  ReportUiMessage(unsigned long Code,unsigned long Flags,const utf16_t* Text,uint64_t ExtraData) override;
+    int  ReportUiDialog(unsigned long Code,unsigned long Flags,unsigned int Count,const utf16_t* Text[],utf16_t* Buffer) override;
 private:
     typedef bool (CMMBDConn::*argp_proc_t)(const uint16_t* argp[]);
 private:
@@ -120,7 +120,7 @@
     uint32_t* GetClipInfo(uint32_t Name);
     void message_worker(uint32_t error_code,const char* message);
     bool convertArg(const char* argp[],CMMBDConn::argp_proc_t Proc);
-    inline void error_message(uint32_t error_code,const char* message)
+    inline void error_message(uint32_t error_code,const char* message) override
     {
         message_worker(error_code|MMBD_MESSAGE_FLAG_MMBD_ERROR,message);
     }

makemkv-oss-1.15.1.tar.xz/makefile.common -> makemkv-oss-1.15.2.tar.xz/makefile.common Changed

makemkv-oss-1.15.1.tar.xz/makemkvgui/inc/lgpl/apdefs.h -> makemkv-oss-1.15.2.tar.xz/makemkvgui/inc/lgpl/apdefs.h Changed

makemkv-oss-1.15.1.tar.xz/makemkvgui/inc/lgpl/aproxy.h -> makemkv-oss-1.15.2.tar.xz/makemkvgui/inc/lgpl/aproxy.h Changed

makemkv-oss-1.15.1.tar.xz/makemkvgui/inc/ver_num.h -> makemkv-oss-1.15.2.tar.xz/makemkvgui/inc/ver_num.h Changed

makemkv-oss-1.15.1.tar.xz/makemkvgui/src/client.cpp -> makemkv-oss-1.15.2.tar.xz/makemkvgui/src/client.cpp Changed

@@ -203,12 +203,12 @@
             return;
             break;
         case apBackFatalCommError:
-            m_Ui->ReportUiMessage(APP_IFACE_FATAL_COMM,AP_UIMSG_BOXERROR,AP_UI_STRING(APP_IFACE_FATAL_COMM));
+            m_Ui->ReportUiMessage(APP_IFACE_FATAL_COMM,AP_UIMSG_BOXERROR,AP_UI_STRING(APP_IFACE_FATAL_COMM),0);
             m_Ui->ExitApp();
             return;
             break;
         case apBackOutOfMem:
-            m_Ui->ReportUiMessage(APP_IFACE_FATAL_MEM,AP_UIMSG_BOXERROR,AP_UI_STRING(APP_IFACE_FATAL_MEM));
+            m_Ui->ReportUiMessage(APP_IFACE_FATAL_MEM,AP_UIMSG_BOXERROR,AP_UI_STRING(APP_IFACE_FATAL_MEM),0);
             m_Ui->ExitApp();
             return;
             break;
@@ -274,7 +274,7 @@
             int rr;
             if (m_Ui)
             {
-                rr = m_Ui->ReportUiMessage( (unsigned long) m_mem->args[0] , (unsigned long) m_mem->args[2] , (utf16_t*)m_mem->strbuf );
+                rr = m_Ui->ReportUiMessage( (unsigned long) m_mem->args[0] , (unsigned long) m_mem->args[2] , (utf16_t*)m_mem->strbuf , m_mem->args[3]);
             } else {
                 rr = 0;
             }

makemkv-oss-1.15.1.tar.xz/makemkvgui/src/logtext.cpp -> makemkv-oss-1.15.2.tar.xz/makemkvgui/src/logtext.cpp Changed

makemkv-oss-1.15.1.tar.xz/makemkvgui/src/mainwnd.cpp -> makemkv-oss-1.15.2.tar.xz/makemkvgui/src/mainwnd.cpp Changed

@@ -984,43 +984,42 @@
     OpenDriveAction[Index]->setEnabled(DriveInfo[Index].showOpen());
 }
 
-void MainWnd::DoProcessLogMessage(QString Message,unsigned int Flags)
+void MainWnd::DoProcessLogMessage(QString Message,unsigned int Flags, uint64_t ExtraData)
 {
     QString new_logline;
 
-    if (Message.indexOf(QLatin1String("http://"))<0)
+    if (0 == (Flags & AP_UIMSG_HAVE_URL))
     {
         new_logline = qt_html_escape(Message);
     } else {
-        QString logline;
-        int http_index;
+        QString url;
 
-        logline.reserve(Message.length()+30);
-        logline.append(qt_html_escape(Message));
+        unsigned int url_index = (ExtraData >> 16) & 0xffff;
+        unsigned int url_size = ExtraData & 0xffff;
+        unsigned int url_offset = 0;
 
-        http_index=logline.indexOf(QLatin1String("http://"));
+        url = Message.mid(url_index, url_size);
 
-        int end_index = logline.indexOf(QChar::fromLatin1(' '),http_index+1);
-        if (end_index<0)
+        if (url.startsWith(QLatin1String("file://")))
         {
-            end_index = logline.length();
+            url_offset = 7;
         }
 
-        new_logline.reserve(logline.length()+80+(end_index-http_index));
-        new_logline.append(logline.mid(0,http_index));
+        new_logline.reserve(Message.length()+80+2*url_size);
+        new_logline.append(qt_html_escape(Message.mid(0,url_index)));
         new_logline.append(QLatin1String("<a href='"));
-        new_logline.append(logline.mid(http_index,end_index-http_index));
+        new_logline.append(url);
         new_logline.append(QLatin1String("'>"));
 
-        if ( (end_index-http_index) < 40 )
+        if ((url_size < 40 ) || (url_offset!=0))
         {
-            new_logline.append(logline.mid(http_index,end_index-http_index));
+            new_logline.append(qt_html_escape(url.mid(url_offset,url_size-url_offset)));
         } else {
-            new_logline.append(logline.mid(http_index,40));
+            new_logline.append(qt_html_escape(url.mid(0, 40)));
             new_logline.append(QLatin1String("..."));
         }
         new_logline.append(QLatin1String("</a>"));
-        new_logline.append(logline.mid(end_index));
+        new_logline.append(qt_html_escape(Message.mid(url_index+url_size)));
     }
     logtext_buf.push_back(new_logline);
 
@@ -1056,7 +1055,8 @@
 int MainWnd::ReportUiMessage(
     unsigned long Code,
     unsigned long Flags,
-    const utf16_t* Text
+    const utf16_t* Text,
+    uint64_t ExtraData
     )
 {
     if (0!=(Flags&AP_UIMSG_HIDDEN))
@@ -1133,7 +1133,7 @@
         notifyEvent(this,Code,QStringFromUtf16(Text),m_notify_name);
     }
 
-    DoProcessLogMessage(QStringFromUtf16(Text),Flags);
+    DoProcessLogMessage(QStringFromUtf16(Text),Flags,ExtraData);
     return 0;
 }
 
@@ -1196,14 +1196,18 @@
 
 void MainWnd::SlotLaunchUrl(const QString &url)
 {
-    QString real_url = url;
-    if (setting_Debug)
+    m_disable_onidle++;
+    if (url.startsWith(QLatin1String("file://", 7)))
     {
-        real_url = QLatin1String("http://127.0.0.1/?hide?") + url;
+        desktopShowFile(url.mid(7));
+    } else {
+        QString real_url = url;
+        if (setting_Debug)
+        {
+            real_url = QLatin1String("http://127.0.0.1/?hide?") + url;
+        }
+        QDesktopServices::openUrl(QUrl(real_url));
     }
-
-    m_disable_onidle++;
-    QDesktopServices::openUrl(QUrl(real_url));
     m_disable_onidle--;
 }

makemkv-oss-1.15.1.tar.xz/makemkvgui/src/mainwnd.h -> makemkv-oss-1.15.2.tar.xz/makemkvgui/src/mainwnd.h Changed

makemkv-oss-1.15.1.tar.xz/makemkvgui/src/notify.h -> makemkv-oss-1.15.2.tar.xz/makemkvgui/src/notify.h Changed

makemkv-oss-1.15.1.tar.xz/makemkvgui/src/notify_linux.cpp -> makemkv-oss-1.15.2.tar.xz/makemkvgui/src/notify_linux.cpp Changed

makemkv-oss-1.15.1.tar.xz/makemkvgui/src/notify_none.cpp -> makemkv-oss-1.15.2.tar.xz/makemkvgui/src/notify_none.cpp Changed

makemkv-oss-1.15.1.tar.xz/makemkvgui/src/str/en_utf16.cpp -> makemkv-oss-1.15.2.tar.xz/makemkvgui/src/str/en_utf16.cpp Changed

@@ -13,7 +13,7 @@
 
 */
 
-static const unsigned short en_po_str[21803]={
+static const unsigned short en_po_str[21835]={
 'e','n','g',':','E','n','g','l','i','s','h',0,
 'D','B','G',' ','A','S','S','E','R','T',':',' ','%','1',' ','a','t',' ','%','2',':','%','3',0,
 'L','I','B','M','K','V','_','T','R','A','C','E',':',' ','%','1',0,
@@ -180,6 +180,7 @@
 'U','s','i','n','g',' ','J','a','v','a',' ','r','u','n','t','i','m','e',' ','f','r','o','m',' ','%','1',0,
 'T','h','i','s',' ','d','i','s','c',' ','r','e','q','u','i','r','e','s',' ','J','a','v','a',' ','r','u','n','t','i','m','e',' ','(','J','R','E',')',',',' ','b','u','t',' ','n','o','n','e',' ','w','a','s',' ','f','o','u','n','d','.',' ','C','e','r','t','a','i','n',' ','f','u','n','c','t','i','o','n','s',' ','w','i','l','l',' ','f','a','i','l',',',' ','p','l','e','a','s','e',' ','i','n','s','t','a','l','l',' ','J','a','v','a','.',' ','S','e','e',' ','%','1',' ','f','o','r',' ','d','e','t','a','i','l','s','.',0,
 'L','i','b','r','e','D','r','i','v','e',' ','c','o','m','p','a','t','i','b','l','e',' ','d','r','i','v','e',' ','i','s',' ','r','e','q','u','i','r','e','d',' ','t','o',' ','o','p','e','n',' ','t','h','i','s',' ','d','i','s','c',' ','-',' ','v','i','d','e','o',' ','c','a','n',0x27,'t',' ','b','e',' ','d','e','c','r','y','p','t','e','d','.',0,
+'P','l','e','a','s','e',' ','s','e','n','d',' ','t','h','e',' ','f','i','l','e',' ','"','%','1','"',' ','t','o',' ','%','2',0,
 'P','r','o','c','e','s','s','i','n','g',' ','A','V',' ','c','l','i','p','s',0,
 'P','r','o','c','e','s','s','i','n','g',' ','m','o','v','i','e',' ','p','l','a','y','l','i','s','t','s',0,
 'D','e','c','r','y','p','t','i','n','g',0,
@@ -569,7 +570,7 @@
 'O','S',' ','d','e','v','i','c','e',' ','n','a','m','e',':',' ',0,
 0};
 
-static const unsigned int en_po_off[1107]={
+static const unsigned int en_po_off[1109]={
 1000,0,1001,12,1002,36,1003,53,1004,77,1005,124,1006,135,1007,136,1008,226,1009,275,1010,301,
 1011,320,1012,323,2001,329,2003,378,2004,432,2006,500,2007,617,2008,772,2009,895,2010,1023,2011,1068,
 2012,1212,2013,1296,2014,1382,2015,1430,2016,1512,2017,1675,2018,1790,2019,1852,2020,1892,2021,2059,2022,2182,
@@ -585,42 +586,42 @@
 3313,6548,3314,6616,3315,6665,3316,6688,3317,6711,3318,6733,3319,6786,3320,6848,3321,6908,3322,6986,3323,7038,
 3324,7097,3325,7143,3326,7196,3327,7269,3328,7333,3329,7382,3330,7475,3331,7532,3332,7565,3333,7590,3334,7655,
 3335,8054,3336,8422,3337,8805,3338,8884,3339,8916,3340,8964,3341,9037,3342,9083,3343,9256,3344,9330,3345,9357,
-3346,9486,3400,9572,3401,9592,3402,9619,3403,9630,3404,9648,3405,9669,3406,9677,3407,9697,4001,9710,4002,9793,
-4003,9859,4004,9924,4007,10007,4008,10069,4009,10127,4020,10238,4021,10273,4022,10325,4023,10357,4024,10421,4025,10455,
-4026,10501,4027,10548,4028,10596,4040,10639,4041,10717,4042,10776,4043,10828,4044,10925,4045,10996,4046,11094,4047,11137,
-4048,11175,4049,11210,4050,11262,4051,11343,4052,11393,4053,11424,4054,11575,4055,11592,4060,11655,4061,11712,4062,11774,
-5000,11869,5001,11894,5002,11946,5003,11963,5004,11998,5005,12025,5006,12041,5007,12064,5008,12087,5009,12128,5010,12161,
-5011,12181,5012,12214,5013,12253,5014,12308,5015,12343,5016,12412,5017,12436,5018,12455,5019,12479,5020,12504,5021,12659,
-5022,12805,5024,12888,5025,12919,5026,12935,5027,12942,5028,12954,5029,12966,5030,12976,5031,12988,5033,13000,5036,13011,
-5037,13043,5038,13086,5039,13251,5040,13432,5041,13658,5042,13805,5043,13855,5044,13951,5045,13964,5046,13978,5047,13991,
-5048,14009,5049,14024,5050,14031,5051,14081,5052,14239,5053,14412,5054,14608,5055,14668,5056,14736,5057,14804,5058,14832,
-5060,14979,5061,14988,5062,15001,5063,15012,5064,15024,5065,15030,5066,15038,5067,15053,5068,15059,5069,15125,5070,15139,
-5071,15151,5072,15328,5073,15361,5074,15441,5075,15567,5076,15618,5077,15679,5078,15718,5079,15780,5080,15823,5081,15838,
-5082,15851,5083,15895,5084,15965,5085,16042,5086,16106,5087,16114,5088,16135,5089,16159,5090,16170,5091,16175,5092,16182,
-5093,16191,5094,16221,5100,16243,5101,16257,5201,16384,5202,16389,5203,16394,5204,16403,5207,16412,5208,16418,5209,16433,
-5210,16442,5214,16447,5215,16456,5216,16462,5217,16479,5218,16491,5219,16507,5220,16518,5221,16531,5222,16542,5223,16548,
-5224,16558,5225,16574,5226,16588,5227,16600,5228,16610,5233,16628,5234,16641,5235,16655,5238,16674,5239,16684,5240,16694,
-5248,16709,5249,16719,5250,16727,5301,16736,5302,16747,5303,16801,5304,16865,5305,16876,5306,16893,5307,16903,5308,16913,
-5380,16928,5381,16936,6000,16943,6001,16956,6002,16975,6003,16994,6005,17028,6006,17049,6007,17063,6008,17145,6010,17159,
-6011,17171,6012,17178,6013,17222,6014,17229,6015,17254,6016,17272,6017,17319,6018,17340,6019,17361,6020,17367,6021,17374,
-6022,17391,6023,17398,6024,17431,6026,17455,6030,17512,6031,17518,6032,17524,6034,17530,6035,17538,6036,17548,6037,17556,
-6038,17581,6039,17593,6040,17605,6041,17634,6042,17689,6043,17702,6044,17730,6045,17743,6046,17756,6047,17778,6048,17788,
-6050,17812,6051,17857,6052,17950,6053,17962,6054,17978,6055,17994,6056,18009,6057,18022,6058,18043,6059,18049,6060,18056,
-6061,18063,6062,18076,6063,18090,6064,18107,6065,18125,6066,18141,6067,18154,6068,18166,6069,18180,6070,18185,6071,18194,
-6072,18201,6073,18208,6074,18216,6075,18229,6076,18234,6077,18258,6078,18289,6079,18344,6080,18414,6081,18422,6082,18427,
-6083,18446,6084,18470,6085,18490,6086,18495,6087,18528,6088,18570,6089,18590,6090,18595,6091,18600,6092,18609,6093,18616,
-6094,18636,6095,18650,6096,18671,6097,18679,6098,18703,6099,18765,6100,18786,6101,18797,6102,18809,6103,18817,6104,18822,
-6105,18847,6106,18854,6107,18879,6108,18900,6109,18941,6110,18958,6111,18969,6112,18986,6119,19000,6120,19030,6121,19059,
-6122,19088,6123,19122,6124,19153,6125,19185,6126,19205,6127,19235,6128,19263,6129,19285,6130,19299,6131,19325,6132,19333,
-6133,19356,6134,19367,6135,19379,6136,19399,6137,19419,6138,19431,6139,19696,6142,19728,6143,19751,6144,19762,6145,19779,
-6146,19789,6147,19814,6148,19822,6149,19842,6150,19884,6151,19908,6152,19948,6153,19957,6154,19978,6156,19999,6157,20004,
-6158,20009,6159,20035,6164,20048,6165,20051,6166,20061,6167,20072,6168,20095,6169,20123,6170,20137,6171,20172,6172,20205,
-6173,20214,6174,20232,6175,20257,6177,20280,6178,20312,6180,20340,6181,20348,6190,20359,6191,20371,6192,20602,6200,20607,
-6201,20613,6202,20619,6203,20625,6204,20635,6205,20640,6206,20652,6207,20661,6209,20675,6210,20688,6211,20699,6212,20714,
-6213,20726,6214,20735,6215,20746,6216,20755,6220,20763,6221,20787,6222,20800,6223,20811,6224,20821,6225,20834,6226,21203,
-6227,21221,6228,21322,6229,21333,6300,21350,6301,21379,6302,21397,6303,21412,6304,21422,6305,21433,6306,21449,6307,21468,
-6308,21484,6309,21507,6320,21530,6321,21562,6322,21594,6323,21619,6324,21635,6325,21647,6326,21659,6327,21679,6329,21698,
-6330,21719,6331,21752,6332,21785,0};
+3346,9486,3347,9572,3400,9604,3401,9624,3402,9651,3403,9662,3404,9680,3405,9701,3406,9709,3407,9729,4001,9742,
+4002,9825,4003,9891,4004,9956,4007,10039,4008,10101,4009,10159,4020,10270,4021,10305,4022,10357,4023,10389,4024,10453,
+4025,10487,4026,10533,4027,10580,4028,10628,4040,10671,4041,10749,4042,10808,4043,10860,4044,10957,4045,11028,4046,11126,
+4047,11169,4048,11207,4049,11242,4050,11294,4051,11375,4052,11425,4053,11456,4054,11607,4055,11624,4060,11687,4061,11744,
+4062,11806,5000,11901,5001,11926,5002,11978,5003,11995,5004,12030,5005,12057,5006,12073,5007,12096,5008,12119,5009,12160,
+5010,12193,5011,12213,5012,12246,5013,12285,5014,12340,5015,12375,5016,12444,5017,12468,5018,12487,5019,12511,5020,12536,
+5021,12691,5022,12837,5024,12920,5025,12951,5026,12967,5027,12974,5028,12986,5029,12998,5030,13008,5031,13020,5033,13032,
+5036,13043,5037,13075,5038,13118,5039,13283,5040,13464,5041,13690,5042,13837,5043,13887,5044,13983,5045,13996,5046,14010,
+5047,14023,5048,14041,5049,14056,5050,14063,5051,14113,5052,14271,5053,14444,5054,14640,5055,14700,5056,14768,5057,14836,
+5058,14864,5060,15011,5061,15020,5062,15033,5063,15044,5064,15056,5065,15062,5066,15070,5067,15085,5068,15091,5069,15157,
+5070,15171,5071,15183,5072,15360,5073,15393,5074,15473,5075,15599,5076,15650,5077,15711,5078,15750,5079,15812,5080,15855,
+5081,15870,5082,15883,5083,15927,5084,15997,5085,16074,5086,16138,5087,16146,5088,16167,5089,16191,5090,16202,5091,16207,
+5092,16214,5093,16223,5094,16253,5100,16275,5101,16289,5201,16416,5202,16421,5203,16426,5204,16435,5207,16444,5208,16450,
+5209,16465,5210,16474,5214,16479,5215,16488,5216,16494,5217,16511,5218,16523,5219,16539,5220,16550,5221,16563,5222,16574,
+5223,16580,5224,16590,5225,16606,5226,16620,5227,16632,5228,16642,5233,16660,5234,16673,5235,16687,5238,16706,5239,16716,
+5240,16726,5248,16741,5249,16751,5250,16759,5301,16768,5302,16779,5303,16833,5304,16897,5305,16908,5306,16925,5307,16935,
+5308,16945,5380,16960,5381,16968,6000,16975,6001,16988,6002,17007,6003,17026,6005,17060,6006,17081,6007,17095,6008,17177,
+6010,17191,6011,17203,6012,17210,6013,17254,6014,17261,6015,17286,6016,17304,6017,17351,6018,17372,6019,17393,6020,17399,
+6021,17406,6022,17423,6023,17430,6024,17463,6026,17487,6030,17544,6031,17550,6032,17556,6034,17562,6035,17570,6036,17580,
+6037,17588,6038,17613,6039,17625,6040,17637,6041,17666,6042,17721,6043,17734,6044,17762,6045,17775,6046,17788,6047,17810,
+6048,17820,6050,17844,6051,17889,6052,17982,6053,17994,6054,18010,6055,18026,6056,18041,6057,18054,6058,18075,6059,18081,
+6060,18088,6061,18095,6062,18108,6063,18122,6064,18139,6065,18157,6066,18173,6067,18186,6068,18198,6069,18212,6070,18217,
+6071,18226,6072,18233,6073,18240,6074,18248,6075,18261,6076,18266,6077,18290,6078,18321,6079,18376,6080,18446,6081,18454,
+6082,18459,6083,18478,6084,18502,6085,18522,6086,18527,6087,18560,6088,18602,6089,18622,6090,18627,6091,18632,6092,18641,
+6093,18648,6094,18668,6095,18682,6096,18703,6097,18711,6098,18735,6099,18797,6100,18818,6101,18829,6102,18841,6103,18849,
+6104,18854,6105,18879,6106,18886,6107,18911,6108,18932,6109,18973,6110,18990,6111,19001,6112,19018,6119,19032,6120,19062,
+6121,19091,6122,19120,6123,19154,6124,19185,6125,19217,6126,19237,6127,19267,6128,19295,6129,19317,6130,19331,6131,19357,
+6132,19365,6133,19388,6134,19399,6135,19411,6136,19431,6137,19451,6138,19463,6139,19728,6142,19760,6143,19783,6144,19794,
+6145,19811,6146,19821,6147,19846,6148,19854,6149,19874,6150,19916,6151,19940,6152,19980,6153,19989,6154,20010,6156,20031,
+6157,20036,6158,20041,6159,20067,6164,20080,6165,20083,6166,20093,6167,20104,6168,20127,6169,20155,6170,20169,6171,20204,
+6172,20237,6173,20246,6174,20264,6175,20289,6177,20312,6178,20344,6180,20372,6181,20380,6190,20391,6191,20403,6192,20634,
+6200,20639,6201,20645,6202,20651,6203,20657,6204,20667,6205,20672,6206,20684,6207,20693,6209,20707,6210,20720,6211,20731,
+6212,20746,6213,20758,6214,20767,6215,20778,6216,20787,6220,20795,6221,20819,6222,20832,6223,20843,6224,20853,6225,20866,
+6226,21235,6227,21253,6228,21354,6229,21365,6300,21382,6301,21411,6302,21429,6303,21444,6304,21454,6305,21465,6306,21481,
+6307,21500,6308,21516,6309,21539,6320,21562,6321,21594,6322,21626,6323,21651,6324,21667,6325,21679,6326,21691,6327,21711,
+6329,21730,6330,21751,6331,21784,6332,21817,0};
 
 extern "C" const unsigned short * en_po_getstr_utf16(unsigned int code)
 {

Changes of Revision 78