X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fgdcmmpeg2%2Fsrc%2Fmpeg2dec%2Fglobal.h;h=807a182db6269a0b7d5977671021b241791ef90f;hb=5044a1d6c4557f9fdc40afa9d43b277a7ce425f7;hp=7d67f008884897f389ebd6fa3ad063a094b7331b;hpb=1ca3acfeda301168a36d4e15a68d3685f9b91fc9;p=gdcm.git

diff --git a/src/gdcmmpeg2/src/mpeg2dec/global.h b/src/gdcmmpeg2/src/mpeg2dec/global.h
index 7d67f008..807a182d 100644
--- a/src/gdcmmpeg2/src/mpeg2dec/global.h
+++ b/src/gdcmmpeg2/src/mpeg2dec/global.h
@@ -72,7 +72,7 @@ void Decode_MPEG2_Non_Intra_Block _ANSI_ARGS_((int comp));
 int Get_Hdr _ANSI_ARGS_((void));
 void next_start_code _ANSI_ARGS_((void));
 int slice_header _ANSI_ARGS_((void));
-void marker_bit _ANSI_ARGS_((char *text));
+void marker_bit _ANSI_ARGS_((const char *text));
 
 /* getpic.c */
 void Decode_Picture _ANSI_ARGS_((int bitstream_framenum, 
@@ -105,7 +105,7 @@ void motion_vector _ANSI_ARGS_((int *PMV, int *dmvector,
 void Dual_Prime_Arithmetic _ANSI_ARGS_((int DMV[][2], int *dmvector, int mvx, int mvy));
 
 /* mpeg2dec.c */
-void Error _ANSI_ARGS_((char *text));
+void Error _ANSI_ARGS_((const char *text));
 void Warning _ANSI_ARGS_((char *text));
 void Print_Bits _ANSI_ARGS_((int code, int bits, int len));
 
@@ -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
@@ -262,10 +263,10 @@ EXTERN int Main_Bitstream_Flag;
 
 
 /* filenames */
-EXTERN char *Output_Picture_Filename;
-EXTERN char *Substitute_Picture_Filename;
-EXTERN char *Main_Bitstream_Filename; 
-EXTERN char *Enhancement_Layer_Bitstream_Filename; 
+EXTERN const char *Output_Picture_Filename;
+EXTERN const char *Substitute_Picture_Filename;
+EXTERN const char *Main_Bitstream_Filename; 
+EXTERN const char *Enhancement_Layer_Bitstream_Filename; 
 
 
 /* buffers for multiuse purposes */
@@ -286,7 +287,7 @@ EXTERN unsigned char *llframe0[3];
 EXTERN unsigned char *llframe1[3];
 
 EXTERN short *lltmp;
-EXTERN char *Lower_Layer_Picture_Filename;
+EXTERN const char *Lower_Layer_Picture_Filename;
 
 
 
@@ -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];