Merge branch 'Cog' of github.com:OpenSmalltalk/opensmalltalk-vm into …

…add-minheadless-vm
OpenSmalltalk · Oct 16, 2017 · 9105ae2 · 9105ae2
2 parents 5f5e924 + 47390dc
commit 9105ae2
Show file tree

Hide file tree

Showing 8 changed files with 794 additions and 129 deletions.
diff --git a/.travis_install.sh b/.travis_install.sh
@@ -20,6 +20,7 @@ elif [[ "${ARCH}" = "linux32x86" ]]; then
             libasound2-dev:i386 \
             libssl-dev:i386 \
             libssl0.9.8:i386 \
+            libpng-dev:i386 \
             libfreetype6-dev:i386 \
             libx11-dev:i386 \
             libsm-dev:i386 \

diff --git a/platforms/Cross/plugins/CameraPlugin/CameraPlugin.h b/platforms/Cross/plugins/CameraPlugin/CameraPlugin.h
@@ -1,11 +1,11 @@
 #ifndef _SQ_CAMERA_PLUGIN_H_
 #define _SQ_CAMERA_PLUGIN_H_
 
-int CameraOpen(int cameraNum, int frameWidth, int frameHeight);
-void CameraClose(int cameraNum);
-int CameraExtent(int cameraNum);
-int CameraGetFrame(int cameraNum, unsigned char* buf, int pixelCount);
-char* CameraName(int cameraNum);
-int CameraGetParam(int cameraNum, int paramNum);
+sqInt CameraOpen(sqInt cameraNum, sqInt frameWidth, sqInt frameHeight);
+void CameraClose(sqInt cameraNum);
+sqInt CameraExtent(sqInt cameraNum);
+sqInt CameraGetFrame(sqInt cameraNum, unsigned char* buf, sqInt pixelCount);
+char* CameraName(sqInt cameraNum);
+sqInt CameraGetParam(sqInt cameraNum, sqInt paramNum);
 
 #endif /* _SQ_CAMERA_PLUGIN_H_ */