songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Modify #include for CGAL_ImageIO after the moves of header files

This commit is contained in:
Guillaume Damiand 2015-03-26 21:16:09 +01:00
parent 808c7c02fa
commit 1712a1b889
40 changed files with 73 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CGAL_ImageIO/include/CGAL/ImageIO_impl.h
View File

@ -51,15 +51,15 @@
GIF | .gif | X | GIF | .gif | X |
BMP | .gif | X | BMP | .gif | X |
*/ */
#include <CGAL/inr.h> #include "inr.h"
#include <CGAL/gif.h> #include "gif.h"
#include <CGAL/gis.h> #include "gis.h"
#include <CGAL/pnm.h> #include "pnm.h"
#include <CGAL/bmp.h> #include "bmp.h"
#include <CGAL/iris.h> #include "iris.h"
#include <CGAL/analyze.h> #include "analyze.h"
#ifdef MINC_FILES #ifdef MINC_FILES
# include <CGAL/mincio.h> #include "mincio.h"
#endif #endif

2
CGAL_ImageIO/include/CGAL/Image_3_vtk_interface.h
View File

@ -21,7 +21,7 @@
#ifndef CGAL_IMAGE_3_VTK_INTERFACE_H #ifndef CGAL_IMAGE_3_VTK_INTERFACE_H
#define CGAL_IMAGE_3_VTK_INTERFACE_H #define CGAL_IMAGE_3_VTK_INTERFACE_H
#include <CGAL/config.h> #include "config.h"
#ifdef CGAL_USE_VTK #ifdef CGAL_USE_VTK
#include <CGAL/Image_3.h> #include <CGAL/Image_3.h>

2
CGAL_ImageIO/src/CGAL_ImageIO/CMakeLists.txt
View File

@ -48,7 +48,7 @@ if(OPENGL_FOUND)
use_essential_libs() use_essential_libs()
include_directories( SYSTEM ${CGAL_3RD_PARTY_INCLUDE_DIRS} ${CGAL_ImageIO_3RD_PARTY_INCLUDE_DIRS} ) include_directories( SYSTEM ${CGAL_3RD_PARTY_INCLUDE_DIRS} ${CGAL_ImageIO_3RD_PARTY_INCLUDE_DIRS} .)
link_directories ( ${CGAL_LIBRARIES_DIR} ${CGAL_3RD_PARTY_LIBRARIES_DIRS} ) link_directories ( ${CGAL_LIBRARIES_DIR} ${CGAL_3RD_PARTY_LIBRARIES_DIRS} )

4
CGAL_ImageIO/src/CGAL_ImageIO/analyze.cpp
View File

@ -21,7 +21,7 @@
#ifndef CGAL_HEADER_ONLY #ifndef CGAL_HEADER_ONLY
#include <CGAL/analyze.h> #include "analyze.h"
#include <CGAL/analyze_impl.h> #include "analyze_impl.h"
#endif // CGAL_HEADER_ONLY #endif // CGAL_HEADER_ONLY

2
CGAL_ImageIO/src/CGAL_ImageIO/analyze.h
View File

@ -68,7 +68,7 @@ int writeAnalyzeHeader( const _image* im ) ;
int writeAnalyzeData( const _image* im ) ; int writeAnalyzeData( const _image* im ) ;
#ifdef CGAL_HEADER_ONLY #ifdef CGAL_HEADER_ONLY
#include <CGAL/analyze_impl.h> #include "analyze_impl.h"
#endif // CGAL_HEADER_ONLY #endif // CGAL_HEADER_ONLY
#endif #endif

4
CGAL_ImageIO/src/CGAL_ImageIO/bmp.cpp
View File

@ -21,7 +21,7 @@
#ifndef CGAL_HEADER_ONLY #ifndef CGAL_HEADER_ONLY
#include <CGAL/bmp.h> #include "bmp.h"
#include <CGAL/bmp_impl.h> #include "bmp_impl.h"
#endif // CGAL_HEADER_ONLY #endif // CGAL_HEADER_ONLY

2
CGAL_ImageIO/src/CGAL_ImageIO/bmp.h
View File

