wxHtmlWindow::OnLinkClicked and wxHtmlCell::Get/SetLink and wxHtmlWinParser::GetSetLi...

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

diff --git a/src/common/image.cpp b/src/common/image.cpp
index 725cff015c7b671f2566fac07c9152db27bf7c84..fcdc3d34e90107196ffd805d09d9b7a3f0fcce0f 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -71,7 +71,7 @@ wxImageRefData::wxImageRefData()
 
 wxImageRefData::~wxImageRefData()
 {
 
 wxImageRefData::~wxImageRefData()
 {

-    if (m_data) 
+    if (m_data)

         free( m_data );
 }
 
         free( m_data );
 }
 


@@ -382,7 +382,7 @@ bool wxImage::LoadFile( const wxString& filename, long type )
        wxBufferedInputStream bstream( stream );
         return LoadFile(bstream, type);
     }
        wxBufferedInputStream bstream( stream );
         return LoadFile(bstream, type);
     }

-    else 
+    else

     {
         wxLogError( _("Can't load image from file '%s': file does not exist."), filename.c_str() );
 
     {
         wxLogError( _("Can't load image from file '%s': file does not exist."), filename.c_str() );
 


@@ -402,7 +402,7 @@ bool wxImage::LoadFile( const wxString& filename, const wxString& mimetype )
        wxBufferedInputStream bstream( stream );
         return LoadFile(bstream, mimetype);
     }
        wxBufferedInputStream bstream( stream );
         return LoadFile(bstream, mimetype);
     }

