Checking for wxUSE_SOCKETS and __GSOCKET_STANDALONE__ should be right, now

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

diff --git a/include/wx/image.h b/include/wx/image.h
index ffdcf30a2f4586eae782f7f1d38e18e276d9d488..9c503f0a5584c02740ec44996a8e39c83d27e6f8 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_IMAGE_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_IMAGE_H_


@@ -18,9 +18,10 @@
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/gdicmn.h"
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/gdicmn.h"

+#include "wx/bitmap.h"

 
 #if wxUSE_STREAMS
 
 #if wxUSE_STREAMS

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

 #endif
 
 //-----------------------------------------------------------------------------
 #endif
 
 //-----------------------------------------------------------------------------


@@ -35,10 +36,17 @@ class WXDLLEXPORT wxPNGHandler;
 class WXDLLEXPORT wxJPEGHandler;
 #endif
 class WXDLLEXPORT wxBMPHandler;
 class WXDLLEXPORT wxJPEGHandler;
 #endif
 class WXDLLEXPORT wxBMPHandler;

+#if wxUSE_GIF
+class WXDLLEXPORT wxGIFHandler;
+#endif
+#if wxUSE_PNM
+class WXDLLEXPORT wxPNMHandler;
+#endif
+#if wxUSE_PCX
+class WXDLLEXPORT wxPCXHandler;
+#endif

 class WXDLLEXPORT wxImage;
 
 class WXDLLEXPORT wxImage;
 

-class WXDLLEXPORT wxBitmap;
-

 //-----------------------------------------------------------------------------
 // wxImageHandler
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxImageHandler
 //-----------------------------------------------------------------------------


@@ -46,13 +54,16 @@ class WXDLLEXPORT wxBitmap;
 class WXDLLEXPORT wxImageHandler: public wxObject
 {
   DECLARE_DYNAMIC_CLASS(wxImageHandler)
 class WXDLLEXPORT wxImageHandler: public wxObject
 {
   DECLARE_DYNAMIC_CLASS(wxImageHandler)

-  
+

 public:
   wxImageHandler() { m_name = ""; m_extension = ""; m_type = 0; }
 
 #if wxUSE_STREAMS
 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, bool verbose=TRUE );
+  virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
+
+  virtual bool CanRead( wxInputStream& stream );
+  virtual bool CanRead( const wxString& name );

 #endif
 
   inline void SetName(const wxString& name) { m_name = name; }
 #endif
 
   inline void SetName(const wxString& name) { m_name = name; }


@@ -69,7 +80,7 @@ protected:
   wxString  m_extension;
   wxString  m_mime;
   long      m_type;
   wxString  m_extension;
   wxString  m_mime;
   long      m_type;

-  
+

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


@@ -80,7 +91,7 @@ protected:
 class WXDLLEXPORT wxPNGHandler: public wxImageHandler
 {
   DECLARE_DYNAMIC_CLASS(wxPNGHandler)
 class WXDLLEXPORT wxPNGHandler: public wxImageHandler
 {
   DECLARE_DYNAMIC_CLASS(wxPNGHandler)

-  
+

 public:
 
   inline wxPNGHandler()
 public:
 
   inline wxPNGHandler()


@@ -92,10 +103,13 @@ public:
   };
 
 #if wxUSE_STREAMS
   };
 
 #if wxUSE_STREAMS

-  virtual bool LoadFile( wxImage *image, wxInputStream& stream );
-  virtual bool SaveFile( wxImage *image, wxOutputStream& stream );
+  virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE );
+  virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
+  virtual bool CanRead( wxInputStream& stream );
+private:
+   // hiding base class virtuals again!
+  inline bool CanRead( const wxString& name ) { return(wxImageHandler::CanRead(name)); };

 #endif
 #endif

-

 };
 #endif
 
 };
 #endif
 


@@ -118,8 +132,14 @@ public:
       m_mime = "image/jpeg";
   };
 
       m_mime = "image/jpeg";
   };
 

-  virtual bool LoadFile( wxImage *image, wxInputStream& stream );
-  virtual bool SaveFile( wxImage *image, wxOutputStream& stream );
+#if wxUSE_STREAMS
+  virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE );
+  virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
+  virtual bool CanRead( wxInputStream& stream );
+private:
+   // hiding base class virtuals again!
+  inline bool CanRead( const wxString& name ) { return(wxImageHandler::CanRead(name)); };
+#endif

 };
 #endif
 
 };
 #endif
 


@@ -130,7 +150,7 @@ public:
 class WXDLLEXPORT wxBMPHandler: public wxImageHandler
 {
   DECLARE_DYNAMIC_CLASS(wxBMPHandler)
 class WXDLLEXPORT wxBMPHandler: public wxImageHandler
 {
   DECLARE_DYNAMIC_CLASS(wxBMPHandler)

-  
+

 public:
 
   inline wxBMPHandler()
 public:
 
   inline wxBMPHandler()


@@ -142,9 +162,101 @@ public:
   };
 
 #if wxUSE_STREAMS
   };
 
 #if wxUSE_STREAMS

-  virtual bool LoadFile( wxImage *image, wxInputStream& stream );
+  virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE );
+  virtual bool CanRead( wxInputStream& stream );
+private:
+   // hiding base class virtuals again!
+  inline bool CanRead( const wxString& name ) { return(wxImageHandler::CanRead(name)); };
+#endif
+};
+
+//-----------------------------------------------------------------------------
+// wxGIFHandler
+//-----------------------------------------------------------------------------
+
+#if wxUSE_GIF
+
+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, bool verbose=TRUE );
+  virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
+  virtual bool CanRead( wxInputStream& stream );
+private:
+   // hiding base class virtuals again!
+  inline bool CanRead( const wxString& name ) { return(wxImageHandler::CanRead(name)); };

 #endif
 };
 #endif
 };

