Window management and sizer layout corrections

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

diff --git a/include/wx/image.h b/include/wx/image.h
index 88f26a453baa6df6506ba0d86c19456702d278c3..cf69aa743aa9e8c98132d895c08fc8762622cd5c 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -19,6 +19,7 @@
 #include "wx/string.h"
 #include "wx/gdicmn.h"
 #include "wx/bitmap.h"
 #include "wx/string.h"
 #include "wx/gdicmn.h"
 #include "wx/bitmap.h"

+#include "wx/hashmap.h"

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


@@ -26,6 +27,8 @@
 
 #if wxUSE_IMAGE
 
 
 #if wxUSE_IMAGE
 

+#define wxIMAGE_OPTION_FILENAME wxString(_T("FileName"))
+

 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------


@@ -43,7 +46,7 @@ public:
     wxImageHandler() { m_name = ""; m_extension = ""; m_type = 0; }
 
 #if wxUSE_STREAMS
     wxImageHandler() { m_name = ""; m_extension = ""; m_type = 0; }
 
 #if wxUSE_STREAMS

-    virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE, int index=0 );
+    virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE, int index=-1 );

     virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
 
     virtual int GetImageCount( wxInputStream& stream );
     virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
 
     virtual int GetImageCount( wxInputStream& stream );


@@ -70,32 +73,44 @@ protected:
     wxString  m_extension;
     wxString  m_mime;
     long      m_type;
     wxString  m_extension;
     wxString  m_mime;
     long      m_type;

-    
+

 private:
     DECLARE_CLASS(wxImageHandler)
 };
 
 //-----------------------------------------------------------------------------
 private:
     DECLARE_CLASS(wxImageHandler)
 };
 
 //-----------------------------------------------------------------------------

-// wxImage
+// wxImageHistogram

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxHNode
+class WXDLLEXPORT wxImageHistogramEntry

 {
 public:
 {
 public:

+    wxImageHistogramEntry() : index(0), value(0) {}

     unsigned long index;
     unsigned long value;
 };
 
     unsigned long index;
     unsigned long value;
 };
 

