Skip to content

Commit

Permalink
typos (#400)
Browse files Browse the repository at this point in the history
  • Loading branch information
spaette authored Jun 21, 2024
1 parent 8d22d7b commit bd099d5
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
- Reset clipping area when magick graphics device is closed or starts new page
- Change default colorspace for image_quantize() to RGB which is safer
- Breaking: 'fuzz' parameter rescaled to be a percentage (0-100)
- Add image_strip() as well as 'strip = TRUE' paremeter to image_read()
- Add image_strip() as well as 'strip = TRUE' parameter to image_read()
- Adding image_blank() to create empty images
- Graphics device: hardcode font aliases for families used by R, issue #80
- Better font family lookup in graphics and image_annotate()
Expand Down Expand Up @@ -236,7 +236,7 @@
- Try to fix the mac binary package

0.2
- Build binary package on macOS --with-zero-configuation (fixes "config xml file" errors).
- Build binary package on macOS --with-zero-configuration (fixes "config xml file" errors).
- image_read now reads straight from disk rather than via R.
- Add as.raster() method for images
- image_write gains a 'flatten' argument
Expand Down
2 changes: 1 addition & 1 deletion R/defines.R
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ image_set_defines <- function(image, defines){
validate_defines <- function(defines){
if(length(defines)){
if(!is.character(defines))
stop("Argumet 'defines' must be named character vector")
stop("Argument 'defines' must be named character vector")
nms <- names(defines)
if(length(unique(nms)) != length(defines))
stop("Argument 'defines' does not have proper names")
Expand Down
4 changes: 2 additions & 2 deletions R/edit.R
Original file line number Diff line number Diff line change
Expand Up @@ -168,13 +168,13 @@ image_readbitmap <- function(x){
}
}

# output of dev.caputure(native = TRUE)
# output of dev.capture(native = TRUE)
image_read_nativeraster <- function(x){
stopifnot(is.matrix(x) && is.integer(x))
magick_image_readbitmap_native(x)
}

# output of dev.caputure(native = FALSE) or as.raster()
# output of dev.capture(native = FALSE) or as.raster()
image_read_raster1 <- function(x){
stopifnot(is.matrix(x) && is.character(x))
magick_image_readbitmap_raster1(t(x))
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ earth <- image_read("https://upload.wikimedia.org/wikipedia/commons/2/2c/Rotatin
length(earth)
earth[1]
earth[1:3]
earth1 <- rev(image_flip(earth)) ## How Austrialans see earth
earth1 <- rev(image_flip(earth)) ## How Australians see earth
image_write(earth1, "man/figures/earth1.gif") ## <-- result of this is shown
```

Expand Down
2 changes: 1 addition & 1 deletion src/magick_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ std::string normalize_font(const char * family);
#define MQD MAGICKCORE_QUANTUM_DEPTH
#define fuzz_pct_to_abs(x) ((x / 100 ) * (MQD * MQD * MQD * MQD + 1))

//IM 6~7 compatiblity
//IM 6~7 compatibility
#if MagickLibVersion >= 0x700
Magick::Point Point(const char * str);
#define myGeomPoint Point
Expand Down
2 changes: 1 addition & 1 deletion testsuite/clipping.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Test that cipping area is reset when device gets closed
# Test that clipping area is reset when device gets closed
img <- image_graph(600, 400, res = 96, clip = TRUE)
plot(iris)
dev.off()
Expand Down
4 changes: 2 additions & 2 deletions testsuite/protect.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
library(magick)

# Test procected from GC while device is open
# Test protected from GC while device is open
image <- image_graph()
rm(list=ls())
gc(); gc()
Expand All @@ -9,7 +9,7 @@ dev.off()
# This should free the image
gc();

# Test procected from while image is in scope
# Test protected from while image is in scope
image <- image_graph()
plot(rnorm(100))
dev.off()
Expand Down

0 comments on commit bd099d5

Please sign in to comment.