X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=utilities%2FCxImage%2Fxmemfile.cpp;h=af8db945a31d82ae91b590eebd8f8e713e31df31;hb=HEAD;hp=22348b92e8ebc9a516b9a7467a960b34d977de3b;hpb=3fd15028ab81e6746d3af96695526d7d973a26c8;p=clitk.git

diff --git a/utilities/CxImage/xmemfile.cpp b/utilities/CxImage/xmemfile.cpp
index 22348b9..af8db94 100644
--- a/utilities/CxImage/xmemfile.cpp
+++ b/utilities/CxImage/xmemfile.cpp
@@ -1,202 +1,202 @@
-#include "xmemfile.h"
-
-//////////////////////////////////////////////////////////
-CxMemFile::CxMemFile(BYTE* pBuffer, DWORD size)
-{
-	m_pBuffer = pBuffer;
-	m_Position = 0;
-	m_Size = m_Edge = size;
-	m_bFreeOnClose = (bool)(pBuffer==0);
-}
-//////////////////////////////////////////////////////////
-CxMemFile::~CxMemFile()
-{
-	Close();
-}
-//////////////////////////////////////////////////////////
-bool CxMemFile::Close()
-{
-	if ( (m_pBuffer) && (m_bFreeOnClose) ){
-		free(m_pBuffer);
-		m_pBuffer = NULL;
-		m_Size = 0;
-	}
-	return true;
-}
-//////////////////////////////////////////////////////////
-bool CxMemFile::Open()
-{
-	if (m_pBuffer) return false;	// Can't re-open without closing first
-
-	m_Position = m_Size = m_Edge = 0;
-	m_pBuffer=(BYTE*)malloc(1);
-	m_bFreeOnClose = true;
-
-	return (m_pBuffer!=0);
-}
-//////////////////////////////////////////////////////////
-BYTE* CxMemFile::GetBuffer(bool bDetachBuffer)
-{
-	//can only detach, avoid inadvertantly attaching to
-	// memory that may not be ours [Jason De Arte]
-	if( bDetachBuffer )
-		m_bFreeOnClose = false;
-	return m_pBuffer;
-}
-//////////////////////////////////////////////////////////
-size_t CxMemFile::Read(void *buffer, size_t size, size_t count)
-{
-	if (buffer==NULL) return 0;
-
-	if (m_pBuffer==NULL) return 0;
-	if (m_Position >= (long)m_Size) return 0;
-
-	long nCount = (long)(count*size);
-	if (nCount == 0) return 0;
-
-	long nRead;
-	if (m_Position + nCount > (long)m_Size)
-		nRead = (m_Size - m_Position);
-	else
-		nRead = nCount;
-
-	memcpy(buffer, m_pBuffer + m_Position, nRead);
-	m_Position += nRead;
-
-	return (size_t)(nRead/size);
-}
-//////////////////////////////////////////////////////////
-size_t CxMemFile::Write(const void *buffer, size_t size, size_t count)
-{
-	if (m_pBuffer==NULL) return 0;
-	if (buffer==NULL) return 0;
-
-	long nCount = (long)(count*size);
-	if (nCount == 0) return 0;
-
-	if (m_Position + nCount > m_Edge){
-		if (!Alloc(m_Position + nCount)){
-			return false;
-		}
-	}
-
-	memcpy(m_pBuffer + m_Position, buffer, nCount);
-
-	m_Position += nCount;
-
-	if (m_Position > (long)m_Size) m_Size = m_Position;
-	
-	return count;
-}
-//////////////////////////////////////////////////////////
-bool CxMemFile::Seek(long offset, int origin)
-{
-	if (m_pBuffer==NULL) return false;
-	long lNewPos = m_Position;
-
-	if (origin == SEEK_SET)		 lNewPos = offset;
-	else if (origin == SEEK_CUR) lNewPos += offset;
-	else if (origin == SEEK_END) lNewPos = m_Size + offset;
-	else return false;
-
-	if (lNewPos < 0) lNewPos = 0;
-
-	m_Position = lNewPos;
-	return true;
-}
-//////////////////////////////////////////////////////////
-long CxMemFile::Tell()
-{
-	if (m_pBuffer==NULL) return -1;
-	return m_Position;
-}
-//////////////////////////////////////////////////////////
-long CxMemFile::Size()
-{
-	if (m_pBuffer==NULL) return -1;
-	return m_Size;
-}
-//////////////////////////////////////////////////////////
-bool CxMemFile::Flush()
-{
-	if (m_pBuffer==NULL) return false;
-	return true;
-}
-//////////////////////////////////////////////////////////
-bool CxMemFile::Eof()
-{
-	if (m_pBuffer==NULL) return true;
-	return (m_Position >= (long)m_Size);
-}
-//////////////////////////////////////////////////////////
-long CxMemFile::Error()
-{
-	if (m_pBuffer==NULL) return -1;
-	return (m_Position > (long)m_Size);
-}
-//////////////////////////////////////////////////////////
-bool CxMemFile::PutC(unsigned char c)
-{
-	if (m_pBuffer==NULL) return false;
-
-	if (m_Position >= m_Edge){
-		if (!Alloc(m_Position + 1)){
-			return false;
-		}
-	}
-
-	m_pBuffer[m_Position++] = c;
-
-	if (m_Position > (long)m_Size) m_Size = m_Position;
-	
-	return true;
-}
-//////////////////////////////////////////////////////////
-long CxMemFile::GetC()
-{
-	if (Eof()) return EOF;
-	return *(BYTE*)((BYTE*)m_pBuffer + m_Position++);
-}
-//////////////////////////////////////////////////////////
-char * CxMemFile::GetS(char *string, int n)
-{
-	n--;
-	long c,i=0;
-	while (i<n){
-		c = GetC();
-		if (c == EOF) return 0;
-		string[i++] = (char)c;
-		if (c == '\n') break;
-	}
-	string[i] = 0;
-	return string;
-}
-//////////////////////////////////////////////////////////
-long	CxMemFile::Scanf(const char *format, void* output)
-{
-	return 0;
-}
-//////////////////////////////////////////////////////////
-bool CxMemFile::Alloc(DWORD dwNewLen)
-{
-	if (dwNewLen > (DWORD)m_Edge)
-	{
-		// find new buffer size
-		DWORD dwNewBufferSize = (DWORD)(((dwNewLen>>16)+1)<<16);
-
-		// allocate new buffer
-		if (m_pBuffer == NULL) m_pBuffer = (BYTE*)malloc(dwNewBufferSize);
-		else	m_pBuffer = (BYTE*)realloc(m_pBuffer, dwNewBufferSize);
-		// I own this buffer now (caller knows nothing about it)
-		m_bFreeOnClose = true;
-
-		m_Edge = dwNewBufferSize;
-	}
-	return (m_pBuffer!=0);
-}
-//////////////////////////////////////////////////////////
-void CxMemFile::Free()
-{
-	Close();
-}
-//////////////////////////////////////////////////////////
+#include "xmemfile.h"
+
+//////////////////////////////////////////////////////////
+CxMemFile::CxMemFile(BYTE* pBuffer, DWORD size)
+{
+	m_pBuffer = pBuffer;
+	m_Position = 0;
+	m_Size = m_Edge = size;
+	m_bFreeOnClose = (bool)(pBuffer==0);
+}
+//////////////////////////////////////////////////////////
+CxMemFile::~CxMemFile()
+{
+	Close();
+}
+//////////////////////////////////////////////////////////
+bool CxMemFile::Close()
+{
+	if ( (m_pBuffer) && (m_bFreeOnClose) ){
+		free(m_pBuffer);
+		m_pBuffer = NULL;
+		m_Size = 0;
+	}
+	return true;
+}
+//////////////////////////////////////////////////////////
+bool CxMemFile::Open()
+{
+	if (m_pBuffer) return false;	// Can't re-open without closing first
+
+	m_Position = m_Size = m_Edge = 0;
+	m_pBuffer=(BYTE*)malloc(1);
+	m_bFreeOnClose = true;
+
+	return (m_pBuffer!=0);
+}
+//////////////////////////////////////////////////////////
+BYTE* CxMemFile::GetBuffer(bool bDetachBuffer)
+{
+	//can only detach, avoid inadvertantly attaching to
+	// memory that may not be ours [Jason De Arte]
+	if( bDetachBuffer )
+		m_bFreeOnClose = false;
+	return m_pBuffer;
+}
+//////////////////////////////////////////////////////////
+size_t CxMemFile::Read(void *buffer, size_t size, size_t count)
+{
+	if (buffer==NULL) return 0;
+
+	if (m_pBuffer==NULL) return 0;
+	if (m_Position >= (long)m_Size) return 0;
+
+	long nCount = (long)(count*size);
+	if (nCount == 0) return 0;
+
+	long nRead;
+	if (m_Position + nCount > (long)m_Size)
+		nRead = (m_Size - m_Position);
+	else
+		nRead = nCount;
+
+	memcpy(buffer, m_pBuffer + m_Position, nRead);
+	m_Position += nRead;
+
+	return (size_t)(nRead/size);
+}
+//////////////////////////////////////////////////////////
+size_t CxMemFile::Write(const void *buffer, size_t size, size_t count)
+{
+	if (m_pBuffer==NULL) return 0;
+	if (buffer==NULL) return 0;
+
+	long nCount = (long)(count*size);
+	if (nCount == 0) return 0;
+
+	if (m_Position + nCount > m_Edge){
+		if (!Alloc(m_Position + nCount)){
+			return false;
+		}
+	}
+
+	memcpy(m_pBuffer + m_Position, buffer, nCount);
+
+	m_Position += nCount;
+
+	if (m_Position > (long)m_Size) m_Size = m_Position;
+	
+	return count;
+}
+//////////////////////////////////////////////////////////
+bool CxMemFile::Seek(long offset, int origin)
+{
+	if (m_pBuffer==NULL) return false;
+	long lNewPos = m_Position;
+
+	if (origin == SEEK_SET)		 lNewPos = offset;
+	else if (origin == SEEK_CUR) lNewPos += offset;
+	else if (origin == SEEK_END) lNewPos = m_Size + offset;
+	else return false;
+
+	if (lNewPos < 0) lNewPos = 0;
+
+	m_Position = lNewPos;
+	return true;
+}
+//////////////////////////////////////////////////////////
+long CxMemFile::Tell()
+{
+	if (m_pBuffer==NULL) return -1;
+	return m_Position;
+}
+//////////////////////////////////////////////////////////
+long CxMemFile::Size()
+{
+	if (m_pBuffer==NULL) return -1;
+	return m_Size;
+}
+//////////////////////////////////////////////////////////
+bool CxMemFile::Flush()
+{
+	if (m_pBuffer==NULL) return false;
+	return true;
+}
+//////////////////////////////////////////////////////////
+bool CxMemFile::Eof()
+{
+	if (m_pBuffer==NULL) return true;
+	return (m_Position >= (long)m_Size);
+}
+//////////////////////////////////////////////////////////
+long CxMemFile::Error()
+{
+	if (m_pBuffer==NULL) return -1;
+	return (m_Position > (long)m_Size);
+}
+//////////////////////////////////////////////////////////
+bool CxMemFile::PutC(unsigned char c)
+{
+	if (m_pBuffer==NULL) return false;
+
+	if (m_Position >= m_Edge){
+		if (!Alloc(m_Position + 1)){
+			return false;
+		}
+	}
+
+	m_pBuffer[m_Position++] = c;
+
+	if (m_Position > (long)m_Size) m_Size = m_Position;
+	
+	return true;
+}
+//////////////////////////////////////////////////////////
+long CxMemFile::GetC()
+{
+	if (Eof()) return EOF;
+	return *(BYTE*)((BYTE*)m_pBuffer + m_Position++);
+}
+//////////////////////////////////////////////////////////
+char * CxMemFile::GetS(char *string, int n)
+{
+	n--;
+	long c,i=0;
+	while (i<n){
+		c = GetC();
+		if (c == EOF) return 0;
+		string[i++] = (char)c;
+		if (c == '\n') break;
+	}
+	string[i] = 0;
+	return string;
+}
+//////////////////////////////////////////////////////////
+long	CxMemFile::Scanf(const char *format, void* output)
+{
+	return 0;
+}
+//////////////////////////////////////////////////////////
+bool CxMemFile::Alloc(DWORD dwNewLen)
+{
+	if (dwNewLen > (DWORD)m_Edge)
+	{
+		// find new buffer size
+		DWORD dwNewBufferSize = (DWORD)(((dwNewLen>>16)+1)<<16);
+
+		// allocate new buffer
+		if (m_pBuffer == NULL) m_pBuffer = (BYTE*)malloc(dwNewBufferSize);
+		else	m_pBuffer = (BYTE*)realloc(m_pBuffer, dwNewBufferSize);
+		// I own this buffer now (caller knows nothing about it)
+		m_bFreeOnClose = true;
+
+		m_Edge = dwNewBufferSize;
+	}
+	return (m_pBuffer!=0);
+}
+//////////////////////////////////////////////////////////
+void CxMemFile::Free()
+{
+	Close();
+}
+//////////////////////////////////////////////////////////