mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-25 17:31:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

commands/output/color_profile: allows use of relative path for ICC profile

Browse source 
(cherry picked from commit 6576b99c24)
This commit is contained in:
Felix Pehla 2024-08-07 18:34:59 +02:00 committed by Simon Ser
parent fb0f2add19
commit d100835485
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sway/commands/output/color_profile.c
View file

@ -5,6 +5,7 @@
#include <wlr/render/color.h> #include <wlr/render/color.h>
#include "sway/commands.h" #include "sway/commands.h"
#include "sway/config.h" #include "sway/config.h"
#include "stringop.h"
static bool read_file_into_buf(const char *path, void **buf, size_t *size) { static bool read_file_into_buf(const char *path, void **buf, size_t *size) {
/* Why not use fopen/fread directly? glibc will succesfully open directories, /* Why not use fopen/fread directly? glibc will succesfully open directories,
@ -70,12 +71,23 @@ struct cmd_results *output_cmd_color_profile(int argc, char **argv) {
return cmd_results_new(CMD_INVALID, return cmd_results_new(CMD_INVALID,
"Invalid color profile specification: icc type requires a file"); "Invalid color profile specification: icc type requires a file");
} }
char *icc_path = strdup(argv[1]);
if (!expand_path(&icc_path)) {
struct cmd_results *cmd_res = cmd_results_new(CMD_INVALID,
"Invalid color profile specification: invalid file path");
free(icc_path);
return cmd_res;
}
void *data = NULL; void *data = NULL;
size_t size = 0; size_t size = 0;
if (!read_file_into_buf(argv[1], &data, &size)) { if (!read_file_into_buf(icc_path, &data, &size)) {
free(icc_path);
return cmd_results_new(CMD_FAILURE, return cmd_results_new(CMD_FAILURE,
"Failed to load color profile: could not read ICC file"); "Failed to load color profile: could not read ICC file");
} }
free(icc_path);
struct wlr_color_transform *tmp = struct wlr_color_transform *tmp =
wlr_color_transform_init_linear_to_icc(data, size); wlr_color_transform_init_linear_to_icc(data, size);