mirrors/opencv
2
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-09-28 04:09:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed cmake and build issues when using Visual Studio 2015

Browse Source
This commit is contained in:
Maksim Shabunin
2015-10-29 11:50:48 +03:00
parent 4552ca98c4
commit f49936a849
59 changed files with 520 additions and 460 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/java/generator/src/cpp/gpu.cpp
+2 -2
View File
@@ -451,9 +451,9 @@ JNIEXPORT void JNICALL Java_org_opencv_gpu_DeviceInfo_queryMemory_10
size_t totalMemory;
size_t freeMemory;
me->queryMemory( totalMemory, freeMemory );
jdouble tmp_totalMemory[1] = {totalMemory};
jdouble tmp_totalMemory[1] = {(jdouble)totalMemory};
env->SetDoubleArrayRegion(totalMemory_out, 0, 1, tmp_totalMemory);
jdouble tmp_freeMemory[1] = {freeMemory};
jdouble tmp_freeMemory[1] = {(jdouble)freeMemory};
env->SetDoubleArrayRegion(freeMemory_out, 0, 1, tmp_freeMemory);
return;
} catch(const std::exception &e) {