removed wxIsLoggingEnabled() as it could create the log target as an unwanted side...

[wxWidgets.git] / src / common / image.cpp

diff --git a/src/common/image.cpp b/src/common/image.cpp
index de70ee86db99df9361e4d92d4fb4b076557f6ebf..64f367c5216066cc9f3e6f1aa1420ce3c272b905 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        image.cpp
+// Name:        src/common/image.cpp

 // Purpose:     wxImage
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Purpose:     wxImage
 // Author:      Robert Roebling
 // RCS-ID:      $Id$


@@ -14,25 +14,26 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/defs.h"
-

 #if wxUSE_IMAGE
 
 #if wxUSE_IMAGE
 

+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/hash.h"
+    #include "wx/utils.h"
+#endif
+

 #include "wx/image.h"
 #include "wx/bitmap.h"
 #include "wx/debug.h"
 #include "wx/image.h"
 #include "wx/bitmap.h"
 #include "wx/debug.h"

-#include "wx/log.h"
-#include "wx/app.h"

 #include "wx/filefn.h"
 #include "wx/wfstream.h"
 #include "wx/intl.h"
 #include "wx/module.h"
 #include "wx/filefn.h"
 #include "wx/wfstream.h"
 #include "wx/intl.h"
 #include "wx/module.h"

-#include "wx/hash.h"
-#include "wx/utils.h"

 #include "wx/math.h"
 
 #if wxUSE_XPM
 #include "wx/math.h"
 
 #if wxUSE_XPM

-#include "wx/xpmdecod.h"
+    #include "wx/xpmdecod.h"

 #endif
 
 // For memcpy
 #endif
 
 // For memcpy


@@ -148,17 +149,6 @@ wxImage::wxImage( wxInputStream& stream, const wxString& mimetype, int index )
 }
 #endif // wxUSE_STREAMS
 
 }
 #endif // wxUSE_STREAMS
 

-wxImage::wxImage( const wxImage& image )
-    : wxObject()
-{
-    Ref(image);
-}
-
-wxImage::wxImage( const wxImage* image )
-{
-    if (image) Ref(*image);
-}
-

 wxImage::wxImage( const char** xpmData )
 {
     Create(xpmData);
 wxImage::wxImage( const char** xpmData )
 {
     Create(xpmData);


@@ -262,8 +252,17 @@ wxImage wxImage::Copy() const
 
     memcpy( data, GetData(), M_IMGDATA->m_width*M_IMGDATA->m_height*3 );
 
 
     memcpy( data, GetData(), M_IMGDATA->m_width*M_IMGDATA->m_height*3 );
 

-    // also copy the image options

     wxImageRefData *imgData = (wxImageRefData *)image.m_refData;
     wxImageRefData *imgData = (wxImageRefData *)image.m_refData;

+
+    // also copy the alpha channel
+    if (HasAlpha())
+    {
+        image.SetAlpha();
+        unsigned char* alpha = image.GetAlpha();
+        memcpy( alpha, GetAlpha(), M_IMGDATA->m_width*M_IMGDATA->m_height );
+    }
+
+    // also copy the image options

     imgData->m_optionNames = M_IMGDATA->m_optionNames;
     imgData->m_optionValues = M_IMGDATA->m_optionValues;
 
     imgData->m_optionNames = M_IMGDATA->m_optionNames;
     imgData->m_optionValues = M_IMGDATA->m_optionValues;
 


@@ -380,7 +379,7 @@ wxImage wxImage::ShrinkBy( int xFactor , int yFactor ) const
         }
     }
 
         }
     }
 

-    // In case this is a cursor, make sure the hotspot is scalled accordingly:
+    // In case this is a cursor, make sure the hotspot is scaled accordingly:

     if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) )
         image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X,
                 (GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X))/xFactor);
     if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) )
         image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X,
                 (GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X))/xFactor);


@@ -466,7 +465,7 @@ wxImage wxImage::Scale( int width, int height ) const
         y += y_delta;
     }
 
         y += y_delta;
     }
 

-    // In case this is a cursor, make sure the hotspot is scalled accordingly:
+    // In case this is a cursor, make sure the hotspot is scaled accordingly:

     if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) )
         image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X,
                 (GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X)*width)/old_width);
     if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) )
         image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X,
                 (GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X)*width)/old_width);


@@ -551,9 +550,16 @@ wxImage wxImage::Mirror( bool horizontally ) const
     image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height, false );
 
     unsigned char *data = image.GetData();
     image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height, false );
 
     unsigned char *data = image.GetData();

+    unsigned char *alpha = NULL;

 
     wxCHECK_MSG( data, image, wxT("unable to create image") );
 
 
     wxCHECK_MSG( data, image, wxT("unable to create image") );
 

+    if (M_IMGDATA->m_alpha != NULL) {
+        image.SetAlpha();
+        alpha = image.GetAlpha();
+        wxCHECK_MSG( alpha, image, wxT("unable to create alpha channel") );
+    }
+

     if (M_IMGDATA->m_hasMask)
         image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
 
     if (M_IMGDATA->m_hasMask)
         image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
 


