wine-commits August 2010

wine-commits@winehq.org

2 participants
884 discussions

Vincent Povirk : windowscodecs: Handle WhiteIsZero TIFF images.
by Alexandre Julliard 25 Aug '10

25 Aug '10

Module: wine Branch: master Commit: 4cedec597530ad8557fbf2c1d2cbff3ab1237274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cedec597530ad8557fbf2c1d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat May 29 11:27:31 2010 -0500 windowscodecs: Handle WhiteIsZero TIFF images. --- dlls/windowscodecs/tiffformat.c | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 58515c5..fe1fb00 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -205,6 +205,7 @@ typedef struct { int planar; int indexed; int reverse_bgr; + int invert_grayscale; UINT width, height; UINT tile_width, tile_height; UINT tile_stride; @@ -230,6 +231,7 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) decode_info->indexed = 0; decode_info->reverse_bgr = 0; + decode_info->invert_grayscale = 0; ret = pTIFFGetField(tiff, TIFFTAG_PHOTOMETRIC, &photometric); if (!ret) @@ -262,6 +264,8 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) switch(photometric) { + case 0: /* WhiteIsZero */ + decode_info->invert_grayscale = 1; case 1: /* BlackIsZero */ if (samples != 1) { @@ -331,7 +335,6 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) return E_FAIL; } break; - case 0: /* WhiteIsZero */ case 4: /* Transparency mask */ case 5: /* CMYK */ case 6: /* YCbCr */ @@ -759,6 +762,22 @@ static HRESULT TiffFrameDecode_ReadTile(TiffFrameDecode *This, UINT tile_x, UINT } } + if (hr == S_OK && This->decode_info.invert_grayscale) + { + BYTE *byte, *end; + + if (This->decode_info.samples != 1) + { + ERR("cannot invert grayscale image with %u samples\n", This->decode_info.samples); + return E_FAIL; + } + + end = This->cached_tile+This->decode_info.tile_size; + + for (byte = This->cached_tile; byte != end; byte++) + *byte = ~(*byte); + } + if (hr == S_OK) { This->cached_tile_x = tile_x;

1 0

Vincent Povirk : windowscodecs: Always check TIFF sample count and planar configuration.
by Alexandre Julliard 25 Aug '10

25 Aug '10

Module: wine Branch: master Commit: 73d539e65703236dac2d57ca1addd038d08aec3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=73d539e65703236dac2d57ca1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat May 29 10:58:05 2010 -0500 windowscodecs: Always check TIFF sample count and planar configuration. This more closely matches the TIFF spec. These values are valid for all photometric interpretations. --- dlls/windowscodecs/tiffformat.c | 48 +++++++++++++++++++++++++++----------- 1 files changed, 34 insertions(+), 14 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index c92a2f2..58515c5 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -202,6 +202,7 @@ typedef struct { int bps; int samples; int bpp; + int planar; int indexed; int reverse_bgr; UINT width, height; @@ -224,7 +225,7 @@ static const IWICBitmapFrameDecodeVtbl TiffFrameDecode_Vtbl; static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) { - uint16 photometric, bps, samples=1, planar; + uint16 photometric, bps, samples, planar; int ret; decode_info->indexed = 0; @@ -239,12 +240,35 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) ret = pTIFFGetField(tiff, TIFFTAG_BITSPERSAMPLE, &bps); if (!ret) bps = 1; - decode_info->bps = bps; + ret = pTIFFGetField(tiff, TIFFTAG_SAMPLESPERPIXEL, &samples); + if (!ret) samples = 1; + decode_info->samples = samples; + + if (samples == 1) + planar = 1; + else + { + ret = pTIFFGetField(tiff, TIFFTAG_PLANARCONFIG, &planar); + if (!ret) planar = 1; + if (planar != 1) + { + FIXME("unhandled planar configuration %u\n", planar); + return E_FAIL; + } + } + decode_info->planar = planar; + switch(photometric) { case 1: /* BlackIsZero */ + if (samples != 1) + { + FIXME("unhandled grayscale sample count %u\n", samples); + return E_FAIL; + } + decode_info->bpp = bps; switch (bps) { @@ -263,22 +287,14 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) } break; case 2: /* RGB */ - ret = pTIFFGetField(tiff, TIFFTAG_PLANARCONFIG, &planar); - if (!ret) planar = 1; - if (planar != 1) - { - FIXME("unhandled planar configuration %u\n", planar); - return E_FAIL; - } - ret = pTIFFGetField(tiff, TIFFTAG_SAMPLESPERPIXEL, &samples); + decode_info->bpp = bps * samples; + if (samples != 3) { FIXME("unhandled RGB sample count %u\n", samples); return E_FAIL; } - decode_info->bpp = bps * samples; - switch(bps) { case 8: @@ -294,6 +310,12 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) } break; case 3: /* RGB Palette */ + if (samples != 1) + { + FIXME("unhandled indexed sample count %u\n", samples); + return E_FAIL; + } + decode_info->indexed = 1; decode_info->bpp = bps; switch (bps) @@ -319,8 +341,6 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) return E_FAIL; } - decode_info->samples = samples; - ret = pTIFFGetField(tiff, TIFFTAG_IMAGEWIDTH, &decode_info->width); if (!ret) {

1 0

Vincent Povirk : windowscodecs: Byte-swap image data from big endian TIFF files.
by Alexandre Julliard 25 Aug '10

25 Aug '10

Module: wine Branch: master Commit: e486a17a407bd458f6070025b370fb2f8ac5c774 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e486a17a407bd458f6070025b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat May 29 10:43:30 2010 -0500 windowscodecs: Byte-swap image data from big endian TIFF files. --- dlls/windowscodecs/tiffformat.c | 41 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 40 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 9318ac2..c92a2f2 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -59,6 +59,7 @@ MAKE_FUNCPTR(TIFFClientOpen); MAKE_FUNCPTR(TIFFClose); MAKE_FUNCPTR(TIFFCurrentDirectory); MAKE_FUNCPTR(TIFFGetField); +MAKE_FUNCPTR(TIFFIsByteSwapped); MAKE_FUNCPTR(TIFFReadDirectory); MAKE_FUNCPTR(TIFFReadEncodedStrip); MAKE_FUNCPTR(TIFFSetDirectory); @@ -85,6 +86,7 @@ static void *load_libtiff(void) LOAD_FUNCPTR(TIFFClose); LOAD_FUNCPTR(TIFFCurrentDirectory); LOAD_FUNCPTR(TIFFGetField); + LOAD_FUNCPTR(TIFFIsByteSwapped); LOAD_FUNCPTR(TIFFReadDirectory); LOAD_FUNCPTR(TIFFReadEncodedStrip); LOAD_FUNCPTR(TIFFSetDirectory); @@ -197,6 +199,8 @@ typedef struct { typedef struct { const WICPixelFormatGUID *format; + int bps; + int samples; int bpp; int indexed; int reverse_bgr; @@ -220,7 +224,7 @@ static const IWICBitmapFrameDecodeVtbl TiffFrameDecode_Vtbl; static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) { - uint16 photometric, bps, samples, planar; + uint16 photometric, bps, samples=1, planar; int ret; decode_info->indexed = 0; @@ -236,6 +240,8 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) ret = pTIFFGetField(tiff, TIFFTAG_BITSPERSAMPLE, &bps); if (!ret) bps = 1; + decode_info->bps = bps; + switch(photometric) { case 1: /* BlackIsZero */ @@ -313,6 +319,8 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) return E_FAIL; } + decode_info->samples = samples; + ret = pTIFFGetField(tiff, TIFFTAG_IMAGEWIDTH, &decode_info->width); if (!ret) { @@ -667,6 +675,9 @@ static HRESULT TiffFrameDecode_ReadTile(TiffFrameDecode *This, UINT tile_x, UINT { HRESULT hr=S_OK; tsize_t ret; + int swap_bytes; + + swap_bytes = pTIFFIsByteSwapped(This->parent->tiff); ret = pTIFFSetDirectory(This->parent->tiff, This->index); @@ -700,6 +711,34 @@ static HRESULT TiffFrameDecode_ReadTile(TiffFrameDecode *This, UINT tile_x, UINT } } + if (hr == S_OK && swap_bytes && This->decode_info.bps > 8) + { + UINT row, i, samples_per_row; + BYTE *sample, temp; + + samples_per_row = This->decode_info.tile_width * This->decode_info.samples; + + switch(This->decode_info.bps) + { + case 16: + for (row=0; row<This->decode_info.tile_height; row++) + { + sample = This->cached_tile + row * This->decode_info.tile_stride; + for (i=0; i<samples_per_row; i++) + { + temp = sample[1]; + sample[1] = sample[0]; + sample[0] = temp; + sample += 2; + } + } + break; + default: + ERR("unhandled bps for byte swap %u\n", This->decode_info.bps); + return E_FAIL; + } + } + if (hr == S_OK) { This->cached_tile_x = tile_x;

1 0

Vincent Povirk : windowscodecs: Add support for decoding 48-bit TIFF images .
by Alexandre Julliard 25 Aug '10

25 Aug '10

Module: wine Branch: master Commit: c30d165ec8b6dac21ae776c9c377465e73b3c372 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c30d165ec8b6dac21ae776c9c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat May 29 10:43:02 2010 -0500 windowscodecs: Add support for decoding 48-bit TIFF images. --- dlls/windowscodecs/regsvr.c | 1 + dlls/windowscodecs/tiffformat.c | 26 +++++++++++++++++--------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index d6b910d..0288633 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -895,6 +895,7 @@ static GUID const * const tiff_formats[] = { &GUID_WICPixelFormat32bppBGR, &GUID_WICPixelFormat32bppBGRA, &GUID_WICPixelFormat32bppPBGRA, + &GUID_WICPixelFormat48bppRGB, NULL }; diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index d069fd1..9318ac2 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -257,9 +257,11 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) } break; case 2: /* RGB */ - if (bps != 8) + ret = pTIFFGetField(tiff, TIFFTAG_PLANARCONFIG, &planar); + if (!ret) planar = 1; + if (planar != 1) { - FIXME("unhandled RGB bit count %u\n", bps); + FIXME("unhandled planar configuration %u\n", planar); return E_FAIL; } ret = pTIFFGetField(tiff, TIFFTAG_SAMPLESPERPIXEL, &samples); @@ -268,16 +270,22 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) FIXME("unhandled RGB sample count %u\n", samples); return E_FAIL; } - ret = pTIFFGetField(tiff, TIFFTAG_PLANARCONFIG, &planar); - if (!ret) planar = 1; - if (planar != 1) + + decode_info->bpp = bps * samples; + + switch(bps) { - FIXME("unhandled planar configuration %u\n", planar); + case 8: + decode_info->reverse_bgr = 1; + decode_info->format = &GUID_WICPixelFormat24bppBGR; + break; + case 16: + decode_info->format = &GUID_WICPixelFormat48bppRGB; + break; + default: + FIXME("unhandled RGB bit count %u\n", bps); return E_FAIL; } - decode_info->bpp = bps * samples; - decode_info->reverse_bgr = 1; - decode_info->format = &GUID_WICPixelFormat24bppBGR; break; case 3: /* RGB Palette */ decode_info->indexed = 1;