+WX_DECLARE_EXPORTED_HASH_MAP(unsigned long, wxImageHistogramEntry,
+                             wxIntegerHash, wxIntegerEqual,
+                             wxImageHistogram);
+
+//-----------------------------------------------------------------------------
+// wxImage
+//-----------------------------------------------------------------------------
+

 class WXDLLEXPORT wxImage: public wxObject
 {
 public:
     wxImage();
     wxImage( int width, int height );
     wxImage( int width, int height, unsigned char* data, bool static_data = FALSE );
 class WXDLLEXPORT wxImage: public wxObject
 {
 public:
     wxImage();
     wxImage( int width, int height );
     wxImage( int width, int height, unsigned char* data, bool static_data = FALSE );

-    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 wxString& name, long type = wxBITMAP_TYPE_ANY, int index = -1 );
+    wxImage( const wxString& name, const wxString& mimetype, int index = -1 );
+
+#if wxUSE_STREAMS
+    wxImage( wxInputStream& stream, long type = wxBITMAP_TYPE_ANY, int index = -1 );
+    wxImage( wxInputStream& stream, const wxString& mimetype, int index = -1 );
+#endif // wxUSE_STREAMS

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


@@ -116,13 +131,13 @@ public:
     // creates an identical copy of the image (the = operator
     // just raises the ref count)
     wxImage Copy() const;
     // creates an identical copy of the image (the = operator
     // just raises the ref count)
     wxImage Copy() const;

-    
+

     // return the new image with size width*height
     wxImage GetSubImage( const wxRect& ) const;
     // return the new image with size width*height
     wxImage GetSubImage( const wxRect& ) const;

-    
+

     // pastes image into this instance and takes care of
     // the mask colour and out of bounds problems
     // pastes image into this instance and takes care of
     // the mask colour and out of bounds problems

-    void Paste( const wxImage &image, int x, int y );    
+    void Paste( const wxImage &image, int x, int y );

 
     // return the new image with size width*height
     wxImage Scale( int width, int height ) const;
 
     // return the new image with size width*height
     wxImage Scale( int width, int height ) const;


@@ -141,7 +156,7 @@ public:
     // replace one colour with another
     void Replace( unsigned char r1, unsigned char g1, unsigned char b1,
                   unsigned char r2, unsigned char g2, unsigned char b2 );
     // replace one colour with another
     void Replace( unsigned char r1, unsigned char g1, unsigned char b1,
                   unsigned char r2, unsigned char g2, unsigned char b2 );

-                 
+

     // convert to monochrome image (<r,g,b> will be replaced by white, everything else by black)
     wxImage ConvertToMono( unsigned char r, unsigned char g, unsigned char b ) const;
 
     // convert to monochrome image (<r,g,b> will be replaced by white, everything else by black)
     wxImage ConvertToMono( unsigned char r, unsigned char g, unsigned char b ) const;
 


@@ -151,26 +166,33 @@ public:
     unsigned char GetGreen( int x, int y ) const;
     unsigned char GetBlue( int x, int y ) const;
 
     unsigned char GetGreen( int x, int y ) const;
     unsigned char GetBlue( int x, int y ) const;
 

-    // used to manipulate the icons while extracting from .ico files   
-    bool GetUnusedColour(  unsigned char *r,  unsigned char *g,  unsigned char *b );
-    bool ApplyMask( const wxImage & mask );
+    // find first colour that is not used in the image and has higher
+    // RGB values than <startR,startG,startB>
+    bool FindFirstUnusedColour( unsigned char *r, unsigned char *g, unsigned char *b,
+                                unsigned char startR = 1, unsigned char startG = 0,
+                                unsigned char startB = 0 ) const;
+    // Set image's mask to the area of 'mask' that has <r,g,b> colour
+    bool SetMaskFromImage(const wxImage & mask,
+                          unsigned char mr, unsigned char mg, unsigned char mb);

 
     static bool CanRead( const wxString& name );
 
     static bool CanRead( const wxString& name );

-    virtual bool LoadFile( const wxString& name, long type = wxBITMAP_TYPE_ANY );
-    virtual bool LoadFile( const wxString& name, const wxString& mimetype );
+    static int GetImageCount( const wxString& name, long type = wxBITMAP_TYPE_ANY );
+    virtual bool LoadFile( const wxString& name, long type = wxBITMAP_TYPE_ANY, int index = -1 );
+    virtual bool LoadFile( const wxString& name, const wxString& mimetype, int index = -1 );

 
 #if wxUSE_STREAMS
     static bool CanRead( wxInputStream& stream );
 
 #if wxUSE_STREAMS
     static bool CanRead( wxInputStream& stream );

-    virtual bool LoadFile( wxInputStream& stream, long type = wxBITMAP_TYPE_ANY );
-    virtual bool LoadFile( wxInputStream& stream, const wxString& mimetype );
+    static int GetImageCount( wxInputStream& stream, long type = wxBITMAP_TYPE_ANY );
+    virtual bool LoadFile( wxInputStream& stream, long type = wxBITMAP_TYPE_ANY, int index = -1 );
+    virtual bool LoadFile( wxInputStream& stream, const wxString& mimetype, int index = -1 );

 #endif
 
 #endif
 

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

 
 #if wxUSE_STREAMS
 
 #if wxUSE_STREAMS

-    virtual bool SaveFile( wxOutputStream& stream, int type );
-    virtual bool SaveFile( wxOutputStream& stream, const wxString& mimetype );
+    virtual bool SaveFile( wxOutputStream& stream, int type ) const;
+    virtual bool SaveFile( wxOutputStream& stream, const wxString& mimetype ) const;

 #endif
 
     bool Ok() const;
 #endif
 
     bool Ok() const;


@@ -203,8 +225,15 @@ public:
     int GetOptionInt(const wxString& name) const;
     bool HasOption(const wxString& name) const;
 
     int GetOptionInt(const wxString& name) const;
     bool HasOption(const wxString& name) const;
 

-    unsigned long CountColours( unsigned long stopafter = (unsigned long) -1 );
-    unsigned long ComputeHistogram( wxHashTable &h );
+    unsigned long CountColours( unsigned long stopafter = (unsigned long) -1 ) const;
+
+    // Computes the histogram of the image and fills a hash table, indexed
+    // with integer keys built as 0xRRGGBB, containing wxImageHistogramEntry
+    // objects. Each of them contains an 'index' (useful to build a palette 
+    // with the image colours) and a 'value', which is the number of pixels 
+    // in the image with that colour.
+    // Returned value: # of entries in the histogram
+    unsigned long ComputeHistogram( wxImageHistogram &h ) const;

 
     wxImage& operator = (const wxImage& image)
     {
 
     wxImage& operator = (const wxImage& image)
     {


@@ -256,6 +285,7 @@ WXDLLEXPORT_DATA(extern wxImage)    wxNullImage;
 #include "wx/imagtiff.h"
 #include "wx/imagpnm.h"
 #include "wx/imagxpm.h"
 #include "wx/imagtiff.h"
 #include "wx/imagpnm.h"
 #include "wx/imagxpm.h"

+#include "wx/imagiff.h"

 
 #endif // wxUSE_IMAGE
 
 
 #endif // wxUSE_IMAGE