// which breaks the compilation below
#undef index
-#define wxIMAGE_OPTION_QUALITY wxString(_T("quality"))
-#define wxIMAGE_OPTION_FILENAME wxString(_T("FileName"))
+#define wxIMAGE_OPTION_QUALITY wxString(wxS("quality"))
+#define wxIMAGE_OPTION_FILENAME wxString(wxS("FileName"))
-#define wxIMAGE_OPTION_RESOLUTION wxString(_T("Resolution"))
-#define wxIMAGE_OPTION_RESOLUTIONX wxString(_T("ResolutionX"))
-#define wxIMAGE_OPTION_RESOLUTIONY wxString(_T("ResolutionY"))
+#define wxIMAGE_OPTION_RESOLUTION wxString(wxS("Resolution"))
+#define wxIMAGE_OPTION_RESOLUTIONX wxString(wxS("ResolutionX"))
+#define wxIMAGE_OPTION_RESOLUTIONY wxString(wxS("ResolutionY"))
-#define wxIMAGE_OPTION_RESOLUTIONUNIT wxString(_T("ResolutionUnit"))
+#define wxIMAGE_OPTION_RESOLUTIONUNIT wxString(wxS("ResolutionUnit"))
-#define wxIMAGE_OPTION_MAX_WIDTH wxString(_T("MaxWidth"))
-#define wxIMAGE_OPTION_MAX_HEIGHT wxString(_T("MaxHeight"))
+#define wxIMAGE_OPTION_MAX_WIDTH wxString(wxS("MaxWidth"))
+#define wxIMAGE_OPTION_MAX_HEIGHT wxString(wxS("MaxHeight"))
+
+#define wxIMAGE_OPTION_ORIGINAL_WIDTH wxString(wxS("OriginalWidth"))
+#define wxIMAGE_OPTION_ORIGINAL_HEIGHT wxString(wxS("OriginalHeight"))
// constants used with wxIMAGE_OPTION_RESOLUTIONUNIT
//
};
// Constants for wxImage::Scale() for determining the level of quality
-enum
+enum wxImageResizeQuality
{
- wxIMAGE_QUALITY_NORMAL = 0,
- wxIMAGE_QUALITY_HIGH = 1
+ // different image resizing algorithms used by Scale() and Rescale()
+ wxIMAGE_QUALITY_NEAREST = 0,
+ wxIMAGE_QUALITY_BILINEAR = 1,
+ wxIMAGE_QUALITY_BICUBIC = 2,
+ wxIMAGE_QUALITY_BOX_AVERAGE = 3,
+
+ // default quality is low (but fast)
+ wxIMAGE_QUALITY_NORMAL = wxIMAGE_QUALITY_NEAREST,
+
+ // highest (but best) quality
+ wxIMAGE_QUALITY_HIGH = 4
};
// alpha channel values: fully transparent, default threshold separating
#if wxUSE_STREAMS
// NOTE: LoadFile and SaveFile are not pure virtuals to allow derived classes
// to implement only one of the two
- virtual bool LoadFile( wxImage *WXUNUSED(image), wxInputStream& WXUNUSED(stream),
+ virtual bool LoadFile( wxImage *WXUNUSED(image), wxInputStream& WXUNUSED(stream),
bool WXUNUSED(verbose)=true, int WXUNUSED(index)=-1 )
{ return false; }
- virtual bool SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream),
+ virtual bool SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream),
bool WXUNUSED(verbose)=true )
{ return false; }
#if wxUSE_STREAMS
// NOTE: this function is allowed to change the current stream position
// since GetImageCount() will take care of restoring it later
- virtual int DoGetImageCount( wxInputStream& WXUNUSED(stream) )
+ virtual int DoGetImageCount( wxInputStream& WXUNUSED(stream) )
{ return 1; } // default return value is 1 image
-
+
// NOTE: this function is allowed to change the current stream position
// since CallDoCanRead() will take care of restoring it later
virtual bool DoCanRead( wxInputStream& stream ) = 0;
bool Create( int width, int height, bool clear = true );
bool Create( int width, int height, unsigned char* data, bool static_data = false );
bool Create( int width, int height, unsigned char* data, unsigned char* alpha, bool static_data = false );
-
+
// Create() variants using wxSize:
bool Create( const wxSize& sz, bool clear = true )
{ return Create(sz.GetWidth(), sz.GetHeight(), clear); }
{ return Create(sz.GetWidth(), sz.GetHeight(), data, alpha, static_data); }
void Destroy();
-
+
// initialize the image data with zeroes
void Clear(unsigned char value = 0);
void Paste( const wxImage &image, int x, int y );
// return the new image with size width*height
- wxImage Scale( int width, int height, int quality = wxIMAGE_QUALITY_NORMAL ) const;
+ wxImage Scale( int width, int height,
+ wxImageResizeQuality quality = wxIMAGE_QUALITY_NORMAL ) const;
// box averager and bicubic filters for up/down sampling
+ wxImage ResampleNearest(int width, int height) const;
wxImage ResampleBox(int width, int height) const;
+ wxImage ResampleBilinear(int width, int height) const;
wxImage ResampleBicubic(int width, int height) const;
// blur the image according to the specified pixel radius
wxImage ShrinkBy( int xFactor , int yFactor ) const ;
// rescales the image in place
- wxImage& Rescale( int width, int height, int quality = wxIMAGE_QUALITY_NORMAL ) { return *this = Scale(width, height, quality); }
+ wxImage& Rescale( int width, int height,
+ wxImageResizeQuality quality = wxIMAGE_QUALITY_NORMAL )
+ { return *this = Scale(width, height, quality); }
// resizes the image in place
wxImage& Resize( const wxSize& size, const wxPoint& pos,
bool interpolating = true, wxPoint * offset_after_rotation = NULL) const;
wxImage Rotate90( bool clockwise = true ) const;
+ wxImage Rotate180() const;
wxImage Mirror( bool horizontally = true ) const;
// replace one colour with another
unsigned char r2, unsigned char g2, unsigned char b2 );
// Convert to greyscale image. Uses the luminance component (Y) of the image.
- // The luma value (YUV) is calculated using (R * lr) + (G * lg) + (B * lb), defaults to ITU-T BT.601
- wxImage ConvertToGreyscale( double lr = 0.299, double lg = 0.587, double lb = 0.114 ) const;
+ // The luma value (YUV) is calculated using (R * weight_r) + (G * weight_g) + (B * weight_b), defaults to ITU-T BT.601
+ wxImage ConvertToGreyscale(double weight_r, double weight_g, double weight_b) const;
+ wxImage ConvertToGreyscale(void) 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;
+ // Convert to disabled (dimmed) image.
+ wxImage ConvertToDisabled(unsigned char brightness = 255) const;
+
// these routines are slow but safe
void SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b );
void SetRGB( const wxRect& rect, unsigned char r, unsigned char g, unsigned char b );
// automatically or using the specified colour for the mask), if it has
// any, does nothing otherwise:
bool ConvertAlphaToMask(unsigned char threshold = wxIMAGE_ALPHA_THRESHOLD);
- void ConvertAlphaToMask(unsigned char mr, unsigned char mg, unsigned char mb,
+ bool ConvertAlphaToMask(unsigned char mr, unsigned char mg, unsigned char mb,
unsigned char threshold = wxIMAGE_ALPHA_THRESHOLD);
bool HasAlpha() const { return GetAlpha() != NULL; }
void SetAlpha(unsigned char *alpha = NULL, bool static_data=false);
void InitAlpha();
+ void ClearAlpha();
// return true if this pixel is masked or has alpha less than specified
// threshold
}
)
- wxDEPRECATED(
- static wxImageHandler *FindHandler(const wxString& ext, long type)
+ static wxDEPRECATED(
+ wxImageHandler *FindHandler(const wxString& ext, long type)
{
return FindHandler(ext, (wxBitmapType)type);
}
)
- wxDEPRECATED(
- static wxImageHandler *FindHandler(long imageType)
+ static wxDEPRECATED(
+ wxImageHandler *FindHandler(long imageType)
{
return FindHandler((wxBitmapType)imageType);
}
private:
friend class WXDLLIMPEXP_FWD_CORE wxImageHandler;
+ // Possible values for MakeEmptyClone() flags.
+ enum
+ {
+ // Create an image with the same orientation as this one. This is the
+ // default and only exists for symmetry with SwapOrientation.
+ Clone_SameOrientation = 0,
+
+ // Create an image with the same height as this image width and the
+ // same width as this image height.
+ Clone_SwapOrientation = 1
+ };
+
+ // Returns a new blank image with the same dimensions (or with width and
+ // height swapped if Clone_SwapOrientation flag is given), alpha, and mask
+ // as this image itself. This is used by several functions creating
+ // modified versions of this image.
+ wxImage MakeEmptyClone(int flags = Clone_SameOrientation) const;
+
#if wxUSE_STREAMS
// read the image from the specified stream updating image type if
// successful
projects / wxWidgets.git / blobdiff