@ -59,7 +59,7 @@ extern void IoBmp_verbose ( );
extern void IoBmp_noverbose ( ); extern void IoBmp_noverbose ( );
#ifdef CGAL_HEADER_ONLY #ifdef CGAL_HEADER_ONLY
#include <CGAL/bmp_impl.h> #include "bmp_impl.h"
#endif // CGAL_HEADER_ONLY #endif // CGAL_HEADER_ONLY
#endif /* _bmp_h_ */ #endif /* _bmp_h_ */

6
CGAL_ImageIO/src/CGAL_ImageIO/bmp_impl.h
View File

@ -27,9 +27,9 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <CGAL/bmptypes.h> #include "bmptypes.h"
#include <CGAL/bmpendian.h> #include "bmpendian.h"
#include <CGAL/bmpread.h> #include "bmpread.h"

4
CGAL_ImageIO/src/CGAL_ImageIO/bmpendian.cpp
View File

@ -21,7 +21,7 @@
#ifndef CGAL_HEADER_ONLY #ifndef CGAL_HEADER_ONLY
#include <CGAL/bmpendian.h> #include "bmpendian.h"
#include <CGAL/bmpendian_impl.h> #include "bmpendian_impl.h"
#endif // CGAL_HEADER_ONLY #endif // CGAL_HEADER_ONLY

6
CGAL_ImageIO/src/CGAL_ImageIO/bmpendian.h
View File

@ -31,7 +31,9 @@
#ifndef __ENDIAN_H_INCLUDED__ #ifndef __ENDIAN_H_INCLUDED__
#define __ENDIAN_H_INCLUDED__ #define __ENDIAN_H_INCLUDED__
#include "bmptypes.h"
/* /*
* Read the basic types as little-endian values. The return value will be * Read the basic types as little-endian values. The return value will be
* zero if successful, EOF, otherwise. * zero if successful, EOF, otherwise.
@ -55,7 +57,7 @@ int writeUINT16little(FILE *f, CGAL_UINT16 i);
int writeUINT32little(FILE *f, CGAL_UINT32 i); int writeUINT32little(FILE *f, CGAL_UINT32 i);
#ifdef CGAL_HEADER_ONLY #ifdef CGAL_HEADER_ONLY
#include <CGAL/bmpendian_impl.h> #include "bmpendian_impl.h"
#endif // CGAL_HEADER_ONLY #endif // CGAL_HEADER_ONLY
#endif /* __ENDIAN_H_INCLUDED__ */ #endif /* __ENDIAN_H_INCLUDED__ */

2
CGAL_ImageIO/src/CGAL_ImageIO/bmpendian_impl.h
View File

