Work on streams of all sorts. More to come.

[wxWidgets.git] / include / wx / image.h

diff --git a/include/wx/image.h b/include/wx/image.h
index b22b46cd071048673c95c99ad6389eea8451cfd8..2a1c3ad5b07370c7aeee96cae01766206ff377e1 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -18,16 +18,22 @@
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/gdicmn.h"
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/gdicmn.h"

+
+#if wxUSE_STREAMS

 #include "wx/stream.h"
 #include "wx/stream.h"

+#endif

 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxImageHandler;
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxImageHandler;

-#ifdef wxUSE_LIBPNG
+#if wxUSE_LIBPNG

 class WXDLLEXPORT wxPNGHandler;
 #endif
 class WXDLLEXPORT wxPNGHandler;
 #endif

+#if wxUSE_LIBJPEG
+class WXDLLEXPORT wxJPEGHandler;
+#endif

 class WXDLLEXPORT wxBMPHandler;
 class WXDLLEXPORT wxImage;
 
 class WXDLLEXPORT wxBMPHandler;
 class WXDLLEXPORT wxImage;
 


@@ -44,19 +50,24 @@ class WXDLLEXPORT wxImageHandler: public wxObject
 public:
   wxImageHandler() { m_name = ""; m_extension = ""; m_type = 0; }
 
 public:
   wxImageHandler() { m_name = ""; m_extension = ""; m_type = 0; }
 

+#if wxUSE_STREAMS

   virtual bool LoadFile( wxImage *image, wxInputStream& stream );
   virtual bool SaveFile( wxImage *image, wxOutputStream& stream );
   virtual bool LoadFile( wxImage *image, wxInputStream& stream );
   virtual bool SaveFile( wxImage *image, wxOutputStream& stream );

+#endif

 
   inline void SetName(const wxString& name) { m_name = name; }
   inline void SetExtension(const wxString& ext) { m_extension = ext; }
   inline void SetType(long type) { m_type = type; }
 
   inline void SetName(const wxString& name) { m_name = name; }
   inline void SetExtension(const wxString& ext) { m_extension = ext; }
   inline void SetType(long type) { m_type = type; }

+  inline void SetMimeType(const wxString& type) { m_mime = type; }

   inline wxString GetName() const { return m_name; }
   inline wxString GetExtension() const { return m_extension; }
   inline long GetType() const { return m_type; }
   inline wxString GetName() const { return m_name; }
   inline wxString GetExtension() const { return m_extension; }
   inline long GetType() const { return m_type; }

-  
+  inline wxString GetMimeType() const { return m_mime; }
+

 protected:
   wxString  m_name;
   wxString  m_extension;
 protected:
   wxString  m_name;
   wxString  m_extension;

+  wxString  m_mime;

   long      m_type;
   
 };
   long      m_type;
   
 };


@@ -65,7 +76,7 @@ protected:
 // wxPNGHandler
 //-----------------------------------------------------------------------------
 
 // wxPNGHandler
 //-----------------------------------------------------------------------------
 

-#ifdef wxUSE_LIBPNG
+#if wxUSE_LIBPNG

 class WXDLLEXPORT wxPNGHandler: public wxImageHandler
 {
   DECLARE_DYNAMIC_CLASS(wxPNGHandler)
 class WXDLLEXPORT wxPNGHandler: public wxImageHandler
 {
   DECLARE_DYNAMIC_CLASS(wxPNGHandler)


@@ -77,10 +88,39 @@ public:
       m_name = "PNG file";
       m_extension = "png";
       m_type = wxBITMAP_TYPE_PNG;
       m_name = "PNG file";
       m_extension = "png";
       m_type = wxBITMAP_TYPE_PNG;

+      m_mime = "image/png";

   };
 
   };
 

+#if wxUSE_STREAMS

   virtual bool LoadFile( wxImage *image, wxInputStream& stream );
   virtual bool SaveFile( wxImage *image, wxOutputStream& stream );
   virtual bool LoadFile( wxImage *image, wxInputStream& stream );
   virtual bool SaveFile( wxImage *image, wxOutputStream& stream );

+#endif
+};
+#endif
+
+//-----------------------------------------------------------------------------
+// wxJPEGHandler
+//-----------------------------------------------------------------------------
+
+#if wxUSE_LIBJPEG
+class WXDLLEXPORT wxJPEGHandler: public wxImageHandler
+{
+  DECLARE_DYNAMIC_CLASS(wxJPEGHandler)
+
+public:
+
+  inline wxJPEGHandler()
+  {
+      m_name = "JPEG file";
+      m_extension = "jpg";
+      m_type = wxBITMAP_TYPE_JPEG;
+      m_mime = "image/jpeg";
+  };
+
+#if wxUSE_STREAMS
+  virtual bool LoadFile( wxImage *image, wxInputStream& stream );
+  virtual bool SaveFile( wxImage *image, wxOutputStream& stream );
+#endif

 };
 #endif
 
 };
 #endif
 


