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

removed one parameter too much

This commit is contained in:
Andreas Fabri 2013-03-01 08:55:10 +01:00
parent e8b191fd87
commit 455190a2e4
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CGAL_ImageIO/include/CGAL/Image_3.h
View File

@ -145,6 +145,7 @@ public:
bool read(const char* file)
{
std::cerr << "read((const char* file)\n";
return private_read(::_readImage(file));
}

11
CGAL_ImageIO/src/CGAL_ImageIO/ImageIO.cpp
View File

@ -137,6 +137,7 @@ size_t ImageIO_write(const _image *im, const void *buf, size_t len) {
*/
size_t ImageIO_read(const _image *im, void *buf, size_t len)
{
fprintf(stderr,"Entering ImageIO_read\n");
size_t to_be_read = len;
int l = -1;
char *b = (char*)buf;
@ -146,7 +147,9 @@ size_t ImageIO_read(const _image *im, void *buf, size_t len)
case OM_CLOSE :
return 0;
case OM_STD :
fprintf(stderr,"OM_STD\n");
#ifdef CGAL_USE_ZLIB
fprintf(stderr,"OM_STD: in #ifdef CGAL_USE_ZLIB\n");
while ( (to_be_read > 0) && ((l = gzread(im->fd, (void *) b, to_be_read)) > 0) ) {
to_be_read -= l;
b += l;
@ -159,7 +162,9 @@ size_t ImageIO_read(const _image *im, void *buf, size_t len)
#endif
return ( len - to_be_read );
#ifdef CGAL_USE_ZLIB
fprintf(stderr,"#ifdef CGAL_USE_ZLIB\n");
case OM_GZ :
fprintf(stderr,"OM_GZ\n");
while ( (to_be_read > 0) && ((l = gzread(im->fd, (void *) b, to_be_read)) > 0) ) {
to_be_read -= l;
b += l;
@ -171,6 +176,7 @@ size_t ImageIO_read(const _image *im, void *buf, size_t len)
}
return ( len - to_be_read );
#else
fprintf(stderr,"in #else\n)";
case OM_FILE :
while ( (to_be_read > 0) && ((l = fread( b, 1, to_be_read, im->fd )) > 0) ) {
to_be_read -= l;
@ -442,6 +448,7 @@ ENDIANNESS _getEndianness()
_image *_initImage() {
_image *im;
fprintf(stderr, "in _initImage\n");
im = (_image *) ImageIO_alloc(sizeof(_image));
if ( im == NULL ) return( im );
@ -595,6 +602,7 @@ void _freeImage(_image *im) {
_image* _readImage(const char *name) {
_image *im;
fprintf(stderr, " _readimage\n");
/* read header */
im = _readImageHeader( name );
@ -912,6 +920,7 @@ _image *_readImageHeader( const char *name ) {
_image *_readImageHeaderAndGetError( const char *name_to_be_read, int *error )
{
fprintf(stderr, "_readImageHeaderAndGetError\n");
_image *im;
char magic[5];
char *name = NULL;
@ -931,7 +940,7 @@ _image *_readImageHeaderAndGetError( const char *name_to_be_read, int *error )
name = strdup( name_to_be_read );
}
fprintf(stderr, "_readImageHeaderAndGetError\n");
_openReadImage(im, name);
if(!im->fd) {

2
Minkowski_sum_3/include/CGAL/Minkowski_sum_3/Gaussian_map.h
View File

@ -107,7 +107,7 @@ class Gaussian_map :
void visit(SHalfedge_const_handle) {}
void visit(SHalfloop_const_handle) {}
void visit(SFace_const_handle) {}
void visit(Halffacet_const_handle) {
void visit(Halffacet_const_handle f) {
CGAL_NEF_TRACEN( "SVertex_creator2 " << f->twin()->plane() );
SVertex_handle sv