X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=utilities%2FCxImage%2Fximaico.h;h=86ef4eafcefe9fd86e080f8dc3d13f24e2f0128e;hb=a1ec529a24b721fcfb2c5725f95bcc2c9125b28d;hp=837939a7dcccca87c637dc7e58c23a41bb4e615d;hpb=19d5db17f1c0e98cf84a6cb83643404a550a12a4;p=clitk.git

diff --git a/utilities/CxImage/ximaico.h b/utilities/CxImage/ximaico.h
index 837939a..86ef4ea 100644
--- a/utilities/CxImage/ximaico.h
+++ b/utilities/CxImage/ximaico.h
@@ -1,58 +1,58 @@
-/*
- * File:	ximaico.h
- * Purpose:	ICON Image Class Loader and Writer
- */
-/* ==========================================================
- * CxImageICO (c) 07/Aug/2001 Davide Pizzolato - www.xdp.it
- * For conditions of distribution and use, see copyright notice in ximage.h
- * ==========================================================
- */
-#if !defined(__ximaICO_h)
-#define __ximaICO_h
-
-#include "ximage.h"
-
-#if CXIMAGE_SUPPORT_ICO
-
-class CxImageICO: public CxImage
-{
-typedef struct tagIconDirectoryEntry {
-    BYTE  bWidth;
-    BYTE  bHeight;
-    BYTE  bColorCount;
-    BYTE  bReserved;
-    WORD  wPlanes;
-    WORD  wBitCount;
-    DWORD dwBytesInRes;
-    DWORD dwImageOffset;
-} ICONDIRENTRY;
-
-typedef struct tagIconDir {
-    WORD          idReserved;
-    WORD          idType;
-    WORD          idCount;
-} ICONHEADER;
-
-public:
-	CxImageICO(): CxImage(CXIMAGE_FORMAT_ICO) {m_dwImageOffset=0;}
-
-//	bool Load(const TCHAR * imageFileName){ return CxImage::Load(imageFileName,CXIMAGE_FORMAT_ICO);}
-//	bool Save(const TCHAR * imageFileName){ return CxImage::Save(imageFileName,CXIMAGE_FORMAT_ICO);}
-	bool Decode(CxFile * hFile);
-	bool Decode(FILE *hFile) { CxIOFile file(hFile); return Decode(&file); }
-
-#if CXIMAGE_SUPPORT_ENCODE
-	bool Encode(CxFile * hFile, bool bAppend=false, int nPageCount=0);
-	bool Encode(CxFile * hFile, CxImage ** pImages, int nPageCount);
-	bool Encode(FILE *hFile, bool bAppend=false, int nPageCount=0)
-				{ CxIOFile file(hFile); return Encode(&file,bAppend,nPageCount); }
-	bool Encode(FILE *hFile, CxImage ** pImages, int nPageCount)
-				{ CxIOFile file(hFile); return Encode(&file, pImages, nPageCount); }
-#endif // CXIMAGE_SUPPORT_ENCODE
-protected:
-	DWORD m_dwImageOffset;
-};
-
-#endif
-
-#endif
+/*
+ * File:	ximaico.h
+ * Purpose:	ICON Image Class Loader and Writer
+ */
+/* ==========================================================
+ * CxImageICO (c) 07/Aug/2001 Davide Pizzolato - www.xdp.it
+ * For conditions of distribution and use, see copyright notice in ximage.h
+ * ==========================================================
+ */
+#if !defined(__ximaICO_h)
+#define __ximaICO_h
+
+#include "ximage.h"
+
+#if CXIMAGE_SUPPORT_ICO
+
+class CxImageICO: public CxImage
+{
+typedef struct tagIconDirectoryEntry {
+    BYTE  bWidth;
+    BYTE  bHeight;
+    BYTE  bColorCount;
+    BYTE  bReserved;
+    WORD  wPlanes;
+    WORD  wBitCount;
+    DWORD dwBytesInRes;
+    DWORD dwImageOffset;
+} ICONDIRENTRY;
+
+typedef struct tagIconDir {
+    WORD          idReserved;
+    WORD          idType;
+    WORD          idCount;
+} ICONHEADER;
+
+public:
+	CxImageICO(): CxImage(CXIMAGE_FORMAT_ICO) {m_dwImageOffset=0;}
+
+//	bool Load(const TCHAR * imageFileName){ return CxImage::Load(imageFileName,CXIMAGE_FORMAT_ICO);}
+//	bool Save(const TCHAR * imageFileName){ return CxImage::Save(imageFileName,CXIMAGE_FORMAT_ICO);}
+	bool Decode(CxFile * hFile);
+	bool Decode(FILE *hFile) { CxIOFile file(hFile); return Decode(&file); }
+
+#if CXIMAGE_SUPPORT_ENCODE
+	bool Encode(CxFile * hFile, bool bAppend=false, int nPageCount=0);
+	bool Encode(CxFile * hFile, CxImage ** pImages, int nPageCount);
+	bool Encode(FILE *hFile, bool bAppend=false, int nPageCount=0)
+				{ CxIOFile file(hFile); return Encode(&file,bAppend,nPageCount); }
+	bool Encode(FILE *hFile, CxImage ** pImages, int nPageCount)
+				{ CxIOFile file(hFile); return Encode(&file, pImages, nPageCount); }
+#endif // CXIMAGE_SUPPORT_ENCODE
+protected:
+	DWORD m_dwImageOffset;
+};
+
+#endif
+
+#endif