mirror/tesseract
1
0
Fork 0
mirror of https://github.com/tesseract-ocr/tesseract.git synced 2025-06-11 12:43:17 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Renamed RGB to ComposeRGB to fix windows macro problem

Browse Source 
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@663 d0cd1f9f-072b-0410-8dd7-cf729c803f20
This commit is contained in:
theraysmith@gmail.com 2012-02-03 16:52:25 +00:00
parent d581ab7e12
commit 09e41d32c2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
textord/imagefind.cpp
View File

@ -363,7 +363,7 @@ double ImageFind::ColorDistanceFromLine(const uinT8* line1,
// Returns the leptonica combined code for the given RGB triplet. // Returns the leptonica combined code for the given RGB triplet.
uinT32 ImageFind::RGB(uinT32 r, uinT32 g, uinT32 b) { uinT32 ImageFind::ComposeRGB(uinT32 r, uinT32 g, uinT32 b) {
l_uint32 result; l_uint32 result;
composeRGBPixel(r, g, b, &result); composeRGBPixel(r, g, b, &result);
return result; return result;
@ -495,11 +495,11 @@ void ImageFind::ComputeRectangleColors(const TBOX& rect, Pix* pix, int factor,
} }
if (color_map1 != NULL) { if (color_map1 != NULL) {
pixSetInRectArbitrary(color_map1, scaled_box, pixSetInRectArbitrary(color_map1, scaled_box,
RGB(color1[COLOR_RED], ComposeRGB(color1[COLOR_RED],
color1[COLOR_GREEN], color1[COLOR_GREEN],
color1[COLOR_BLUE])); color1[COLOR_BLUE]));
pixSetInRectArbitrary(color_map2, scaled_box, pixSetInRectArbitrary(color_map2, scaled_box,
RGB(color2[COLOR_RED], ComposeRGB(color2[COLOR_RED],
color2[COLOR_GREEN], color2[COLOR_GREEN],
color2[COLOR_BLUE])); color2[COLOR_BLUE]));
pixSetInRectArbitrary(rms_map, scaled_box, color1[L_ALPHA_CHANNEL]); pixSetInRectArbitrary(rms_map, scaled_box, color1[L_ALPHA_CHANNEL]);

2
textord/imagefind.h
View File

@ -85,7 +85,7 @@ class ImageFind {
const uinT8* point); const uinT8* point);
// Returns the leptonica combined code for the given RGB triplet. // Returns the leptonica combined code for the given RGB triplet.
static uinT32 RGB(uinT32 r, uinT32 g, uinT32 b); static uinT32 ComposeRGB(uinT32 r, uinT32 g, uinT32 b);
// Returns the input value clipped to a uinT8. // Returns the input value clipped to a uinT8.
static uinT8 ClipToByte(double pixel); static uinT8 ClipToByte(double pixel);