Skip to content

Commit 6f46c8f

Browse files
authored
Merge pull request #11 from korarei/doc/v0.2.2
Doc: Update README and version information
2 parents 45cc2fc + caadc81 commit 6f46c8f

File tree

2 files changed

+71
-2
lines changed

2 files changed

+71
-2
lines changed

README.md

Lines changed: 70 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@
178178
extrapolation = 2,
179179
resize = true, -- booleanも可
180180
geo_cache = 0,
181-
geo_ctrl = 0,
181+
cache_ctrl = 0,
182182
object_id = 0,
183183
mix = 0.0,
184184
print_info = false, -- booleanも可
@@ -194,7 +194,76 @@
194194
## License
195195
LICENSEファイルに記載.
196196

197+
## Credits
198+
199+
### LuaJIT 2.1
200+
201+
https://luajit.org/
202+
203+
---
204+
205+
LuaJIT -- a Just-In-Time Compiler for Lua. https://luajit.org/
206+
207+
Copyright (C) 2005-2025 Mike Pall. All rights reserved.
208+
209+
Permission is hereby granted, free of charge, to any person obtaining a copy
210+
of this software and associated documentation files (the "Software"), to deal
211+
in the Software without restriction, including without limitation the rights
212+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
213+
copies of the Software, and to permit persons to whom the Software is
214+
furnished to do so, subject to the following conditions:
215+
216+
The above copyright notice and this permission notice shall be included in
217+
all copies or substantial portions of the Software.
218+
219+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
220+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
221+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
222+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
223+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
224+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
225+
THE SOFTWARE.
226+
227+
[ MIT license: https://www.opensource.org/licenses/mit-license.php ]
228+
229+
---
230+
231+
[ LuaJIT includes code from Lua 5.1/5.2, which has this license statement: ]
232+
233+
Copyright (C) 1994-2012 Lua.org, PUC-Rio.
234+
235+
Permission is hereby granted, free of charge, to any person obtaining a copy
236+
of this software and associated documentation files (the "Software"), to deal
237+
in the Software without restriction, including without limitation the rights
238+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
239+
copies of the Software, and to permit persons to whom the Software is
240+
furnished to do so, subject to the following conditions:
241+
242+
The above copyright notice and this permission notice shall be included in
243+
all copies or substantial portions of the Software.
244+
245+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
246+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
247+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
248+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
249+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
250+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
251+
THE SOFTWARE.
252+
253+
---
254+
255+
[ LuaJIT includes code from dlmalloc, which has this license statement: ]
256+
257+
This is a version (aka dlmalloc) of malloc/free/realloc written by
258+
Doug Lea and released to the public domain, as explained at
259+
https://creativecommons.org/licenses/publicdomain
260+
197261
## Change Log
262+
- **v0.2.2**
263+
- luaの`require`から呼び出せるように変更.
264+
- リサイズ計算の精度向上.
265+
- `PI`項目名の間違いを修正.
266+
198267
- **v0.2.1**
199268
- 平均計算ミスの修正.
200269
- リサイズ計算で中心座標に対してブラー量を考慮していなかった問題の修正.

dll_src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.20.0)
2-
project(ObjectMotionBlur_LK VERSION 0.2.1 LANGUAGES CXX)
2+
project(ObjectMotionBlur_LK VERSION 0.2.2 LANGUAGES CXX)
33

44
# Path Settings.
55
set(LUA_DIR "${CMAKE_SOURCE_DIR}/../.lua")

0 commit comments

Comments
 (0)