cosmetic

[clitk.git] / utilities / CxImage / ximaico.h

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