add SQL_CATALOG and SQL_LOG filename variables

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

diff --git a/src/common/image.cpp b/src/common/image.cpp
index e1d156365c2b49ba848e4531817ad10150fa1109..e9435b5a4667a9360153a5c754dc782cac97cc8d 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -2756,11 +2756,11 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
     wxRotationPoint p3 = rotated_point (img.GetWidth(), 0, cos_angle, sin_angle, p0);
     wxRotationPoint p4 = rotated_point (img.GetWidth(), img.GetHeight(), cos_angle, sin_angle, p0);
 
     wxRotationPoint p3 = rotated_point (img.GetWidth(), 0, cos_angle, sin_angle, p0);
     wxRotationPoint p4 = rotated_point (img.GetWidth(), img.GetHeight(), cos_angle, sin_angle, p0);
 

-    int x1 = floor (wxMin (wxMin(p1.x, p2.x), wxMin(p3.x, p4.x)));
-    int y1 = floor (wxMin (wxMin(p1.y, p2.y), wxMin(p3.y, p4.y)));
+    int x1 = (int) floor (wxMin (wxMin(p1.x, p2.x), wxMin(p3.x, p4.x)));
+    int y1 = (int) floor (wxMin (wxMin(p1.y, p2.y), wxMin(p3.y, p4.y)));

 
 

-    int x2 = ceil (wxMax (wxMax(p1.x, p2.x), wxMax(p3.x, p4.x)));
-    int y2 = ceil (wxMax (wxMax(p1.y, p2.y), wxMax(p3.y, p4.y)));
+    int x2 = (int) ceil (wxMax (wxMax(p1.x, p2.x), wxMax(p3.x, p4.x)));
+    int y2 = (int) ceil (wxMax (wxMax(p1.y, p2.y), wxMax(p3.y, p4.y)));

 
     wxImage rotated (x2 - x1 + 1, y2 - y1 + 1);
 
 
     wxImage rotated (x2 - x1 + 1, y2 - y1 + 1);
 


@@ -2841,7 +2841,7 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
                     else
                     {
                                // weights for the weighted average are proportional to the inverse of the distance
                     else
                     {
                                // weights for the weighted average are proportional to the inverse of the distance

-                       const w1 = 1/d1, w2 = 1/d2, w3 = 1/d3, w4 = 1/d4;
+                     const double w1 = 1/d1, w2 = 1/d2, w3 = 1/d3, w4 = 1/d4;

                        
                            for (int i = 0; i < 3; i++)     // repeat calculation for R, G, and B
                        {
                        
                            for (int i = 0; i < 3; i++)     // repeat calculation for R, G, and B
                        {