1 0

Vincent Povirk : windowscodecs: Prefer builtin version.
by Alexandre Julliard 25 Aug '10

25 Aug '10

Module: wine Branch: master Commit: 467f232f37507a7ceeb3224f6a54a05f4ce41e32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=467f232f37507a7ceeb3224f6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 24 13:34:38 2010 -0500 windowscodecs: Prefer builtin version. --- dlls/windowscodecs/main.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index 7ec5d41..ff543d5 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -37,8 +37,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); break;

1 0

Aric Stewart : usp10: Add Lao script.
by Alexandre Julliard 25 Aug '10

25 Aug '10

Module: wine Branch: master Commit: 68ab5e2689b2417c00b5c6a21497fd72d4bbf145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68ab5e2689b2417c00b5c6a21… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Aug 24 11:55:41 2010 -0500 usp10: Add Lao script. --- dlls/usp10/shape.c | 2 ++ dlls/usp10/usp10.c | 9 ++++++++- dlls/usp10/usp10_internal.h | 2 ++ 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 9272c70..70722c2 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -341,6 +341,8 @@ static const ScriptShapeData ShapingData[] = {{ tibetan_features, 2}, "phag", ContextualShape_Phags_pa}, {{ thai_features, 1}, "thai", NULL}, {{ thai_features, 1}, "thai", NULL}, + {{ thai_features, 1}, "lao", NULL}, + {{ thai_features, 1}, "lao", NULL}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 0bffd27..29ec1e8 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -81,6 +81,8 @@ static const scriptRange scriptRanges[] = { { Script_Sinhala, 0xd80, 0xdff, 0, 0}, /* Thai: U+0E00–U+0E7F */ { Script_Thai, 0xe00, 0xe7f, Script_Thai_Numeric, 0}, + /* Lao: U+0E80–U+0EFF */ + { Script_Lao, 0xe80, 0xeff, Script_Lao_Numeric, 0}, /* Tibetan: U+0F00–U+0FFF */ { Script_Tibetan, 0xf00, 0xfff, Script_Tibetan_Numeric, 0}, /* Georgian: U+10A0–U+10FF */ @@ -170,6 +172,10 @@ static const scriptData scriptInformation[] = { {LANG_THAI, 0, 1, 1, 1, THAI_CHARSET, 0, 0, 1, 0, 1, 0, 0, 0, 1}}, {{Script_Thai_Numeric, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_THAI, 1, 1, 0, 0, THAI_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, + {{Script_Lao, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {LANG_LAO, 0, 1, 1, 1, DEFAULT_CHARSET, 0, 0, 1, 0, 1, 0, 0, 0, 0}}, + {{Script_Lao_Numeric, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {LANG_LAO, 1, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, }; static const SCRIPT_PROPERTIES *script_props[] = @@ -184,7 +190,8 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[14].props, &scriptInformation[15].props, &scriptInformation[16].props, &scriptInformation[17].props, &scriptInformation[18].props, &scriptInformation[19].props, - &scriptInformation[20].props, &scriptInformation[21].props + &scriptInformation[20].props, &scriptInformation[21].props, + &scriptInformation[22].props, &scriptInformation[23].props }; typedef struct { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 815d2e2..7e5b5ba 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -42,6 +42,8 @@ /* Unicode Chapter 11 */ #define Script_Thai 20 #define Script_Thai_Numeric 21 +#define Script_Lao 22 +#define Script_Lao_Numeric 23 #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)

1 0

Aric Stewart : usp10: Add Thai Script.
by Alexandre Julliard 25 Aug '10

25 Aug '10

Module: wine Branch: master Commit: 331c8cdef6fd66316a90914bea45d6b74448fbe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=331c8cdef6fd66316a90914be… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Aug 24 11:55:33 2010 -0500 usp10: Add Thai Script. --- dlls/usp10/shape.c | 7 +++++++ dlls/usp10/usp10.c | 9 ++++++++- dlls/usp10/usp10_internal.h | 3 +++ 3 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 3f3513d..9272c70 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -305,6 +305,11 @@ static OPENTYPE_FEATURE_RECORD tibetan_features[] = { 0x73776c62 /*blws*/, 1}, }; +static OPENTYPE_FEATURE_RECORD thai_features[] = +{ + { 0x706d6363 /*ccmp*/, 1}, +}; + typedef struct ScriptShapeDataTag { TEXTRANGE_PROPERTIES defaultTextRange; CHAR otTag[5]; @@ -334,6 +339,8 @@ static const ScriptShapeData ShapingData[] = {{ tibetan_features, 2}, "tibt", NULL}, {{ tibetan_features, 2}, "tibt", NULL}, {{ tibetan_features, 2}, "phag", ContextualShape_Phags_pa}, + {{ thai_features, 1}, "thai", NULL}, + {{ thai_features, 1}, "thai", NULL}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index c18c532..0bffd27 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -79,6 +79,8 @@ static const scriptRange scriptRanges[] = { { Script_Thaana, 0x780, 0x7bf, 0, 0}, /* Sinhala: U+0D80–U+0DFF */ { Script_Sinhala, 0xd80, 0xdff, 0, 0}, + /* Thai: U+0E00–U+0E7F */ + { Script_Thai, 0xe00, 0xe7f, Script_Thai_Numeric, 0}, /* Tibetan: U+0F00–U+0FFF */ { Script_Tibetan, 0xf00, 0xfff, Script_Tibetan_Numeric, 0}, /* Georgian: U+10A0–U+10FF */ @@ -164,6 +166,10 @@ static const scriptData scriptInformation[] = { {LANG_TIBETAN, 1, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, {{Script_Phags_pa, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_MONGOLIAN, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, + {{Script_Thai, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {LANG_THAI, 0, 1, 1, 1, THAI_CHARSET, 0, 0, 1, 0, 1, 0, 0, 0, 1}}, + {{Script_Thai_Numeric, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {LANG_THAI, 1, 1, 0, 0, THAI_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, }; static const SCRIPT_PROPERTIES *script_props[] = @@ -177,7 +183,8 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[12].props, &scriptInformation[13].props, &scriptInformation[14].props, &scriptInformation[15].props, &scriptInformation[16].props, &scriptInformation[17].props, - &scriptInformation[18].props, &scriptInformation[19].props + &scriptInformation[18].props, &scriptInformation[19].props, + &scriptInformation[20].props, &scriptInformation[21].props }; typedef struct { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index bfde66d..815d2e2 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -39,6 +39,9 @@ #define Script_Tibetan 17 #define Script_Tibetan_Numeric 18 #define Script_Phags_pa 19 +/* Unicode Chapter 11 */ +#define Script_Thai 20 +#define Script_Thai_Numeric 21 #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)

1 0

Aric Stewart : usp10: Add Phags-pa Script.
by Alexandre Julliard 25 Aug '10

25 Aug '10

Module: wine Branch: master Commit: 57053fa51efbfb0ff2e101ce1d22fffd3d9c1812 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57053fa51efbfb0ff2e101ce1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Aug 24 11:55:27 2010 -0500 usp10: Add Phags-pa Script. --- dlls/usp10/shape.c | 87 +++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/usp10.c | 6 ++- dlls/usp10/usp10_internal.h | 1 + 3 files changed, 93 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index cea9415..3f3513d 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -42,6 +42,7 @@ typedef VOID (*ContextualShapingProc)(HDC, ScriptCache*, SCRIPT_ANALYSIS*, static void ContextualShape_Arabic(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); static void ContextualShape_Syriac(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); +static void ContextualShape_Phags_pa(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); extern const unsigned short wine_shaping_table[]; extern const unsigned short wine_shaping_forms[LAST_ARABIC_CHAR - FIRST_ARABIC_CHAR + 1][4]; @@ -332,6 +333,7 @@ static const ScriptShapeData ShapingData[] = {{ sinhala_features, 7}, "sinh", NULL}, {{ tibetan_features, 2}, "tibt", NULL}, {{ tibetan_features, 2}, "tibt", NULL}, + {{ tibetan_features, 2}, "phag", ContextualShape_Phags_pa}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) @@ -1173,6 +1175,91 @@ right_join_causing(neighbour_joining_type(i,dirR,context_type,cChars,psa))) HeapFree(GetProcessHeap(),0,context_type); } +/* + * ContextualShape_Phags_pa + */ + +#define phags_pa_CANDRABINDU 0xA873 +#define phags_pa_START 0xA840 +#define phags_pa_END 0xA87F + +static void ContextualShape_Phags_pa(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust) +{ + INT *context_shape; + INT dirR, dirL; + int i; + + if (*pcGlyphs != cChars) + { + ERR("Number of Glyphs and Chars need to match at the beginning\n"); + return; + } + + if (!psa->fLogicalOrder && psa->fRTL) + { + dirR = 1; + dirL = -1; + } + else + { + dirR = -1; + dirL = 1; + } + + if (!psc->GSUB_Table) + psc->GSUB_Table = load_gsub_table(hdc); + + if (!psc->GSUB_Table) + return; + + context_shape = HeapAlloc(GetProcessHeap(),0,sizeof(INT) * cChars); + + for (i = 0; i < cChars; i++) + { + if (pwcChars[i] >= phags_pa_START && pwcChars[i] <= phags_pa_END) + { + WCHAR rchar = neighbour_char(i,dirR,pwcChars,cChars); + WCHAR lchar = neighbour_char(i,dirL,pwcChars,cChars); + BOOL jrchar = (rchar != phags_pa_CANDRABINDU && rchar >= phags_pa_START && rchar <= phags_pa_END); + BOOL jlchar = (lchar != phags_pa_CANDRABINDU && lchar >= phags_pa_START && lchar <= phags_pa_END); + + if (jrchar && jlchar) + context_shape[i] = Xm; + else if (jrchar) + context_shape[i] = Xr; + else if (jlchar) + context_shape[i] = Xl; + else + context_shape[i] = Xn; + } + else + context_shape[i] = -1; + } + + /* Contextual Shaping */ + i = 0; + while(i < *pcGlyphs) + { + if (context_shape[i] >= 0) + { + INT nextIndex; + INT prevCount = *pcGlyphs; + nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, i, dirL, pcGlyphs, contextual_features[context_shape[i]]); + if (nextIndex > GSUB_E_NOGLYPH) + { + UpdateClusters(nextIndex, *pcGlyphs - prevCount, dirL, cChars, pwLogClust); + i = nextIndex; + } + else + i++; + } + else + i++; + } + + HeapFree(GetProcessHeap(),0,context_shape); +} + void SHAPE_ContextualShaping(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust) { if (ShapingData[psa->eScript].contextProc) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 23695cd..c18c532 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -100,6 +100,8 @@ static const scriptRange scriptRanges[] = { /* Modifier Tone Letters: U+A700–U+A71F */ /* Latin Extended-D: U+A720–U+A7FF */ { Script_Latin, 0xa700, 0xa7ff, 0, 0}, + /* Phags-pa: U+A840–U+A87F */ + { Script_Phags_pa, 0xa840, 0xa87f, 0, 0}, /* Latin Ligatures: U+FB00–U+FB06 */ { Script_Latin, 0xfb00, 0xfb06, 0, 0}, /* Armenian ligatures U+FB13..U+FB17 */ @@ -160,6 +162,8 @@ static const scriptData scriptInformation[] = { {LANG_TIBETAN, 0, 1, 1, 1, DEFAULT_CHARSET, 0, 0, 1, 0, 1, 0, 0, 0, 0}}, {{Script_Tibetan_Numeric, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_TIBETAN, 1, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, + {{Script_Phags_pa, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {LANG_MONGOLIAN, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, }; static const SCRIPT_PROPERTIES *script_props[] = @@ -173,7 +177,7 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[12].props, &scriptInformation[13].props, &scriptInformation[14].props, &scriptInformation[15].props, &scriptInformation[16].props, &scriptInformation[17].props, - &scriptInformation[18].props + &scriptInformation[18].props, &scriptInformation[19].props }; typedef struct { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index bc3fd57..bfde66d 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -38,6 +38,7 @@ #define Script_Sinhala 16 #define Script_Tibetan 17 #define Script_Tibetan_Numeric 18 +#define Script_Phags_pa 19 #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)

1 0

Aric Stewart : usp10: Add Tibetan Script.
by Alexandre Julliard 25 Aug '10

25 Aug '10

Module: wine Branch: master Commit: 29d896e40a4c21e486a5099097b9116b2ff0709f URL: http://source.winehq.org/git/wine.git/?a=commit;h=29d896e40a4c21e486a509909… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Aug 24 11:55:18 2010 -0500 usp10: Add Tibetan Script. --- dlls/usp10/shape.c | 8 ++++++++ dlls/usp10/usp10.c | 9 ++++++++- dlls/usp10/usp10_internal.h | 2 ++ 3 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 81809af..cea9415 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -298,6 +298,12 @@ static OPENTYPE_FEATURE_RECORD sinhala_features[] = { 0x73747370 /*psts*/, 1}, }; +static OPENTYPE_FEATURE_RECORD tibetan_features[] = +{ + { 0x73766261 /*abvs*/, 1}, + { 0x73776c62 /*blws*/, 1}, +}; + typedef struct ScriptShapeDataTag { TEXTRANGE_PROPERTIES defaultTextRange; CHAR otTag[5]; @@ -324,6 +330,8 @@ static const ScriptShapeData ShapingData[] = {{ standard_features, 2}, "armn", NULL}, {{ standard_features, 2}, "geor", NULL}, {{ sinhala_features, 7}, "sinh", NULL}, + {{ tibetan_features, 2}, "tibt", NULL}, + {{ tibetan_features, 2}, "tibt", NULL}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 235bb8a..23695cd 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -79,6 +79,8 @@ static const scriptRange scriptRanges[] = { { Script_Thaana, 0x780, 0x7bf, 0, 0}, /* Sinhala: U+0D80–U+0DFF */ { Script_Sinhala, 0xd80, 0xdff, 0, 0}, + /* Tibetan: U+0F00–U+0FFF */ + { Script_Tibetan, 0xf00, 0xfff, Script_Tibetan_Numeric, 0}, /* Georgian: U+10A0–U+10FF */ { Script_Georgian, 0x10a0, 0x10ff, 0, 0}, /* Phonetic Extensions: U+1D00–U+1DBF */ @@ -154,6 +156,10 @@ static const scriptData scriptInformation[] = { {LANG_GEORGIAN, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}}, {{Script_Sinhala, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_SINHALESE, 0, 1, 0, 1, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, + {{Script_Tibetan, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {LANG_TIBETAN, 0, 1, 1, 1, DEFAULT_CHARSET, 0, 0, 1, 0, 1, 0, 0, 0, 0}}, + {{Script_Tibetan_Numeric, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {LANG_TIBETAN, 1, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, }; static const SCRIPT_PROPERTIES *script_props[] = @@ -166,7 +172,8 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[10].props, &scriptInformation[11].props, &scriptInformation[12].props, &scriptInformation[13].props, &scriptInformation[14].props, &scriptInformation[15].props, - &scriptInformation[16].props + &scriptInformation[16].props, &scriptInformation[17].props, + &scriptInformation[18].props }; typedef struct { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index b41de7d..bc3fd57 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -36,6 +36,8 @@ #define Script_Georgian 15 /* Unicode Chapter 10 */ #define Script_Sinhala 16 +#define Script_Tibetan 17 +#define Script_Tibetan_Numeric 18 #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)

1 0

Aric Stewart : usp10: Add Sinhala Script.
by Alexandre Julliard 25 Aug '10

25 Aug '10

Module: wine Branch: master Commit: 2fe30b377cb4c291842c1057a4bd7469249e003f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fe30b377cb4c291842c1057a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Aug 24 11:55:11 2010 -0500 usp10: Add Sinhala Script. --- dlls/usp10/shape.c | 14 ++++++++++++++ dlls/usp10/usp10.c | 7 ++++++- dlls/usp10/usp10_internal.h | 2 ++ 3 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index f48210e..81809af 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -285,6 +285,19 @@ static OPENTYPE_FEATURE_RECORD syriac_features[] = { 0x67696c64 /*dlig*/, 1}, }; +static OPENTYPE_FEATURE_RECORD sinhala_features[] = +{ + /* Base forms */ + { 0x6e686b61 /*akhn*/, 1}, + { 0x66687072 /*rphf*/, 1}, + { 0x75746176 /*vatu*/, 1}, + { 0x66747370 /*pstf*/, 1}, + /* Presentation forms */ + { 0x73776c62 /*blws*/, 1}, + { 0x73766261 /*abvs*/, 1}, + { 0x73747370 /*psts*/, 1}, +}; + typedef struct ScriptShapeDataTag { TEXTRANGE_PROPERTIES defaultTextRange; CHAR otTag[5]; @@ -310,6 +323,7 @@ static const ScriptShapeData ShapingData[] = {{ standard_features, 2}, "cyrl", NULL}, {{ standard_features, 2}, "armn", NULL}, {{ standard_features, 2}, "geor", NULL}, + {{ sinhala_features, 7}, "sinh", NULL}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index aac53f2..235bb8a 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -77,6 +77,8 @@ static const scriptRange scriptRanges[] = { { Script_Arabic, 0x750, 0x77f, 0, 0}, /* Thaana: U+0780–U+07BF */ { Script_Thaana, 0x780, 0x7bf, 0, 0}, + /* Sinhala: U+0D80–U+0DFF */ + { Script_Sinhala, 0xd80, 0xdff, 0, 0}, /* Georgian: U+10A0–U+10FF */ { Script_Georgian, 0x10a0, 0x10ff, 0, 0}, /* Phonetic Extensions: U+1D00–U+1DBF */ @@ -150,6 +152,8 @@ static const scriptData scriptInformation[] = { {LANG_ARMENIAN, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}}, {{Script_Georgian, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_GEORGIAN, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}}, + {{Script_Sinhala, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {LANG_SINHALESE, 0, 1, 0, 1, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, }; static const SCRIPT_PROPERTIES *script_props[] = @@ -161,7 +165,8 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[8].props, &scriptInformation[9].props, &scriptInformation[10].props, &scriptInformation[11].props, &scriptInformation[12].props, &scriptInformation[13].props, - &scriptInformation[14].props, &scriptInformation[15].props + &scriptInformation[14].props, &scriptInformation[15].props, + &scriptInformation[16].props }; typedef struct { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 6a3cb1b..b41de7d 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -34,6 +34,8 @@ #define Script_Cyrillic 13 #define Script_Armenian 14 #define Script_Georgian 15 +/* Unicode Chapter 10 */ +#define Script_Sinhala 16 #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
89
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2010