@@ -99,9 +139,36 @@ public:
       m_name = "BMP file";
       m_extension = "bmp";
       m_type = wxBITMAP_TYPE_BMP;
       m_name = "BMP file";
       m_extension = "bmp";
       m_type = wxBITMAP_TYPE_BMP;

+      m_mime = "image/bmp";

   };
 
   };
 

+#if wxUSE_STREAMS

   virtual bool LoadFile( wxImage *image, wxInputStream& stream );
   virtual bool LoadFile( wxImage *image, wxInputStream& stream );

+#endif
+};
+
+//-----------------------------------------------------------------------------
+// wxGIFHandler
+//-----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxGIFHandler : public wxImageHandler
+{
+  DECLARE_DYNAMIC_CLASS(wxGIFHandler)
+
+public:
+
+  inline wxGIFHandler()
+  {
+      m_name = "GIF file";
+      m_extension = "gif";
+      m_type = wxBITMAP_TYPE_GIF;
+      m_mime = "image/gif";
+  };
+
+#if wxUSE_STREAMS
+  virtual bool LoadFile( wxImage *image, wxInputStream& stream );
+  virtual bool SaveFile( wxImage *image, wxOutputStream& stream );
+#endif

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------


@@ -120,7 +187,9 @@ public:
   wxImage( int width, int height );
   wxImage( const wxString& name, long type = wxBITMAP_TYPE_PNG );
   wxImage( wxInputStream& stream, long type = wxBITMAP_TYPE_PNG );
   wxImage( int width, int height );
   wxImage( const wxString& name, long type = wxBITMAP_TYPE_PNG );
   wxImage( wxInputStream& stream, long type = wxBITMAP_TYPE_PNG );

-  
+  wxImage( const wxString& name, const wxString& mimetype );
+  wxImage( wxInputStream& stream, const wxString& mimetype );
+

   wxImage( const wxImage& image );
   wxImage( const wxImage* image );
   
   wxImage( const wxImage& image );
   wxImage( const wxImage* image );
   


@@ -140,9 +209,20 @@ public:
   unsigned char GetBlue( int x, int y );
   
   virtual bool LoadFile( const wxString& name, long type = wxBITMAP_TYPE_PNG );
   unsigned char GetBlue( int x, int y );
   
   virtual bool LoadFile( const wxString& name, long type = wxBITMAP_TYPE_PNG );

+  virtual bool LoadFile( const wxString& name, const wxString& mimetype );
+
+#if wxUSE_STREAMS

   virtual bool LoadFile( wxInputStream& stream, long type = wxBITMAP_TYPE_PNG );
   virtual bool LoadFile( wxInputStream& stream, long type = wxBITMAP_TYPE_PNG );

+  virtual bool LoadFile( wxInputStream& stream, const wxString& mimetype );
+#endif
+

   virtual bool SaveFile( const wxString& name, int type );
   virtual bool SaveFile( const wxString& name, int type );

+  virtual bool SaveFile( const wxString& name, const wxString& mimetype );
+
+#if wxUSE_STREAMS

   virtual bool SaveFile( wxOutputStream& stream, int type );
   virtual bool SaveFile( wxOutputStream& stream, int type );

+  virtual bool SaveFile( wxOutputStream& stream, const wxString& mimetype );
+#endif

 
   bool Ok() const;
   int GetWidth() const;
 
   bool Ok() const;
   int GetWidth() const;


@@ -176,7 +256,8 @@ public:
   static wxImageHandler *FindHandler( const wxString& name );
   static wxImageHandler *FindHandler( const wxString& extension, long imageType );
   static wxImageHandler *FindHandler( long imageType );
   static wxImageHandler *FindHandler( const wxString& name );
   static wxImageHandler *FindHandler( const wxString& extension, long imageType );
   static wxImageHandler *FindHandler( long imageType );

-  
+  static wxImageHandler *FindHandlerMime( const wxString& mimetype );
+

   static void CleanUpHandlers();
   static void InitStandardHandlers();
 
   static void CleanUpHandlers();
   static void InitStandardHandlers();
 


@@ -188,3 +269,4 @@ protected:
 
 #endif
   // _WX_IMAGE_H_
 
 #endif
   // _WX_IMAGE_H_

+