--- a/tests/arthur/data/qps/pixmap_scaling.qps Tue Feb 02 00:43:10 2010 +0200
+++ b/tests/arthur/data/qps/pixmap_scaling.qps Wed Mar 31 11:06:36 2010 +0300
@@ -219,309 +219,309 @@
restore
-
-image_load alpha2x2.png alpha2x2
-image_convertToFormat alpha2x2 alpha2x2_argb32 ARGB32
-image_convertToFormat alpha2x2 alpha2x2_argb32pre ARGB32_Premultiplied
-image_convertToFormat alpha2x2 alpha2x2_rgb888 Format_RGB888
-image_convertToFormat alpha2x2 alpha2x2_rgb32 RGB32
-image_convertToFormat alpha2x2 alpha2x2_rgb16 Format_RGB16
-
-save
- translate 0 300
- drawText 15 0 "drawImage - argb32"
- translate 50 50
- save
- translate 0.5 0.5
- scale 20 20
- drawImage alpha2x2_argb32 0 0
- restore
- save
- translate -0.5 0.5
- scale -20 20
- drawImage alpha2x2_argb32 0 0
- restore
- save
- translate 0.5 -0.5
- scale 20 -20
- drawImage alpha2x2_argb32 0 0
- restore
- save
- translate -0.5 -0.5
- scale -20 -20
- drawImage alpha2x2_argb32 0 0
- restore
-restore
-
-save
- translate 150 300
- drawText 15 0 "drawImage - argb32premul"
- translate 50 50
- save
- translate 0.5 0.5
- scale 20 20
- drawImage alpha2x2_argb32pre 0 0
- restore
- save
- translate -0.5 0.5
- scale -20 20
- drawImage alpha2x2_argb32pre 0 0
- restore
- save
- translate 0.5 -0.5
- scale 20 -20
- drawImage alpha2x2_argb32pre 0 0
- restore
- save
- translate -0.5 -0.5
- scale -20 -20
- drawImage alpha2x2_argb32pre 0 0
- restore
-restore
-
-
-
-save
- translate 0 450
- drawText 15 0 "drawImage - rgb888"
- translate 50 50
- save
- translate 0.5 0.5
- scale 20 20
- drawImage alpha2x2_rgb888 0 0
- restore
- save
- translate -0.5 0.5
- scale -20 20
- drawImage alpha2x2_rgb888 0 0
- restore
- save
- translate 0.5 -0.5
- scale 20 -20
- drawImage alpha2x2_rgb888 0 0
- restore
- save
- translate -0.5 -0.5
- scale -20 -20
- drawImage alpha2x2_rgb888 0 0
- restore
-restore
-
-save
- translate 150 450
- drawText 15 0 "drawImage - rgb32"
- translate 50 50
- save
- translate 0.5 0.5
- scale 20 20
- drawImage alpha2x2_rgb32 0 0
- restore
- save
- translate -0.5 0.5
- scale -20 20
- drawImage alpha2x2_rgb32 0 0
- restore
- save
- translate 0.5 -0.5
- scale 20 -20
- drawImage alpha2x2_rgb32 0 0
- restore
- save
- translate -0.5 -0.5
- scale -20 -20
- drawImage alpha2x2_rgb32 0 0
- restore
-restore
-
-save
- translate 300 450
- drawText 15 0 "drawImage - rgb16"
- translate 50 50
- save
- translate 0.5 0.5
- scale 20 20
- drawImage alpha2x2_rgb16 0 0
- restore
- save
- translate -0.5 0.5
- scale -20 20
- drawImage alpha2x2_rgb16 0 0
- restore
- save
- translate 0.5 -0.5
- scale 20 -20
- drawImage alpha2x2_rgb16 0 0
- restore
- save
- translate -0.5 -0.5
- scale -20 -20
- drawImage alpha2x2_rgb16 0 0
- restore
-restore
-
-
-
-save
- translate 0 600
- drawText 15 0 "clipping - argb32"
- translate 50 50
- setClipRect -30 -30 60 60 ReplaceClip
- save
- translate 0.5 0.5
- scale 20 20
- drawImage alpha2x2_argb32 0 0
- restore
- save
- translate -0.5 0.5
- scale -20 20
- drawImage alpha2x2_argb32 0 0
- restore
- save
- translate 0.5 -0.5
- scale 20 -20
- drawImage alpha2x2_argb32 0 0
- restore
- save
- translate -0.5 -0.5
- scale -20 -20
- drawImage alpha2x2_argb32 0 0
- restore
-restore
-
-save
- translate 150 600
- drawText 15 0 "clipping - argb32premul"
- translate 50 50
- setClipRect -30 -30 60 60 ReplaceClip
- save
- translate 0.5 0.5
- scale 20 20
- drawImage alpha2x2_argb32pre 0 0
- restore
- save
- translate -0.5 0.5
- scale -20 20
- drawImage alpha2x2_argb32pre 0 0
- restore
- save
- translate 0.5 -0.5
- scale 20 -20
- drawImage alpha2x2_argb32pre 0 0
- restore
- save
- translate -0.5 -0.5
- scale -20 -20
- drawImage alpha2x2_argb32pre 0 0
- restore
-restore
-
-save
- translate 300 600
- drawText 15 0 "clipping - rgb16"
- translate 50 50
- setClipRect -30 -30 60 60 ReplaceClip
- save
- translate 0.5 0.5
- scale 20 20
- drawImage alpha2x2_rgb16 0 0
- restore
- save
- translate -0.5 0.5
- scale -20 20
- drawImage alpha2x2_rgb16 0 0
- restore
- save
- translate 0.5 -0.5
- scale 20 -20
- drawImage alpha2x2_rgb16 0 0
- restore
- save
- translate -0.5 -0.5
- scale -20 -20
- drawImage alpha2x2_rgb16 0 0
- restore
-restore
-
-
-path_addEllipse ellipse -30 -30 60 60
-
-save
- translate 0 750
- drawText 15 0 "clipping - argb32"
- translate 50 50
- setClipPath ellipse ReplaceClip
- save
- translate 0.5 0.5
- scale 20 20
- drawImage alpha2x2_argb32 0 0
- restore
- save
- translate -0.5 0.5
- scale -20 20
- drawImage alpha2x2_argb32 0 0
- restore
- save
- translate 0.5 -0.5
- scale 20 -20
- drawImage alpha2x2_argb32 0 0
- restore
- save
- translate -0.5 -0.5
- scale -20 -20
- drawImage alpha2x2_argb32 0 0
- restore
-restore
-
-save
- translate 150 750
- drawText 15 0 "clipping - argb32premul"
- translate 50 50
- setClipPath ellipse ReplaceClip
- save
- translate 0.5 0.5
- scale 20 20
- drawImage alpha2x2_argb32pre 0 0
- restore
- save
- translate -0.5 0.5
- scale -20 20
- drawImage alpha2x2_argb32pre 0 0
- restore
- save
- translate 0.5 -0.5
- scale 20 -20
- drawImage alpha2x2_argb32pre 0 0
- restore
- save
- translate -0.5 -0.5
- scale -20 -20
- drawImage alpha2x2_argb32pre 0 0
- restore
-restore
-
-save
- translate 300 750
- drawText 15 0 "clipping - rgb16"
- translate 50 50
- setClipPath ellipse ReplaceClip
- save
- translate 0.5 0.5
- scale 20 20
- drawImage alpha2x2_rgb16 0 0
- restore
- save
- translate -0.5 0.5
- scale -20 20
- drawImage alpha2x2_rgb16 0 0
- restore
- save
- translate 0.5 -0.5
- scale 20 -20
- drawImage alpha2x2_rgb16 0 0
- restore
- save
- translate -0.5 -0.5
- scale -20 -20
- drawImage alpha2x2_rgb16 0 0
- restore
-restore
+
+image_load alpha2x2.png alpha2x2
+image_convertToFormat alpha2x2 alpha2x2_argb32 ARGB32
+image_convertToFormat alpha2x2 alpha2x2_argb32pre ARGB32_Premultiplied
+image_convertToFormat alpha2x2 alpha2x2_rgb888 Format_RGB888
+image_convertToFormat alpha2x2 alpha2x2_rgb32 RGB32
+image_convertToFormat alpha2x2 alpha2x2_rgb16 Format_RGB16
+
+save
+ translate 0 300
+ drawText 15 0 "drawImage - argb32"
+ translate 50 50
+ save
+ translate 0.5 0.5
+ scale 20 20
+ drawImage alpha2x2_argb32 0 0
+ restore
+ save
+ translate -0.5 0.5
+ scale -20 20
+ drawImage alpha2x2_argb32 0 0
+ restore
+ save
+ translate 0.5 -0.5
+ scale 20 -20
+ drawImage alpha2x2_argb32 0 0
+ restore
+ save
+ translate -0.5 -0.5
+ scale -20 -20
+ drawImage alpha2x2_argb32 0 0
+ restore
+restore
+
+save
+ translate 150 300
+ drawText 15 0 "drawImage - argb32premul"
+ translate 50 50
+ save
+ translate 0.5 0.5
+ scale 20 20
+ drawImage alpha2x2_argb32pre 0 0
+ restore
+ save
+ translate -0.5 0.5
+ scale -20 20
+ drawImage alpha2x2_argb32pre 0 0
+ restore
+ save
+ translate 0.5 -0.5
+ scale 20 -20
+ drawImage alpha2x2_argb32pre 0 0
+ restore
+ save
+ translate -0.5 -0.5
+ scale -20 -20
+ drawImage alpha2x2_argb32pre 0 0
+ restore
+restore
+
+
+
+save
+ translate 0 450
+ drawText 15 0 "drawImage - rgb888"
+ translate 50 50
+ save
+ translate 0.5 0.5
+ scale 20 20
+ drawImage alpha2x2_rgb888 0 0
+ restore
+ save
+ translate -0.5 0.5
+ scale -20 20
+ drawImage alpha2x2_rgb888 0 0
+ restore
+ save
+ translate 0.5 -0.5
+ scale 20 -20
+ drawImage alpha2x2_rgb888 0 0
+ restore
+ save
+ translate -0.5 -0.5
+ scale -20 -20
+ drawImage alpha2x2_rgb888 0 0
+ restore
+restore
+
+save
+ translate 150 450
+ drawText 15 0 "drawImage - rgb32"
+ translate 50 50
+ save
+ translate 0.5 0.5
+ scale 20 20
+ drawImage alpha2x2_rgb32 0 0
+ restore
+ save
+ translate -0.5 0.5
+ scale -20 20
+ drawImage alpha2x2_rgb32 0 0
+ restore
+ save
+ translate 0.5 -0.5
+ scale 20 -20
+ drawImage alpha2x2_rgb32 0 0
+ restore
+ save
+ translate -0.5 -0.5
+ scale -20 -20
+ drawImage alpha2x2_rgb32 0 0
+ restore
+restore
+
+save
+ translate 300 450
+ drawText 15 0 "drawImage - rgb16"
+ translate 50 50
+ save
+ translate 0.5 0.5
+ scale 20 20
+ drawImage alpha2x2_rgb16 0 0
+ restore
+ save
+ translate -0.5 0.5
+ scale -20 20
+ drawImage alpha2x2_rgb16 0 0
+ restore
+ save
+ translate 0.5 -0.5
+ scale 20 -20
+ drawImage alpha2x2_rgb16 0 0
+ restore
+ save
+ translate -0.5 -0.5
+ scale -20 -20
+ drawImage alpha2x2_rgb16 0 0
+ restore
+restore
+
+
+
+save
+ translate 0 600
+ drawText 15 0 "clipping - argb32"
+ translate 50 50
+ setClipRect -30 -30 60 60 ReplaceClip
+ save
+ translate 0.5 0.5
+ scale 20 20
+ drawImage alpha2x2_argb32 0 0
+ restore
+ save
+ translate -0.5 0.5
+ scale -20 20
+ drawImage alpha2x2_argb32 0 0
+ restore
+ save
+ translate 0.5 -0.5
+ scale 20 -20
+ drawImage alpha2x2_argb32 0 0
+ restore
+ save
+ translate -0.5 -0.5
+ scale -20 -20
+ drawImage alpha2x2_argb32 0 0
+ restore
+restore
+
+save
+ translate 150 600
+ drawText 15 0 "clipping - argb32premul"
+ translate 50 50
+ setClipRect -30 -30 60 60 ReplaceClip
+ save
+ translate 0.5 0.5
+ scale 20 20
+ drawImage alpha2x2_argb32pre 0 0
+ restore
+ save
+ translate -0.5 0.5
+ scale -20 20
+ drawImage alpha2x2_argb32pre 0 0
+ restore
+ save
+ translate 0.5 -0.5
+ scale 20 -20
+ drawImage alpha2x2_argb32pre 0 0
+ restore
+ save
+ translate -0.5 -0.5
+ scale -20 -20
+ drawImage alpha2x2_argb32pre 0 0
+ restore
+restore
+
+save
+ translate 300 600
+ drawText 15 0 "clipping - rgb16"
+ translate 50 50
+ setClipRect -30 -30 60 60 ReplaceClip
+ save
+ translate 0.5 0.5
+ scale 20 20
+ drawImage alpha2x2_rgb16 0 0
+ restore
+ save
+ translate -0.5 0.5
+ scale -20 20
+ drawImage alpha2x2_rgb16 0 0
+ restore
+ save
+ translate 0.5 -0.5
+ scale 20 -20
+ drawImage alpha2x2_rgb16 0 0
+ restore
+ save
+ translate -0.5 -0.5
+ scale -20 -20
+ drawImage alpha2x2_rgb16 0 0
+ restore
+restore
+
+
+path_addEllipse ellipse -30 -30 60 60
+
+save
+ translate 0 750
+ drawText 15 0 "clipping - argb32"
+ translate 50 50
+ setClipPath ellipse ReplaceClip
+ save
+ translate 0.5 0.5
+ scale 20 20
+ drawImage alpha2x2_argb32 0 0
+ restore
+ save
+ translate -0.5 0.5
+ scale -20 20
+ drawImage alpha2x2_argb32 0 0
+ restore
+ save
+ translate 0.5 -0.5
+ scale 20 -20
+ drawImage alpha2x2_argb32 0 0
+ restore
+ save
+ translate -0.5 -0.5
+ scale -20 -20
+ drawImage alpha2x2_argb32 0 0
+ restore
+restore
+
+save
+ translate 150 750
+ drawText 15 0 "clipping - argb32premul"
+ translate 50 50
+ setClipPath ellipse ReplaceClip
+ save
+ translate 0.5 0.5
+ scale 20 20
+ drawImage alpha2x2_argb32pre 0 0
+ restore
+ save
+ translate -0.5 0.5
+ scale -20 20
+ drawImage alpha2x2_argb32pre 0 0
+ restore
+ save
+ translate 0.5 -0.5
+ scale 20 -20
+ drawImage alpha2x2_argb32pre 0 0
+ restore
+ save
+ translate -0.5 -0.5
+ scale -20 -20
+ drawImage alpha2x2_argb32pre 0 0
+ restore
+restore
+
+save
+ translate 300 750
+ drawText 15 0 "clipping - rgb16"
+ translate 50 50
+ setClipPath ellipse ReplaceClip
+ save
+ translate 0.5 0.5
+ scale 20 20
+ drawImage alpha2x2_rgb16 0 0
+ restore
+ save
+ translate -0.5 0.5
+ scale -20 20
+ drawImage alpha2x2_rgb16 0 0
+ restore
+ save
+ translate 0.5 -0.5
+ scale 20 -20
+ drawImage alpha2x2_rgb16 0 0
+ restore
+ save
+ translate -0.5 -0.5
+ scale -20 -20
+ drawImage alpha2x2_rgb16 0 0
+ restore
+restore