wxSocket compilation

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

diff --git a/src/common/image.cpp b/src/common/image.cpp
index 8ef0b3429a540af8d739a6563e5f73c1aae22305..76afc83b77f2bb9b8b918501b831c955e4c97d05 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -150,7 +150,7 @@ void wxImage::Destroy()
     UnRef();
 }
 
     UnRef();
 }
 

-wxImage wxImage::Scale( int width, int height )
+wxImage wxImage::Scale( int width, int height ) const

 {
     wxImage image;
 
 {
     wxImage image;
 


@@ -592,11 +592,11 @@ wxBitmap wxImage::ConvertToBitmap() const
     // calc the number of bytes per scanline and padding
     int bytePerLine = width*3;
     int sizeDWORD = sizeof( DWORD );
     // calc the number of bytes per scanline and padding
     int bytePerLine = width*3;
     int sizeDWORD = sizeof( DWORD );

-    div_t lineBoundary = div( bytePerLine, sizeDWORD );
+    int lineBoundary = bytePerLine % sizeDWORD;

     int padding = 0;
     int padding = 0;

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

     {
     {

-        padding = sizeDWORD - lineBoundary.rem;
+        padding = sizeDWORD - lineBoundary;

         bytePerLine += padding;
     }
     // calc the number of DIBs and heights of DIBs
         bytePerLine += padding;
     }
     // calc the number of DIBs and heights of DIBs


@@ -607,9 +607,8 @@ wxBitmap wxImage::ConvertToBitmap() const
         height = bmpHeight;
     else
     {
         height = bmpHeight;
     else
     {

-        div_t result = div( bmpHeight, height );
-        numDIB = result.quot;
-        hRemain = result.rem;
+        numDIB =  bmpHeight / height;
+        hRemain = bmpHeight % height;

         if( hRemain >0 )  numDIB++;
     }
 
         if( hRemain >0 )  numDIB++;
     }
 


@@ -805,11 +804,11 @@ wxImage::wxImage( const wxBitmap &bitmap )
     // calc the number of bytes per scanline and padding in the DIB
     int bytePerLine = width*3;
     int sizeDWORD = sizeof( DWORD );
     // 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 lineBoundary =  bytePerLine % sizeDWORD;

     int padding = 0;
     int padding = 0;

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

     {
     {

-        padding = sizeDWORD - lineBoundary.rem;
+        padding = sizeDWORD - lineBoundary;

         bytePerLine += padding;
     }
 
         bytePerLine += padding;
     }
 


@@ -944,7 +943,7 @@ wxBitmap wxImage::ConvertToBitmap() const
      // Retrieve depth
 
     GdkVisual *visual = gdk_window_get_visual( bitmap.GetPixmap() );
      // Retrieve depth
 
     GdkVisual *visual = gdk_window_get_visual( bitmap.GetPixmap() );

-    if (visual == NULL) visual = gdk_visual_get_best();
+    if (visual == NULL) visual = gdk_visual_get_system();

     int bpp = visual->depth;
 
     bitmap.SetDepth( bpp );
     int bpp = visual->depth;
 
     bitmap.SetDepth( bpp );


@@ -984,7 +983,7 @@ wxBitmap wxImage::ConvertToBitmap() const
     // Create picture image
 
     GdkImage *data_image =
     // Create picture image
 
     GdkImage *data_image =

-        gdk_image_new( GDK_IMAGE_FASTEST, gdk_visual_get_best(), width, height );
+        gdk_image_new( GDK_IMAGE_FASTEST, gdk_visual_get_system(), width, height );

 
     // Create mask image
 
 
     // Create mask image
 


@@ -994,7 +993,7 @@ wxBitmap wxImage::ConvertToBitmap() const
     {
         unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
 
     {
         unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
 

-        mask_image =  gdk_image_new_bitmap( gdk_visual_get_best(), 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 );


@@ -1009,7 +1008,7 @@ wxBitmap wxImage::ConvertToBitmap() const
 
     if (bpp >= 24)
     {
 
     if (bpp >= 24)
     {

-        GdkVisual *visual = gdk_visual_get_best();
+        GdkVisual *visual = gdk_visual_get_system();

         if ((visual->red_mask > visual->green_mask) && (visual->green_mask > visual->blue_mask))      b_o = RGB;
         else if ((visual->red_mask > visual->blue_mask) && (visual->blue_mask > visual->green_mask))  b_o = RGB;
         else if ((visual->blue_mask > visual->red_mask) && (visual->red_mask > visual->green_mask))   b_o = BRG;
         if ((visual->red_mask > visual->green_mask) && (visual->green_mask > visual->blue_mask))      b_o = RGB;
         else if ((visual->red_mask > visual->blue_mask) && (visual->blue_mask > visual->green_mask))  b_o = RGB;
         else if ((visual->blue_mask > visual->red_mask) && (visual->red_mask > visual->green_mask))   b_o = BRG;