From a0fc4320b738cbaac562f14d442755c059f45b27 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Tue, 22 Nov 2016 08:24:44 +0100 Subject: [PATCH] Fix an unfixed merge conflict Signed-off-by: Stefan Weil --- opencl/openclwrapper.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/opencl/openclwrapper.cpp b/opencl/openclwrapper.cpp index bf1b6271..d3ededbf 100644 --- a/opencl/openclwrapper.cpp +++ b/opencl/openclwrapper.cpp @@ -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;