Allow user to create mutiframes

[gdcm.git] / src / gdcmmpeg2 / src / mpeg2dec / mpeg2dec.c

diff --git a/src/gdcmmpeg2/src/mpeg2dec/mpeg2dec.c b/src/gdcmmpeg2/src/mpeg2dec/mpeg2dec.c
index 4f156aa07452080b466ffff22147a20f70d93f28..f07432060e07bfdf73d41605bf596c0078841991 100644 (file)
--- a/src/gdcmmpeg2/src/mpeg2dec/mpeg2dec.c
+++ b/src/gdcmmpeg2/src/mpeg2dec/mpeg2dec.c
@@ -76,13 +76,12 @@ off_t my_seek(istream *infile, off_t offset, int whence)
 ssize_t my_read(istream *infile, void *buf, size_t count)
 {
 #ifdef FILESTAR
-  size_t r = fread(buf,1,count, infile->InFd);
+  return fread(buf,1,count, infile->InFd);
 #else
-  ssize_t r = read(infile->InFd,buf,count);
+  return read(infile->InFd,buf,count);
 #endif
-  printf( "%d , %d\n", count , r);
-  return r;
 }
+
 int my_close(istream *infile)
 {
 #ifdef FILESTAR
@@ -94,7 +93,6 @@ int my_close(istream *infile)
 
 int my_fopenr(const char *path, const char *mode, istream *os)
 {
-#if 0
   FILE *fd = fopen(path, mode);
   if(fd)
     {
@@ -103,7 +101,6 @@ int my_fopenr(const char *path, const char *mode, istream *os)
     }
   else
     os->InFd = NULL;
-#endif
   return 0;
 }
 
@@ -198,6 +195,7 @@ int argc;
 char *argv[];
 {
   int ret, code;
+  istream bos,eos;
   /*base.open_stream = my_open;*/
   base.seek_stream = my_seek;
   base.read_stream = my_read;
@@ -218,7 +216,6 @@ char *argv[];
   /* NOTE: this is either a base layer stream or a spatial enhancement stream */
 /*  if ((base.Infile=open(Main_Bitstream_Filename,O_RDONLY|O_BINARY))<0) */
   /*base.Infile = ld->open_stream(Main_Bitstream_Filename);*/
-  istream bos;
   base.Infile = &bos;
 #ifdef FILESTAR
   base.Infile->InFd = fopen(Main_Bitstream_Filename, "rb");
@@ -279,7 +276,6 @@ char *argv[];
 
     /*if ((enhan.Infile = open(Enhancement_Layer_Bitstream_Filename,O_RDONLY|O_BINARY))<0)*/
     /*enhan.Infile = ld->open_stream(Enhancement_Layer_Bitstream_Filename);*/
-    istream eos;
     enhan.Infile = &eos;
 #ifdef FILESTAR
     enhan.Infile->InFd = fopen(Main_Bitstream_Filename, "rb");
@@ -431,7 +427,7 @@ static void Initialize_Sequence()
 }
 
 void Error(text)
-char *text;
+const char *text;
 {
   fprintf(stderr,text);
   exit(1);
@@ -774,21 +770,21 @@ static int Decode_Bitstream()
   Bitstream_Framenum = 0;
 
   for(;;)
-  {
+    {
 
 #ifdef VERIFY
     Clear_Verify_Headers();
 #endif /* VERIFY */
 
     ret = Headers();
-    
+
     if(ret==1)
-    {
-      ret = video_sequence(&Bitstream_Framenum);
-    }
+      {
+      /*ret =*/ video_sequence(&Bitstream_Framenum);
+      }
     else
       return(ret);
-  }
+    }
 
 }