mirror/tesseract
1
0
Fork 0
mirror of https://github.com/tesseract-ocr/tesseract.git synced 2024-11-27 20:59:36 +08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Use Leptonica struct names L_Compressed_Data, Pix

Browse Source 
The Tesseract project prefers that names, so fix the remaining exceptions.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
This commit is contained in:
Stefan Weil 2017-04-30 10:50:12 +02:00
parent 7a116ce8bb
commit 1c59914b61
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/pdfrenderer.cpp
View File

@ -716,7 +716,7 @@ bool TessPDFRenderer::imageToPDFObj(Pix *pix,
if (!filename)
return false;
L_COMP_DATA *cid = NULL;
L_Compressed_Data *cid = NULL;
const int kJpegQuality = 85;
int format, sad;

12
opencl/openclwrapper.cpp
View File

@ -690,18 +690,18 @@ cl_mem allocateZeroCopyBuffer(KernelEnv rEnv, l_uint32 *hostbuffer, size_t nElem
return membuffer;
}
PIX *mapOutputCLBuffer(KernelEnv rEnv, cl_mem clbuffer, PIX *pixd, PIX *pixs,
Pix *mapOutputCLBuffer(KernelEnv rEnv, cl_mem clbuffer, Pix *pixd, Pix *pixs,
int elements, cl_mem_flags flags, bool memcopy = false,
bool sync = true) {
PROCNAME("mapOutputCLBuffer");
if (!pixd) {
if (memcopy) {
if ((pixd = pixCreateTemplate(pixs)) == nullptr)
(PIX *)ERROR_PTR("pixd not made", procName, nullptr);
(Pix *)ERROR_PTR("pixd not made", procName, nullptr);
} else {
if ((pixd = pixCreateHeader(pixGetWidth(pixs), pixGetHeight(pixs),
pixGetDepth(pixs))) == nullptr)
(PIX *)ERROR_PTR("pixd not made", procName, nullptr);
(Pix *)ERROR_PTR("pixd not made", procName, nullptr);
}
}
l_uint32 *pValues = (l_uint32 *)clEnqueueMapBuffer(
@ -756,7 +756,7 @@ void OpenclDevice::releaseMorphCLBuffers()
pixdCLIntermediate = pixsCLBuffer = pixdCLBuffer = pixThBuffer = nullptr;
}
int OpenclDevice::initMorphCLAllocations(l_int32 wpl, l_int32 h, PIX* pixs)
int OpenclDevice::initMorphCLAllocations(l_int32 wpl, l_int32 h, Pix* pixs)
{
SetKernelEnv( &rEnv );
@ -1767,8 +1767,8 @@ cl_int pixSubtractCL_work(l_uint32 wpl, l_uint32 h, cl_mem buffer1,
// OpenCL implementation of Get Lines from pix function
//Note: Assumes the source and dest opencl buffer are initialized. No check done
void OpenclDevice::pixGetLinesCL(PIX *pixd, PIX *pixs, PIX **pix_vline,
PIX **pix_hline, PIX **pixClosed,
void OpenclDevice::pixGetLinesCL(Pix *pixd, Pix *pixs, Pix **pix_vline,
Pix **pix_hline, Pix **pixClosed,
bool getpixClosed, l_int32 close_hsize,
l_int32 close_vsize, l_int32 open_hsize,
l_int32 open_vsize, l_int32 line_hsize,

6
opencl/openclwrapper.h
View File

@ -246,11 +246,11 @@ public:
/* OpenCL implementations of Morphological operations*/
//Initialiation of OCL buffers used in Morph operations
static int initMorphCLAllocations(l_int32 wpl, l_int32 h, PIX* pixs);
static int initMorphCLAllocations(l_int32 wpl, l_int32 h, Pix* pixs);
static void releaseMorphCLBuffers();
static void pixGetLinesCL(PIX *pixd, PIX *pixs, PIX **pix_vline,
PIX **pix_hline, PIX **pixClosed,
static void pixGetLinesCL(Pix *pixd, Pix *pixs, Pix **pix_vline,
Pix **pix_hline, Pix **pixClosed,
bool getpixClosed, l_int32 close_hsize,
l_int32 close_vsize, l_int32 open_hsize,
l_int32 open_vsize, l_int32 line_hsize,