libragephoto 0.8.2 release

- CMakeLists.txt: update version to 0.8.2
- RagePhoto.cpp: fix memory issue on Windows convertPath function for C+
+11 support
- RagePhoto.cs: code style changes for Boolean
- RagePhoto.h: update copyright header
- RagePhoto.hpp: update copyright header
- RagePhotoLibrary.h: update copyright header
- src/dotnet: add package tags and update version to 0.8.2
This commit is contained in:
Syping 2025-11-30 08:13:17 +01:00
parent 728a3dff6c
commit 5c43a39d13
7 changed files with 29 additions and 25 deletions

View file

@ -18,7 +18,7 @@
cmake_minimum_required(VERSION 3.16) cmake_minimum_required(VERSION 3.16)
cmake_policy(VERSION 3.16...3.28) cmake_policy(VERSION 3.16...3.28)
project(ragephoto VERSION 0.8.1 LANGUAGES C CXX) project(ragephoto VERSION 0.8.2 LANGUAGES C CXX)
include(GNUInstallDirs) include(GNUInstallDirs)
# RagePhoto CMake includes # RagePhoto CMake includes

View file

@ -66,13 +66,16 @@ const char* nullchar = "";
/* BEGIN OF STATIC LIBRARY FUNCTIONS */ /* BEGIN OF STATIC LIBRARY FUNCTIONS */
#if defined(_WIN32) && ((RAGEPHOTO_CXX_STD < 17) || (__cplusplus < 201703L)) #if defined(_WIN32) && ((RAGEPHOTO_CXX_STD < 17) || (__cplusplus < 201703L))
inline std::unique_ptr<wchar_t> convertPath(const char *path) inline std::wstring convertPath(const char *path)
{ {
int wideCharSize = MultiByteToWideChar(CP_UTF8, 0, path, -1, nullptr, 0); int wideCharSize = MultiByteToWideChar(CP_UTF8, 0, path, -1, nullptr, 0);
if (wideCharSize <= 0) if (wideCharSize <= 0)
return std::unique_ptr<wchar_t>(new wchar_t[1]()); return {};
std::unique_ptr<wchar_t> wideCharPath(new wchar_t[wideCharSize]); std::wstring wideCharPath;
MultiByteToWideChar(CP_UTF8, 0, path, -1, wideCharPath.get(), wideCharSize); wideCharPath.resize(wideCharSize);
if (!MultiByteToWideChar(CP_UTF8, 0, path, -1, &wideCharPath[0], wideCharSize))
return {};
wideCharPath.resize(wideCharSize - 1);
return wideCharPath; return wideCharPath;
} }
#endif #endif
@ -292,7 +295,7 @@ bool RagePhoto::load(const char *data, size_t length, RagePhotoData *rp_data, Ra
rp_data->error = Error::HeaderMallocError; // 4 rp_data->error = Error::HeaderMallocError; // 4
return false; return false;
} }
memcpy(rp_data->header, photoHeader_string.c_str(), photoHeader_size); memcpy(rp_data->header, photoHeader_string.data(), photoHeader_size);
#elif defined UNICODE_ICONV #elif defined UNICODE_ICONV
iconv_t iconv_in = iconv_open("UTF-8", "UTF-16LE"); iconv_t iconv_in = iconv_open("UTF-8", "UTF-16LE");
if (iconv_in == (iconv_t)-1) { if (iconv_in == (iconv_t)-1) {
@ -610,7 +613,7 @@ bool RagePhoto::loadFile(const char *filename)
#if defined(_WIN32) && (RAGEPHOTO_CXX_STD >= 17) && (__cplusplus >= 201703L) #if defined(_WIN32) && (RAGEPHOTO_CXX_STD >= 17) && (__cplusplus >= 201703L)
std::ifstream ifs(std::filesystem::u8path(filename), std::ios::in | std::ios::binary); std::ifstream ifs(std::filesystem::u8path(filename), std::ios::in | std::ios::binary);
#elif defined(_WIN32) #elif defined(_WIN32)
std::ifstream ifs(convertPath(filename).get(), std::ios::in | std::ios::binary); std::ifstream ifs(convertPath(filename).data(), std::ios::in | std::ios::binary);
#else #else
std::ifstream ifs(filename, std::ios::in | std::ios::binary); std::ifstream ifs(filename, std::ios::in | std::ios::binary);
#endif #endif
@ -1012,7 +1015,7 @@ bool RagePhoto::saveFile(const char *filename, uint32_t photoFormat)
#if defined(_WIN32) && (RAGEPHOTO_CXX_STD >= 17) && (__cplusplus >= 201703L) #if defined(_WIN32) && (RAGEPHOTO_CXX_STD >= 17) && (__cplusplus >= 201703L)
std::ofstream ofs(std::filesystem::u8path(filename), std::ios::out | std::ios::binary | std::ios::trunc); std::ofstream ofs(std::filesystem::u8path(filename), std::ios::out | std::ios::binary | std::ios::trunc);
#elif defined(_WIN32) #elif defined(_WIN32)
std::ofstream ofs(convertPath(filename).get(), std::ios::out | std::ios::binary | std::ios::trunc); std::ofstream ofs(convertPath(filename).data(), std::ios::out | std::ios::binary | std::ios::trunc);
#else #else
std::ofstream ofs(filename, std::ios::out | std::ios::binary | std::ios::trunc); std::ofstream ofs(filename, std::ios::out | std::ios::binary | std::ios::trunc);
#endif #endif

View file

@ -1,6 +1,6 @@
/***************************************************************************** /*****************************************************************************
* libragephoto RAGE Photo Parser * libragephoto RAGE Photo Parser
* Copyright (C) 2021-2024 Syping * Copyright (C) 2021-2025 Syping
* *
* Redistribution and use in source and binary forms, with or without modification, * Redistribution and use in source and binary forms, with or without modification,
* are permitted provided that the following conditions are met: * are permitted provided that the following conditions are met:

View file

@ -1,6 +1,6 @@
/***************************************************************************** /*****************************************************************************
* libragephoto RAGE Photo Parser * libragephoto RAGE Photo Parser
* Copyright (C) 2023-2024 Syping * Copyright (C) 2023-2025 Syping
* *
* Redistribution and use in source and binary forms, with or without modification, * Redistribution and use in source and binary forms, with or without modification,
* are permitted provided that the following conditions are met: * are permitted provided that the following conditions are met:

View file

@ -1,6 +1,6 @@
/***************************************************************************** /*****************************************************************************
* libragephoto RAGE Photo Parser * libragephoto RAGE Photo Parser
* Copyright (C) 2023 Syping * Copyright (C) 2023-2025 Syping
* *
* Redistribution and use in source and binary forms, with or without modification, * Redistribution and use in source and binary forms, with or without modification,
* are permitted provided that the following conditions are met: * are permitted provided that the following conditions are met:

View file

@ -1,17 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netstandard2.1;net47;net8.0</TargetFrameworks> <TargetFrameworks>netstandard2.1;net47</TargetFrameworks>
<AssemblyName>RagePhoto.Core</AssemblyName> <AssemblyName>RagePhoto.Core</AssemblyName>
<RootNamespace>RagePhoto</RootNamespace> <RootNamespace>RagePhoto</RootNamespace>
<Version>0.8.1</Version> <Version>0.8.2</Version>
<AssemblyVersion>0.8.1</AssemblyVersion> <AssemblyVersion>0.8.2</AssemblyVersion>
<FileVersion>0.8.1</FileVersion> <FileVersion>0.8.2</FileVersion>
<Authors>Syping</Authors> <Authors>Syping</Authors>
<Copyright>Copyright © 2025 Syping</Copyright> <Copyright>Copyright © 2025 Syping</Copyright>
<Description>Open Source RAGE Photo Parser for GTA V and RDR 2</Description> <Description>Open Source RAGE Photo Parser for GTA V and RDR 2</Description>
<PackageLicenseExpression>BSD-2-Clause</PackageLicenseExpression> <PackageLicenseExpression>BSD-2-Clause</PackageLicenseExpression>
<PackageReadmeFile>README.md</PackageReadmeFile> <PackageReadmeFile>README.md</PackageReadmeFile>
<PackageTags>libragephoto;gta5;gtav;snapmatic;rdr2;photo</PackageTags>
<RepositoryUrl>https://github.com/Syping/libragephoto</RepositoryUrl> <RepositoryUrl>https://github.com/Syping/libragephoto</RepositoryUrl>
<Nullable>disable</Nullable> <Nullable>disable</Nullable>
</PropertyGroup> </PropertyGroup>

View file

@ -6,7 +6,7 @@ namespace RagePhoto {
public class Photo : IDisposable { public class Photo : IDisposable {
private bool _disposed; private Boolean _disposed;
private readonly IntPtr _instance; private readonly IntPtr _instance;
private const String _library = "libragephoto"; private const String _library = "libragephoto";
@ -18,10 +18,10 @@ namespace RagePhoto {
private static extern void ragephoto_close(IntPtr instance); private static extern void ragephoto_close(IntPtr instance);
[DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] [DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
[return: MarshalAs(UnmanagedType.I1)] [return: MarshalAs(UnmanagedType.I1)]
private static extern bool ragephoto_load(IntPtr instance, Byte[] data, UIntPtr size); private static extern Boolean ragephoto_load(IntPtr instance, Byte[] data, UIntPtr size);
[DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] [DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
[return: MarshalAs(UnmanagedType.I1)] [return: MarshalAs(UnmanagedType.I1)]
private static extern bool ragephoto_loadfile(IntPtr instance, [MarshalAs(UnmanagedType.LPUTF8Str)] String filename); private static extern Boolean ragephoto_loadfile(IntPtr instance, [MarshalAs(UnmanagedType.LPUTF8Str)] String filename);
[DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] [DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
private static extern Int32 ragephoto_error(IntPtr instance); private static extern Int32 ragephoto_error(IntPtr instance);
[DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] [DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
@ -48,30 +48,30 @@ namespace RagePhoto {
private static extern UIntPtr ragephoto_getsavesizef(IntPtr instance, UInt32 photoFormat); private static extern UIntPtr ragephoto_getsavesizef(IntPtr instance, UInt32 photoFormat);
[DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] [DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
[return: MarshalAs(UnmanagedType.I1)] [return: MarshalAs(UnmanagedType.I1)]
private static extern bool ragephoto_save(IntPtr instance, [Out] Byte[] data); private static extern Boolean ragephoto_save(IntPtr instance, [Out] Byte[] data);
[DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] [DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
[return: MarshalAs(UnmanagedType.I1)] [return: MarshalAs(UnmanagedType.I1)]
private static extern bool ragephoto_savef(IntPtr instance, [Out] Byte[] data, UInt32 photoFormat); private static extern Boolean ragephoto_savef(IntPtr instance, [Out] Byte[] data, UInt32 photoFormat);
[DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] [DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
[return: MarshalAs(UnmanagedType.I1)] [return: MarshalAs(UnmanagedType.I1)]
private static extern bool ragephoto_savefile(IntPtr instance, [MarshalAs(UnmanagedType.LPUTF8Str)] String filename); private static extern Boolean ragephoto_savefile(IntPtr instance, [MarshalAs(UnmanagedType.LPUTF8Str)] String filename);
[DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] [DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
[return: MarshalAs(UnmanagedType.I1)] [return: MarshalAs(UnmanagedType.I1)]
private static extern bool ragephoto_savefilef(IntPtr instance, [MarshalAs(UnmanagedType.LPUTF8Str)] String filename, UInt32 photoFormat); private static extern Boolean ragephoto_savefilef(IntPtr instance, [MarshalAs(UnmanagedType.LPUTF8Str)] String filename, UInt32 photoFormat);
[DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] [DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
private static extern void ragephoto_setbufferdefault(IntPtr instance); private static extern void ragephoto_setbufferdefault(IntPtr instance);
[DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] [DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
private static extern void ragephoto_setbufferoffsets(IntPtr instance); private static extern void ragephoto_setbufferoffsets(IntPtr instance);
[DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] [DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
[return: MarshalAs(UnmanagedType.I1)] [return: MarshalAs(UnmanagedType.I1)]
private static extern bool ragephoto_setphotodatac(IntPtr instance, IntPtr data); private static extern Boolean ragephoto_setphotodatac(IntPtr instance, IntPtr data);
[DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] [DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
private static extern void ragephoto_setphotodesc(IntPtr instance, [MarshalAs(UnmanagedType.LPUTF8Str)] String description, UInt32 bufferSize); private static extern void ragephoto_setphotodesc(IntPtr instance, [MarshalAs(UnmanagedType.LPUTF8Str)] String description, UInt32 bufferSize);
[DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] [DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
private static extern void ragephoto_setphotoformat(IntPtr instance, UInt32 photoFormat); private static extern void ragephoto_setphotoformat(IntPtr instance, UInt32 photoFormat);
[DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] [DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
[return: MarshalAs(UnmanagedType.I1)] [return: MarshalAs(UnmanagedType.I1)]
private static extern bool ragephoto_setphotojpeg(IntPtr instance, Byte[] jpeg, UInt32 size, UInt32 bufferSize); private static extern Boolean ragephoto_setphotojpeg(IntPtr instance, Byte[] jpeg, UInt32 size, UInt32 bufferSize);
[DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] [DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
private static extern void ragephoto_setphotojson(IntPtr instance, [MarshalAs(UnmanagedType.LPUTF8Str)] String json, UInt32 bufferSize); private static extern void ragephoto_setphotojson(IntPtr instance, [MarshalAs(UnmanagedType.LPUTF8Str)] String json, UInt32 bufferSize);
[DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] [DllImport(_library, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
@ -114,7 +114,7 @@ namespace RagePhoto {
GC.SuppressFinalize(this); GC.SuppressFinalize(this);
} }
protected virtual void Dispose(bool disposing) { protected virtual void Dispose(Boolean disposing) {
if (_disposed) if (_disposed)
return; return;
ragephoto_close(_instance); ragephoto_close(_instance);