From 54e91b1f76b121f8dd2ad4c19d2786f2175be6ee Mon Sep 17 00:00:00 2001 From: Igor Timofeev Date: Sat, 9 Sep 2017 22:12:21 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A1=D1=83=D0=BA=D0=B0,=20=D1=81=D1=80=D0=BE?= =?UTF-8?q?=D1=87=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/ImageFormatModules/OCIF.lua | 16 ++++------------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/Applications.cfg b/Applications.cfg index 4a125aea..62fe6bed 100644 --- a/Applications.cfg +++ b/Applications.cfg @@ -263,7 +263,7 @@ url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/lib/ImageFormatModules/OCIF.lua", type="Library", preloadFile=true, - version=1.02, + version=1.03, }, { path="/lib/image.lua", diff --git a/lib/ImageFormatModules/OCIF.lua b/lib/ImageFormatModules/OCIF.lua index 07144ce3..af32bcb4 100755 --- a/lib/ImageFormatModules/OCIF.lua +++ b/lib/ImageFormatModules/OCIF.lua @@ -40,13 +40,9 @@ end encodingMethods.save[5] = function(file, picture) for i = 3, #picture, 4 do - -- writeByteArrayToFile(file, {color.HEXToRGB(picture[i])}) - -- writeByteArrayToFile(file, {color.HEXToRGB(picture[i + 1])}) - file:write(string.char(color.to8Bit(picture[i]))) file:write(string.char(color.to8Bit(picture[i + 1]))) - - file:write(string.char(picture[i + 2])) + file:write(string.char(math.floor(picture[i + 2] * 255))) writeByteArrayToFile(file, {string.byte(picture[i + 3], 1, 6)}) end end @@ -56,13 +52,9 @@ encodingMethods.load[5] = function(file, picture) table.insert(picture, readNumberFromFile(file, 2)) for i = 1, image.getWidth(picture) * image.getHeight(picture) do - -- table.insert(picture, color.RGBToHEX(string.byte(file:read(1)), string.byte(file:read(1)), string.byte(file:read(1)))) - -- table.insert(picture, color.RGBToHEX(string.byte(file:read(1)), string.byte(file:read(1)), string.byte(file:read(1)))) - table.insert(picture, color.to24Bit(string.byte(file:read(1)))) table.insert(picture, color.to24Bit(string.byte(file:read(1)))) - - table.insert(picture, string.byte(file:read(1))) + table.insert(picture, string.byte(file:read(1)) / 255) table.insert(picture, string.readUnicodeChar(file)) end end @@ -77,7 +69,7 @@ encodingMethods.save[6] = function(file, picture) for alpha in pairs(groupedPicture) do -- Writing 1 byte for current alpha value - file:write(string.char(alpha)) + file:write(string.char(math.floor(alpha * 255))) -- Writing 2 bytes for symbols array size writeByteArrayToFile(file, bit32.numberToFixedSizeByteArray(table.size(groupedPicture[alpha]), 2)) @@ -125,7 +117,7 @@ encodingMethods.load[6] = function(file, picture) alphaSize = string.byte(file:read(1)) for alpha = 1, alphaSize do - currentAlpha = string.byte(file:read(1)) + currentAlpha = string.byte(file:read(1)) / 255 symbolSize = readNumberFromFile(file, 2) for symbol = 1, symbolSize do