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

Fix two typos and a linker bug (extern "C").

This commit is contained in:
Laurent Rineau 2007-02-16 19:18:00 +00:00
parent 86307ba0e2
commit 349d29a80c
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Surface_mesher/include/CGAL/Gray_level_image_3.h
View File

@ -22,15 +22,17 @@
#include <CGAL/basic.h> #include <CGAL/basic.h>
/* Copy-paste from <imageio/ImageIO.h> */
extern "C" {
struct _image; struct _image;
/* Copy-paste from <imageio/ImageIO.h> */
_image* _readImage(const char *name); _image* _readImage(const char *name);
void convertImageTypeToFloat(_image* image);
float triLinInterp(_image* image,float posx, float posy, float posz);
bool _get_image_bounding_box(_image*, bool _get_image_bounding_box(_image*,
float*, float*, float*, float*, float*, float*,
float*, float*, float*); float*, float*, float*);
void convertImageTypeToFloat(_image* image);
float triLinInterp(_image* image,float posx, float posy, float posz);
}
/* End of copy-paste from <imageio/ImageIO.h> */ /* End of copy-paste from <imageio/ImageIO.h> */
namespace CGAL { namespace CGAL {
@ -54,7 +56,7 @@ public:
max_x(0.f), max_x(0.f),
max_y(0.f), max_y(0.f),
max_z(0.f), max_z(0.f),
is_valid(false); is_valid(false)
{ {
image = ::_readImage(file); image = ::_readImage(file);
if( image != 0 ) if( image != 0 )
@ -70,7 +72,7 @@ public:
bool inside(float X, float Y, float Z) const bool inside(float X, float Y, float Z) const
{ {
return ( X>=min_x. && Y>=min_y && Z>=min_z && return ( X>=min_x && Y>=min_y && Z>=min_z &&
X<=max_x && Y<=max_y && Z<=max_z ); X<=max_x && Y<=max_y && Z<=max_z );
} }