bitwise vs. logical operator

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

diff --git a/wxPython/src/_image.i b/wxPython/src/_image.i
index f083ba0d17afde21dd80bd93d10b3aedd3c880ca..6b315bc824b97d15b8f1d24a5d09f40df220273d 100644 (file)
--- a/wxPython/src/_image.i
+++ b/wxPython/src/_image.i
@@ -28,6 +28,13 @@ enum {
 };
 
 
 };
 
 

+// Constants for wxImage::Scale() for determining the level of quality
+enum
+{
+    wxIMAGE_QUALITY_NORMAL = 0,
+    wxIMAGE_QUALITY_HIGH = 1
+};
+

 //---------------------------------------------------------------------------
 %newgroup
 
 //---------------------------------------------------------------------------
 %newgroup
 


@@ -225,6 +232,7 @@ public:
 };
 
 
 };
 
 

+

 class wxImage : public wxObject {
 public:
     %typemap(out) wxImage*;    // turn off this typemap
 class wxImage : public wxObject {
 public:
     %typemap(out) wxImage*;    // turn off this typemap


@@ -399,19 +407,60 @@ initialized to black. Otherwise, the image data will be uninitialized.", "");
     
 
     DocDeclStr(
     
 
     DocDeclStr(

-        wxImage , Scale( int width, int height ),
+        wxImage , Scale( int width, int height, int quality = wxIMAGE_QUALITY_NORMAL ),

         "Returns a scaled version of the image. This is also useful for scaling
 bitmaps in general as the only other way to scale bitmaps is to blit a
         "Returns a scaled version of the image. This is also useful for scaling
 bitmaps in general as the only other way to scale bitmaps is to blit a

-`wx.MemoryDC` into another `wx.MemoryDC`.", "
+`wx.MemoryDC` into another `wx.MemoryDC`.  The ``quality`` parameter
+specifies what method to use for resampling the image.  It can be
+either wx.IMAGE_QUALITY_NORMAL, which uses the normal default scaling
+method of pixel replication, or wx.IMAGE_QUALITY_HIGH which uses
+bicubic and box averaging resampling methods for upsampling and
+downsampling respectively.", "
+
+It should be noted that although using wx.IMAGE_QUALITY_HIGH produces
+much nicer looking results it is a slower method.  Downsampling will
+use the box averaging method which seems to operate very fast.  If you
+are upsampling larger images using this method you will most likely
+notice that it is a bit slower and in extreme cases it will be quite
+substantially slower as the bicubic algorithm has to process a lot of
+data.
+
+It should also be noted that the high quality scaling may not work as
+expected when using a single mask colour for transparency, as the
+scaling will blur the image and will therefore remove the mask
+partially. Using the alpha channel will work.

 
 :see: `Rescale`");
 
 :see: `Rescale`");

+
+    
+    wxImage ResampleBox(int width, int height) const;
+    wxImage ResampleBicubic(int width, int height) const;
+
+    DocDeclStr(
+        wxImage , Blur(int radius),
+        "Blurs the image in both horizontal and vertical directions by the
+specified pixel ``radius``. This should not be used when using a
+single mask colour for transparency.", "");
+    
+    DocDeclStr(
+        wxImage , BlurHorizontal(int radius),
+        "Blurs the image in the horizontal direction only. This should not be
+used when using a single mask colour for transparency.
+", "");
+    
+    DocDeclStr(
+        wxImage , BlurVertical(int radius),
+        "Blurs the image in the vertical direction only. This should not be
+used when using a single mask colour for transparency.", "");
+    
+

     
     DocDeclStr(
         wxImage , ShrinkBy( int xFactor , int yFactor ) const ,
         "Return a version of the image scaled smaller by the given factors.", "");
     
     DocDeclStr(
     
     DocDeclStr(
         wxImage , ShrinkBy( int xFactor , int yFactor ) const ,
         "Return a version of the image scaled smaller by the given factors.", "");
     
     DocDeclStr(

-        wxImage& , Rescale(int width, int height),
+        wxImage& , Rescale(int width, int height, int quality = wxIMAGE_QUALITY_NORMAL),

         "Changes the size of the image in-place by scaling it: after a call to
 this function, the image will have the given width and height.
 
         "Changes the size of the image in-place by scaling it: after a call to
 this function, the image will have the given width and height.
 


@@ -620,8 +669,9 @@ object, using a MIME type string to specify the image file format.", "",
     
 
     DocDeclStr(
     
 
     DocDeclStr(

-        bool , Ok(),
+        bool , IsOk(),

         "Returns true if image data is present.", "");
         "Returns true if image data is present.", "");

+    %pythoncode { Ok = IsOk }

     
     DocDeclStr(
         int , GetWidth(),
     
     DocDeclStr(
         int , GetWidth(),


@@ -987,7 +1037,7 @@ range -1.0..1.0 where -1.0 is -360 degrees and 1.0 is 360 degrees", "");
         "Converts a color in HSV color space to RGB color space.", "");
     
 
         "Converts a color in HSV color space to RGB color space.", "");
     
 

-    %pythoncode { def __nonzero__(self): return self.Ok() }
+    %pythoncode { def __nonzero__(self): return self.IsOk() }

     
     %property(AlphaBuffer, GetAlphaBuffer, SetAlphaBuffer, doc="See `GetAlphaBuffer` and `SetAlphaBuffer`");
     %property(AlphaData, GetAlphaData, SetAlphaData, doc="See `GetAlphaData` and `SetAlphaData`");
     
     %property(AlphaBuffer, GetAlphaBuffer, SetAlphaBuffer, doc="See `GetAlphaBuffer` and `SetAlphaBuffer`");
     %property(AlphaData, GetAlphaData, SetAlphaData, doc="See `GetAlphaData` and `SetAlphaData`");


@@ -997,8 +1047,8 @@ range -1.0..1.0 where -1.0 is -360 degrees and 1.0 is 360 degrees", "");
     %property(MaskBlue, GetMaskBlue, doc="See `GetMaskBlue`");
     %property(MaskGreen, GetMaskGreen, doc="See `GetMaskGreen`");
     %property(MaskRed, GetMaskRed, doc="See `GetMaskRed`");
     %property(MaskBlue, GetMaskBlue, doc="See `GetMaskBlue`");
     %property(MaskGreen, GetMaskGreen, doc="See `GetMaskGreen`");
     %property(MaskRed, GetMaskRed, doc="See `GetMaskRed`");

-    %property(Size, GetSize, doc="See `GetSize`");

     %property(Width, GetWidth, doc="See `GetWidth`");
     %property(Width, GetWidth, doc="See `GetWidth`");

+    

 };
 
 
 };
 
 


@@ -1213,7 +1263,12 @@ public:
 };
 
 
 };
 
 

-#if wxUSE_IFF
+
+#if 0
+%{
+#include <wx/imagiff.h>
+%}
+

 DocStr(wxIFFHandler,
 "A `wx.ImageHandler` for IFF image files.", "");
 class wxIFFHandler : public wxImageHandler {
 DocStr(wxIFFHandler,
 "A `wx.ImageHandler` for IFF image files.", "");
 class wxIFFHandler : public wxImageHandler {


@@ -1222,6 +1277,19 @@ public:
 };
 #endif
 
 };
 #endif
 

+
+%{
+#include <wx/imagtga.h>
+%}
+
+DocStr(wxTGAHandler,
+"A `wx.ImageHandler` for TGA image files.", "");
+class wxTGAHandler : public wxImageHandler {
+public:
+    wxTGAHandler();
+};
+
+

 //---------------------------------------------------------------------------
 
 %{
 //---------------------------------------------------------------------------
 
 %{