ENH: IO abstract layer is finally working

[gdcm.git] / src / gdcmmpeg2 / src / mpeg2dec / global.h

diff --git a/src/gdcmmpeg2/src/mpeg2dec/global.h b/src/gdcmmpeg2/src/mpeg2dec/global.h
index 7d67f008884897f389ebd6fa3ad063a094b7331b..363e0db1f198be6b4363d0401a8e382d3c7fffae 100644 (file)
--- a/src/gdcmmpeg2/src/mpeg2dec/global.h
+++ b/src/gdcmmpeg2/src/mpeg2dec/global.h
@@ -118,6 +118,7 @@ void form_predictions _ANSI_ARGS_((int bx, int by, int macroblock_type,
 void Spatial_Prediction _ANSI_ARGS_((void));
 
 /* store.c */
+void FreeStaticBuffer _ANSI_ARGS_((void));
 void Write_Frame _ANSI_ARGS_((unsigned char *src[], int frame));
 
 #ifdef DISPLAY
@@ -417,20 +418,14 @@ EXTERN int broken_link;
 
 
 
-/* FIXME */
-#include <sys/types.h>
-#ifdef _WIN32
-typedef int ssize_t;
-#endif
-
 /* layer specific variables (needed for SNR and DP scalability) */
 EXTERN struct layer_data {
   /* bit input */
-  int Infile;
-  int  (*open_stream) (char *filename);
-  off_t   (*seek_stream) (int infile, off_t offset,int whence);
-  ssize_t (*read_stream) (int infile, void *buf, size_t count);
-  int  (*close_stream) (int infile);
+  istream *Infile;
+/*  int  (*open_stream) (char *filename);*/
+  off_t   (*seek_stream) (istream *is, off_t offset,int whence);
+  ssize_t (*read_stream) (istream *is, void *buf, size_t count);
+  int  (*close_stream) (istream *is);
   unsigned char Rdbfr[2048];
   unsigned char *Rdptr;
   unsigned char Inbfr[16];