@ -33,7 +33,7 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include <CGAL/bmptypes.h> #include "bmptypes.h"
/***************************************************************************** /*****************************************************************************
* *

4
CGAL_ImageIO/src/CGAL_ImageIO/bmpread.cpp
View File

@ -21,7 +21,7 @@
#ifndef CGAL_HEADER_ONLY #ifndef CGAL_HEADER_ONLY
#include <CGAL/bmpread.h> #include "bmpread.h"
#include <CGAL/bmpread_impl.h> #include "bmpread_impl.h"
#endif // CGAL_HEADER_ONLY #endif // CGAL_HEADER_ONLY

2
CGAL_ImageIO/src/CGAL_ImageIO/bmpread.h
View File

@ -61,7 +61,7 @@ int readMultipleImage(FILE *fp, RGB ***argbs, char ***xorMasks,
int *imageCount); int *imageCount);
#ifdef CGAL_HEADER_ONLY #ifdef CGAL_HEADER_ONLY
#include <CGAL/bmpread_impl.h> #include "bmpread_impl.h"
#endif // CGAL_HEADER_ONLY #endif // CGAL_HEADER_ONLY
#endif #endif

4
CGAL_ImageIO/src/CGAL_ImageIO/bmpread_impl.h
View File

@ -38,8 +38,8 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <CGAL/bmptypes.h> #include "bmptypes.h"
#include <CGAL/bmpendian.h> #include "bmpendian.h"
/***************************************************************************** /*****************************************************************************
* *

4
CGAL_ImageIO/src/CGAL_ImageIO/convert.cpp
View File

@ -21,7 +21,7 @@
#ifndef CGAL_HEADER_ONLY #ifndef CGAL_HEADER_ONLY
#include <CGAL/convert.h> #include "convert.h"
#include <CGAL/convert_impl.h> #include "convert_impl.h"
#endif // CGAL_HEADER_ONLY #endif // CGAL_HEADER_ONLY

4
CGAL_ImageIO/src/CGAL_ImageIO/convert.h
View File

@ -48,7 +48,7 @@
#include <stdio.h> /* memcpy */ #include <stdio.h> /* memcpy */
#include <string.h> /* memcpy */ #include <string.h> /* memcpy */
#include <CGAL/typedefs.h> #include "typedefs.h"
@ -102,7 +102,7 @@ extern void Convert_r32_to_u16( r32 *theBuf,
#ifdef CGAL_HEADER_ONLY #ifdef CGAL_HEADER_ONLY
#include <CGAL/convert_impl.h> #include "convert_impl.h"
#endif // CGAL_HEADER_ONLY #endif // CGAL_HEADER_ONLY
#endif #endif

4
CGAL_ImageIO/src/CGAL_ImageIO/fgetns.cpp
View File

@ -21,7 +21,7 @@
#ifndef CGAL_HEADER_ONLY #ifndef CGAL_HEADER_ONLY
#include <CGAL/fgetns.h> #include "fgetns.h"
#include <CGAL/fgetns_impl.h> #include "fgetns_impl.h"
#endif // CGAL_HEADER_ONLY #endif // CGAL_HEADER_ONLY

2
CGAL_ImageIO/src/CGAL_ImageIO/fgetns.h
View File

@ -29,7 +29,7 @@
char *fgetns(char *str, int n, _image *im ); char *fgetns(char *str, int n, _image *im );
#ifdef CGAL_HEADER_ONLY #ifdef CGAL_HEADER_ONLY
#include <CGAL/fgetns_impl.h> #include "fgetns_impl.h"
#endif // CGAL_HEADER_ONLY #endif // CGAL_HEADER_ONLY
#endif // FGETNS_H #endif // FGETNS_H

4
CGAL_ImageIO/src/CGAL_ImageIO/gif.cpp
View File

@ -21,7 +21,7 @@
#ifndef CGAL_HEADER_ONLY #ifndef CGAL_HEADER_ONLY
#include <CGAL/gif.h> #include "gif.h"
#include <CGAL/gif_impl.h> #include "gif_impl.h"
#endif // CGAL_HEADER_ONLY #endif // CGAL_HEADER_ONLY

2
CGAL_ImageIO/src/CGAL_ImageIO/gif.h
View File

@ -32,7 +32,7 @@ int testGifHeader(char *magic,const char *name);
PTRIMAGE_FORMAT createGifFormat(); PTRIMAGE_FORMAT createGifFormat();
#ifdef CGAL_HEADER_ONLY #ifdef CGAL_HEADER_ONLY
#include <CGAL/gif_impl.h> #include "gif_impl.h"
#endif // CGAL_HEADER_ONLY #endif // CGAL_HEADER_ONLY
#endif #endif

4
CGAL_ImageIO/src/CGAL_ImageIO/gis.cpp
View File

@ -21,7 +21,7 @@
#ifndef CGAL_HEADER_ONLY #ifndef CGAL_HEADER_ONLY
#include <CGAL/gis.h> #include "gis.h"
#include <CGAL/gis_impl.h> #include "gis_impl.h"
#endif // CGAL_HEADER_ONLY #endif // CGAL_HEADER_ONLY

2
CGAL_ImageIO/src/CGAL_ImageIO/gis.h
View File

@ -135,7 +135,7 @@ int writeGisHeader( const _image* im ) ;
int writeGisData( const _image* im ) ; int writeGisData( const _image* im ) ;
#ifdef CGAL_HEADER_ONLY #ifdef CGAL_HEADER_ONLY
#include <CGAL/gis_impl.h> #include "gis_impl.h"
#endif // CGAL_HEADER_ONLY #endif // CGAL_HEADER_ONLY
#endif #endif

5
CGAL_ImageIO/src/CGAL_ImageIO/gis_impl.h
View File

@ -27,9 +27,10 @@
#include <string> #include <string>
#include <sstream> #include <sstream>
#include <cstring>
#include <CGAL/inr.h> #include "inr.h"
#include <CGAL/fgetns.h> #include "fgetns.h"
#define _LGTH_STRING_ 1024 #define _LGTH_STRING_ 1024

4
CGAL_ImageIO/src/CGAL_ImageIO/inr.cpp
View File

@ -21,7 +21,7 @@
#ifndef CGAL_HEADER_ONLY #ifndef CGAL_HEADER_ONLY
#include <CGAL/inr.h> #include "inr.h"
#include <CGAL/inr_impl.h> #include "inr_impl.h"
#endif // CGAL_HEADER_ONLY #endif // CGAL_HEADER_ONLY

2
CGAL_ImageIO/src/CGAL_ImageIO/inr.h
View File

@ -58,7 +58,7 @@ int writeInrimage(char *basename,_image *im);
PTRIMAGE_FORMAT createInrimageFormat(); PTRIMAGE_FORMAT createInrimageFormat();
#ifdef CGAL_HEADER_ONLY #ifdef CGAL_HEADER_ONLY
#include <CGAL/inr_impl.h> #include "inr_impl.h"
#endif // CGAL_HEADER_ONLY #endif // CGAL_HEADER_ONLY

2
CGAL_ImageIO/src/CGAL_ImageIO/inr_impl.h
View File

@ -25,7 +25,7 @@
#define CGAL_INLINE_FUNCTION #define CGAL_INLINE_FUNCTION
#endif #endif
#include <CGAL/fgetns.h> #include "fgetns.h"
#include <string> #include <string>
#include <sstream> #include <sstream>

4
CGAL_ImageIO/src/CGAL_ImageIO/iris.cpp
View File

@ -21,7 +21,7 @@
#ifndef CGAL_HEADER_ONLY #ifndef CGAL_HEADER_ONLY
#include <CGAL/iris.h> #include "iris.h"
#include <CGAL/iris_impl.h> #include "iris_impl.h"
#endif // CGAL_HEADER_ONLY #endif // CGAL_HEADER_ONLY

4
CGAL_ImageIO/src/CGAL_ImageIO/mincio.cpp
View File

@ -21,7 +21,7 @@
#ifndef CGAL_HEADER_ONLY #ifndef CGAL_HEADER_ONLY
#include <CGAL/mincio.h> #include "mincio.h"
#include <CGAL/mincio_impl.h> #include "mincio_impl.h"
#endif // CGAL_HEADER_ONLY #endif // CGAL_HEADER_ONLY

2
CGAL_ImageIO/src/CGAL_ImageIO/mincio.h
View File

@ -71,7 +71,7 @@ int writeMincFile( const _image* im, const char *name, const char *sourceName,
#endif #endif
#ifdef CGAL_HEADER_ONLY #ifdef CGAL_HEADER_ONLY
#include <CGAL/mincio_impl.h> #include "mincio_impl.h"
#endif // CGAL_HEADER_ONLY #endif // CGAL_HEADER_ONLY
#endif #endif

4
CGAL_ImageIO/src/CGAL_ImageIO/pnm.cpp
View File

@ -21,7 +21,7 @@
#ifndef CGAL_HEADER_ONLY #ifndef CGAL_HEADER_ONLY
#include <CGAL/pnm.h> #include "pnm.h"
#include <CGAL/pnm_impl.h> #include "pnm_impl.h"
#endif // CGAL_HEADER_ONLY #endif // CGAL_HEADER_ONLY

2
CGAL_ImageIO/src/CGAL_ImageIO/pnm.h
View File

@ -40,7 +40,7 @@ PTRIMAGE_FORMAT createPgmAscIIFormat();
PTRIMAGE_FORMAT createPpmFormat(); PTRIMAGE_FORMAT createPpmFormat();
#ifdef CGAL_HEADER_ONLY #ifdef CGAL_HEADER_ONLY
#include <CGAL/pnm_impl.h> #include "pnm_impl.h"
#endif // CGAL_HEADER_ONLY #endif // CGAL_HEADER_ONLY
#endif #endif

2
CGAL_ImageIO/src/CGAL_ImageIO/pnm_impl.h
View File

@ -32,7 +32,7 @@
#include <string.h> #include <string.h>
#include <sstream> #include <sstream>
#include <CGAL/fgetns.h> #include "fgetns.h"

4
CGAL_ImageIO/src/CGAL_ImageIO/recbuffer.cpp
View File

@ -21,7 +21,7 @@
#ifndef CGAL_HEADER_ONLY #ifndef CGAL_HEADER_ONLY
#include <CGAL/recbuffer.h> #include "recbuffer.h"
#include <CGAL/recbuffer_impl.h> #include "recbuffer_impl.h"
#endif // CGAL_HEADER_ONLY #endif // CGAL_HEADER_ONLY

6
CGAL_ImageIO/src/CGAL_ImageIO/recbuffer.h
View File

@ -49,8 +49,8 @@
#define _recbuffer_h_ #define _recbuffer_h_
#include <CGAL/typedefs.h> #include "typedefs.h"
#include <CGAL/recline.h> #include "recline.h"
@ -196,7 +196,7 @@ extern void Recbuffer_noverbose ( );
#ifdef CGAL_HEADER_ONLY #ifdef CGAL_HEADER_ONLY
#include <CGAL/recbuffer_impl.h> #include "recbuffer_impl.h"
#endif // CGAL_HEADER_ONLY #endif // CGAL_HEADER_ONLY

2
CGAL_ImageIO/src/CGAL_ImageIO/recbuffer_impl.h
View File

@ -58,7 +58,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <math.h> #include <math.h>
#include <CGAL/convert.h> #include "convert.h"
#ifdef CGAL_HEADER_ONLY #ifdef CGAL_HEADER_ONLY

4
CGAL_ImageIO/src/CGAL_ImageIO/recline.cpp
View File

@ -21,7 +21,7 @@
#ifndef CGAL_HEADER_ONLY #ifndef CGAL_HEADER_ONLY
#include <CGAL/recline.h> #include "recline.h"
#include <CGAL/recline_impl.h> #include "recline_impl.h"
#endif // CGAL_HEADER_ONLY #endif // CGAL_HEADER_ONLY

2
CGAL_ImageIO/src/CGAL_ImageIO/recline.h
View File

@ -229,7 +229,7 @@ extern void Recline_verbose ( );
extern void Recline_noverbose ( ); extern void Recline_noverbose ( );
#ifdef CGAL_HEADER_ONLY #ifdef CGAL_HEADER_ONLY
#include <CGAL/recline_impl.h> #include "recline_impl.h"
#endif // CGAL_HEADER_ONLY #endif // CGAL_HEADER_ONLY
#endif /* _recline_h_ */ #endif /* _recline_h_ */

4
CGAL_ImageIO/src/CGAL_ImageIO/reech4x4.cpp
View File

@ -21,7 +21,7 @@
#ifndef CGAL_HEADER_ONLY #ifndef CGAL_HEADER_ONLY
#include <CGAL/reech4x4.h> #include "reech4x4.h"
#include <CGAL/reech4x4_impl.h> #include "reech4x4_impl.h"
#endif // CGAL_HEADER_ONLY #endif // CGAL_HEADER_ONLY

2
CGAL_ImageIO/src/CGAL_ImageIO/reech4x4.h
View File

@ -281,7 +281,7 @@ extern void Reech4x4_verbose ( );
extern void Reech4x4_noverbose ( ); extern void Reech4x4_noverbose ( );
#ifdef CGAL_HEADER_ONLY #ifdef CGAL_HEADER_ONLY
#include <CGAL/reech4x4_impl.h> #include "reech4x4_impl.h"
#endif // CGAL_HEADER_ONLY #endif // CGAL_HEADER_ONLY

2
CGAL_ImageIO/src/CGAL_ImageIO/reech4x4_impl.h
View File

@ -51,7 +51,7 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include <CGAL/typedefs.h> #include "typedefs.h"
#define _CONVERTR_(R) ( R ) #define _CONVERTR_(R) ( R )
#define _CONVERTI_(R) ( (R) >= 0.0 ? ((int)((R)+0.5)) : ((int)((R)-0.5)) ) #define _CONVERTI_(R) ( (R) >= 0.0 ? ((int)((R)+0.5)) : ((int)((R)-0.5)) )