-    else 
+    else

     {
         wxLogError( _("Can't load image from file '%s': file does not exist."), filename.c_str() );
 
     {
         wxLogError( _("Can't load image from file '%s': file does not exist."), filename.c_str() );
 


@@ -747,7 +747,7 @@ wxBitmap wxImage::ConvertToBitmap() const
 
     // create a DIB header
     int headersize = sizeof(BITMAPINFOHEADER);
 
     // create a DIB header
     int headersize = sizeof(BITMAPINFOHEADER);

-    LPBITMAPINFO lpDIBh = (BITMAPINFO *) malloc( headersize );
+    BITMAPINFO *lpDIBh = (BITMAPINFO *) malloc( headersize );

     wxCHECK_MSG( lpDIBh, bitmap, wxT("could not allocate memory for DIB header") );
     // Fill in the DIB header
     lpDIBh->bmiHeader.biSize = headersize;
     wxCHECK_MSG( lpDIBh, bitmap, wxT("could not allocate memory for DIB header") );
     // Fill in the DIB header
     lpDIBh->bmiHeader.biSize = headersize;


@@ -939,7 +939,7 @@ wxImage::wxImage( const wxBitmap &bitmap )
 
     // create a DIB header
     int headersize = sizeof(BITMAPINFOHEADER);
 
     // create a DIB header
     int headersize = sizeof(BITMAPINFOHEADER);

-    LPBITMAPINFO lpDIBh = (BITMAPINFO *) malloc( headersize );
+    BITMAPINFO *lpDIBh = (BITMAPINFO *) malloc( headersize );

     if( !lpDIBh )
     {
         wxFAIL_MSG( wxT("could not allocate data for DIB header") );
     if( !lpDIBh )
     {
         wxFAIL_MSG( wxT("could not allocate data for DIB header") );


@@ -1054,31 +1054,31 @@ wxBitmap wxImage::ConvertToBitmap() const
     int height = GetHeight();
 
     // Create picture
     int height = GetHeight();
 
     // Create picture

-    
+

     wxBitmap bitmap( width , height , wxDisplayDepth() ) ;
     wxBitmap bitmap( width , height , wxDisplayDepth() ) ;

-    
+

     // Create mask
     // Create mask

-    
+

     if (HasMask())
     {
        /*
         unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
     if (HasMask())
     {
        /*
         unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height );

-        
+

         mask_image =  gdk_image_new_bitmap( gdk_visual_get_system(), mask_data, width, height );
         mask_image =  gdk_image_new_bitmap( gdk_visual_get_system(), mask_data, width, height );

-        
+

         wxMask *mask = new wxMask();
         mask->m_bitmap = gdk_pixmap_new( (GdkWindow*)&gdk_root_parent, width, height, 1 );
         wxMask *mask = new wxMask();
         mask->m_bitmap = gdk_pixmap_new( (GdkWindow*)&gdk_root_parent, width, height, 1 );

-        
+

         bitmap.SetMask( mask );
        */
     }
         bitmap.SetMask( mask );
        */
     }

-        
+

     // Render
     // Render

-        
+

     int r_mask = GetMaskRed();
     int g_mask = GetMaskGreen();
     int b_mask = GetMaskBlue();
     int r_mask = GetMaskRed();
     int g_mask = GetMaskGreen();
     int b_mask = GetMaskBlue();

-    
+

                CGrafPtr        origPort ;
                GDHandle        origDevice ;
                
                CGrafPtr        origPort ;
                GDHandle        origDevice ;
                


@@ -1086,7 +1086,7 @@ wxBitmap wxImage::ConvertToBitmap() const
                SetGWorld( bitmap.GetHBITMAP() , NULL ) ;
 
     register unsigned char* data = GetData();
                SetGWorld( bitmap.GetHBITMAP() , NULL ) ;
 
     register unsigned char* data = GetData();

-    
+

     int index = 0;
     for (int y = 0; y < height; y++)
     {
     int index = 0;
     for (int y = 0; y < height; y++)
     {


@@ -1102,7 +1102,7 @@ wxBitmap wxImage::ConvertToBitmap() const
                unsigned char r = data[index++];
                unsigned char g = data[index++];
                unsigned char b = data[index++];
                unsigned char r = data[index++];
                unsigned char g = data[index++];
                unsigned char b = data[index++];

- 
+

                        if ( r != lastr || g != lastg || b != lastb )
                        {
                                lastcolor.red = ( lastr  << 8 ) + lastr ;
                        if ( r != lastr || g != lastg || b != lastb )
                        {
                                lastcolor.red = ( lastr  << 8 ) + lastr ;


@@ -1136,9 +1136,9 @@ wxBitmap wxImage::ConvertToBitmap() const
     }  // for height
 
        SetGWorld( origPort , origDevice ) ;
     }  // for height
 
        SetGWorld( origPort , origDevice ) ;

-    
+

     return bitmap;
     return bitmap;

-    
+

 }
 
 wxImage::wxImage( const wxBitmap &bitmap )
 }
 
 wxImage::wxImage( const wxBitmap &bitmap )


@@ -1149,11 +1149,11 @@ wxImage::wxImage( const wxBitmap &bitmap )
         wxFAIL_MSG( "invalid bitmap" );
         return;
     }
         wxFAIL_MSG( "invalid bitmap" );
         return;
     }

-    
+

     // create an wxImage object
     int width = bitmap.GetWidth();
     int height = bitmap.GetHeight();
     // create an wxImage object
     int width = bitmap.GetWidth();
     int height = bitmap.GetHeight();

-    Create( width, height ); 
+    Create( width, height );

     /*
     unsigned char *data = GetData();
     if( !data )
     /*
     unsigned char *data = GetData();
     if( !data )


@@ -1161,18 +1161,18 @@ wxImage::wxImage( const wxBitmap &bitmap )
         wxFAIL_MSG( "could not allocate data for image" );
         return;
     }
         wxFAIL_MSG( "could not allocate data for image" );
         return;
     }

-    
+

     // calc the number of bytes per scanline and padding in the DIB
     int bytePerLine = width*3;
     int sizeDWORD = sizeof( DWORD );
     div_t lineBoundary = div( bytePerLine, sizeDWORD );
     int padding = 0;
     // calc the number of bytes per scanline and padding in the DIB
     int bytePerLine = width*3;
     int sizeDWORD = sizeof( DWORD );
     div_t lineBoundary = div( bytePerLine, sizeDWORD );
     int padding = 0;

-    if( lineBoundary.rem > 0 )  
+    if( lineBoundary.rem > 0 )

     {
         padding = sizeDWORD - lineBoundary.rem;
         bytePerLine += padding;
     }
     {
         padding = sizeDWORD - lineBoundary.rem;
         bytePerLine += padding;
     }

-    
+

     // create a DIB header
     int headersize = sizeof(BITMAPINFOHEADER);
     LPBITMAPINFO lpDIBh = (BITMAPINFO *) malloc( headersize );
     // create a DIB header
     int headersize = sizeof(BITMAPINFOHEADER);
     LPBITMAPINFO lpDIBh = (BITMAPINFO *) malloc( headersize );


@@ -1205,13 +1205,13 @@ wxImage::wxImage( const wxBitmap &bitmap )
         free( lpDIBh );
         return;
     }
         free( lpDIBh );
         return;
     }

-    
+

     // copy data from the device-dependent bitmap to the DIB
     HDC hdc = ::GetDC(NULL);
     HBITMAP hbitmap;
     hbitmap = (HBITMAP) bitmap.GetHBITMAP();
     ::GetDIBits( hdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS );
     // copy data from the device-dependent bitmap to the DIB
     HDC hdc = ::GetDC(NULL);
     HBITMAP hbitmap;
     hbitmap = (HBITMAP) bitmap.GetHBITMAP();
     ::GetDIBits( hdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS );

-    
+

     // copy DIB data into the wxImage object
     int i, j;
     unsigned char *ptdata = data;
     // copy DIB data into the wxImage object
     int i, j;
     unsigned char *ptdata = data;


@@ -1227,7 +1227,7 @@ wxImage::wxImage( const wxBitmap &bitmap )
         }
         ptbits += padding;
     }  
         }
         ptbits += padding;
     }  

-    
+

     // similarly, set data according to the possible mask bitmap
     if( bitmap.GetMask() && bitmap.GetMask()->GetMaskBitmap() )
     {
     // similarly, set data according to the possible mask bitmap
     if( bitmap.GetMask() && bitmap.GetMask()->GetMaskBitmap() )
     {


@@ -1237,9 +1237,9 @@ wxImage::wxImage( const wxBitmap &bitmap )
         ::SetTextColor( memdc, RGB( 0, 0, 0 ) );
         ::SetBkColor( memdc, RGB( 255, 255, 255 ) );
         ::GetDIBits( memdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS );
         ::SetTextColor( memdc, RGB( 0, 0, 0 ) );
         ::SetBkColor( memdc, RGB( 255, 255, 255 ) );
         ::GetDIBits( memdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS );

-        ::DeleteDC( memdc ); 
+        ::DeleteDC( memdc );

         // background color set to RGB(16,16,16) in consistent with wxGTK
         // background color set to RGB(16,16,16) in consistent with wxGTK

-        unsigned char r=16, g=16, b=16;  
+        unsigned char r=16, g=16, b=16;

         ptdata = data;
         ptbits = lpBits;
         for( i=0; i<height; i++ )
         ptdata = data;
         ptbits = lpBits;
         for( i=0; i<height; i++ )


@@ -1257,16 +1257,16 @@ wxImage::wxImage( const wxBitmap &bitmap )
                 ptbits += 3;
             }
             ptbits += padding;
                 ptbits += 3;
             }
             ptbits += padding;

-        }       
+        }

         SetMaskColour( r, g, b );
         SetMask( TRUE );
         SetMaskColour( r, g, b );
         SetMask( TRUE );

-    }  
+    }

     else
     {
         SetMask( FALSE );
     else
     {
         SetMask( FALSE );

-    }  
-    // free allocated resources      
-    ::ReleaseDC(NULL, hdc);   
+    }
+    // free allocated resources
+    ::ReleaseDC(NULL, hdc);

     free(lpDIBh);
     free(lpBits);
     */
     free(lpDIBh);
     free(lpBits);
     */


@@ -2301,13 +2301,57 @@ IMPLEMENT_DYNAMIC_CLASS(wxImageModule, wxModule)
 
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 

+// GRG, Dic/99
+// Counts and returns the number of different colours. Optionally stops
+// when it exceeds 'stopafter' different colours. This is useful, for
+// example, to see if the image can be saved as 8-bit (256 colour or
+// less, in this case it would be invoked as CountColours(256)). Default
+// value for stopafter is -1 (don't care).
+//
+unsigned long wxImage::CountColours( unsigned long stopafter )
+{
+    wxHashTable h;
+    wxNode *node;
+    wxHNode *hnode;
+    unsigned char r, g, b, *p;
+    unsigned long size, nentries, key;
+
+    p = GetData();
+    size = GetWidth() * GetHeight();
+    nentries = 0;
+
+    for (unsigned long j = 0; (j < size) && (nentries <= stopafter) ; j++)
+    {
+        r = *(p++);
+        g = *(p++);
+        b = *(p++);
+        key = (r << 16) | (g << 8) | b;
+
+        hnode = (wxHNode *) h.Get(key);
+
+        if (!hnode)
+        {
+            h.Put(key, (wxObject *)(new wxHNode));
+            nentries++;
+        }
+    }
+
+    // delete all HNodes
+    h.BeginFind();
+    while ((node = h.Next()) != NULL)
+        delete (wxHNode *)node->GetData();
+
+    return nentries;
+}
+
+

 // GRG, Dic/99
 // Computes the histogram of the image and fills a hash table, indexed
 // with integer keys built as 0xRRGGBB, containing wxHNode objects. Each
 // wxHNode contains an 'index' (useful to build a palette with the image
 // colours) and a 'value', which is the number of pixels in the image with
 // that colour.
 // GRG, Dic/99
 // Computes the histogram of the image and fills a hash table, indexed
 // with integer keys built as 0xRRGGBB, containing wxHNode objects. Each
 // wxHNode contains an 'index' (useful to build a palette with the image
 // colours) and a 'value', which is the number of pixels in the image with
 // that colour.

-
+//

 unsigned long wxImage::ComputeHistogram( wxHashTable &h )
 {
     unsigned char r, g, b, *p;
 unsigned long wxImage::ComputeHistogram( wxHashTable &h )
 {
     unsigned char r, g, b, *p;


@@ -2332,7 +2376,7 @@ unsigned long wxImage::ComputeHistogram( wxHashTable &h )
         else
         {
             hnode = new wxHNode();
         else
         {
             hnode = new wxHNode();

-            hnode->index = nentries++;  
+            hnode->index = nentries++;

             hnode->value = 1;
 
             h.Put(key, (wxObject *)hnode);
             hnode->value = 1;
 
             h.Put(key, (wxObject *)hnode);