Skip to content

Commit

Permalink
Merge pull request #379 from dmurdoch/version1.2.1
Browse files Browse the repository at this point in the history
Rearrange header order
  • Loading branch information
dmurdoch authored Jul 4, 2023
2 parents d59dd63 + 55ae816 commit bce9fce
Showing 15 changed files with 23 additions and 20 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.0
Version: 1.2.1
Title: 3D Visualization Using OpenGL
Authors@R: c(person("Duncan", "Murdoch", role = c("aut", "cre"),
email = "murdoch.duncan@gmail.com"),
8 changes: 5 additions & 3 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# rgl 1.2.0
# rgl 1.2.1

## Major changes

@@ -41,8 +41,10 @@ properly.
* `addNormals()` sometimes gave `NaN` values due to rounding
error (issue #372).
* `arc3d()` sometimes missed plotting the last segment of the arc (issue #369).
* `R_NO_REMAP` has been defined to prevent conflict between
R internals and C++17 library.
* `R_NO_REMAP` has been defined and header includes have been
rearranged to prevent conflict between R internals and C++17
library. (Thanks to Prof. B. D. Ripley and G. Csardi for
suggested fixes.)


# rgl 1.1.3
5 changes: 5 additions & 0 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# 1.2.1

In addition to the changes below, this version rearranges header
include order.

# 1.2.0

This release is at the request of Prof Ripley, largely because of C++17
2 changes: 1 addition & 1 deletion src/Makevars.in
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@

PKG_CFLAGS=$(C_VISIBILITY)

PKG_CPPFLAGS=-DR_NO_REMAP @NULL_CPPFLAGS@
PKG_CPPFLAGS=@NULL_CPPFLAGS@ -DR_NO_REMAP

PKG_LIBS=@NULL_LIBS@

2 changes: 1 addition & 1 deletion src/Makevars.win.in
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ PKG_LIBS = \
@HIDE_IF_R42PLUS@ CXX_STD = CXX11

@HIDE_IF_R42PLUS@ PKG_CPPFLAGS = \
@HIDE_IF_R42PLUS@ -DHAVE_PNG_H -DHAVE_FREETYPE -Iext -Iext/ftgl \
@HIDE_IF_R42PLUS@ -DHAVE_PNG_H -DHAVE_FREETYPE -DR_NO_REMAP -Iext -Iext/ftgl \
@HIDE_IF_R42PLUS@ -I$(RWINLIB)/include -I$(RWINLIB)/include/freetype2 \
@HIDE_IF_R42PLUS@ -Iext/glad/include

2 changes: 1 addition & 1 deletion src/NULLgui.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@

#include <ctype.h>
#include <Rinternals.h>
#include "config.h"
// C++ source
// This file is part of RGL.
@@ -13,6 +12,7 @@

#include "assert.h"
#include "R.h"
#include <Rinternals.h>

// ---------------------------------------------------------------------------

2 changes: 1 addition & 1 deletion src/api.cpp
Original file line number Diff line number Diff line change
@@ -8,8 +8,8 @@

#include "lib.h"
#include "R.h"
#include "api.h"
#include "platform.h"
#include "api.h"

using namespace rgl;
//
4 changes: 2 additions & 2 deletions src/api.h
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#ifndef RGL_API_H
#define RGL_API_H

#include "R.h"
#include <Rinternals.h>
#include "ABCLineSet.h"
#include "PlaneSet.h"
#include "SphereSet.h"
#include "SpriteSet.h"
#include "Surface.h"
#include "TextSet.h"
#include "R.h"
#include <Rinternals.h>


namespace rgl {
4 changes: 1 addition & 3 deletions src/callbacks.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#include "api.h"
#include "rglview.h"

#include "DeviceManager.h"
#include "api.h"

using namespace rgl;

@@ -12,7 +11,6 @@ extern DeviceManager* deviceManager;
/* These defines are not in the installed version of R */
#include "R.h"

#include <Rdefines.h>
#include <Rinternals.h>

static void userControl(void *userData, int mouseX, int mouseY)
4 changes: 2 additions & 2 deletions src/init.cpp
Original file line number Diff line number Diff line change
@@ -2,8 +2,6 @@
#include <unistd.h>
#include "lib.h"
#include "DeviceManager.h"
#include "init.h"
#include "api.h"

/* libfreetype 2.6 defines a conflicting TYPEOF macro */

@@ -14,6 +12,8 @@
#include <R_ext/Visibility.h>
#include <R_ext/Rdynload.h>
#include "R.h"
#include "init.h"
#include "api.h"

using namespace rgl;

1 change: 0 additions & 1 deletion src/init.h
Original file line number Diff line number Diff line change
@@ -2,7 +2,6 @@
#define RGL_INIT_H

#include "R.h"
#include <Rdefines.h>
#include <Rinternals.h>

namespace rgl {
1 change: 0 additions & 1 deletion src/par3d.cpp
Original file line number Diff line number Diff line change
@@ -14,7 +14,6 @@
#define _
#define streql(s, t) (!strcmp((s), (t)))

#include <Rdefines.h>
#include <Rinternals.h>

namespace rgl {
2 changes: 1 addition & 1 deletion src/useNULL/Makevars.in
Original file line number Diff line number Diff line change
@@ -7,6 +7,6 @@
@HIDE_IF_R42PLUS@ CXX_STD = CXX11
PKG_CFLAGS=$(C_VISIBILITY)

PKG_CPPFLAGS=@NULL_CPPFLAGS@
PKG_CPPFLAGS=@NULL_CPPFLAGS@ -DR_NO_REMAP
PKG_LIBS=@NULL_LIBS@

2 changes: 1 addition & 1 deletion src/win32gui.cpp
Original file line number Diff line number Diff line change
@@ -13,9 +13,9 @@
#include <shlobj.h>
#include "assert.h"
#include "R.h"
#include <ctype.h>
#include <Rinternals.h>

#include <ctype.h>

namespace rgl {

2 changes: 1 addition & 1 deletion src/x11gui.cpp
Original file line number Diff line number Diff line change
@@ -12,10 +12,10 @@
#include "opengl.h"
#include <X11/keysym.h>
#include <cstdio>
#include <Rinternals.h>
#include "x11gui.h"
#include "lib.h"
#include "R.h"
#include <Rinternals.h>

namespace rgl {

0 comments on commit bce9fce

Please sign in to comment.