PAM/Y4M: support for UTF-8 file names

GPUJPEG 0.27.5

refers to GH-93

Author: MartinPulec

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.10.0 FATAL_ERROR)
 # change version also in configure.ac
-project(gpujpeg VERSION 0.27.2 LANGUAGES C CUDA)
+project(gpujpeg VERSION 0.27.5 LANGUAGES C CUDA)
 
 # options
 set(BUILD_OPENGL OFF CACHE STRING "Build with OpenGL support, options are: AUTO ON OFF")

NEWS.md

@@ -1,4 +1,4 @@
-next
+2025-06-10 - 0.27.5
 ----------
 
 - support for non-ASCII characters in filename (tool+_load/_save)

configure.ac

@@ -1,6 +1,6 @@
 AC_PREREQ([2.65])
 # change version also in CMakeLists.txt
-AC_INIT([libgpujpeg],[0.27.2],[https://github.com/CESNET/GPUJPEG/issues],[libgpujpeg],[https://github.com/CESNET/GPUJPEG])
+AC_INIT([libgpujpeg],[0.27.5],[https://github.com/CESNET/GPUJPEG/issues],[libgpujpeg],[https://github.com/CESNET/GPUJPEG])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_AUX_DIR([.])

src/utils/pam.c

@@ -138,10 +138,36 @@ static bool parse_pnm(FILE *file, char pnm_id, struct pam_metadata *info) {
         return false;
 }
 
+#ifdef _WIN32
+#include <wchar.h>
+#include <windows.h>
+static wchar_t*
+mbs_to_wstr_helper(const char* mbstr, wchar_t* wstr_buf, size_t wstr_len)
+{
+    const int size_needed = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, mbstr, -1, NULL, 0);
+    if ( size_needed == 0 ) {
+        fprintf(stderr, "[PAM] MultiByteToWideChar error: %d (0x%x)!\n", GetLastError(), GetLastError());
+        return NULL;
+    }
+    if ( size_needed > (int)wstr_len ) {
+        fprintf(stderr, "[PAM] buffer provided to %s too short - needed %d, got %zu!\n", __func__, size_needed,
+                wstr_len);
+        return NULL;
+    }
+    MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, mbstr, -1, wstr_buf, size_needed);
+    return wstr_buf;
+}
+#define mbs_to_wstr(tstr) mbs_to_wstr_helper(tstr, (wchar_t[1024]){0}, 1024)
+#endif
+
 bool pam_read(const char *filename, struct pam_metadata *info, unsigned char **data, void *(*allocator)(size_t)) {
         char line[128];
         errno = 0;
+#ifdef _WIN32
+        FILE *file = _wfopen(mbs_to_wstr(filename), L"rb");
+#else
         FILE *file = fopen(filename, "rb");
+#endif
         if (!file) {
                 fprintf(stderr, "Failed to open %s: %s\n", filename, strerror(errno));
                 return false;
@@ -203,7 +229,11 @@ bool pam_read(const char *filename, struct pam_metadata *info, unsigned char **d
 
 bool pam_write(const char *filename, unsigned int width, unsigned int height, int ch_count, int maxval, const unsigned char *data, bool pnm) {
         errno = 0;
+#ifdef _WIN32
+        FILE *file = _wfopen(mbs_to_wstr(filename), L"wb");
+#else
         FILE *file = fopen(filename, "wb");
+#endif
         if (!file) {
                 fprintf(stderr, "Failed to open %s for writing: %s\n", filename, strerror(errno));
                 return false;

src/utils/y4m.c

@@ -5,7 +5,7 @@
  * This file is part of GPUJPEG.
  */
 /*
- * Copyright (c) 2022-2024, CESNET z.s.p.o.
+ * Copyright (c) 2022-2025, CESNET
  *
  * All rights reserved.
  *
@@ -74,8 +74,34 @@ static size_t y4m_get_data_len(const struct y4m_metadata *info) {
         return ret * (info->bitdepth > 8 ? 2 : 1);
 }
 
+#ifdef _WIN32
+#include <wchar.h>
+#include <windows.h>
+static wchar_t*
+mbs_to_wstr_helper(const char* mbstr, wchar_t* wstr_buf, size_t wstr_len)
+{
+    const int size_needed = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, mbstr, 0 - 1, NULL, 0);
+    if ( size_needed == 0 ) {
+        fprintf(stderr, "[Y4M] MultiByteToWideChar error %d (0x%x)!\n", GetLastError(), GetLastError());
+        return NULL;
+    }
+    if ( size_needed > (int)wstr_len ) {
+        fprintf(stderr, "[Y4M] buffer provided to %s too short - needed %d, got %zu!\n", __func__, size_needed,
+                wstr_len);
+        return NULL;
+    }
+    MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, mbstr, -1, wstr_buf, size_needed);
+    return wstr_buf;
+}
+#define mbs_to_wstr(tstr) mbs_to_wstr_helper(tstr, (wchar_t[1024]){0}, 1024)
+#endif
+
 size_t y4m_read(const char *filename, struct y4m_metadata *info, unsigned char **data, void *(*allocator)(size_t)) {
+#ifdef _WIN32
+        FILE *file = _wfopen(mbs_to_wstr(filename), L"rb");
+#else
         FILE *file = fopen(filename, "rb");
+#endif
         if (!file) {
                 fprintf(stderr, "Failed to open %s: %s\n", filename, strerror(errno));
                 return 0;
@@ -134,7 +160,11 @@ size_t y4m_read(const char *filename, struct y4m_metadata *info, unsigned char *
 
 bool y4m_write(const char *filename, const struct y4m_metadata *info, const unsigned char *data) {
         errno = 0;
+#ifdef _WIN32
+        FILE *file = _wfopen(mbs_to_wstr(filename), L"wb");
+#else
         FILE *file = fopen(filename, "wb");
+#endif
         if (!file) {
                 fprintf(stderr, "Failed to open %s for writing: %s\n", filename, strerror(errno));
                 return false;