X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmMpeg.cxx;h=fc31f6e4a783319ec53915be6888ab4833ac5fb0;hb=df832cf7f90b4ca5aca2f628c1756fb276779fac;hp=516f1bbaccea6017189379b4e6a52119d494e252;hpb=9ca0e4bb2208be93bebf21d0c5d75c8018e7605a;p=gdcm.git diff --git a/src/gdcmMpeg.cxx b/src/gdcmMpeg.cxx index 516f1bba..fc31f6e4 100644 --- a/src/gdcmMpeg.cxx +++ b/src/gdcmMpeg.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmMpeg.cxx,v $ Language: C++ - Date: $Date: 2005/06/24 10:55:59 $ - Version: $Revision: 1.5 $ + Date: $Date: 2007/09/17 12:20:01 $ + Version: $Revision: 1.14 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -34,7 +34,7 @@ static int Headers _ANSI_ARGS_((void)); static void Initialize_Sequence _ANSI_ARGS_((void)); static void Initialize_Decoder _ANSI_ARGS_((void)); static void Deinitialize_Sequence _ANSI_ARGS_((void)); -//static void Process_Options _ANSI_ARGS_((int argc, char *argv[])); +//static void Process_Options _ANSI_ARGS_((int argc, char *argv[])); /* IMPLEMENTATION specific routines */ static void Initialize_Decoder() @@ -117,7 +117,7 @@ static void Initialize_Sequence() if ( !(auxframe[cc] = (unsigned char *)malloc(size)) ) Error("auxframe[] malloc failed\n"); - if ( Ersatz_Flag ) + if ( Ersatz_Flag ) if ( !(substitute_frame[cc] = (unsigned char *)malloc(size)) ) Error("substitute_frame[] malloc failed\n"); @@ -168,7 +168,7 @@ static int Headers() int ret; ld = &base; - + /* return when end of sequence (0) or picture header has been parsed (1) */ @@ -244,7 +244,6 @@ static void Deinitialize_Sequence() #endif } - static int video_sequence(int *Bitstream_Framenumber) { int Bitstream_Framenum; @@ -298,7 +297,7 @@ static int video_sequence(int *Bitstream_Framenumber) } } // End "C" extern -namespace gdcm +namespace GDCM_NAME_SPACE { /** * \brief routine for MPEG decompression @@ -308,14 +307,12 @@ namespace gdcm * @param length length * @return 1 on success, 0 on error */ - bool ReadMPEGFile (std::ifstream *fp, void *image_buffer, size_t length) { int ret, code; #if 0 fp->read((char*)image_buffer, length); - ofstream out("/tmp/etiam.mpeg"); out.write((char*)image_buffer, length); out.close();