revert change to image_as_matrix

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [v2.5.1] - September 8 2020
+
+### Added
+
+### Changed
+
+- image_as_matrix(): reverted accidental flip of xy coordinates introduced at 2.5.0 (sorry everyone!)
+
+### Removed
+
+### Deprecated
+
 ## [v2.5.0] - September 6 2020
 
 ### Added

Project.toml

@@ -1,7 +1,7 @@
 name = "Luxor"
 uuid = "ae8d54c2-7ccd-5906-9d76-62fc9837b5bc"
 authors = ["cormullion <[email protected]>"]
-version = "2.5.0"
+version = "2.5.1"
 
 [deps]
 Cairo = "159f3aea-2a34-519c-b102-8c37f9878175"

docs/src/basics.md

@@ -262,7 +262,7 @@ matrix, using the `image_as_matrix()` function.
 
 `image_as_matrix()` returns a array of ARGB32 values that encode the Red, Green, Blue, and Alpha values of each pixel.
 
-The following example draws a red box, then copies the drawing into a matrix called `mat1`. Then it draws a blue circle, and copies the updated drawing into `mat2`. Then, the second drawing reads the values in from the two matrices and draws some square tiles depending on the corresponding values in the two matrices ... a very primitive Boolean operation.
+The following example draws a red box, then copies the drawing into a matrix called `mat1`. Then it draws a blue triangle, and copies the updated drawing into `mat2`. Then, the second drawing reads the values in from the two matrices and draws some square tiles depending on the corresponding values in the two matrices ... a very primitive Boolean operation.
 
 ```@example
 using Luxor, Colors
@@ -271,29 +271,30 @@ Drawing(40, 40, :png)
 origin()
 background("black")
 sethue("red")
-box(O, 40, 20, :fill)
-mat1 = image_as_matrix()'
+box(O, 40, 15, :fill)
+mat1 = image_as_matrix()
 sethue("blue")
-setline(5)
-circle(O, 15, :stroke)
-mat2 = image_as_matrix()'
+setline(10)
+setopacity(0.6)
+ngon(O, 10, 3, 0, :stroke)
+mat2 = image_as_matrix()
 finish()
 
 # second drawing
 
 Drawing(400, 400, "assets/figures/image-drawings.svg")
 background("grey20")
 origin()
-t = Tiler(400, 400, size(mat1)..., margin=0)
+t = Table(mr, mc, 4, 4)
 sethue("white")
-for (pos, n) in t
-
-    pixel1 = convert(Colors.RGBA, mat1[n])
-    pixel2 = convert(Colors.RGBA, mat2[n])
-
+rc = CartesianIndices(mat1)
+for i in rc
+    r, c = Tuple(i)
+    pixel1 = convert(Colors.RGBA, mat1[r, c])
+    pixel2 = convert(Colors.RGBA, mat2[r, c])
     if red(pixel1) > .5 && blue(pixel2) > .5
         randomhue()
-        box(pos, t.tilewidth - 1, t.tileheight - 1, :fillstroke)
+        box(t, r, c, :fillstroke)
     end
 end
 finish() # hide

src/drawings.jl

@@ -115,7 +115,7 @@ function Base.show(io::IO, ::MIME"text/plain", d::Drawing)
     # perhaps drawing hasn't started yet, eg in the REPL
     if !ispath(d.filename)
         location = !isempty(d.filename) ? d.filename : "in memory"
-        println(" Luxor drawing: (type = :$(d.surfacetype), width = $(d.width), height = $(d.width), location = $(location))")
+        println(" Luxor drawing: (type = :$(d.surfacetype), width = $(d.width), height = $(d.height), location = $(location))")
     else
         # open the image file
         if Sys.isapple()
@@ -693,7 +693,8 @@ function image_as_matrix()
     h = Int(current_surface().height)
     z = zeros(UInt32, w, h)
     # create a new image surface to receive the data from the current drawing
-    imagesurface = CairoImageSurface(z, Cairo.FORMAT_ARGB32)
+    # flipxy: see issue https://github.com/Wikunia/Javis.jl/pull/149
+    imagesurface = CairoImageSurface(z, Cairo.FORMAT_ARGB32, flipxy=false)
     cr = Cairo.CairoContext(imagesurface)
     Cairo.set_source_surface(cr, current_surface(), 0, 0)
     Cairo.paint(cr)

test/imagematrix.jl

@@ -5,6 +5,14 @@ function convertmatrixtocolors(m)
 end
 
 function imagematrix()
+
+    Drawing(10, 2, :png)
+    origin()
+    img = image_as_matrix()
+    finish()
+
+    @test size(img) == (2, 10)
+
     Drawing(2, 2, :png)
 
     # get image as matrix