mirror/tesseract
1
0
Fork 0
mirror of https://github.com/tesseract-ocr/tesseract.git synced 2024-11-28 05:39:35 +08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge pull request #488 from stweil/conflict

Browse Source 
Fix an unfixed merge conflict
This commit is contained in:
zdenop 2016-11-22 08:29:59 +01:00 committed by GitHub
commit 478011024a
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
opencl/openclwrapper.cpp
View File

@ -1133,7 +1133,6 @@ OpenclDevice::pixReadMemTiffCl(const l_uint8 *data,size_t size,l_int32 n)
// L_MEMSTREAM *memStream;
PROCNAME("pixReadMemTiffCl");
<<<<<<< HEAD
if (!data)
return (PIX *)ERROR_PTR("data pointer is NULL", procName, NULL);
@ -1156,17 +1155,10 @@ OpenclDevice::pixReadMemTiffCl(const l_uint8 *data,size_t size,l_int32 n)
}
if (pagefound == FALSE) {
L_WARNING("tiff page %d not found", procName);
L_WARNING("tiff page %d not found", procName, i);
TIFFCleanup(tif);
return NULL;
}
=======
if (pagefound == FALSE) {
L_WARNING("tiff page %d not found", procName, i);
TIFFCleanup(tif);
return NULL;
}
>>>>>>> 8bff1e618ff4f14dfacd523ff0b57b944999f24f
TIFFCleanup(tif);
return pix;