[gphoto-cvs] gphoto2/gphoto2 actions.c,1.12,1.13 gphoto2-cmd-capture.c,1.4,1.5 main.c,1.26,1.27

[<as...@us...>]

Update of /cvsroot/gphoto/gphoto2/gphoto2
In directory sc8-pr-cvs1:/tmp/cvs-serv5952/gphoto2

Modified Files:
	actions.c gphoto2-cmd-capture.c main.c 
Log Message:
too much ©

Index: actions.c
===================================================================
RCS file: /cvsroot/gphoto/gphoto2/gphoto2/actions.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- actions.c	15 Dec 2002 11:39:48 -0000	1.12
+++ actions.c	23 Dec 2002 18:46:49 -0000	1.13
@@ -755,7 +755,7 @@
 	int n;
 	printf (_("gphoto2 %s\n"
 		  "\n"
-		  "Copyright © 2000-2002 Lutz Mueller and others\n"
+		  "Copyright (c) 2000-2002 Lutz Mueller and others\n"
 		  "%s"
 		  "\n"
 		  "gphoto2 comes with NO WARRANTY, to the extent permitted by law. You may\n"

Index: gphoto2-cmd-capture.c
===================================================================
RCS file: /cvsroot/gphoto/gphoto2/gphoto2/gphoto2-cmd-capture.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gphoto2-cmd-capture.c	15 Dec 2002 11:39:48 -0000	1.4
+++ gphoto2-cmd-capture.c	23 Dec 2002 18:46:49 -0000	1.5
@@ -56,7 +56,7 @@
 	params = aa_getrenderparams ();
 	contrast = params->contrast;
 	bright = params->bright;
-	aa_hidecursor ©;
+	aa_hidecursor (c);
 
 	result = gp_camera_capture_preview (camera, file, context);
 	if (result < 0)
@@ -69,7 +69,7 @@
 
 		gp_file_get_data_and_size (file, &data, &size);
 		gp_file_get_mime_type (file, &type);
-		bitmap = aa_image ©;
+		bitmap = aa_image (c);
 
 #ifdef HAVE_JPEG
 		if (!strcmp (type, GP_MIME_JPEG)) {
@@ -90,7 +90,7 @@
 			gp_file_save (file, tempname);
 			f = fopen (tempname, "rb");
 			if (!f) {
-				aa_close ©;
+				aa_close (c);
 				return (GP_ERROR);
 			}
 
@@ -102,8 +102,8 @@
 			jpeg_read_header (&cinfo, TRUE);
 			while (cinfo.scale_denom) {
 				jpeg_calc_output_dimensions (&cinfo);
-				if ((aa_imgwidth © >= cinfo.output_width) &&
-				    (aa_imgheight © >= cinfo.output_height))
+				if ((aa_imgwidth (c) >= cinfo.output_width) &&
+				    (aa_imgheight (c) >= cinfo.output_height))
 					break;
 				cinfo.scale_denom *= 2;
 			}
@@ -111,11 +111,11 @@
 				gp_log (GP_LOG_DEBUG, "gphoto2", "Screen "
 					"too small.");
 				jpeg_destroy_decompress (&cinfo);
-				aa_close ©;
+				aa_close (c);
 				return (GP_OK);
 			}
 			gp_log (GP_LOG_DEBUG, "gphoto2", "AA: (w,h) = (%i,%i)",
-				aa_imgwidth ©, aa_imgheight ©);
+				aa_imgwidth (c), aa_imgheight (c));
 			jpeg_start_decompress (&cinfo);
 			gp_log (GP_LOG_DEBUG, "gphoto2", "JPEG: (w,h) = "
 				"(%i,%i)", cinfo.output_width,
@@ -129,7 +129,7 @@
 				lptr = lines;
 				for (i = 0; i < cinfo.rec_outbuf_height; i++) {
 					*lptr++ = dptr;
-					dptr += aa_imgwidth ©;
+					dptr += aa_imgwidth (c);
 				}
 				jpeg_read_scanlines (&cinfo, lines,
 						cinfo.rec_outbuf_height);
@@ -146,13 +146,13 @@
 #endif
 		{
 			/* Silently skip the preview */
-			aa_close ©;
+			aa_close (c);
 			return (GP_OK);
 		}
 
 		aa_render (c, params, 0, 0,
-			aa_scrwidth ©, aa_scrheight ©);
-		aa_flush ©;
+			aa_scrwidth (c), aa_scrheight (c));
+		aa_flush (c);
 		
 		event = aa_getevent (c, 0);
 		switch (event) {
@@ -182,8 +182,8 @@
 			params->contrast = contrast;
 			break;
 		case AA_RESIZE:
-			aa_resize ©;
-			aa_flush ©;
+			aa_resize (c);
+			aa_flush (c);
 			break;
 		case AA_NONE:
 		case 32:
@@ -191,22 +191,22 @@
 			result = gp_camera_capture_preview (camera, file,
 							    context);
 			if (result < 0) {
-				aa_close ©;
+				aa_close (c);
 				return (result);
 			}
 			break;
 		case 305:
 			/* ESC */
-			aa_close ©;
+			aa_close (c);
 			gp_context_error (context, _("Operation cancelled"));
 			return (GP_ERROR_CANCEL);
 		default:
-			aa_close ©;
+			aa_close (c);
 			return (GP_OK);
 		}
 	}
 
-	aa_close ©;
+	aa_close (c);
 
 	return (GP_OK);
 }

Index: main.c
===================================================================
RCS file: /cvsroot/gphoto/gphoto2/gphoto2/main.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- main.c	15 Dec 2002 11:39:48 -0000	1.26
+++ main.c	23 Dec 2002 18:46:49 -0000	1.27
@@ -693,7 +693,7 @@
 				printf (_("File %s exists. Overwrite? [y|n] "),
 					s);
 				fflush (stdout);
-				fgets (c, sizeof © - 1, stdin);
+				fgets (c, sizeof (c) - 1, stdin);
 			} while ((c[0]!='y')&&(c[0]!='Y')&&
 				 (c[0]!='n')&&(c[0]!='N'));
 
@@ -703,7 +703,7 @@
 			do { 
 				printf (_("Specify new filename? [y|n] "));
 				fflush (stdout); 
-				fgets (c, sizeof © - 1, stdin);
+				fgets (c, sizeof (c) - 1, stdin);
 			} while ((c[0]!='y')&&(c[0]!='Y')&&
 				 (c[0]!='n')&&(c[0]!='N'));