Merge pull request #467 from stweil/opencl2

zdenop · web-flow · commit f8bc09a23a48 · 2016-11-06T17:43:47.000+01:00
opencl: Fix two small bugs (both found by gcc)
diff --git a/opencl/opencl_device_selection.h b/opencl/opencl_device_selection.h
@@ -586,7 +586,7 @@ static ds_status getNumDeviceWithEmptyScore(ds_profile* profile,
   *num=0;
   for (i = 0; i < profile->numDevices; i++) {
     if (profile->devices[i].score == NULL) {
-      *num++;
+      (*num)++;
     }
   }
   return DS_SUCCESS;
diff --git a/opencl/openclwrapper.cpp b/opencl/openclwrapper.cpp
@@ -1159,7 +1159,7 @@ 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;
 	}

Original file line number	Diff line number	Diff line change
`@@ -586,7 +586,7 @@ static ds_status getNumDeviceWithEmptyScore(ds_profile* profile,`
`586`	`586`	`*num=0;`
`587`	`587`	`for (i = 0; i < profile->numDevices; i++) {`
`588`	`588`	`if (profile->devices[i].score == NULL) {`
`589`		`- *num++;`
	`589`	`+ (*num)++;`
`590`	`590`	`}`
`591`	`591`	`}`
`592`	`592`	`return DS_SUCCESS;`
Original file line number	Diff line number	Diff line change
`@@ -1159,7 +1159,7 @@ OpenclDevice::pixReadMemTiffCl(const l_uint8 *data,size_t size,l_int32 n)`
`1159`	`1159`	`}`
`1160`	`1160`
`1161`	`1161`	`if (pagefound == FALSE) {`
`1162`		`- L_WARNING("tiff page %d not found", procName);`
	`1162`	`+ L_WARNING("tiff page %d not found", procName, i);`
`1163`	`1163`	`TIFFCleanup(tif);`
`1164`	`1164`	`return NULL;`
`1165`	`1165`	`}`