X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmMpeg.cxx;h=301ba84f380f35571bf79d9002f6861e325c3591;hb=36d2133b15ab9d3e4c0f1ae2cc608188c05e4fb9;hp=4eee68ae03ebe35467be2456f9056eadcd4b36ba;hpb=33e0626ee829c06cee6f6dda37f7f720c6c9b311;p=gdcm.git diff --git a/src/gdcmMpeg.cxx b/src/gdcmMpeg.cxx index 4eee68ae..301ba84f 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/10/27 20:08:29 $ - Version: $Revision: 1.8 $ + Date: $Date: 2006/05/30 08:19:25 $ + Version: $Revision: 1.10 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -64,14 +64,7 @@ int my_close(istream *infile) namespace gdcm { -/** - * \brief routine for MPEG decompression - * @param fp pointer to an already open file descriptor - * 8 significant bits per pixel - * @param image_buffer to receive uncompressed pixels - * @param length length - * @return 1 on success, 0 on error - */ + static int Headers(); static void DeInitialize_Decoder() { @@ -321,6 +314,14 @@ static void Initialize_Decoder() } +/** + * \brief routine for MPEG decompression + * @param fp pointer to an already open file descriptor + * 8 significant bits per pixel + * @param image_buffer to receive uncompressed pixels + * @param length length + * @return 1 on success, 0 on error + */ bool ReadMPEGFile (std::ifstream *fp, char *image_buffer, size_t length) { std::streampos mpeg_start = fp->tellg(); // the MPEG stream in our case does not start at 0 @@ -329,6 +330,8 @@ bool ReadMPEGFile (std::ifstream *fp, char *image_buffer, size_t length) std::ofstream out("/tmp/etiam.mpeg"); out.write((char*)image_buffer, length); out.close(); +#else + (void)length; #endif int ret, code;