@@ -576,6 +582,25 @@ wxImage wxImage::Mirror( bool horizontally ) const
                 target_data -= 3;
             }
         }
                 target_data -= 3;
             }
         }

+
+        if (alpha != NULL)
+        {
+            // src_alpha starts at the first pixel and increases by 1 after each step
+            // (a step here is the copy of the alpha value of one pixel)
+            const unsigned char *src_alpha = M_IMGDATA->m_alpha;
+            // dest_alpha starts just beyond the first line, decreases before each step,
+            // and after each line is finished, increases by 2 widths (skipping the line
+            // just copied and the line that will be copied next)
+            unsigned char *dest_alpha = alpha + width;
+
+            for (long jj = 0; jj < height; ++jj)
+            {
+                for (long i = 0; i < width; ++i) {
+                    *(--dest_alpha) = *(src_alpha++); // copy one pixel
+                }
+                dest_alpha += 2 * width; // advance beyond the end of the next line
+            }
+        }

     }
     else
     {
     }
     else
     {


@@ -585,6 +610,23 @@ wxImage wxImage::Mirror( bool horizontally ) const
             memcpy( target_data, source_data, (size_t)3*width );
             source_data += 3*width;
         }
             memcpy( target_data, source_data, (size_t)3*width );
             source_data += 3*width;
         }

+
+        if (alpha != NULL)
+        {
+            // src_alpha starts at the first pixel and increases by 1 width after each step
+            // (a step here is the copy of the alpha channel of an entire line)
+            const unsigned char *src_alpha = M_IMGDATA->m_alpha;
+            // dest_alpha starts just beyond the last line (beyond the whole image)
+            // and decreases by 1 width before each step
+            unsigned char *dest_alpha = alpha + width * height;
+
+            for (long jj = 0; jj < height; ++jj)
+            {
+                dest_alpha -= width;
+                memcpy( dest_alpha, src_alpha, (size_t)width );
+                src_alpha += width;
+            }
+        }

     }
 
     return image;
     }
 
     return image;


@@ -596,32 +638,47 @@ wxImage wxImage::GetSubImage( const wxRect &rect ) const
 
     wxCHECK_MSG( Ok(), image, wxT("invalid image") );
 
 
     wxCHECK_MSG( Ok(), image, wxT("invalid image") );
 

-    wxCHECK_MSG( (rect.GetLeft()>=0) && (rect.GetTop()>=0) && (rect.GetRight()<=GetWidth()) && (rect.GetBottom()<=GetHeight()),
+    wxCHECK_MSG( (rect.GetLeft()>=0) && (rect.GetTop()>=0) &&
+                 (rect.GetRight()<=GetWidth()) && (rect.GetBottom()<=GetHeight()),

                  image, wxT("invalid subimage size") );
 
                  image, wxT("invalid subimage size") );
 

-    int subwidth=rect.GetWidth();
-    const int subheight=rect.GetHeight();
+    const int subwidth = rect.GetWidth();
+    const int subheight = rect.GetHeight();

 
     image.Create( subwidth, subheight, false );
 
 
     image.Create( subwidth, subheight, false );
 

-    unsigned char *subdata = image.GetData(), *data=GetData();
+    const unsigned char *src_data = GetData();
+    const unsigned char *src_alpha = M_IMGDATA->m_alpha;
+    unsigned char *subdata = image.GetData();
+    unsigned char *subalpha = NULL;

 
     wxCHECK_MSG( subdata, image, wxT("unable to create image") );
 
 
     wxCHECK_MSG( subdata, image, wxT("unable to create image") );
 

+    if (src_alpha != NULL) {
+        image.SetAlpha();
+        subalpha = image.GetAlpha();
+        wxCHECK_MSG( subalpha, image, wxT("unable to create alpha channel"));
+    }
+

     if (M_IMGDATA->m_hasMask)
         image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
 
     if (M_IMGDATA->m_hasMask)
         image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
 

-    const int subleft=3*rect.GetLeft();
-    const int width=3*GetWidth();
-    subwidth*=3;
+    const int width = GetWidth();
+    const int pixsoff = rect.GetLeft() + width * rect.GetTop();

 
 

-    data+=rect.GetTop()*width+subleft;
+    src_data += 3 * pixsoff;
+    src_alpha += pixsoff; // won't be used if was NULL, so this is ok

 
     for (long j = 0; j < subheight; ++j)
     {
 
     for (long j = 0; j < subheight; ++j)
     {

-        memcpy( subdata, data, subwidth);
-        subdata+=subwidth;
-        data+=width;
+        memcpy( subdata, src_data, 3 * subwidth );
+        subdata += 3 * subwidth;
+        src_data += 3 * width;
+        if (subalpha != NULL) {
+            memcpy( subalpha, src_alpha, subwidth );
+            subalpha += subwidth;
+            src_alpha += width;
+        }

     }
 
     return image;
     }
 
     return image;


