1. add std::nothrow to new operator because then ptr checked with NULL

2. "currentNewBlock" is assigned values twice successively
3. optimize std::vector<>::iterator's usage "iter++" -> "++iter". See preincrement and postincrement operator++()

diff --git a/matroska/KaxBlock.h b/matroska/KaxBlock.h
index aedec5a619fc08a553355570b43aafde6ed338e1..3ee83971bedb41751bd0f18ecffd0aa778d04466 100644 (file)
--- a/matroska/KaxBlock.h
+++ b/matroska/KaxBlock.h
@@ -70,7 +70,7 @@ class MATROSKA_DLL_API DataBuffer {
                {
                        if (bInternalBuffer)
                        {
-                               myBuffer = new binary[mySize];
+                               myBuffer = new (std::nothrow) binary[mySize];
                                if (myBuffer == NULL)
                                        bValidValue = false;
                                else

diff --git a/src/KaxCluster.cpp b/src/KaxCluster.cpp
index deacace2e7ec026fb655155ab821b1685dd2236d..068f7e09c08e3b55178e1689a654c58cc18ee855 100644 (file)
--- a/src/KaxCluster.cpp
+++ b/src/KaxCluster.cpp
@@ -98,7 +98,6 @@ bool KaxCluster::AddFrameInternal(const KaxTrackEntry & track, uint64 timecode,
        if (currentNewBlock == NULL || uint32(track.TrackNumber()) != uint32(currentNewBlock->TrackNumber()) || PastBlock != NULL || ForwBlock != NULL) {
                KaxBlockGroup & aNewBlock = GetNewBlock();
                MyNewBlock = currentNewBlock = &aNewBlock;
-               currentNewBlock = &aNewBlock;
        }
 
        if (PastBlock != NULL) {

diff --git a/src/KaxCues.cpp b/src/KaxCues.cpp
index 184654c8df854912ba60c3d00f1329d556e333fe..0dff50a17c9e2689907581b74c28d0b52400eae2 100644 (file)
--- a/src/KaxCues.cpp
+++ b/src/KaxCues.cpp
@@ -70,7 +70,7 @@ 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++)
+       for (ListIdx = myTempReferences.begin(); ListIdx != myTempReferences.end(); ++ListIdx)
                if (*ListIdx == &BlockReference)
                        return true;
 
@@ -83,7 +83,7 @@ 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++) {
+       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);
@@ -99,7 +99,7 @@ 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++) {
+       for (ListIdx = myTempReferences.begin(); ListIdx != myTempReferences.end(); ++ListIdx) {
                const KaxInternalBlock &refTmp = **ListIdx;
                if (refTmp.GlobalTimecode() == BlockRef.GlobalTimecode() &&
                        refTmp.TrackNum() == BlockRef.TrackNumber()) {