Replace bitops module with custom isbitset function

libvips · Mar 28, 2024 · 24e7485 · 24e7485
1 parent 1364a52
commit 24e7485
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 51 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -33,9 +33,6 @@ jobs:
       run: |
         make dev
         if [[ ${{ matrix.luaVersion }} == 5.* ]]; then make ffi; fi
-        if [[ ${{ matrix.luaVersion }} == 5.1 ]] || [[ ${{ matrix.luaVersion }} == 5.2 ]]; then
-          make bit 
-        fi
 
     - name: Lint with luacheck
       run: |
@@ -79,11 +76,6 @@ jobs:
                    mingw-w64-x86_64-lua-luarocks
                    mingw-w64-x86_64-${{ matrix.lua.name }}
 
-      - if: matrix.lua.name == 'lua51'
-        name: Install bitop
-        run: |
-          pacman --noconfirm -S mingw-w64-x86_64-lua51-bitop
-
       - name: Lua dependencies
         run: |
           if [[ ${{ matrix.lua.exe }} == lua5.3 ]]; then

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 DEV_ROCKS = "busted 2.2.0" "luacheck 1.1.2"
 
-.PHONY: dev ffi bit
+.PHONY: dev ffi
 
 dev:
 	@for rock in $(DEV_ROCKS) ; do \
@@ -14,6 +14,3 @@ dev:
 
 ffi:
 	@luarocks install luaffi-tkl
-
-bit:
-	@luarocks install luabitop
diff --git a/lua-vips-1.1-10.rockspec b/lua-vips-1.1-10.rockspec
@@ -24,7 +24,6 @@ build = {
    type = "builtin",
    modules = {
        vips = "src/vips.lua",
-       ["vips.bitops"] = "src/vips/bitops.lua",
        ["vips.cdefs"] = "src/vips/cdefs.lua",
        ["vips.verror"] = "src/vips/verror.lua",
        ["vips.version"] = "src/vips/version.lua",

diff --git a/src/vips/bitops.lua b/src/vips/bitops.lua
diff --git a/src/vips/voperation.lua b/src/vips/voperation.lua
@@ -3,15 +3,13 @@
 
 local ffi = require "ffi"
 
-local bitops = require "vips.bitops"
 local verror = require "vips.verror"
 local version = require "vips.version"
 local log = require "vips.log"
 local gvalue = require "vips.gvalue"
 local vobject = require "vips.vobject"
 local Image = require "vips.Image"
 
-local band = bitops.band
 local type = type
 local error = error
 local pairs = pairs
@@ -30,6 +28,10 @@ local OUTPUT = 32
 local DEPRECATED = 64
 local MODIFY = 128
 
+local function isbitset(a, b)
+    return ( (a - (a % b)) / b ) % 2 == 1
+end
+
 -- find the first image, and recurse
 local function find_first_image(array, length)
     length = length or #array
@@ -90,7 +92,7 @@ voperation.set = function(self, name, flags, match_image, value)
     end
 
     -- MODIFY args need to be copied before they are set
-    if band(flags, MODIFY) ~= 0 then
+    if isbitset(flags, MODIFY) then
         log.msg("copying MODIFY arg", name)
         -- make sure we have a unique copy
         value = value:copy():copy_memory()
@@ -167,9 +169,9 @@ voperation.call = function(name, string_options, ...)
         local flag = flags[i]
         flags_from_name[names[i]] = flag
 
-        if band(flag, INPUT) ~= 0 and
-                band(flag, REQUIRED) ~= 0 and
-                band(flag, DEPRECATED) == 0 then
+        if isbitset(flag, INPUT) and
+                isbitset(flag, REQUIRED) and
+                not isbitset(flag, DEPRECATED) then
             n_required = n_required + 1
         end
     end
@@ -207,9 +209,9 @@ voperation.call = function(name, string_options, ...)
     for i = 1, arguments_length do
         local flag = flags[i]
 
-        if band(flag, INPUT) ~= 0 and
-                band(flag, REQUIRED) ~= 0 and
-                band(flag, DEPRECATED) == 0 then
+        if isbitset(flag, INPUT) and
+                isbitset(flag, REQUIRED) and
+                not isbitset(flag, DEPRECATED) then
             n = n + 1
 
             if not vop:set(names[i], flag,
@@ -247,17 +249,17 @@ voperation.call = function(name, string_options, ...)
     for i = 1, arguments_length do
         local flag = flags[i]
 
-        if band(flag, OUTPUT) ~= 0 and
-                band(flag, REQUIRED) ~= 0 and
-                band(flag, DEPRECATED) == 0 then
+        if isbitset(flag, OUTPUT) and
+                isbitset(flag, REQUIRED) and
+                not isbitset(flag, DEPRECATED) then
             result[n] = vob:get(names[i])
             n = n + 1
         end
 
         -- MODIFY input args are returned .. this will get the copy we
         -- made above
-        if band(flag, INPUT) ~= 0 and
-                band(flag, MODIFY) ~= 0 then
+        if isbitset(flag, INPUT) and
+                isbitset(flag, MODIFY) then
             result[n] = vob:get(names[i])
             n = n + 1
         end
@@ -267,9 +269,9 @@ voperation.call = function(name, string_options, ...)
     for i = 1, arguments_length do
         local flag = flags[i]
 
-        if band(flag, OUTPUT) ~= 0 and
-                band(flag, REQUIRED) == 0 and
-                band(flag, DEPRECATED) == 0 then
+        if isbitset(flag, OUTPUT) and
+                not isbitset(flag, REQUIRED) and
+                not isbitset(flag, DEPRECATED) then
             result[n] = vob:get(names[i])
             n = n + 1
         end