From e97bdff8654a3cc71db2110e8b35515bc13a8a57 Mon Sep 17 00:00:00 2001
From: Romain Garrigues <romain.garrigues@c-s.fr>
Date: Tue, 29 Aug 2006 08:29:04 +0000
Subject: [PATCH] =?UTF-8?q?Modifications=20pour=20la=20compatibilit=C3=A9?=
=?UTF-8?q?=20du=20code=20avec=20Cygwin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Code/IO/otbLUMImageIO.cxx | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/Code/IO/otbLUMImageIO.cxx b/Code/IO/otbLUMImageIO.cxx
index 30e977e713..43c76a7e84 100644
--- a/Code/IO/otbLUMImageIO.cxx
+++ b/Code/IO/otbLUMImageIO.cxx
@@ -36,7 +36,7 @@
# include <malloc.h>
# include <math.h>
-#if defined(WIN32) || defined(WIN32CE)
+#if (defined(WIN32) || defined(WIN32CE)) && !defined(__CYGWIN__)
/* WIN32 PLATFORM */
#ifndef WIN32CE
# include <io.h>
@@ -556,7 +556,7 @@ void LUMImageIO::InternalWriteImageInformation()
/* */
/*****************************************************************************/
-#if defined(WIN32) || defined(WIN32CE)
+#if (defined(WIN32) || defined(WIN32CE)) && !defined(__CYGWIN__)
/* WIN32 PLATFORM */
long int LUMImageIO::cai_liste_ima_lum (char *repert,char ***tab_ima)
@@ -1057,6 +1057,7 @@ ERREUR:
if (iret == 0)
{
+ delete image1;
return (NULL);
}
else
@@ -1381,6 +1382,7 @@ CAI_IMAGE* LUMImageIO::cai_ouvre_creation_lum( char *repert,
ERREUR :
if (fic !=NULL) cai_dest_ima_lum ( repert , nom_image );
+ delete image1;
return(NULL);
}
@@ -2228,6 +2230,7 @@ CAI_IMAGE* LUMImageIO::cai_ouvre_modifie_lum( char *repert,
ERREUR:
if (iret == 0)
{
+ delete image1;
return (NULL);
}
else
--
GitLab