From afd4abadbb975ab26ed8d29fd94b1665ab31f6c0 Mon Sep 17 00:00:00 2001 From: yyc12345 Date: Mon, 8 Jan 2024 10:54:14 +0800 Subject: [PATCH] fix bugs - fix typing hint error in PyBMap - remove UNKNOWN_PF in PixelFormat enum in PyBMap.virtools_type. because it is a fallback value and should not be used directly. so when I apply it to Blender plugin, it cause a error. --- BMapBindings/PyBMap/PyBMap/bmap.py | 8 ++++---- BMapBindings/PyBMap/PyBMap/virtools_types.py | 2 +- CodeGen/BMapBindings/snippets/header.py | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/BMapBindings/PyBMap/PyBMap/bmap.py b/BMapBindings/PyBMap/PyBMap/bmap.py index 4ecce82..5926c8b 100644 --- a/BMapBindings/PyBMap/PyBMap/bmap.py +++ b/BMapBindings/PyBMap/PyBMap/bmap.py @@ -1,4 +1,4 @@ -import ctypes, os, sys +import ctypes, os, sys, typing #region Type Defines @@ -89,15 +89,15 @@ except: def is_bmap_available() -> bool: return _g_BMapModule is not None -def _bmap_error_check(result: bm_bool, func, args): +def _bmap_error_check(result: bool, func, args): if not result: raise BMapException("BMap operation failed.") return result -def _create_bmap_func(fct_name: str, fct_params: list[ctypes._SimpleCData]) -> ctypes._CFuncPtr: +def _create_bmap_func(fct_name: str, fct_params: list[typing.Any]) -> typing.Callable[..., bm_bool]: if _g_BMapModule is None: return None - cache: ctypes._CFuncPtr = getattr(_g_BMapModule, fct_name) + cache: typing.Callable[..., bm_bool] = getattr(_g_BMapModule, fct_name) cache.argtypes = fct_params cache.restype = bm_bool cache.errcheck = _bmap_error_check diff --git a/BMapBindings/PyBMap/PyBMap/virtools_types.py b/BMapBindings/PyBMap/PyBMap/virtools_types.py index 0b91581..c1e952d 100644 --- a/BMapBindings/PyBMap/PyBMap/virtools_types.py +++ b/BMapBindings/PyBMap/PyBMap/virtools_types.py @@ -188,7 +188,7 @@ class VX_PIXELFORMAT(enum.IntEnum): """! Pixel format types. """ - UNKNOWN_PF = 0 ##< Unknown pixel format + #UNKNOWN_PF = 0 ##< Unknown pixel format _32_ARGB8888 = 1 ##< 32-bit ARGB pixel format with alpha _32_RGB888 = 2 ##< 32-bit RGB pixel format without alpha _24_RGB888 = 3 ##< 24-bit RGB pixel format diff --git a/CodeGen/BMapBindings/snippets/header.py b/CodeGen/BMapBindings/snippets/header.py index 32cf17b..b97f62f 100644 --- a/CodeGen/BMapBindings/snippets/header.py +++ b/CodeGen/BMapBindings/snippets/header.py @@ -1,4 +1,4 @@ -import ctypes, os, sys +import ctypes, os, sys, typing #region Type Defines @@ -89,15 +89,15 @@ except: def is_bmap_available() -> bool: return _g_BMapModule is not None -def _bmap_error_check(result: bm_bool, func, args): +def _bmap_error_check(result: bool, func, args): if not result: raise BMapException("BMap operation failed.") return result -def _create_bmap_func(fct_name: str, fct_params: list[ctypes._SimpleCData]) -> ctypes._CFuncPtr: +def _create_bmap_func(fct_name: str, fct_params: list[typing.Any]) -> typing.Callable[..., bm_bool]: if _g_BMapModule is None: return None - cache: ctypes._CFuncPtr = getattr(_g_BMapModule, fct_name) + cache: typing.Callable[..., bm_bool] = getattr(_g_BMapModule, fct_name) cache.argtypes = fct_params cache.restype = bm_bool cache.errcheck = _bmap_error_check