removed é in license header to prevent warning C4819 (see http://code.google.com...

[openjpeg.git] / jp3d / codec / jp3d_to_volume.c

diff --git a/jp3d/codec/jp3d_to_volume.c b/jp3d/codec/jp3d_to_volume.c
index b5c757567031e5d6d012b827454757960a0eec2a..eb7fe308a5cd09634d6f6dffea0f7c1da8406404 100755 (executable)
--- a/jp3d/codec/jp3d_to_volume.c
+++ b/jp3d/codec/jp3d_to_volume.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens\r
  * Copyright (c) 2002-2003, Yannick Verschueren\r
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe\r
- * Copyright (c) 2005, Herv� Drolon, FreeImage Team\r
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team\r
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium\r
  * Copyright (c) 2006, M�nica D�ez Garc�a, Image Processing Laboratory, University of Valladolid, Spain\r
  * All rights reserved.\r
@@ -33,14 +33,16 @@
 #include <stdlib.h>\r
 #include <math.h>\r
 \r
-#include "openjpeg.h"\r
+#include "../libjp3dvm/openjpeg3d.h"\r
 #include "getopt.h"\r
 #include "convert.h"\r
 \r
-#ifndef WIN32\r
+#ifdef _WIN32\r
+#include <windows.h>\r
+#else\r
 #define stricmp strcasecmp\r
 #define strnicmp strncasecmp\r
-#endif\r
+#endif /* _WIN32 */\r
 \r
 /* ----------------------------------------------------------------------- */\r
 static double calc_PSNR(opj_volume_t *original, opj_volume_t *decoded)\r