From 5cb32502b777eb0dec8ec2d8a8c9714ed487b86f Mon Sep 17 00:00:00 2001
From: scuri <scuri>
Date: Wed, 3 Dec 2008 15:45:33 +0000
Subject: *** empty log message ***

---
 include/im_file.h       |  2 +-
 include/im_format.h     | 52 +++++++++++++++++++++++++++++++++----------------
 include/im_format_raw.h |  2 +-
 3 files changed, 37 insertions(+), 19 deletions(-)

(limited to 'include')

diff --git a/include/im_file.h b/include/im_file.h
index a35c82a..33ef12e 100644
--- a/include/im_file.h
+++ b/include/im_file.h
@@ -23,7 +23,7 @@ extern "C" {
  * \ingroup file */
 
 
-/** \brief Image File Format Base (SDK Use Only)
+/** \brief Image File Format Base Class (SDK Use Only)
  *
  * \par
  * Base container to hold format independent state variables.
diff --git a/include/im_format.h b/include/im_format.h
index 9120676..6ee0473 100644
--- a/include/im_format.h
+++ b/include/im_format.h
@@ -11,27 +11,20 @@
 #define __IM_FORMAT_H
 
 
-/** \brief Image File Format Driver (SDK Use Only) 
+class imFormat;
+
+/** \brief Image File Format Virtual Class (SDK Use Only) 
  * 
  * \par
  * Virtual Base class for file formats. All file formats inherit from this class.
  * \ingroup filesdk */
-class imFormat: public _imFile
+class imFileFormatBase: public _imFile
 {
 public:
-  const char* format; 
-  const char* desc;
-  const char* ext;
-  const char** comp;
-  int comp_count, 
-      can_sequence;
+  const imFormat* iformat;
 
-  imFormat(const char* _format, const char* _desc, const char* _ext, 
-           const char** _comp, int _comp_count, int _can_sequence)
-    :format(_format), desc(_desc), ext(_ext), comp(_comp), 
-     comp_count(_comp_count), can_sequence(_can_sequence)
-    {} 
-  virtual ~imFormat() {}
+  imFileFormatBase(const imFormat* _iformat): iformat(_iformat) {}
+  virtual ~imFileFormatBase() {}
 
   imAttribTable* AttribTable() {return (imAttribTable*)this->attrib_table;}
 
@@ -45,7 +38,32 @@ public:
   virtual int ReadImageData(void* data) = 0;
   virtual int WriteImageInfo() = 0;            // Should update compression
   virtual int WriteImageData(void* data) = 0;  // Must update image_count
+};
+
+/** \brief Image File Format Descriptor (SDK Use Only) 
+ * 
+ * \par
+ * All file formats must define these informations. They are stored by \ref imFormatRegister.
+ * \ingroup filesdk */
+class imFormat
+{
+public:
+  const char* format; 
+  const char* desc;
+  const char* ext;
+  const char** comp;
+  int comp_count, 
+      can_sequence;
+
+  virtual imFileFormatBase* Create() const = 0;
   virtual int CanWrite(const char* compression, int color_mode, int data_type) const = 0;
+
+  imFormat(const char* _format, const char* _desc, const char* _ext, 
+           const char** _comp, int _comp_count, int _can_sequence)
+    :format(_format), desc(_desc), ext(_ext), comp(_comp), 
+     comp_count(_comp_count), can_sequence(_can_sequence)
+    {} 
+  virtual ~imFormat() {}
 };
 
 extern "C"
@@ -56,15 +74,15 @@ extern "C"
 /* Opens a file with the respective format driver 
  * Uses the file extension to speed up the search for the format driver.
  * Used by "im_file.cpp" only. */
-imFormat* imFormatOpen(const char* file_name, int *error);
+imFileFormatBase* imFileFormatBaseOpen(const char* file_name, int *error);
 
 /* Opens a file with the given format
  * Used by "im_file.cpp" only. */
-imFormat* imFormatOpenAs(const char* file_name, const char* format, int *error);
+imFileFormatBase* imFileFormatBaseOpenAs(const char* file_name, const char* format, int *error);
 
 /* Creates a file using the given format driver.
  * Used by "im_file.cpp" only. */
-imFormat* imFormatNew(const char* file_name, const char* format, int *error);
+imFileFormatBase* imFileFormatBaseNew(const char* file_name, const char* format, int *error);
 
 
 /* File Format SDK */
diff --git a/include/im_format_raw.h b/include/im_format_raw.h
index 8027f82..07cc81c 100644
--- a/include/im_format_raw.h
+++ b/include/im_format_raw.h
@@ -54,7 +54,7 @@ extern "C" {
       StartOffset, SwitchType, ByteOrder, Padding  IM_INT (1)
 \endverbatim
  * \ingroup format */
-imFormat* imFormatInitRAW(void);
+imFileFormatBase* imFormatInitRAW(void);
 
 
 #if defined(__cplusplus)
-- 
cgit v1.2.3