Skip to content

Commit

Permalink
Fix issues reported by CRAN; prepare for release.
Browse files Browse the repository at this point in the history
  • Loading branch information
dmurdoch committed Nov 28, 2023
1 parent 366806a commit 7f3fb4f
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 22 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: rgl
Version: 1.2.7
Version: 1.2.8
Title: 3D Visualization Using OpenGL
Authors@R: c(person("Duncan", "Murdoch", role = c("aut", "cre"),
email = "murdoch.duncan@gmail.com"),
Expand Down
3 changes: 2 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# rgl 1.2.7
# rgl 1.2.8

## Minor changes

Expand All @@ -14,6 +14,7 @@ run in a Shiny session.
* `snapshot3d()` failed on Windows with some versions of `webshot2` (issue #391).
* Fixed issues caused by misuse of `dev.off()` using new function
`safe.dev.off()`.
* Fixed issue with `warning()` call reported by CRAN.

# rgl 1.2.1

Expand Down
34 changes: 15 additions & 19 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,27 +1,23 @@
# 1.2.1
# 1.2.8

In addition to the changes below, this version rearranges header
include order.
This small release is at the request of CRAN to address issues
shown in the CRAN checks.

# 1.2.0
- A call to Rf_warning() passed a variable; it now has a
separate constant format string.

This release is at the request of Prof Ripley, largely because of C++17
conflicts. His log listed a lot of them, but I think they are all
consequences of `length` being defined as a macro as part of the R API
and also used in some C++ header file.
- Some old documentation of arguments that were not present
has been removed.

I have also increased the tolerance for changes in some of the test
code, hopefully enough to pass the tests on the M1mac.
These warnings/notes have not been addressed:

I have not been able to reproduce the segfault in the M1mac tests,
so I haven't dealt with it.
- The installed package size has not been improved.

There's a warning in the Mac tests about using a deprecated function,
but in fact the recommended function is used when available. The
use of the deprecated function is present for back compatibility.
- Some deprecated function warnings on MacOS are still
present, as those functions are still needed. I hope that
the major changes I am in the process of making will allow
me to address these finally, but those changes are months
away from being done.

There are also other changes described in NEWS.md, but none of them
are very large.
In addition to those changes, there are some minor improvements and bug fixes mentioned in the NEWS file.

I have run checks on R-devel for `rgl` and for most of the
reverse dependencies. Nothing new has turned up.
2 changes: 1 addition & 1 deletion src/x11gui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ GLFont* X11WindowImpl::getFont(const char* family, int style, double cex,
UNPROTECT(4);
return font;
} else {
Rf_warning(font->errmsg);
Rf_warning("Error creating font: %s", font->errmsg);
delete font;
}
}
Expand Down

0 comments on commit 7f3fb4f

Please sign in to comment.