support for Element 0x0000

git-svn-id: https://svn.code.sf.net/p/osirix/code/osirix@6949 4e9e6e3d-4551-47eb-9dbe-a6127f9400a1
pixmeo · Mar 24, 2010 · 8f55724 · 8f55724
1 parent 5e93b81
commit 8f55724
Showing 1 changed file with 21 additions and 16 deletions.
diff --git a/Papyrus3/PapyRead3.c b/Papyrus3/PapyRead3.c
@@ -2947,24 +2947,29 @@ PutBufferInGroup3 (PapyShort inFileNb, unsigned char *ioBuffP, SElement *ioGroup
 				return -1;
 			}
 
-			if( *ioBufPosP - theInitialBufPos + theElemLength > inBytesToRead)
+			if( theArrElemP [theStructPos].element == 0x0000) // Retired attribute - UL Group Length
+				*ioBufPosP += theElemLength;
+			else
 			{
-				printf("****** err length : *ioBufPosP - theInitialBufPos + theElemLength > inBytesToRead -- BAD GROUP LENGTH - CORRUPTED DICOM FILE, %s\n", gPapyFilePath [inFileNb]);
-				RETURN (papReadGroup);
+				if( *ioBufPosP - theInitialBufPos + theElemLength > inBytesToRead)
+				{
+					printf("****** err length : *ioBufPosP - theInitialBufPos + theElemLength > inBytesToRead -- BAD GROUP LENGTH - CORRUPTED DICOM FILE, %s\n", gPapyFilePath [inFileNb]);
+					RETURN (papReadGroup);
+				}
+
+				/* extract the element depending on the value representation */
+				  if ((theErr = PutBufferInElement3 (inFileNb, ioBuffP, theElemLength, &theArrElemP [theStructPos], ioBufPosP, theInitialFilePos)) < 0)
+				{
+					printf("****** err PutBufferInElement3, %s\n", gPapyFilePath [inFileNb]);
+					RETURN (theErr);  
+				}
+
+				/* if it was a sequence with an undefined length, move the buffer accordingly */
+				if (theIsUndefSeqLen)
+				  *ioBufPosP += 8L;		//ANTOINE - au lieu de + !!!
+
+				*ioBufPosP = ccval + theElemLength; //ANTOINE
 			}
-
-            /* extract the element depending on the value representation */
-	          if ((theErr = PutBufferInElement3 (inFileNb, ioBuffP, theElemLength, &theArrElemP [theStructPos], ioBufPosP, theInitialFilePos)) < 0)
-			{
-				printf("****** err PutBufferInElement3, %s\n", gPapyFilePath [inFileNb]);
-			    RETURN (theErr);  
-            }
-
-			/* if it was a sequence with an undefined length, move the buffer accordingly */
-            if (theIsUndefSeqLen)
-              *ioBufPosP += 8L;		//ANTOINE - au lieu de + !!!
-
-			*ioBufPosP = ccval + theElemLength; //ANTOINE
 		  } /* if ...theElemLength > 0 */
         } /* else ...element found */