github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 14:16:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Draw: Dither, CtrlCore: Win32 now supports dithering on purely monochromatic printers

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@7314 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-04-25 13:25:33 +00:00
parent 14af1cc1f1
commit 96bc6fe038
4 changed files with 39 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/CtrlCore/ImageWin32.cpp
View file

@ -340,7 +340,7 @@ void SystemDraw::SysDrawImageOp(int x, int y, const Image& img, const Rect& src,
static LRUCache<ImageSysData, int64> cache;
LLOG("SysImage cache pixels " << cache.GetSize() << ", count " << cache.GetCount());
Size sz = Ctrl::GetPrimaryScreenArea().GetSize();
m.img = img;
m.img = IsPrinter() && GetDeviceCaps(GetHandle(), NUMCOLORS) == 2 ? Dither(img, 360) : img; // If printer does not support color, dither
cache.Get(m).Paint(*this, x, y, src, color);
cache.Shrink(4 * sz.cx * sz.cy, IsWinNT() ? 1000 : 100);
}

26
uppsrc/Draw/ImageOp.cpp
View file

@ -790,4 +790,30 @@ Image Rotate(const Image& m, int angle)
return ib;
}
Image Dither(const Image& m, int dival)
{
DTIMING("Dither");
static byte dither[8][8]= {
1, 49, 13, 61, 4, 52, 16, 64,
33, 17, 45, 29, 36, 20, 48, 32,
9, 57, 5, 53, 12, 60, 8, 56,
41, 25, 37, 21, 44, 28, 40, 24,
3, 51, 15, 63, 2, 50, 14, 62,
35, 19, 47, 31, 34, 18, 46, 30,
11, 59, 7, 55, 10, 58, 6, 54,
43, 27, 39, 23, 42, 26, 38, 22
};
Size isz = m.GetSize();
ImageBuffer ib(m.GetSize());
const RGBA *s = ~m;
RGBA *t = ~ib;
for(int y = 0; y < isz.cy; y++)
for(int x = 0; x < isz.cx; x++) {
int g = Grayscale(*s++) * 100 / dival;
*t++ = g > dither[y & 7][x & 7] ? White() : Black();
}
return ib;
}
END_UPP_NAMESPACE

1
uppsrc/Draw/ImageOp.h
View file

@ -89,6 +89,7 @@ void Filter(RasterEncoder& target, Raster& src, ImageFilter9& filter);
Image Etched(const Image& img);
Image Sharpen(const Image& img, int amount = 100);
Image Dither(const Image& m, int dival = 394);
Image RotateClockwise(const Image& img);
Image RotateAntiClockwise(const Image& img);

13
uppsrc/Draw/src.tpp/Image$en-us.tpp
View file

@ -390,12 +390,21 @@ based on [%-*@3 img].&]
[s4; &]
[s5;:Sharpen`(const Image`&`,int`): [_^Image^ Image]_[* Sharpen]([@(0.0.255) const]_[_^Image^ I
mage][@(0.0.255) `&]_[*@3 img], [@(0.0.255) int]_[*@3 amount]_`=_[@3 100])&]
[s2;%% [%-*@3 img] [%-*@3 amount].&]
[s2;%% Sharpens image using primitive convolution filter.&]
[s3;%% &]
[s4; &]
[s5;:Dither`(const Image`&`,int`): [_^Image^ Image]_[* Dither]([@(0.0.255) const]_[_^Image^ I
mage][@(0.0.255) `&]_[*@3 m], [@(0.0.255) int]_[*@3 dival]_`=_[@3 394])&]
[s2;%% Provides primitive dithering with 8x8 matrix into black/white
picture. Dival is sort of gamma control of output, lowering it
from default value (to e.g. 350) can produce better results when
dithering is using for printing on purely monochromatic (without
half`-toning support) printers.&]
[s3;%% &]
[s4; &]
[s5;:Etched`(const Image`&`): [_^Image^ Image]_[* Etched]([@(0.0.255) const]_[_^Image^ Image][@(0.0.255) `&
]_[*@3 img])&]
[s2;%% [%-*@3 img].&]
[s2;%% `"Etching`" effect.&]
[s3;%% &]
[s4; &]
[s5;:SetColorKeepAlpha`(const Image`&`,Color`): [_^Image^ Image]_[* SetColorKeepAlpha]([@(0.0.255) c