Skip to content

Commit 22ffbbb

Browse files
pepijn-devriespepijn-devries
authored
Merge pull request #7 from pepijn-devries/work-in-progress
Fixes to pass CRAN checks
2 parents f7a1117 + fc29793 commit 22ffbbb

47 files changed

Lines changed: 298 additions & 291 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎DESCRIPTION‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: AmigaFFH
22
Type: Package
33
Title: Commodore Amiga File Format Handler
4-
Version: 0.4.7
4+
Version: 0.4.8
55
Authors@R: c(person("Pepijn", "de Vries", role = c("aut", "cre", "dtc"),
66
email = "pepijn.devries@outlook.com"))
77
Author: Pepijn de Vries [aut, cre, dtc]
@@ -12,7 +12,7 @@ Description: Modern software often poorly support older file formats. This
1212
the older Amiga operating systems (<= 3.0). It will read and write specific
1313
file formats and coerces them into more contemporary data.
1414
Depends:
15-
R (>= 2.10),
15+
R (>= 4.1.0),
1616
tuneR (>= 1.0)
1717
Imports:
1818
grDevices,
@@ -26,7 +26,7 @@ Suggests:
2626
License: GPL-3
2727
LazyData: True
2828
Encoding: UTF-8
29-
RoxygenNote: 7.2.3
29+
RoxygenNote: 7.3.2
3030
NeedsCompilation: no
3131
Roxygen: list(markdown = TRUE)
3232
URL: https://pepijn-devries.github.io/AmigaFFH/, https://github.com/pepijn-devries/AmigaFFH/

‎NAMESPACE‎

