X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmJpeg12.cxx;h=d4069cb53d3215fdccfd13557fb55c06aac241b5;hb=1d6b53d6cc3487013b10aa9b604ae948585dbfb7;hp=7cb84bf2e0d8de40479900d960acdd51432ba24c;hpb=fea9426f960497d2d9124ab532d2097f2915678f;p=gdcm.git diff --git a/src/gdcmJpeg12.cxx b/src/gdcmJpeg12.cxx index 7cb84bf2..d4069cb5 100644 --- a/src/gdcmJpeg12.cxx +++ b/src/gdcmJpeg12.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmJpeg12.cxx,v $ Language: C++ - Date: $Date: 2004/10/22 03:05:42 $ - Version: $Revision: 1.23 $ + Date: $Date: 2004/12/12 17:21:08 $ + Version: $Revision: 1.28 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -16,17 +16,18 @@ =========================================================================*/ #include "gdcmFile.h" +#include extern "C" { -#include "src/jpeg/libijg12/jconfig.h" -#include "src/jpeg/libijg12/jpeglib.h" -#include "src/jpeg/libijg12/jinclude.h" -#include "src/jpeg/libijg12/jerror.h" +#include "gdcmjpeg/12/jconfig.h" +#include "gdcmjpeg/12/jpeglib.h" +#include "gdcmjpeg/12/jinclude.h" +#include "gdcmjpeg/12/jerror.h" } - -#define gdcm_write_JPEG_file gdcm_write_JPEG_file12 -#define gdcm_read_JPEG_file gdcm_read_JPEG_file12 +#define gdcm_write_JPEG_file gdcm_write_JPEG_file12 +#define gdcm_read_JPEG_file gdcm_read_JPEG_file12 +#define gdcm_read_JPEG_memory gdcm_read_JPEG_memory12 #include "gdcmJpeg.cxx"