Colin Stearns / Mbed 2 deprecated qcControl

QC Control software

Dependencies:   mbed

Fork of dgps by Colin Stearns

Diff: handle/handleCamera.cpp

Revision:
9:da906eeac51e
Parent:
8:28b866df62cf
Child:
12:e42985e3ea64
--- a/handle/handleCamera.cpp	Tue Apr 01 17:58:35 2014 +0000
+++ b/handle/handleCamera.cpp	Thu Apr 03 17:15:29 2014 +0000
@@ -17,7 +17,7 @@
     int i;
     for(i=0;i<size;){
         // read 32 bytes at a time;
-        uint8_t bytesToRead = min(64, size-i); // change 32 to 64 for a speedup but may not work with all setups!
+        uint8_t bytesToRead = std::min(64, size-i); // change 32 to 64 for a speedup but may not work with all setups!
         uint8_t bytesRead=0;
         uint8_t* buffer = cam.readPicture(bytesToRead,&bytesRead);
         for(int a=0;a<bytesRead;a++){USB::getSerial().putc(buffer[a]);}