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

Protect new code with preprocessor checks

This commit is contained in:
Maxime Gimeno 2018-07-27 14:04:37 +02:00
parent 1d958dbd54
commit a50b224fc2
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,6 +63,12 @@
#include <CGAL/ImageIO/mincio.h> #include <CGAL/ImageIO/mincio.h>
#endif #endif
#ifdef CGAL_USE_ZLIB
#define ZLIB_MAJOR_VERSION ZLIB_VERNUM>>8
#define ZLIB_MINOR_VERSION (ZLIB_VERNUM-(ZLIB_MAJOR_VERSION <<8))
#define CGAL_USE_GZFWRITE ZLIB_MAJOR_VERSION > 0x12 || ((ZLIB_MAJOR_VERSION == 0x12) && (ZLIB_MINOR_VERSION >= 0x90))
#endif
struct Remove_supported_file_format { struct Remove_supported_file_format {
~Remove_supported_file_format() ~Remove_supported_file_format()
{ {
@ -194,12 +200,14 @@ size_t ImageIO_write(const _image *im, const void *buf, size_t len) {
fprintf(stderr, "zlib error: %s\n", gzerror(im->fd, &errnum)); fprintf(stderr, "zlib error: %s\n", gzerror(im->fd, &errnum));
} }
return ( len - to_be_written ); return ( len - to_be_written );
#if CGAL_USE_GZFWRITE
case OM_FILE : case OM_FILE :
while ( (to_be_written > 0) && ((l = gzfwrite( b, sizeof(char), ImageIO_limit_len(to_be_written), im->fd )) > 0) ) { while ( (to_be_written > 0) && ((l = gzfwrite( b, sizeof(char), ImageIO_limit_len(to_be_written), im->fd )) > 0) ) {
to_be_written -= l; to_be_written -= l;
b += l; b += l;
} }
return ( len - to_be_written ); return ( len - to_be_written );
#endif // CGAL_USE_GZFWRITE
#else #else
case OM_FILE : case OM_FILE :
while ( (to_be_written > 0) && ((l = fwrite( b, 1, ImageIO_limit_len(to_be_written), im->fd )) > 0) ) { while ( (to_be_written > 0) && ((l = fwrite( b, 1, ImageIO_limit_len(to_be_written), im->fd )) > 0) ) {
@ -249,7 +257,9 @@ size_t ImageIO_read(const _image *im, void *buf, size_t len)
return ( len - to_be_read ); return ( len - to_be_read );
#ifdef CGAL_USE_ZLIB #ifdef CGAL_USE_ZLIB
case OM_GZ : case OM_GZ :
#if CGAL_USE_GZFWRITE
case OM_FILE : case OM_FILE :
#endif// CGAL_USE_GZFWRITE
while ( (to_be_read > 0) && ((l = gzread(im->fd, (void *) b, ImageIO_limit_len(to_be_read))) > 0) ) { while ( (to_be_read > 0) && ((l = gzread(im->fd, (void *) b, ImageIO_limit_len(to_be_read))) > 0) ) {
to_be_read -= l; to_be_read -= l;
b += l; b += l;
@ -298,7 +308,9 @@ char *ImageIO_gets( const _image *im, char *str, int size )
break; break;
#ifdef CGAL_USE_ZLIB #ifdef CGAL_USE_ZLIB
case OM_GZ : case OM_GZ :
#if CGAL_USE_GZFWRITE
case OM_FILE : case OM_FILE :
#endif // CGAL_USE_GZFWRITE
ret = (char *) gzgets(im->fd, str, size); ret = (char *) gzgets(im->fd, str, size);
break; break;
@ -321,7 +333,9 @@ long ImageIO_seek( const _image *im, long offset, int whence ) {
return -1; return -1;
#ifdef CGAL_USE_ZLIB #ifdef CGAL_USE_ZLIB
case OM_GZ: case OM_GZ:
#if CGAL_USE_GZFWRITE
case OM_FILE: case OM_FILE:
#endif //CGAL_USE_GZFWRITE
return gzseek(im->fd, offset, whence ); return gzseek(im->fd, offset, whence );
#else #else
case OM_FILE: case OM_FILE:
@ -341,7 +355,9 @@ int ImageIO_error( const _image *im )
return 0; return 0;
#ifdef CGAL_USE_ZLIB #ifdef CGAL_USE_ZLIB
case OM_GZ : case OM_GZ :
#if CGAL_USE_GZFWRITE
case OM_FILE : case OM_FILE :
#endif //CGAL_USE_GZFWRITE
static int errnum; static int errnum;
(void)gzerror(im->fd, &errnum); (void)gzerror(im->fd, &errnum);
return( (errnum != Z_OK) || gzeof(im->fd) ); return( (errnum != Z_OK) || gzeof(im->fd) );
@ -372,7 +388,9 @@ int ImageIO_close( _image* im )
#ifdef CGAL_USE_ZLIB #ifdef CGAL_USE_ZLIB
case OM_GZ : case OM_GZ :
case OM_STD : case OM_STD :
#if CGAL_USE_GZFWRITE
case OM_FILE : case OM_FILE :
#endif//CGAL_USE_GZFWRITE
ret = gzclose( im->fd ); ret = gzclose( im->fd );
break; break;
#else #else
@ -489,19 +507,20 @@ void _openWriteImage(_image* im, const char *name)
#endif #endif
im->openMode = OM_GZ; im->openMode = OM_GZ;
} }
#if CGAL_USE_GZFWRITE
else else
{ {
im->fd = (_ImageIO_file) gzopen(name, "wb"); im->fd = (_ImageIO_file) gzopen(name, "wb");
im->openMode = OM_FILE; im->openMode = OM_FILE;
} }
} #endif// CGAL_USE_GZFWRITE
#else #else
{ {
im->fd = (_ImageIO_file) fopen(name, "wb"); im->fd = (_ImageIO_file) fopen(name, "wb");
im->openMode = OM_FILE; im->openMode = OM_FILE;
} }
}
#endif #endif
}
} }