root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 12.0 no-patch

Browse Source 
Files correlati     : 
Commento            : Aggiornamento codice per passaggio a Visual Studio 2017

git-svn-id: svn://10.65.10.50/branches/R_10_00@24259 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
mtollari 2018-01-09 16:45:05 +00:00
parent 425522aebc
commit 841a2a0d04
1 changed files with 263 additions and 252 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

171
libraries/wx28X/include/wx/image.h
View File

@ -71,14 +71,14 @@ class WXDLLIMPEXP_FWD_CORE wxPalette;
#if wxUSE_VARIANT #if wxUSE_VARIANT
#include "wx/variant.h" #include "wx/variant.h"
DECLARE_VARIANT_OBJECT_EXPORTED(wxImage,WXDLLEXPORT) DECLARE_VARIANT_OBJECT_EXPORTED(wxImage, WXDLLEXPORT)
#endif #endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxImageHandler // wxImageHandler
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
class WXDLLEXPORT wxImageHandler: public wxObject class WXDLLEXPORT wxImageHandler : public wxObject
{ {
public: public:
wxImageHandler() wxImageHandler()
@ -86,13 +86,13 @@ public:
{ } { }
#if wxUSE_STREAMS #if wxUSE_STREAMS
virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ); virtual bool LoadFile(wxImage *image, wxInputStream& stream, bool verbose = true, int index = -1);
virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ); virtual bool SaveFile(wxImage *image, wxOutputStream& stream, bool verbose = true);
virtual int GetImageCount( wxInputStream& stream ); virtual int GetImageCount(wxInputStream& stream);
bool CanRead( wxInputStream& stream ) { return CallDoCanRead(stream); } bool CanRead(wxInputStream& stream) { return CallDoCanRead(stream); }
bool CanRead( const wxString& name ); bool CanRead(const wxString& name);
#endif // wxUSE_STREAMS #endif // wxUSE_STREAMS
void SetName(const wxString& name) { m_name = name; } void SetName(const wxString& name) { m_name = name; }
@ -106,7 +106,7 @@ public:
protected: protected:
#if wxUSE_STREAMS #if wxUSE_STREAMS
virtual bool DoCanRead( wxInputStream& stream ) = 0; virtual bool DoCanRead(wxInputStream& stream) = 0;
// save the stream position, call DoCanRead() and restore the position // save the stream position, call DoCanRead() and restore the position
bool CallDoCanRead(wxInputStream& stream); bool CallDoCanRead(wxInputStream& stream);
@ -160,14 +160,14 @@ public:
unsigned char *b, unsigned char *b,
unsigned char startR = 1, unsigned char startR = 1,
unsigned char startG = 0, unsigned char startG = 0,
unsigned char startB = 0 ) const; unsigned char startB = 0) const;
}; };
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxImage // wxImage
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
class WXDLLEXPORT wxImage: public wxObject class WXDLLEXPORT wxImage : public wxObject
{ {
public: public:
// red, green and blue are 8 bit unsigned integers in the range of 0..255 // red, green and blue are 8 bit unsigned integers in the range of 0..255
@ -175,7 +175,7 @@ public:
class RGBValue class RGBValue
{ {
public: public:
RGBValue(unsigned char r=0, unsigned char g=0, unsigned char b=0) RGBValue(unsigned char r = 0, unsigned char g = 0, unsigned char b = 0)
: red(r), green(g), blue(b) {} : red(r), green(g), blue(b) {}
unsigned char red; unsigned char red;
unsigned char green; unsigned char green;
@ -186,34 +186,34 @@ public:
class HSVValue class HSVValue
{ {
public: public:
HSVValue(double h=0.0, double s=0.0, double v=0.0) HSVValue(double h = 0.0, double s = 0.0, double v = 0.0)
: hue(h), saturation(s), value(v) {} : hue(h), saturation(s), value(v) {}
double hue; double hue;
double saturation; double saturation;
double value; double value;
}; };
wxImage(){} wxImage() {}
wxImage( int width, int height, bool clear = true ); wxImage(int width, int height, bool clear = true);
wxImage( int width, int height, unsigned char* data, bool static_data = false ); wxImage(int width, int height, unsigned char* data, bool static_data = false);
wxImage( int width, int height, unsigned char* data, unsigned char* alpha, bool static_data = false ); wxImage(int width, int height, unsigned char* data, unsigned char* alpha, bool static_data = false);
wxImage( const wxString& name, long type = wxBITMAP_TYPE_ANY, int index = -1 ); wxImage(const wxString& name, long type = wxBITMAP_TYPE_ANY, int index = -1);
wxImage( const wxString& name, const wxString& mimetype, int index = -1 ); wxImage(const wxString& name, const wxString& mimetype, int index = -1);
wxImage( const char* const* xpmData ); wxImage(const char* const* xpmData);
#if wxUSE_STREAMS #if wxUSE_STREAMS
wxImage( wxInputStream& stream, long type = wxBITMAP_TYPE_ANY, int index = -1 ); wxImage(wxInputStream& stream, long type = wxBITMAP_TYPE_ANY, int index = -1);
wxImage( wxInputStream& stream, const wxString& mimetype, int index = -1 ); wxImage(wxInputStream& stream, const wxString& mimetype, int index = -1);
#endif // wxUSE_STREAMS #endif // wxUSE_STREAMS
bool Create( int width, int height, bool clear = true ); 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, bool static_data = false);
bool Create( int width, int height, unsigned char* data, unsigned char* alpha, bool static_data = false ); bool Create(int width, int height, unsigned char* data, unsigned char* alpha, bool static_data = false);
bool Create( const char* const* xpmData ); bool Create(const char* const* xpmData);
#ifdef __BORLANDC__ #ifdef __BORLANDC__
// needed for Borland 5.5 // needed for Borland 5.5
wxImage( char** xpmData ) { Create(wx_const_cast(const char* const*, xpmData)); } wxImage(char** xpmData) { Create(wx_const_cast(const char* const*, xpmData)); }
bool Create( char** xpmData ) { return Create(wx_const_cast(const char* const*, xpmData)); } bool Create(char** xpmData) { return Create(wx_const_cast(const char* const*, xpmData)); }
#endif #endif
void Destroy(); void Destroy();
@ -222,21 +222,21 @@ public:
wxImage Copy() const; wxImage Copy() const;
// return the new image with size width*height // return the new image with size width*height
wxImage GetSubImage( const wxRect& rect) const; wxImage GetSubImage(const wxRect& rect) const;
// Paste the image or part of this image into an image of the given size at the pos // Paste the image or part of this image into an image of the given size at the pos
// any newly exposed areas will be filled with the rgb colour // any newly exposed areas will be filled with the rgb colour
// by default if r = g = b = -1 then fill with this image's mask colour or find and // by default if r = g = b = -1 then fill with this image's mask colour or find and
// set a suitable mask colour // set a suitable mask colour
wxImage Size( const wxSize& size, const wxPoint& pos, wxImage Size(const wxSize& size, const wxPoint& pos,
int r = -1, int g = -1, int b = -1 ) const; int r = -1, int g = -1, int b = -1) const;
// pastes image into this instance and takes care of // pastes image into this instance and takes care of
// the mask colour and out of bounds problems // 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 // 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, int quality = wxIMAGE_QUALITY_NORMAL) const;
// box averager and bicubic filters for up/down sampling // box averager and bicubic filters for up/down sampling
wxImage ResampleBox(int width, int height) const; wxImage ResampleBox(int width, int height) const;
@ -247,50 +247,52 @@ public:
wxImage BlurHorizontal(int radius); wxImage BlurHorizontal(int radius);
wxImage BlurVertical(int radius); wxImage BlurVertical(int radius);
wxImage ShrinkBy( int xFactor , int yFactor ) const ; wxImage ShrinkBy(int xFactor, int yFactor) const;
// rescales the image in place // 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, int quality = wxIMAGE_QUALITY_NORMAL) { return *this = Scale(width, height, quality); }
// resizes the image in place // resizes the image in place
wxImage& Resize( const wxSize& size, const wxPoint& pos, wxImage& Resize(const wxSize& size, const wxPoint& pos,
int r = -1, int g = -1, int b = -1 ) { return *this = Size(size, pos, r, g, b); } int r = -1, int g = -1, int b = -1) {
return *this = Size(size, pos, r, g, b);
}
// Rotates the image about the given point, 'angle' radians. // Rotates the image about the given point, 'angle' radians.
// Returns the rotated image, leaving this image intact. // Returns the rotated image, leaving this image intact.
wxImage Rotate(double angle, const wxPoint & centre_of_rotation, wxImage Rotate(double angle, const wxPoint & centre_of_rotation,
bool interpolating = true, wxPoint * offset_after_rotation = (wxPoint*) NULL) const; bool interpolating = true, wxPoint * offset_after_rotation = (wxPoint*)NULL) const;
wxImage Rotate90( bool clockwise = true ) const; wxImage Rotate90(bool clockwise = true) const;
wxImage Mirror( bool horizontally = true ) const; wxImage Mirror(bool horizontally = true) const;
// replace one colour with another // replace one colour with another
void Replace( unsigned char r1, unsigned char g1, unsigned char b1, void Replace(unsigned char r1, unsigned char g1, unsigned char b1,
unsigned char r2, unsigned char g2, unsigned char b2 ); unsigned char r2, unsigned char g2, unsigned char b2);
// Convert to greyscale image. Uses the luminance component (Y) of the image. // 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 // 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; 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, // convert to monochrome image (<r,g,b> will be replaced by white,
// everything else by black) // everything else by black)
wxImage ConvertToMono( unsigned char r, unsigned char g, unsigned char b ) const; wxImage ConvertToMono(unsigned char r, unsigned char g, unsigned char b) const;
// these routines are slow but safe // these routines are slow but safe
void SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b ); 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 ); void SetRGB(const wxRect& rect, unsigned char r, unsigned char g, unsigned char b);
unsigned char GetRed( int x, int y ) const; unsigned char GetRed(int x, int y) const;
unsigned char GetGreen( int x, int y ) const; unsigned char GetGreen(int x, int y) const;
unsigned char GetBlue( int x, int y ) const; unsigned char GetBlue(int x, int y) const;
void SetAlpha(int x, int y, unsigned char alpha); void SetAlpha(int x, int y, unsigned char alpha);
unsigned char GetAlpha(int x, int y) const; unsigned char GetAlpha(int x, int y) const;
// find first colour that is not used in the image and has higher // find first colour that is not used in the image and has higher
// RGB values than <startR,startG,startB> // RGB values than <startR,startG,startB>
bool FindFirstUnusedColour( unsigned char *r, unsigned char *g, unsigned char *b, bool FindFirstUnusedColour(unsigned char *r, unsigned char *g, unsigned char *b,
unsigned char startR = 1, unsigned char startG = 0, unsigned char startR = 1, unsigned char startG = 0,
unsigned char startB = 0 ) const; unsigned char startB = 0) const;
// Set image's mask to the area of 'mask' that has <r,g,b> colour // Set image's mask to the area of 'mask' that has <r,g,b> colour
bool SetMaskFromImage(const wxImage & mask, bool SetMaskFromImage(const wxImage & mask,
unsigned char mr, unsigned char mg, unsigned char mb); unsigned char mr, unsigned char mg, unsigned char mb);
@ -309,27 +311,27 @@ public:
// and white text (actually only the red channel is read). // and white text (actually only the red channel is read).
// The method will then fill up the whole image with the // The method will then fill up the whole image with the
// colour given. // colour given.
bool ConvertColourToAlpha( unsigned char r, unsigned char g, unsigned char b ); bool ConvertColourToAlpha(unsigned char r, unsigned char g, unsigned char b);
static bool CanRead( const wxString& name ); static bool CanRead(const wxString& name);
static int GetImageCount( const wxString& name, long type = wxBITMAP_TYPE_ANY ); 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, long type = wxBITMAP_TYPE_ANY, int index = -1);
virtual bool LoadFile( const wxString& name, const wxString& mimetype, int index = -1 ); virtual bool LoadFile(const wxString& name, const wxString& mimetype, int index = -1);
#if wxUSE_STREAMS #if wxUSE_STREAMS
static bool CanRead( wxInputStream& stream ); static bool CanRead(wxInputStream& stream);
static int GetImageCount( wxInputStream& stream, long type = wxBITMAP_TYPE_ANY ); 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, long type = wxBITMAP_TYPE_ANY, int index = -1);
virtual bool LoadFile( wxInputStream& stream, const wxString& mimetype, int index = -1 ); virtual bool LoadFile(wxInputStream& stream, const wxString& mimetype, int index = -1);
#endif #endif
virtual bool SaveFile( const wxString& name ) const; virtual bool SaveFile(const wxString& name) const;
virtual bool SaveFile( const wxString& name, int type ) const; virtual bool SaveFile(const wxString& name, int type) const;
virtual bool SaveFile( const wxString& name, const wxString& mimetype ) const; virtual bool SaveFile(const wxString& name, const wxString& mimetype) const;
#if wxUSE_STREAMS #if wxUSE_STREAMS
virtual bool SaveFile( wxOutputStream& stream, int type ) const; virtual bool SaveFile(wxOutputStream& stream, int type) const;
virtual bool SaveFile( wxOutputStream& stream, const wxString& mimetype ) const; virtual bool SaveFile(wxOutputStream& stream, const wxString& mimetype) const;
#endif #endif
bool Ok() const { return IsOk(); } bool Ok() const { return IsOk(); }
@ -340,12 +342,12 @@ public:
// these functions provide fastest access to wxImage data but should be // these functions provide fastest access to wxImage data but should be
// used carefully as no checks are done // used carefully as no checks are done
unsigned char *GetData() const; unsigned char *GetData() const;
void SetData( unsigned char *data, bool static_data=false ); void SetData(unsigned char *data, bool static_data = false);
void SetData( unsigned char *data, int new_width, int new_height, bool static_data=false ); void SetData(unsigned char *data, int new_width, int new_height, bool static_data = false);
unsigned char *GetAlpha() const; // may return NULL! unsigned char *GetAlpha() const; // may return NULL!
bool HasAlpha() const { return GetAlpha() != NULL; } bool HasAlpha() const { return GetAlpha() != NULL; }
void SetAlpha(unsigned char *alpha = NULL, bool static_data=false); void SetAlpha(unsigned char *alpha = NULL, bool static_data = false);
void InitAlpha(); void InitAlpha();
// return true if this pixel is masked or has alpha less than specified // return true if this pixel is masked or has alpha less than specified
@ -354,14 +356,14 @@ public:
unsigned char threshold = wxIMAGE_ALPHA_THRESHOLD) const; unsigned char threshold = wxIMAGE_ALPHA_THRESHOLD) const;
// Mask functions // Mask functions
void SetMaskColour( unsigned char r, unsigned char g, unsigned char b ); void SetMaskColour(unsigned char r, unsigned char g, unsigned char b);
// Get the current mask colour or find a suitable colour // Get the current mask colour or find a suitable colour
// returns true if using current mask colour // returns true if using current mask colour
bool GetOrFindMaskColour( unsigned char *r, unsigned char *g, unsigned char *b ) const; bool GetOrFindMaskColour(unsigned char *r, unsigned char *g, unsigned char *b) const;
unsigned char GetMaskRed() const; unsigned char GetMaskRed() const;
unsigned char GetMaskGreen() const; unsigned char GetMaskGreen() const;
unsigned char GetMaskBlue() const; unsigned char GetMaskBlue() const;
void SetMask( bool mask = true ); void SetMask(bool mask = true);
bool HasMask() const; bool HasMask() const;
#if wxUSE_PALETTE #if wxUSE_PALETTE
@ -378,7 +380,7 @@ public:
int GetOptionInt(const wxString& name) const; int GetOptionInt(const wxString& name) const;
bool HasOption(const wxString& name) const; bool HasOption(const wxString& name) const;
unsigned long CountColours( unsigned long stopafter = (unsigned long) -1 ) const; unsigned long CountColours(unsigned long stopafter = (unsigned long)-1) const;
// Computes the histogram of the image and fills a hash table, indexed // Computes the histogram of the image and fills a hash table, indexed
// with integer keys built as 0xRRGGBB, containing wxImageHistogramEntry // with integer keys built as 0xRRGGBB, containing wxImageHistogramEntry
@ -386,20 +388,20 @@ public:
// with the image colours) and a 'value', which is the number of pixels // with the image colours) and a 'value', which is the number of pixels
// in the image with that colour. // in the image with that colour.
// Returned value: # of entries in the histogram // Returned value: # of entries in the histogram
unsigned long ComputeHistogram( wxImageHistogram &h ) const; unsigned long ComputeHistogram(wxImageHistogram &h) const;
// Rotates the hue of each pixel of the image. angle is a double in the range // 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 // -1.0..1.0 where -1.0 is -360 degrees and 1.0 is 360 degrees
void RotateHue(double angle); void RotateHue(double angle);
static wxList& GetHandlers() { return sm_handlers; } static wxList& GetHandlers() { return sm_handlers; }
static void AddHandler( wxImageHandler *handler ); static void AddHandler(wxImageHandler *handler);
static void InsertHandler( wxImageHandler *handler ); static void InsertHandler(wxImageHandler *handler);
static bool RemoveHandler( const wxString& name ); static bool RemoveHandler(const wxString& name);
static wxImageHandler *FindHandler( const wxString& name ); static wxImageHandler *FindHandler(const wxString& name);
static wxImageHandler *FindHandler( const wxString& extension, long imageType ); static wxImageHandler *FindHandler(const wxString& extension, long imageType);
static wxImageHandler *FindHandler( long imageType ); static wxImageHandler *FindHandler(long imageType);
static wxImageHandler *FindHandlerMime( const wxString& mimetype ); static wxImageHandler *FindHandlerMime(const wxString& mimetype);
static wxString GetImageExtWildcard(); static wxString GetImageExtWildcard();
@ -409,6 +411,15 @@ public:
static HSVValue RGBtoHSV(const RGBValue& rgb); static HSVValue RGBtoHSV(const RGBValue& rgb);
static RGBValue HSVtoRGB(const HSVValue& hsv); static RGBValue HSVtoRGB(const HSVValue& hsv);
// Ridefinito causa problemi con VS2017
wxImage& operator=(const wxImage& other)
{
if (this != &other)
{
Ref(other);
}
return *this;
}
protected: protected:
static wxList sm_handlers; static wxList sm_handlers;
@ -451,4 +462,4 @@ extern WXDLLEXPORT_DATA(wxImage) wxNullImage;
#endif // wxUSE_IMAGE #endif // wxUSE_IMAGE
#endif #endif
// _WX_IMAGE_H_ // _WX_IMAGE_H_