+#endif
+
+//-----------------------------------------------------------------------------
+// wxPNMHandler
+//-----------------------------------------------------------------------------
+
+#if wxUSE_PNM
+class WXDLLEXPORT wxPNMHandler : public wxImageHandler
+{
+  DECLARE_DYNAMIC_CLASS(wxPNMHandler)
+
+public:
+
+  inline wxPNMHandler()
+  {
+      m_name = "PNM file";
+      m_extension = "pnm";
+      m_type = wxBITMAP_TYPE_PNM;
+      m_mime = "image/pnm";
+  };
+
+#if wxUSE_STREAMS
+  virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE );
+  virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
+  virtual bool CanRead( wxInputStream& stream );
+private:
+   // hiding base class virtuals again!
+  inline bool CanRead( const wxString& name ) { return(wxImageHandler::CanRead(name)); };
+#endif
+};
+#endif
+
+//-----------------------------------------------------------------------------
+// wxPCXHandler
+//-----------------------------------------------------------------------------
+
+#if wxUSE_PCX
+class WXDLLEXPORT wxPCXHandler : public wxImageHandler
+{
+  DECLARE_DYNAMIC_CLASS(wxPCXHandler)
+
+public:
+
+  inline wxPCXHandler()
+  {
+      m_name = "PCX file";
+      m_extension = "pcx";
+      m_type = wxBITMAP_TYPE_PCX;
+      m_mime = "image/pcx";
+  };
+
+#if wxUSE_STREAMS
+  virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE );
+  virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
+  virtual bool CanRead( wxInputStream& stream );
+#endif
+};
+#endif

 
 //-----------------------------------------------------------------------------
 // wxImage
 
 //-----------------------------------------------------------------------------
 // wxImage


@@ -160,34 +272,42 @@ public:
 
   wxImage();
   wxImage( int width, int height );
 
   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 wxString& name, long type = wxBITMAP_TYPE_ANY );
+  wxImage( wxInputStream& stream, long type = wxBITMAP_TYPE_ANY );

   wxImage( const wxString& name, const wxString& mimetype );
   wxImage( wxInputStream& stream, const wxString& mimetype );
 
   wxImage( const wxImage& image );
   wxImage( const wxImage* image );
   wxImage( const wxString& name, const wxString& mimetype );
   wxImage( wxInputStream& stream, const wxString& mimetype );
 
   wxImage( const wxImage& image );
   wxImage( const wxImage* image );

-  
-  // these functions get implemented in /src/(platform)/bitmap.cpp 
+
+  // these functions get implemented in /src/(platform)/bitmap.cpp

   wxImage( const wxBitmap &bitmap );
   wxImage( const wxBitmap &bitmap );

+  operator wxBitmap() const { return ConvertToBitmap(); }

   wxBitmap ConvertToBitmap() const;
 
   void Create( int width, int height );
   void Destroy();
   wxBitmap ConvertToBitmap() const;
 
   void Create( int width, int height );
   void Destroy();

-  
-  wxImage Scale( int width, int height );
-  
-  // these routines are slow but safe  
+
+  // return the new image with size width*height
+  wxImage GetSubImage( const wxRect& ) const;
+
+  // return the new image with size width*height
+  wxImage Scale( int width, int height ) const;
+
+  // rescales the image in place
+  void Rescale( int width, int height ) { *this = Scale(width, 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 );
   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 );
+
+  virtual bool LoadFile( const wxString& name, long type = wxBITMAP_TYPE_ANY );

   virtual bool LoadFile( const wxString& name, const wxString& mimetype );
 
 #if wxUSE_STREAMS
   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_ANY );

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


@@ -205,7 +325,7 @@ public:
 
   char unsigned *GetData() const;
   void SetData( char unsigned *data );
 
   char unsigned *GetData() const;
   void SetData( char unsigned *data );

-  
+

   void SetMaskColour( unsigned char r, unsigned char g, unsigned char b );
   unsigned char GetMaskRed() const;
   unsigned char GetMaskGreen() const;
   void SetMaskColour( unsigned char r, unsigned char g, unsigned char b );
   unsigned char GetMaskRed() const;
   unsigned char GetMaskGreen() const;


@@ -213,18 +333,19 @@ 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);
+  wxImage& operator = (const wxImage& image)
+  {
+    if ( (*this) != image )

       Ref(image);
       Ref(image);

-      return *this; }
+    return *this;
+  }

 
 

-  inline bool operator == (const wxImage& image)
+  bool operator == (const wxImage& image)

     { return m_refData == image.m_refData; }
     { return m_refData == image.m_refData; }

-  inline bool operator != (const wxImage& image) 
+  bool operator != (const wxImage& image)

     { return m_refData != image.m_refData; }
 
     { return m_refData != image.m_refData; }
 

-  static inline wxList& GetHandlers() { return sm_handlers; }
+  static wxList& GetHandlers() { return sm_handlers; }

   static void AddHandler( wxImageHandler *handler );
   static void InsertHandler( wxImageHandler *handler );
   static bool RemoveHandler( const wxString& name );
   static void AddHandler( wxImageHandler *handler );
   static void InsertHandler( wxImageHandler *handler );
   static bool RemoveHandler( const wxString& name );


@@ -239,7 +360,7 @@ public:
 protected:
 
   static wxList sm_handlers;
 protected:
 
   static wxList sm_handlers;

-  
+

 };
 
 #endif
 };
 
 #endif