diff -NurdB libgphoto2-2.1.4-orig/camlibs/aox/aox.c libgphoto2-2.1.4/camlibs/aox/aox.c --- libgphoto2-2.1.4-orig/camlibs/aox/aox.c 2004-05-06 00:19:28.000000000 -0500 +++ libgphoto2-2.1.4/camlibs/aox/aox.c 2004-05-06 00:50:49.000000000 -0500 @@ -39,10 +39,10 @@ int aox_init (GPPort *port, Model *model, Info *info) { unsigned char c[4]; - memset(c,0,sizeof(c)); unsigned char hi[2]; - memset (hi,0,2); unsigned char lo[2]; + memset(c,0,sizeof(c)); + memset (hi,0,2); memset (lo,0,2); GP_DEBUG("Running aox_init\n"); @@ -86,11 +86,11 @@ int aox_get_picture_size (GPPort *port, int lo, int hi, int n, int k) { + unsigned char c[4]; + unsigned int size; GP_DEBUG("Running aox_get_picture_size\n"); - unsigned char c[4]; memset (c,0,4); - unsigned int size; if ( ( (lo) && ( n ==k ) && (k ==0)) ) { READ(port, 0x04, 0x1, 0x1, c, 2); diff -NurdB libgphoto2-2.1.4-orig/camlibs/aox/library.c libgphoto2-2.1.4/camlibs/aox/library.c --- libgphoto2-2.1.4-orig/camlibs/aox/library.c 2004-05-06 00:19:28.000000000 -0500 +++ libgphoto2-2.1.4/camlibs/aox/library.c 2004-05-06 00:20:27.000000000 -0500 @@ -202,6 +202,7 @@ gp_file_adjust_name_for_mime_type (file); } if ((w == 640)){ + int header_len; /* Stripping useless header */ p_data = data + 0x98; /* Picture is mirror-imaged.*/ @@ -222,7 +223,7 @@ GP_DEBUG("size of data = %i\n", sizeof(data)); GP_DEBUG("size of p_data = %i\n", sizeof(p_data)); /* And now create a ppm file, with our own header */ - int header_len = snprintf(header, 127, + header_len = snprintf(header, 127, "P6\n" "# CREATOR: gphoto2, aox library\n" "%d %d\n"