X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/01111366c9b4ea40eee7f4b13ddfe6f6b9f886db..b4b92fa660b3d08b8c26f714abafeb776d3b1cca:/include/wx/image.h?ds=sidebyside

diff --git a/include/wx/image.h b/include/wx/image.h
index dd8a5e9754..1962bd3f87 100644
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -19,15 +19,26 @@
 #include "wx/string.h"
 #include "wx/gdicmn.h"
 
+#if wxUSE_STREAMS
+#include "wx/stream.h"
+#endif
+
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxImageHandler;
+#if wxUSE_LIBPNG
 class WXDLLEXPORT wxPNGHandler;
+#endif
+#if wxUSE_LIBJPEG
+class WXDLLEXPORT wxJPEGHandler;
+#endif
 class WXDLLEXPORT wxBMPHandler;
 class WXDLLEXPORT wxImage;
 
+class WXDLLEXPORT wxBitmap;
+
 //-----------------------------------------------------------------------------
 // wxImageHandler
 //-----------------------------------------------------------------------------
@@ -39,8 +50,10 @@ class WXDLLEXPORT wxImageHandler: public wxObject
 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; }
@@ -60,22 +73,50 @@ protected:
 // wxPNGHandler
 //-----------------------------------------------------------------------------
 
+#if wxUSE_LIBPNG
 class WXDLLEXPORT wxPNGHandler: public wxImageHandler
 {
   DECLARE_DYNAMIC_CLASS(wxPNGHandler)
   
 public:
 
-    inline wxPNGHandler()
-    {
-        m_name = "PNG file";
-        m_extension = "png";
-        m_type = wxBITMAP_TYPE_PNG;
-    };
+  inline wxPNGHandler()
+  {
+      m_name = "PNG file";
+      m_extension = "png";
+      m_type = wxBITMAP_TYPE_PNG;
+  };
+
+#if wxUSE_STREAMS
+  virtual bool LoadFile( wxImage *image, wxInputStream& stream );
+  virtual bool SaveFile( wxImage *image, wxOutputStream& stream );
+#endif
 
-    virtual bool LoadFile( wxImage *image, const wxString& name );
-    virtual bool SaveFile( wxImage *image, const wxString& name );
 };
+#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
@@ -87,15 +128,18 @@ class WXDLLEXPORT wxBMPHandler: public wxImageHandler
   
 public:
 
-    inline wxBMPHandler()
-    {
-        m_name = "BMP file";
-        m_extension = "bmp";
-        m_type = wxBITMAP_TYPE_BMP;
-    };
+  inline wxBMPHandler()
+  {
+      m_name = "BMP file";
+      m_extension = "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
 };
+
 //-----------------------------------------------------------------------------
 // wxImage
 //-----------------------------------------------------------------------------
@@ -111,16 +155,38 @@ public:
   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 );
+  
+  // these functions get implemented in /src/(platform)/bitmap.cpp 
+  wxImage( const wxBitmap &bitmap );
+  wxBitmap ConvertToBitmap() const;
 
   void Create( int width, int height );
   void Destroy();
   
+  wxImage Scale( int width, int height );
+  
+  // these routines are slow but safe  
+  void SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b );
+  unsigned char GetRed( int x, int y );
+  unsigned char GetGreen( int x, int y );
+  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 );
 
+#if wxUSE_STREAMS
+  virtual bool SaveFile( wxOutputStream& stream, int type );
+#endif
+
   bool Ok() const;
   int GetWidth() const;
   int GetHeight() const;
@@ -135,9 +201,13 @@ public:
   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; }
@@ -151,6 +221,7 @@ public:
   static wxImageHandler *FindHandler( long imageType );
   
   static void CleanUpHandlers();
+  static void InitStandardHandlers();
 
 protected: