Skip to content

Commit 2d8074b

Browse files
committed
Windows: update static libs to gifski 1.32.0
1 parent 9f887f9 commit 2d8074b

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

.github/workflows/R-CMD-check.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ jobs:
1717
matrix:
1818
config:
1919
- {os: windows-latest, r: '4.1'}
20+
- {os: windows-latest, r: '4.1', FORCE_STATIC_GIFSKI: 'static'}
2021
- {os: windows-latest, r: '4.2', FORCE_STATIC_GIFSKI: 'static'}
22+
- {os: windows-latest, r: '4.3', FORCE_STATIC_GIFSKI: 'static'}
2123
- {os: windows-latest, r: 'release'}
2224
- {os: windows-latest, r: 'release', FORCE_STATIC_GIFSKI: 'static'}
2325
- {os: macOS-13, r: 'release'}

src/myrustlib/gifski.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,8 @@ GifskiError gifski_set_extra_effort(gifski *handle, bool extra);
162162
*
163163
* The first frame should have PTS=0. If the first frame has PTS > 0, it'll be used as a delay after the last frame.
164164
*
165+
* This function may block and wait until the frame is processed. Make sure to call `gifski_set_write_callback` or `gifski_set_file_output` first to avoid a deadlock.
166+
*
165167
* Returns 0 (`GIFSKI_OK`) on success, and non-0 `GIFSKI_*` constant on error.
166168
*/
167169
GifskiError gifski_add_frame_png_file(gifski *handle,
@@ -177,6 +179,8 @@ GifskiError gifski_add_frame_png_file(gifski *handle,
177179
*
178180
* `frame_number` orders frames (consecutive numbers starting from 0).
179181
* You can add frames in any order, and they will be sorted by their `frame_number`.
182+
* However, out-of-order frames are buffered in RAM, and will cause high memory usage
183+
* if there are gaps in the frame numbers.
180184
*
181185
* Presentation timestamp (PTS) is time in seconds, since start of the file, when this frame is to be displayed.
182186
* For a 20fps video it could be `frame_number/20.0`. First frame must have PTS=0.
@@ -186,6 +190,8 @@ GifskiError gifski_add_frame_png_file(gifski *handle,
186190
*
187191
* Colors are in sRGB, uncorrelated RGBA, with alpha byte last.
188192
*
193+
* This function may block and wait until the frame is processed. Make sure to call `gifski_set_write_callback` or `gifski_set_file_output` first to avoid a deadlock.
194+
*
189195
* Returns 0 (`GIFSKI_OK`) on success, and non-0 `GIFSKI_*` constant on error.
190196
*/
191197
GifskiError gifski_add_frame_rgba(gifski *handle,

tools/winlibs.R

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
if(!file.exists("../windows/libgifski/lib")){
22
unlink("../windows", recursive = TRUE)
33
url <- if(grepl("aarch", R.version$platform)){
4-
"https://github.com/r-windows/bundles/releases/download/gifski-1.12.2/gifski-1.12.2-clang-aarch64.tar.xz"
4+
"https://github.com/r-windows/bundles/releases/download/gifski-1.32.0/gifski-1.32.0-clang-aarch64.tar.xz"
55
} else if(grepl("clang", Sys.getenv('R_COMPILED_BY'))){
6-
"https://github.com/r-windows/bundles/releases/download/gifski-1.12.2/gifski-1.12.2-clang-x86_64.tar.xz"
6+
"https://github.com/r-windows/bundles/releases/download/gifski-1.32.0/gifski-1.32.0-clang-x86_64.tar.xz"
77
} else if(getRversion() >= "4.2") {
8-
"https://github.com/r-windows/bundles/releases/download/gifski-1.12.2/gifski-1.12.2-ucrt-x86_64.tar.xz"
8+
"https://github.com/r-windows/bundles/releases/download/gifski-1.32.0/gifski-1.32.0-ucrt-x86_64.tar.xz"
99
} else {
1010
"https://github.com/r-windows/bundles/releases/download/gifski-1.12.2/gifski-1.12.0-msvcrt.tar.xz"
1111
}

0 commit comments

Comments
 (0)