From 99ff32802db1f76cdb58b4e23d425fa17d942c56 Mon Sep 17 00:00:00 2001 From: Igor Timofeev Date: Sun, 6 Aug 2017 16:26:23 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D1=87=D0=B5=D0=BD=D1=8C=20=D0=B2=D0=B0?= =?UTF-8?q?=D0=B6=D0=BD=D1=8B=D0=B9=20=D1=84=D0=B8=D0=BA=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Applications.cfg | 2 +- lib/color.lua | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Applications.cfg b/Applications.cfg index 30f9d00f..11b28c43 100644 --- a/Applications.cfg +++ b/Applications.cfg @@ -274,7 +274,7 @@ url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/lib/color.lua", type="Library", preloadFile=true, - version=1.07, + version=1.08, }, { path="/lib/ImageFormatModules/OCIF.lua", diff --git a/lib/color.lua b/lib/color.lua index 8e38f9d1..7dfd2cc4 100755 --- a/lib/color.lua +++ b/lib/color.lua @@ -7,13 +7,17 @@ local color = {} -- Yoba-fix for PIDORS if computer.getArchitecture and computer.getArchitecture() == "Lua 5.3" then - color.RGBToHEX = function(r, g, b) - return (r // 1 << 16) | (g // 1 << 8) | b // 1 - end + color.RGBToHEX = load([[ + return function(r, g, b) + return (r // 1 << 16) | (g // 1 << 8) | b // 1 + end + ]])() else - color.RGBToHEX = function(r, g, b) - return bit32.lshift(r, 16) + bit32.lshift(g, 8) + b - end + color.RGBToHEX = load([[ + return function(r, g, b) + return bit32.bor(bit32.bor(bit32.lshift(r, 16), bit32.lshift(g, 8)), b) + end + ]])() end function color.HEXToRGB(HEXColor)