LegacyConsole/jpexs-decompiler
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-11 14:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

color transform fix

Browse Source
This commit is contained in:
honfika@gmail.com
2014-12-14 11:10:32 +01:00
parent 27e2769ff3
commit 7b03313615
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/types/ColorTransform.java
View File

@@ -124,22 +124,22 @@ public class ColorTransform implements Cloneable {
@Override
public int getRedMulti() {
return (int) ((float) t.getRedMulti() / 255f * c.getRedMulti());
return (int) ((float) t.getRedMulti() / 256f * c.getRedMulti());
}
@Override
public int getGreenMulti() {
return (int) ((float) t.getGreenMulti() / 255f * c.getGreenMulti());
return (int) ((float) t.getGreenMulti() / 256f * c.getGreenMulti());
}
@Override
public int getBlueMulti() {
return (int) ((float) t.getBlueMulti() / 255f * c.getBlueMulti());
return (int) ((float) t.getBlueMulti() / 256f * c.getBlueMulti());
}
@Override
public int getAlphaMulti() {
return (int) ((float) t.getAlphaMulti() / 255f * c.getAlphaMulti());
return (int) ((float) t.getAlphaMulti() / 256f * c.getAlphaMulti());
}
};
}

16
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/types/filters/Filtering.java
View File

@@ -570,10 +570,10 @@ public class Filtering {
int r = (rgb >> 16) & 0xff;
int g = (rgb >> 8) & 0xff;
int b = (rgb) & 0xff;
r = cut(((r * redMultTerm) / 255) + redAddTerm);
g = cut(((g * greenMultTerm) / 255) + greenAddTerm);
b = cut(((b * blueMultTerm) / 255) + blueAddTerm);
a = cut(((a * alphaMultTerm) / 255) + alphaAddTerm);
r = cut(((r * redMultTerm) / 256) + redAddTerm);
g = cut(((g * greenMultTerm) / 256) + greenAddTerm);
b = cut(((b * blueMultTerm) / 256) + blueAddTerm);
a = cut(((a * alphaMultTerm) / 256) + alphaAddTerm);
return RGBA.toInt(r, g, b, a);
}
@@ -587,10 +587,10 @@ public class Filtering {
int r = (rgb[i] >> 16) & 0xff;
int g = (rgb[i] >> 8) & 0xff;
int b = (rgb[i]) & 0xff;
r = Math.max(0, Math.min(((r * redMultTerm) / 256) + redAddTerm, 255));
g = Math.max(0, Math.min(((g * greenMultTerm) / 256) + greenAddTerm, 255));
b = Math.max(0, Math.min(((b * blueMultTerm) / 256) + blueAddTerm, 255));
a = Math.max(0, Math.min(((a * alphaMultTerm) / 256) + alphaAddTerm, 255));
r = cut(((r * redMultTerm) / 256) + redAddTerm);
g = cut(((g * greenMultTerm) / 256) + greenAddTerm);
b = cut(((b * blueMultTerm) / 256) + blueAddTerm);
a = cut(((a * alphaMultTerm) / 256) + alphaAddTerm);
rgb[i] = (a << 24) | (r << 16) | (g << 8) | (b);
}
setRGB(dst, src.getWidth(), src.getHeight(), rgb);