Bazaar:Leptonica - Code restructuration

git-svn-id: svn://ultimatepp.org/upp/trunk@1570 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
micio 2009-09-13 09:39:14 +00:00
parent 5592e88a26
commit 51d82b5bad
35 changed files with 2390 additions and 2286 deletions

View file

@ -2,29 +2,21 @@
NAMESPACE_UPP
bool PixRaster::CombineMasked(int destPage, int sourcePage, int maskPage)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
Pix Pix::CombineMasked(Pix &aPix, Pix &maskPix)
{
if(IsEmpty())
return false;
sourcePage = getTruePage(sourcePage);
destPage = getTruePage(destPage);
Dup(destPage);
PIX *dPix = GetPIX(PIXRASTER_LASTPAGE, PIXRASTER_CLONE);
PIX *sPix = pixaGetPix(pixa, sourcePage, L_CLONE);
PIX *mPix = pixaGetPix(pixa, maskPage, L_CLONE);
int res = pixCombineMasked(dPix, sPix, mPix);
pixDestroy(&sPix);
pixDestroy(&dPix);
pixDestroy(&mPix);
PIX *dPix = pixCopy(NULL, pix);
int res = pixCombineMasked(dPix, aPix, maskPix);
if(res)
{
Drop();
return false;
pixDestroy(&dPix);
return Pix();
}
SeekPage(PIXRASTER_LASTPAGE);
return true;
return Pix(&dPix);
}
} // END Pix::CombineMasked()
END_UPP_NAMESPACE