Motif compilation fixes (now ok)

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

diff --git a/include/wx/image.h b/include/wx/image.h
index fe15103b2a0b9fbea3a06f0809d12cb545b14561..1962bd3f87a31b0100608c8a72424871413efe5f 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -19,12 +19,21 @@
 #include "wx/string.h"
 #include "wx/gdicmn.h"
 
 #include "wx/string.h"
 #include "wx/gdicmn.h"
 

+#if wxUSE_STREAMS
+#include "wx/stream.h"
+#endif
+

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

+#if wxUSE_LIBPNG

 class WXDLLEXPORT wxPNGHandler;
 class WXDLLEXPORT wxPNGHandler;

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

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


@@ -41,8 +50,10 @@ class WXDLLEXPORT wxImageHandler: public wxObject
 public:
   wxImageHandler() { m_name = ""; m_extension = ""; m_type = 0; }
 
 public:
   wxImageHandler() { m_name = ""; m_extension = ""; m_type = 0; }
 

-  virtual bool LoadFile( wxImage *image, const wxString& name );
-  virtual bool SaveFile( wxImage *image, const wxString& name );
+#if wxUSE_STREAMS
+  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 SetName(const wxString& name) { m_name = name; }
   inline void SetExtension(const wxString& ext) { m_extension = ext; }


@@ -62,6 +73,7 @@ protected:
 // wxPNGHandler
 //-----------------------------------------------------------------------------
 
 // wxPNGHandler
 //-----------------------------------------------------------------------------
 

+#if wxUSE_LIBPNG

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


@@ -75,9 +87,36 @@ public:
       m_type = wxBITMAP_TYPE_PNG;
   };
 
       m_type = wxBITMAP_TYPE_PNG;
   };
 

-  virtual bool LoadFile( wxImage *image, const wxString& name );
-  virtual bool SaveFile( wxImage *image, const wxString& name );
+#if wxUSE_STREAMS
+  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;
+  };
+
+  virtual bool LoadFile( wxImage *image, wxInputStream& stream );
+  virtual bool SaveFile( wxImage *image, wxOutputStream& stream );

 };
 };

+#endif

 
 //-----------------------------------------------------------------------------
 // wxBMPHandler
 
 //-----------------------------------------------------------------------------
 // wxBMPHandler


@@ -96,7 +135,9 @@ public:
       m_type = wxBITMAP_TYPE_BMP;
   };
 
       m_type = wxBITMAP_TYPE_BMP;
   };
 

-  virtual bool LoadFile( wxImage *image, const wxString& name );
+#if wxUSE_STREAMS
+  virtual bool LoadFile( wxImage *image, wxInputStream& stream );
+#endif

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


@@ -114,6 +155,7 @@ public:
   wxImage();
   wxImage( int width, int height );
   wxImage( const wxString& name, long type = wxBITMAP_TYPE_PNG );
   wxImage();
   wxImage( int width, int height );
   wxImage( const wxString& name, long type = wxBITMAP_TYPE_PNG );

+  wxImage( wxInputStream& stream, long type = wxBITMAP_TYPE_PNG );

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


@@ -134,8 +176,17 @@ 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 );

+
+#if wxUSE_STREAMS
+  virtual bool LoadFile( wxInputStream& stream, long type = wxBITMAP_TYPE_PNG );
+#endif
+

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

+#if wxUSE_STREAMS
+  virtual bool SaveFile( wxOutputStream& stream, int type );
+#endif
+

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


@@ -150,9 +201,13 @@ public:
   void SetMask( bool mask = TRUE );
   bool HasMask() const;
 
   void SetMask( bool mask = TRUE );
   bool HasMask() const;
 

-  inline wxImage& operator = (const wxImage& image) 
-    { if (*this == image) return (*this); Ref(image); return *this; }
-  inline bool operator == (const wxImage& image) 
+  inline wxImage& operator = (const wxImage& image)
+    { if ((*this) == image)
+          return (*this);
+      Ref(image);
+      return *this; }
+
+  inline bool operator == (const wxImage& image)

     { return m_refData == image.m_refData; }
   inline bool operator != (const wxImage& image) 
     { return m_refData != image.m_refData; }
     { return m_refData == image.m_refData; }
   inline bool operator != (const wxImage& image) 
     { return m_refData != image.m_refData; }