@@ -651,6 +708,10 @@ wxImage wxImage::Size( const wxSize& size, const wxPoint& pos,
 
     wxRect subRect(pos.x, pos.y, width, height);
     wxRect finalRect(0, 0, size.GetWidth(), size.GetHeight());
 
     wxRect subRect(pos.x, pos.y, width, height);
     wxRect finalRect(0, 0, size.GetWidth(), size.GetHeight());

+    if (pos.x < 0)
+        finalRect.width -= pos.x;
+    if (pos.y < 0)
+        finalRect.height -= pos.y;

 
     subRect.Intersect(finalRect);
 
 
     subRect.Intersect(finalRect);
 


@@ -769,6 +830,46 @@ void wxImage::Replace( unsigned char r1, unsigned char g1, unsigned char b1,
         }
 }
 
         }
 }
 

+wxImage wxImage::ConvertToGreyscale( double lr, double lg, double lb ) const
+{
+    wxImage image;
+
+    wxCHECK_MSG( Ok(), image, wxT("invalid image") );
+
+    image.Create(M_IMGDATA->m_width, M_IMGDATA->m_height, false);
+
+    unsigned char *dest = image.GetData();
+
+    wxCHECK_MSG( dest, image, wxT("unable to create image") );
+
+    unsigned char *src = M_IMGDATA->m_data;
+    bool hasMask = M_IMGDATA->m_hasMask;
+    unsigned char maskRed = M_IMGDATA->m_maskRed;
+    unsigned char maskGreen = M_IMGDATA->m_maskGreen;
+    unsigned char maskBlue = M_IMGDATA->m_maskBlue;
+
+    if ( hasMask )
+        image.SetMaskColour(maskRed, maskGreen, maskBlue);
+
+    const long size = M_IMGDATA->m_width * M_IMGDATA->m_height;
+    for ( long i = 0; i < size; i++, src += 3, dest += 3 )
+    {
+        // don't modify the mask
+        if ( hasMask && src[0] == maskRed && src[1] == maskGreen && src[2] == maskBlue )
+        {
+            memcpy(dest, src, 3);
+        }
+        else
+        {
+            // calculate the luma
+            double luma = (src[0] * lr + src[1] * lg + src[2] * lb) + 0.5;
+            dest[0] = dest[1] = dest[2] = wx_static_cast(unsigned char, luma);
+        }
+    }
+
+    return image;
+}
+

 wxImage wxImage::ConvertToMono( unsigned char r, unsigned char g, unsigned char b ) const
 {
     wxImage image;
 wxImage wxImage::ConvertToMono( unsigned char r, unsigned char g, unsigned char b ) const
 {
     wxImage image;


@@ -1554,7 +1655,13 @@ bool wxImage::LoadFile( wxInputStream& stream, long type, int index )
         return false;
     }
 
         return false;
     }
 

-    return handler->LoadFile(this, stream, true/*verbose*/, index);
+    if (stream.IsSeekable() && !handler->CanRead(stream))
+    {
+        wxLogError(_("Image file is not of type %d."), type);
+        return false;
+    }
+    else
+        return handler->LoadFile(this, stream, true/*verbose*/, index);

 }
 
 bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int index )
 }
 
 bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int index )


@@ -1572,7 +1679,13 @@ bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int ind
         return false;
     }
 
         return false;
     }
 

-    return handler->LoadFile( this, stream, true/*verbose*/, index );
+    if (stream.IsSeekable() && !handler->CanRead(stream))
+    {
+        wxLogError(_("Image file is not of type %s."), (const wxChar*) mimetype);
+        return false;
+    }
+    else
+        return handler->LoadFile( this, stream, true/*verbose*/, index );

 }
 
 bool wxImage::SaveFile( wxOutputStream& stream, int type ) const
 }
 
 bool wxImage::SaveFile( wxOutputStream& stream, int type ) const


@@ -1778,7 +1891,7 @@ wxImage::HSVValue wxImage::RGBtoHSV(const RGBValue& rgb)
 
     const double value = maximumRGB;
 
 
     const double value = maximumRGB;
 

-    double hue, saturation;
+    double hue = 0.0, saturation;

     const double deltaRGB = maximumRGB - minimumRGB;
     if ( wxIsNullDouble(deltaRGB) )
     {
     const double deltaRGB = maximumRGB - minimumRGB;
     if ( wxIsNullDouble(deltaRGB) )
     {


@@ -1801,6 +1914,10 @@ wxImage::HSVValue wxImage::RGBtoHSV(const RGBValue& rgb)
             case BLUE:
                 hue = 4.0 + (red - green) / deltaRGB;
                 break;
             case BLUE:
                 hue = 4.0 + (red - green) / deltaRGB;
                 break;

+
+            default:
+                wxFAIL_MSG(wxT("hue not specified"));
+                break;

         }
 
         hue /= 6.0;
         }
 
         hue /= 6.0;