X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/978d3d3647fde4362cfe8b7b2b505ba1cc52770a..08469b1f18dbf44abd5400ddf83a7c0e1bd65af1:/include/wx/image.h

diff --git a/include/wx/image.h b/include/wx/image.h
index 38f2809d98..aa801035f6 100644
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -10,10 +10,6 @@
 #ifndef _WX_IMAGE_H_
 #define _WX_IMAGE_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "image.h"
-#endif
-
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
@@ -157,7 +153,6 @@ public:
 class WXDLLEXPORT wxImage: public wxObject
 {
 public:
-#if wxABI_VERSION >= 20602
     // red, green and blue are 8 bit unsigned integers in the range of 0..255
     // We use the identifier RGBValue instead of RGB, since RGB is #defined
     class RGBValue
@@ -165,7 +160,7 @@ public:
     public:
       RGBValue(unsigned char r=0, unsigned char g=0, unsigned char b=0)
         : red(r), green(g), blue(b) {}
-        unsigned char red;  
+        unsigned char red;
         unsigned char green;
         unsigned char blue;
     };
@@ -176,11 +171,10 @@ public:
     public:
         HSVValue(double h=0.0, double s=0.0, double v=0.0)
             : hue(h), saturation(s), value(v) {}
-        double hue;  
+        double hue;
         double saturation;
         double value;
     };
-#endif // wxABI_VERSION >= 2.6.2
 
     wxImage(){}
     wxImage( int width, int height, bool clear = true );
@@ -196,9 +190,6 @@ public:
     wxImage( wxInputStream& stream, const wxString& mimetype, int index = -1 );
 #endif // wxUSE_STREAMS
 
-    wxImage( const wxImage& image );
-    wxImage( const wxImage* image );
-
     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 );
@@ -247,6 +238,10 @@ public:
     void Replace( unsigned char r1, unsigned char g1, unsigned char b1,
                   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;
+
     // 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;
@@ -362,18 +357,9 @@ public:
     // Returned value: # of entries in the histogram
     unsigned long ComputeHistogram( wxImageHistogram &h ) const;
 
-#if wxABI_VERSION >= 20602
     // Rotates the hue of each pixel of the image. angle is a double in the range
     // -1.0..1.0 where -1.0 is -360 degrees and 1.0 is 360 degrees
     void RotateHue(double angle);
-#endif // wxABI_VERSION >= 2.6.2
-
-    wxImage& operator = (const wxImage& image)
-    {
-        if ( (*this) != image )
-            Ref(image);
-        return *this;
-    }
 
     bool operator == (const wxImage& image) const
         { return m_refData == image.m_refData; }
@@ -394,10 +380,8 @@ public:
     static void CleanUpHandlers();
     static void InitStandardHandlers();
 
-#if wxABI_VERSION >= 20602
     static HSVValue RGBtoHSV(const RGBValue& rgb);
     static RGBValue HSVtoRGB(const HSVValue& hsv);
-#endif // wxABI_VERSION >= 2.6.2
 
 
 protected: