Merge pull request #16 from JeromeMartinez/Tdat

Was flagging as duplicated chunk if iXML chunk before Tdat chunk
MediaArea · May 8, 2018 · fff0c72 · fff0c72
2 parents 6fd6545 + 64fde87
commit fff0c72
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/Source/Riff/Riff_Chunks_AVI__Tdat_rn_A.cpp b/Source/Riff/Riff_Chunks_AVI__Tdat_rn_A.cpp
@@ -20,7 +20,7 @@
 void Riff_AVI__Tdat_rn_A::Read_Internal ()
 {
     //Integrity
-    if (Global->iXML)
+    if (Global->Tdat->Strings.find("rn_a")!=Global->Tdat->Strings.end())
         throw exception_valid("2 rn_A chunks");
 
     //Reading

diff --git a/Source/Riff/Riff_Chunks_AVI__Tdat_rn_O.cpp b/Source/Riff/Riff_Chunks_AVI__Tdat_rn_O.cpp
@@ -20,7 +20,7 @@
 void Riff_AVI__Tdat_rn_O::Read_Internal ()
 {
     //Integrity
-    if (Global->iXML)
+    if (Global->Tdat->Strings.find("rn_O")!=Global->Tdat->Strings.end())
         throw exception_valid("2 rn_O chunks");
 
     //Reading

diff --git a/Source/Riff/Riff_Chunks_AVI__Tdat_tc_A.cpp b/Source/Riff/Riff_Chunks_AVI__Tdat_tc_A.cpp
@@ -20,7 +20,7 @@
 void Riff_AVI__Tdat_tc_A::Read_Internal ()
 {
     //Integrity
-    if (Global->iXML)
+    if (Global->Tdat->Strings.find("tc_A")!=Global->Tdat->Strings.end())
         throw exception_valid("2 tc_A chunks");
 
     //Reading

diff --git a/Source/Riff/Riff_Chunks_AVI__Tdat_tc_O.cpp b/Source/Riff/Riff_Chunks_AVI__Tdat_tc_O.cpp
@@ -20,7 +20,7 @@
 void Riff_AVI__Tdat_tc_O::Read_Internal ()
 {
     //Integrity
-    if (Global->iXML)
+    if (Global->Tdat->Strings.find("tc_O")!=Global->Tdat->Strings.end())
         throw exception_valid("2 tc_O chunks");
 
     //Reading