Lines changed: 156 additions & 155 deletions
Original file line numberDiff line numberDiff line change
@@ -1,155 +1,156 @@
1-
# Generated by roxygen2: do not edit by hand
2-
3-
S3method("$<-",AmigaBitmapFont)
4-
S3method("$<-",AmigaBitmapFontSet)
5-
S3method("$<-",AmigaIcon)
6-
S3method("$<-",SysConfig)
7-
S3method("[",AmigaBasic)
8-
S3method("[<-",AmigaBasic)
9-
S3method("[[",AmigaBasic)
10-
S3method("[[<-",AmigaBasic)
11-
S3method("[[<-",AmigaBitmapFont)
12-
S3method("[[<-",AmigaBitmapFontSet)
13-
S3method("[[<-",AmigaIcon)
14-
S3method("[[<-",SysConfig)
15-
S3method("names<-",AmigaBasic)
16-
S3method(IFFChunk,IFF.8SVX)
17-
S3method(IFFChunk,IFF.ANHD)
18-
S3method(IFFChunk,IFF.ANIM)
19-
S3method(IFFChunk,IFF.ANNO)
20-
S3method(IFFChunk,IFF.AUTH)
21-
S3method(IFFChunk,IFF.BMHD)
22-
S3method(IFFChunk,IFF.BODY)
23-
S3method(IFFChunk,IFF.CAMG)
24-
S3method(IFFChunk,IFF.CHAN)
25-
S3method(IFFChunk,IFF.CHRS)
26-
S3method(IFFChunk,IFF.CMAP)
27-
S3method(IFFChunk,IFF.CRNG)
28-
S3method(IFFChunk,IFF.DLTA)
29-
S3method(IFFChunk,IFF.DPAN)
30-
S3method(IFFChunk,IFF.FORM)
31-
S3method(IFFChunk,IFF.ILBM)
32-
S3method(IFFChunk,IFF.NAME)
33-
S3method(IFFChunk,IFF.TEXT)
34-
S3method(IFFChunk,IFF.VHDR)
35-
S3method(IFFChunk,IFF.copyright)
36-
S3method(IFFChunk,character)
37-
S3method(as.character,AmigaBasic)
38-
S3method(as.list,AmigaBasicBMAP)
39-
S3method(as.raster,AmigaBasicShape)
40-
S3method(as.raster,AmigaBitmapFont)
41-
S3method(as.raster,AmigaBitmapFontSet)
42-
S3method(as.raster,AmigaIcon)
43-
S3method(as.raster,IFFChunk)
44-
S3method(as.raster,hardwareSprite)
45-
S3method(as.raw,AmigaBasic)
46-
S3method(as.raw,AmigaBasicBMAP)
47-
S3method(as.raw,AmigaBasicShape)
48-
S3method(as.raw,AmigaBitmapFont)
49-
S3method(as.raw,AmigaBitmapFontSet)
50-
S3method(as.raw,AmigaIcon)
51-
S3method(as.raw,AmigaTimeVal)
52-
S3method(as.raw,IFF.ANY)
53-
S3method(as.raw,SysConfig)
54-
S3method(c,AmigaBasic)
55-
S3method(c,AmigaBitmapFont)
56-
S3method(dim,hardwareSprite)
57-
S3method(dither,matrix)
58-
S3method(dither,raster)
59-
S3method(names,AmigaBasic)
60-
S3method(plot,AmigaBasicShape)
61-
S3method(plot,AmigaBitmapFont)
62-
S3method(plot,AmigaBitmapFontSet)
63-
S3method(plot,AmigaIcon)
64-
S3method(plot,IFF.8SVX)
65-
S3method(plot,IFF.ANIM)
66-
S3method(plot,IFF.FORM)
67-
S3method(plot,IFF.ILBM)
68-
S3method(plot,IFFChunk)
69-
S3method(plot,SysConfig)
70-
S3method(plot,hardwareSprite)
71-
S3method(print,AmigaBasic)
72-
S3method(print,AmigaBasicBMAP)
73-
S3method(print,AmigaBasicShape)
74-
S3method(print,AmigaBitmapFont)
75-
S3method(print,AmigaBitmapFontSet)
76-
S3method(print,AmigaIcon)
77-
S3method(print,AmigaTimeVal)
78-
S3method(print,IFFChunk)
79-
S3method(print,SysConfig)
80-
S3method(print,hardwareSprite)
81-
export("fontName<-")
82-
export(AmigaBasic.reserved)
83-
export(IFFChunk)
84-
export(WaveToIFF)
85-
export(amigaRawToColour)
86-
export(as.AmigaBasic)
87-
export(as.AmigaBasicBMAP)
88-
export(availableFontSizes)
89-
export(bitmapToRaster)
90-
export(check.names.AmigaBasic)
91-
export(colourToAmigaRaw)
92-
export(deltaFibonacciCompress)
93-
export(deltaFibonacciDecompress)
94-
export(dither)
95-
export(fontName)
96-
export(getAmigaBitmapFont)
97-
export(index.colours)
98-
export(packBitmap)
99-
export(rasterToAmigaBasicShape)
100-
export(rasterToAmigaBitmapFont)
101-
export(rasterToBitmap)
102-
export(rasterToHWSprite)
103-
export(rasterToIFF)
104-
export(rawToAmigaBasic)
105-
export(rawToAmigaBasicBMAP)
106-
export(rawToAmigaBasicShape)
107-
export(rawToAmigaBitmapFont)
108-
export(rawToAmigaBitmapFontSet)
109-
export(rawToAmigaIcon)
110-
export(rawToSysConfig)
111-
export(read.AmigaBasic)
112-
export(read.AmigaBasicBMAP)
113-
export(read.AmigaBasicShape)
114-
export(read.AmigaBitmapFont)
115-
export(read.AmigaBitmapFontSet)
116-
export(read.AmigaIcon)
117-
export(read.SysConfig)
118-
export(read.iff)
119-
export(simpleAmigaIcon)
120-
export(simpleSysConfig)
121-
export(timeval)
122-
export(unPackBitmap)
123-
export(write.AmigaBasic)
124-
export(write.AmigaBasicBMAP)
125-
export(write.AmigaBasicShape)
126-
export(write.AmigaBitmapFont)
127-
export(write.AmigaBitmapFontSet)
128-
export(write.AmigaIcon)
129-
export(write.SysConfig)
130-
export(write.iff)
131-
exportClasses(IFFChunk)
132-
exportClasses(hardwareSprite)
133-
exportMethods("getIFFChunk<-")
134-
exportMethods(as.raw)
135-
exportMethods(getIFFChunk)
136-
exportMethods(interpretIFFChunk)
137-
exportMethods(play)
138-
exportMethods(rawToHWSprite)
139-
exportMethods(rawToIFFChunk)
140-
importFrom(grDevices,adjustcolor)
141-
importFrom(grDevices,as.raster)
142-
importFrom(grDevices,col2rgb)
143-
importFrom(grDevices,gray)
144-
importFrom(grDevices,hsv)
145-
importFrom(grDevices,rgb)
146-
importFrom(grDevices,rgb2hsv)
147-
importFrom(graphics,plot)
148-
importFrom(methods,as)
149-
importFrom(methods,new)
150-
importFrom(stats,ave)
151-
importFrom(stats,kmeans)
152-
importFrom(tuneR,MCnames)
153-
importFrom(tuneR,Wave)
154-
importFrom(tuneR,WaveMC)
155-
importFrom(tuneR,play)
1+
# Generated by roxygen2: do not edit by hand
2+
3+
S3method("$<-",AmigaBitmapFont)
4+
S3method("$<-",AmigaBitmapFontSet)
5+
S3method("$<-",AmigaIcon)
6+
S3method("$<-",SysConfig)
7+
S3method("[",AmigaBasic)
8+
S3method("[<-",AmigaBasic)
9+
S3method("[[",AmigaBasic)
10+
S3method("[[<-",AmigaBasic)
11+
S3method("[[<-",AmigaBitmapFont)
12+
S3method("[[<-",AmigaBitmapFontSet)
13+
S3method("[[<-",AmigaIcon)
14+
S3method("[[<-",SysConfig)
15+
S3method("names<-",AmigaBasic)
16+
S3method(IFFChunk,IFF.8SVX)
17+
S3method(IFFChunk,IFF.ANHD)
18+
S3method(IFFChunk,IFF.ANIM)
19+
S3method(IFFChunk,IFF.ANNO)
20+
S3method(IFFChunk,IFF.AUTH)
21+
S3method(IFFChunk,IFF.BMHD)
22+
S3method(IFFChunk,IFF.BODY)
23+
S3method(IFFChunk,IFF.CAMG)
24+
S3method(IFFChunk,IFF.CHAN)
25+
S3method(IFFChunk,IFF.CHRS)
26+
S3method(IFFChunk,IFF.CMAP)
27+
S3method(IFFChunk,IFF.CRNG)
28+
S3method(IFFChunk,IFF.DLTA)
29+
S3method(IFFChunk,IFF.DPAN)
30+
S3method(IFFChunk,IFF.FORM)
31+
S3method(IFFChunk,IFF.ILBM)
32+
S3method(IFFChunk,IFF.NAME)
33+
S3method(IFFChunk,IFF.TEXT)
34+
S3method(IFFChunk,IFF.VHDR)
35+
S3method(IFFChunk,IFF.copyright)
36+
S3method(IFFChunk,character)
37+
S3method(as.character,AmigaBasic)
38+
S3method(as.list,AmigaBasicBMAP)
39+
S3method(as.list,IFFChunk)
40+
S3method(as.raster,AmigaBasicShape)
41+
S3method(as.raster,AmigaBitmapFont)
42+
S3method(as.raster,AmigaBitmapFontSet)
43+
S3method(as.raster,AmigaIcon)
44+
S3method(as.raster,IFFChunk)
45+
S3method(as.raster,hardwareSprite)
46+
S3method(as.raw,AmigaBasic)
47+
S3method(as.raw,AmigaBasicBMAP)
48+
S3method(as.raw,AmigaBasicShape)
49+
S3method(as.raw,AmigaBitmapFont)
50+
S3method(as.raw,AmigaBitmapFontSet)
51+
S3method(as.raw,AmigaIcon)
52+
S3method(as.raw,AmigaTimeVal)
53+
S3method(as.raw,IFF.ANY)
54+
S3method(as.raw,SysConfig)
55+
S3method(c,AmigaBasic)
56+
S3method(c,AmigaBitmapFont)
57+
S3method(dim,hardwareSprite)
58+
S3method(dither,matrix)
59+
S3method(dither,raster)
60+
S3method(names,AmigaBasic)
61+
S3method(plot,AmigaBasicShape)
62+
S3method(plot,AmigaBitmapFont)
63+
S3method(plot,AmigaBitmapFontSet)
64+
S3method(plot,AmigaIcon)
65+
S3method(plot,IFF.8SVX)
66+
S3method(plot,IFF.ANIM)
67+
S3method(plot,IFF.FORM)
68+
S3method(plot,IFF.ILBM)
69+
S3method(plot,IFFChunk)
70+
S3method(plot,SysConfig)
71+
S3method(plot,hardwareSprite)
72+
S3method(print,AmigaBasic)
73+
S3method(print,AmigaBasicBMAP)
74+
S3method(print,AmigaBasicShape)
75+
S3method(print,AmigaBitmapFont)
76+
S3method(print,AmigaBitmapFontSet)
77+
S3method(print,AmigaIcon)
78+
S3method(print,AmigaTimeVal)
79+
S3method(print,IFFChunk)
80+
S3method(print,SysConfig)
81+
S3method(print,hardwareSprite)
82+
export("fontName<-")
83+
export(AmigaBasic.reserved)
84+
export(IFFChunk)
85+
export(WaveToIFF)
86+
export(amigaRawToColour)
87+
export(as.AmigaBasic)
88+
export(as.AmigaBasicBMAP)
89+
export(availableFontSizes)
90+
export(bitmapToRaster)
91+
export(check.names.AmigaBasic)
92+
export(colourToAmigaRaw)
93+
export(deltaFibonacciCompress)
94+
export(deltaFibonacciDecompress)
95+
export(dither)
96+
export(fontName)
97+
export(getAmigaBitmapFont)
98+
export(index.colours)
99+
export(packBitmap)
100+
export(rasterToAmigaBasicShape)
101+
export(rasterToAmigaBitmapFont)
102+
export(rasterToBitmap)
103+
export(rasterToHWSprite)
104+
export(rasterToIFF)
105+
export(rawToAmigaBasic)
106+
export(rawToAmigaBasicBMAP)
107+
export(rawToAmigaBasicShape)
108+
export(rawToAmigaBitmapFont)
109+
export(rawToAmigaBitmapFontSet)
110+
export(rawToAmigaIcon)
111+
export(rawToSysConfig)
112+
export(read.AmigaBasic)
113+
export(read.AmigaBasicBMAP)
114+
export(read.AmigaBasicShape)
115+
export(read.AmigaBitmapFont)
116+
export(read.AmigaBitmapFontSet)
117+
export(read.AmigaIcon)
118+
export(read.SysConfig)
119+
export(read.iff)
120+
export(simpleAmigaIcon)
121+
export(simpleSysConfig)
122+
export(timeval)
123+
export(unPackBitmap)
124+
export(write.AmigaBasic)
125+
export(write.AmigaBasicBMAP)
126+
export(write.AmigaBasicShape)
127+
export(write.AmigaBitmapFont)
128+
export(write.AmigaBitmapFontSet)
129+
export(write.AmigaIcon)
130+
export(write.SysConfig)
131+
export(write.iff)
132+
exportClasses(IFFChunk)
133+
exportClasses(hardwareSprite)
134+
exportMethods("getIFFChunk<-")
135+
exportMethods(as.raw)
136+
exportMethods(getIFFChunk)
137+
exportMethods(interpretIFFChunk)
138+
exportMethods(play)
139+
exportMethods(rawToHWSprite)
140+
exportMethods(rawToIFFChunk)
141+
importFrom(grDevices,adjustcolor)
142+
importFrom(grDevices,as.raster)
143+
importFrom(grDevices,col2rgb)
144+
importFrom(grDevices,gray)
145+
importFrom(grDevices,hsv)
146+
importFrom(grDevices,rgb)
147+
importFrom(grDevices,rgb2hsv)
148+
importFrom(graphics,plot)
149+
importFrom(methods,as)
150+
importFrom(methods,new)
151+
importFrom(stats,ave)
152+
importFrom(stats,kmeans)
153+
importFrom(tuneR,MCnames)
154+
importFrom(tuneR,Wave)
155+
importFrom(tuneR,WaveMC)
156+
importFrom(tuneR,play)

‎NEWS.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
AmigaFFH v0.4.8
2+
=============
3+
4+
* Corrected R dependency
5+
16
AmigaFFH v0.4.7
27
=============
38

‎R/iff.0.r‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1113,6 +1113,7 @@ print.IFFChunk <- function(x, ...) {
11131113
cat(typ)
11141114
}
11151115

1116+
#' @export
11161117
as.list.IFFChunk <- function(x, ...) {
11171118
slotList <- function(x) {
11181119
if (inherits(x@chunk.data[[1]], "raw")) {

‎man/AmigaBasic.Rd‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎man/AmigaBasic.reserved.Rd‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)