compilation error fix (trailing comma in an enum)

[wxWidgets.git] / wxPython / src / image.i

diff --git a/wxPython/src/image.i b/wxPython/src/image.i
index adcf9ebaa6337117824d8efa84ba60390d155b23..ab9ccc65e9af94edde6f6c514b859fad7366d8fb 100644 (file)
--- a/wxPython/src/image.i
+++ b/wxPython/src/image.i
@@ -15,6 +15,7 @@
 
 %{
 #include "helpers.h"
 
 %{
 #include "helpers.h"

+#include "pyistream.h"

 #include <wx/image.h>
 %}
 
 #include <wx/image.h>
 %}
 


@@ -27,6 +28,7 @@
 %import _defs.i
 %import misc.i
 %import gdi.i
 %import _defs.i
 %import misc.i
 %import gdi.i

+%import streams.i

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


@@ -75,6 +77,16 @@ public:
     wxICOHandler();
 };
 
     wxICOHandler();
 };
 

+class wxCURHandler : public wxICOHandler {
+public:
+    wxCURHandler();
+};
+
+class wxANIHandler : public wxCURHandler {
+public:
+    wxANIHandler();
+};
+

 class wxGIFHandler : public wxImageHandler {
 public:
     wxGIFHandler();
 class wxGIFHandler : public wxImageHandler {
 public:
     wxGIFHandler();


@@ -96,6 +108,7 @@ public:
 };
 
 
 };
 
 

