From b301807ed44b8c0744aa7555847ca3d5c41a7278 Mon Sep 17 00:00:00 2001 From: cignoni Date: Mon, 3 Jan 2005 13:59:54 +0000 Subject: [PATCH] Resolved min/max macro conflict --- apps/shadevis/shadevis.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/apps/shadevis/shadevis.cpp b/apps/shadevis/shadevis.cpp index 2a331543..273ff9a4 100644 --- a/apps/shadevis/shadevis.cpp +++ b/apps/shadevis/shadevis.cpp @@ -24,6 +24,9 @@ History $Log: not supported by cvs2svn $ +Revision 1.8 2004/09/30 00:57:42 ponchio +Reference to temporary fixed and indented. + Revision 1.7 2004/09/28 09:46:51 cignoni Added MapFalseColor @@ -48,6 +51,10 @@ Added GPL comments #include #include #include +// this define is mandatory to avoid the conflicts due to the silly definition of +// min and max macros in windows.h (included by glut...) +#define NOMINMAX + #include #include #include @@ -535,7 +542,7 @@ int main(int argc, char** argv) // loading original mesh int ret=tri::io::ImporterPLY::Open(m,argv[i]); - if(ret) {printf("Error unable to open mesh %s\n",argv[i]);exit(-1);} + if(ret) {printf("Error unable to open mesh %s : '%s' \n",argv[i],tri::io::ImporterPLY::ErrorMsg(ret));exit(-1);} tri::UpdateNormals::PerVertexNormalized(m); tri::UpdateBounding::Box(m); tri::UpdateColor::VertexConstant(m,Color4b::White);