Important changes to repositories hosted on mbed.com
Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.
To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.
It is also possible to export all your personal repositories from the account settings page.
Diff: MARY_CAMERA.cpp
- Revision:
- 9:c1e24f1bec19
- Parent:
- 8:23d14d5254d2
- Child:
- 10:82394d226c74
--- a/MARY_CAMERA.cpp Thu Mar 06 07:28:44 2014 +0000
+++ b/MARY_CAMERA.cpp Thu Mar 06 09:54:19 2014 +0000
@@ -109,12 +109,17 @@
void MARY_CAMERA::transfer_a_line( short *p, int line_number, int x_offset, int n_of_pixels )
{
+ char tmp;
+
set_address( line_number * BYTE_PER_LINE + x_offset * BYTE_PER_PIXEL );
read_register( CAMERA_DATA_REGISTER );
for( int x = 0; x < n_of_pixels; x++ )
- *p++ = (read_register( CAMERA_DATA_REGISTER ) << 8) | (read_register( CAMERA_DATA_REGISTER ) << 0);
+ {
+ tmp = read_register( CAMERA_DATA_REGISTER );
+ *p++ = (read_register( CAMERA_DATA_REGISTER ) << 8) | tmp;
+ }
}
void MARY_CAMERA::write_register( char reg, char value )