Simplify image transforms

* src/image.c: (image_set_rotation, image_set_size,
image_set_transform): Combine into image_set_transform.
(image_set_crop): Remove function.
(lookup_image): Remove calls to removed functions and remove
transform_matrix.
* test/manual/image-transforms-tests.el (test-cropping): Remove
function.
(test-transforms): Remove reference to test-cropping.

1 files changed, 3 insertions, 31 deletions

diff --git a/test/manual/image-transforms-tests.el b/test/manual/image-transforms-tests.el
index d601b9397e3..907f0639e4c 100644
--- a/test/manual/image-transforms-tests.el
+++ b/test/manual/image-transforms-tests.el
@@ -25,6 +25,9 @@
 
 ;; Type M-x test-transforms RET to generate the test buffer.
 
+;; There is a difference in how librsvg and ImageMagick draw some of
+;; the images.  This results in what looks like a one pixel difference.
+
 ;;; Code:
 
 (defun test-rotation ()
@@ -44,36 +47,6 @@
     (insert-test "45" up up '(:rotation 45)))
   (insert "\n\n"))
 
-(defun test-cropping ()
-  (let ((image "<svg height='30' width='30'>
-                  <rect x='0' y='0' width='10' height='10'/>
-                  <rect x='10' y='10' width='10' height='10'
-                        style='fill:none;stroke-width:1;stroke:#000'/>
-                  <line x1='10' y1='10' x2='20' y2='20' style='stroke:#000'/>
-                  <line x1='20' y1='10' x2='10' y2='20' style='stroke:#000'/>
-                  <rect x='20' y='20' width='10' height='10'
-                        style='fill:none;stroke-width:1;stroke:#000'/>
-                </svg>")
-        (top-left "<svg height='10' width='10'>
-                     <rect x='0' y='0' width='10' height='10'/>
-                   </svg>")
-        (middle "<svg height='10' width='10'>
-                   <rect x='0' y='0' width='10' height='10'
-                         style='fill:none;stroke-width:1;stroke:#000'/>
-                   <line x1='0' y1='0' x2='10' y2='10' style='stroke:#000'/>
-                   <line x1='10' y1='0' x2='0' y2='10' style='stroke:#000'/>
-                 </svg>")
-        (bottom-right "<svg height='10' width='10'>
-                         <rect x='0' y='0' width='10' height='10'
-                               style='fill:none;stroke-width:1;stroke:#000'/>
-                       </svg>"))
-    (insert-header "Test Crop: cropping an image")
-    (insert-test "all params" top-left image '(:crop (10 10 0 0)))
-    (insert-test "width/height only" middle image '(:crop (10 10)))
-    (insert-test "negative x y" middle image '(:crop (10 10 -10 -10)))
-    (insert-test "all params" bottom-right image '(:crop (10 10 20 20))))
-  (insert "\n\n"))
-
 (defun test-scaling ()
   (let ((image "<svg height='10' width='10'>
                   <rect x='0' y='0' width='10' height='10'
@@ -170,7 +143,6 @@
     (unless #'imagemagick-types
       (insert "ImageMagick not detected.  ImageMagick tests will be skipped.\n\n"))
     (test-rotation)
-    (test-cropping)
     (test-scaling)
     (test-scaling-rotation)
     (goto-char (point-min))))