+

 //---------------------------------------------------------------------------
 
 class wxImage : public wxObject {
 //---------------------------------------------------------------------------
 
 class wxImage : public wxObject {


@@ -103,10 +116,6 @@ public:
     wxImage( const wxString& name, long type = wxBITMAP_TYPE_ANY, int index = -1 );
     ~wxImage();
 
     wxImage( const wxString& name, long type = wxBITMAP_TYPE_ANY, int index = -1 );
     ~wxImage();
 

-    wxBitmap ConvertToBitmap(); // deprecated
-#ifdef __WXGTK__
-    wxBitmap ConvertToMonoBitmap( unsigned char red, unsigned char green, unsigned char blue ) const;
-#endif

     void Create( int width, int height );
     void Destroy();
 
     void Create( int width, int height );
     void Destroy();
 


@@ -118,6 +127,21 @@ public:
     unsigned char GetGreen( int x, int y );
     unsigned char GetBlue( int x, int y );
 
     unsigned char GetGreen( int x, int y );
     unsigned char GetBlue( int x, int y );
 

+        // find first colour that is not used in the image and has higher
+    // RGB values than <startR,startG,startB>
+    bool FindFirstUnusedColour( byte *OUTPUT, byte *OUTPUT, byte *OUTPUT,
+                                byte startR = 0, byte startG = 0, byte startB = 0 ) const;
+
+    // Set image's mask to the area of 'mask' that has <mr,mg,mb> colour
+    bool SetMaskFromImage(const wxImage & mask,
+                          byte mr, byte mg, byte mb);
+
+//      void DoFloodFill (wxCoord x, wxCoord y,
+//          const wxBrush & fillBrush,
+//          const wxColour& testColour,
+//          int style = wxFLOOD_SURFACE,
+//          int LogicalFunction = wxCOPY /* currently unused */ ) ;
+

     static bool CanRead( const wxString& name );
     static int GetImageCount( const wxString& name, long type = wxBITMAP_TYPE_ANY );
 
     static bool CanRead( const wxString& name );
     static int GetImageCount( const wxString& name, long type = wxBITMAP_TYPE_ANY );
 


@@ -127,6 +151,10 @@ public:
     bool SaveFile( const wxString& name, int type );
     %name(SaveMimeFile)bool SaveFile( const wxString& name, const wxString& mimetype );
 
     bool SaveFile( const wxString& name, int type );
     %name(SaveMimeFile)bool SaveFile( const wxString& name, const wxString& mimetype );
 

+    %name(CanReadStream) static bool CanRead( wxInputStream& stream );
+    %name(LoadStream) bool LoadFile( wxInputStream& stream, long type = wxBITMAP_TYPE_ANY, int index = -1 );
+    %name(LoadMimeStream) bool LoadFile( wxInputStream& stream, const wxString& mimetype, int index = -1 );
+

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


@@ -139,6 +167,12 @@ public:
     //void SetData( unsigned char *data );
 
     %addmethods {
     //void SetData( unsigned char *data );
 
     %addmethods {

+        PyObject* GetDataBuffer() {
+            unsigned char* data = self->GetData();
+            int len = self->GetWidth() * self->GetHeight() * 3;
+            return PyBuffer_FromReadWriteMemory(data, len);
+        }
+

         PyObject* GetData() {
             unsigned char* data = self->GetData();
             int len = self->GetWidth() * self->GetHeight() * 3;
         PyObject* GetData() {
             unsigned char* data = self->GetData();
             int len = self->GetWidth() * self->GetHeight() * 3;


@@ -190,6 +224,22 @@ public:
     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 );

+
+
+    %addmethods {
+        wxBitmap ConvertToBitmap() {
+            wxBitmap bitmap(*self);
+            return bitmap;
+        }
+
+        wxBitmap ConvertToMonoBitmap( unsigned char red,
+                                      unsigned char green,
+                                      unsigned char blue ) {
+            wxImage mono = self->ConvertToMono( red, green, blue );
+            wxBitmap bitmap( mono, 1 );
+            return bitmap;
+        }
+    }

 };
 
 
 };
 
 


@@ -198,6 +248,9 @@ public:
 %new wxImage* wxImageFromMime(const wxString& name, const wxString& mimetype, int index = -1);
 %new wxImage* wxImageFromBitmap(const wxBitmap &bitmap);
 %new wxImage* wxImageFromData(int width, int height, unsigned char* data);
 %new wxImage* wxImageFromMime(const wxString& name, const wxString& mimetype, int index = -1);
 %new wxImage* wxImageFromBitmap(const wxBitmap &bitmap);
 %new wxImage* wxImageFromData(int width, int height, unsigned char* data);

+%new wxImage* wxImageFromStream(wxInputStream& stream, long type = wxBITMAP_TYPE_ANY, int index = -1);
+%new wxImage* wxImageFromStreamMime(wxInputStream& stream, const wxString& mimetype, int index = -1 );
+

 %{
     wxImage* wxEmptyImage(int width=0, int height=0) {
         if (width == 0 && height == 0)
 %{
     wxImage* wxEmptyImage(int width=0, int height=0) {
         if (width == 0 && height == 0)


@@ -206,14 +259,17 @@ public:
             return new wxImage(width, height);
     }
 
             return new wxImage(width, height);
     }
 

+

     wxImage* wxImageFromMime(const wxString& name, const wxString& mimetype, int index) {
         return new wxImage(name, mimetype, index);
     }
 
     wxImage* wxImageFromMime(const wxString& name, const wxString& mimetype, int index) {
         return new wxImage(name, mimetype, index);
     }
 

+

     wxImage* wxImageFromBitmap(const wxBitmap &bitmap) {
     wxImage* wxImageFromBitmap(const wxBitmap &bitmap) {

-        return new wxImage(bitmap);
+        return new wxImage(bitmap.ConvertToImage());

     }
 
     }
 

+

     wxImage* wxImageFromData(int width, int height, unsigned char* data) {
         // Copy the source data so the wxImage can clean it up later
         unsigned char* copy = (unsigned char*)malloc(width*height*3);
     wxImage* wxImageFromData(int width, int height, unsigned char* data) {
         // Copy the source data so the wxImage can clean it up later
         unsigned char* copy = (unsigned char*)malloc(width*height*3);


@@ -224,8 +280,22 @@ public:
         memcpy(copy, data, width*height*3);
         return new wxImage(width, height, copy, FALSE);
     }
         memcpy(copy, data, width*height*3);
         return new wxImage(width, height, copy, FALSE);
     }

+
+
+    wxImage* wxImageFromStream(wxInputStream& stream,
+                               long type = wxBITMAP_TYPE_ANY, int index = -1) {
+        return new wxImage(stream, type, index);
+    }
+
+
+    wxImage* wxImageFromStreamMime(wxInputStream& stream,
+                                   const wxString& mimetype, int index = -1 ) {
+        return new wxImage(stream, mimetype, index);
+    }

 %}
 
 %}
 

+
+

 void wxInitAllImageHandlers();
 
 
 void wxInitAllImageHandlers();