debian/changelog: release package version 0.1.6-2

[libam7xxx.git] / examples / picoproj.c

diff --git a/examples/picoproj.c b/examples/picoproj.c
index e15b2a2..2069799 100644 (file)
--- a/examples/picoproj.c
+++ b/examples/picoproj.c
@@ -1,10 +1,10 @@
 /* picoproj - test program for libam7xxx
  *
 /* picoproj - test program for libam7xxx
  *

- * Copyright (C) 2012  Antonio Ospite <ospite@studenti.unina.it>
+ * Copyright (C) 2012-2014  Antonio Ospite <ao2@ao2.it>

  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or

  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,


@@ -28,6 +28,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>

+#include <errno.h>

 
 #include "am7xxx.h"
 
 
 #include "am7xxx.h"
 


@@ -46,8 +47,8 @@ static void usage(char *name)
               AM7XXX_POWER_OFF, AM7XXX_POWER_TURBO);
        printf("\t\t\t\tWARNING: Level 2 and greater require the master AND\n");
        printf("\t\t\t\t         the slave connector to be plugged in.\n");
               AM7XXX_POWER_OFF, AM7XXX_POWER_TURBO);
        printf("\t\t\t\tWARNING: Level 2 and greater require the master AND\n");
        printf("\t\t\t\t         the slave connector to be plugged in.\n");

-       printf("\t-z <zoom mode>\t\tthe display zoom mode, between %d (original) and %d (test)\n",
-              AM7XXX_ZOOM_ORIGINAL, AM7XXX_ZOOM_TEST);
+       printf("\t-z <zoom mode>\t\tthe display zoom mode, between %d (original) and %d (tele)\n",
+              AM7XXX_ZOOM_ORIGINAL, AM7XXX_ZOOM_TELE);

        printf("\t-W <image width>\tthe width of the image to upload\n");
        printf("\t-H <image height>\tthe height of the image to upload\n");
        printf("\t-h \t\t\tthis help message\n");
        printf("\t-W <image width>\tthe width of the image to upload\n");
        printf("\t-H <image height>\tthe height of the image to upload\n");
        printf("\t-h \t\t\tthis help message\n");


@@ -58,7 +59,6 @@ static void usage(char *name)
 int main(int argc, char *argv[])
 {
        int ret;
 int main(int argc, char *argv[])
 {
        int ret;

-       int exit_code = EXIT_SUCCESS;

        int opt;
 
        char filename[FILENAME_MAX] = {0};
        int opt;
 
        char filename[FILENAME_MAX] = {0};


@@ -68,13 +68,13 @@ int main(int argc, char *argv[])
        am7xxx_device *dev;
        int log_level = AM7XXX_LOG_INFO;
        int device_index = 0;
        am7xxx_device *dev;
        int log_level = AM7XXX_LOG_INFO;
        int device_index = 0;

-       am7xxx_power_mode power_mode = AM7XXX_POWER_LOW;
-       am7xxx_zoom_mode zoom = AM7XXX_ZOOM_ORIGINAL;
+       int power_mode = AM7XXX_POWER_LOW;
+       int zoom = AM7XXX_ZOOM_ORIGINAL;

        int format = AM7XXX_IMAGE_FORMAT_JPEG;
        int width = 800;
        int height = 480;
        unsigned char *image;
        int format = AM7XXX_IMAGE_FORMAT_JPEG;
        int width = 800;
        int height = 480;
        unsigned char *image;

-       unsigned int size;
+       off_t size;

        am7xxx_device_info device_info;
 
        while ((opt = getopt(argc, argv, "d:f:F:l:p:z:W:H:h")) != -1) {
        am7xxx_device_info device_info;
 
        while ((opt = getopt(argc, argv, "d:f:F:l:p:z:W:H:h")) != -1) {


@@ -83,7 +83,8 @@ int main(int argc, char *argv[])
                        device_index = atoi(optarg);
                        if (device_index < 0) {
                                fprintf(stderr, "Unsupported device index\n");
                        device_index = atoi(optarg);
                        if (device_index < 0) {
                                fprintf(stderr, "Unsupported device index\n");

-                               exit(EXIT_FAILURE);
+                               ret = -EINVAL;
+                               goto out;

                        }
                        break;
                case 'f':
                        }
                        break;
                case 'f':


@@ -102,7 +103,8 @@ int main(int argc, char *argv[])
                                break;
                        default:
                                fprintf(stderr, "Unsupported format\n");
                                break;
                        default:
                                fprintf(stderr, "Unsupported format\n");

-                               exit(EXIT_FAILURE);
+                               ret = -EINVAL;
+                               goto out;

                        }
                        break;
                case 'l':
                        }
                        break;
                case 'l':


@@ -125,7 +127,8 @@ int main(int argc, char *argv[])
                        default:
                                fprintf(stderr, "Invalid power mode value, must be between %d and %d\n",
                                        AM7XXX_POWER_OFF, AM7XXX_POWER_TURBO);
                        default:
                                fprintf(stderr, "Invalid power mode value, must be between %d and %d\n",
                                        AM7XXX_POWER_OFF, AM7XXX_POWER_TURBO);

-                               exit(EXIT_FAILURE);
+                               ret = -EINVAL;
+                               goto out;

                        }
                        break;
                case 'z':
                        }
                        break;
                case 'z':


@@ -135,53 +138,59 @@ int main(int argc, char *argv[])
                        case AM7XXX_ZOOM_H:
                        case AM7XXX_ZOOM_H_V:
                        case AM7XXX_ZOOM_TEST:
                        case AM7XXX_ZOOM_H:
                        case AM7XXX_ZOOM_H_V:
                        case AM7XXX_ZOOM_TEST:

+                       case AM7XXX_ZOOM_TELE:

                                fprintf(stdout, "Zoom: %d\n", zoom);
                                break;
                        default:
                                fprintf(stderr, "Invalid zoom mode value, must be between %d and %d\n",
                                fprintf(stdout, "Zoom: %d\n", zoom);
                                break;
                        default:
                                fprintf(stderr, "Invalid zoom mode value, must be between %d and %d\n",

-                                       AM7XXX_ZOOM_ORIGINAL, AM7XXX_ZOOM_TEST);
-                               exit(EXIT_FAILURE);
+                                       AM7XXX_ZOOM_ORIGINAL, AM7XXX_ZOOM_TELE);
+                               ret = -EINVAL;
+                               goto out;

                        }
                        break;
                case 'W':
                        width = atoi(optarg);
                        if (width < 0) {
                                fprintf(stderr, "Unsupported width\n");
                        }
                        break;
                case 'W':
                        width = atoi(optarg);
                        if (width < 0) {
                                fprintf(stderr, "Unsupported width\n");

-                               exit(EXIT_FAILURE);
+                               ret = -EINVAL;
+                               goto out;

                        }
                        break;
                case 'H':
                        height = atoi(optarg);
                        if (height < 0) {
                                fprintf(stderr, "Unsupported height\n");
                        }
                        break;
                case 'H':
                        height = atoi(optarg);
                        if (height < 0) {
                                fprintf(stderr, "Unsupported height\n");

-                               exit(EXIT_FAILURE);
+                               ret = -EINVAL;
+                               goto out;

                        }
                        break;
                case 'h':
                        usage(argv[0]);
                        }
                        break;
                case 'h':
                        usage(argv[0]);

-                       exit(EXIT_SUCCESS);
-                       break;
+                       ret = 0;
+                       goto out;

                default: /* '?' */
                        usage(argv[0]);
                default: /* '?' */
                        usage(argv[0]);

-                       exit(EXIT_FAILURE);
+                       ret = -EINVAL;
+                       goto out;

                }
        }
 
        if (filename[0] == '\0') {
                }
        }
 
        if (filename[0] == '\0') {

-               fprintf(stderr, "An image file MUST be specified.\n");
-               exit_code = EXIT_FAILURE;
+               fprintf(stderr, "An image file MUST be specified with the -f option.\n\n");
+               usage(argv[0]);
+               ret = -EINVAL;

                goto out;
        }
 
        image_fp = fopen(filename, "rb");
        if (image_fp == NULL) {
                perror("fopen");
                goto out;
        }
 
        image_fp = fopen(filename, "rb");
        if (image_fp == NULL) {
                perror("fopen");

-               exit_code = EXIT_FAILURE;
+               ret = -EINVAL;

                goto out;
        }
                goto out;
        }

-       if (fstat(fileno(image_fp), &st) < 0) {
+       ret = fstat(fileno(image_fp), &st);
+       if (ret < 0) {

                perror("fstat");
                perror("fstat");

-               exit_code = EXIT_FAILURE;

                goto out_close_image_fp;
        }
        size = st.st_size;
                goto out_close_image_fp;
        }
        size = st.st_size;


@@ -189,11 +198,11 @@ int main(int argc, char *argv[])
        image = malloc(size * sizeof(unsigned char));
        if (image == NULL) {
                perror("malloc");
        image = malloc(size * sizeof(unsigned char));
        if (image == NULL) {
                perror("malloc");

-               exit_code = EXIT_FAILURE;
+               ret = -ENOMEM;

                goto out_close_image_fp;
        }
 
                goto out_close_image_fp;
        }
 

-       ret = fread(image, size, 1, image_fp);
+       ret = (int)fread(image, size, 1, image_fp);

        if (ret != 1) {
                if (feof(image_fp))
                        fprintf(stderr, "Unexpected end of file.\n");
        if (ret != 1) {
                if (feof(image_fp))
                        fprintf(stderr, "Unexpected end of file.\n");


@@ -202,13 +211,14 @@ int main(int argc, char *argv[])
                else
                        fprintf(stderr, "Unexpected error condition.\n");
 
                else
                        fprintf(stderr, "Unexpected error condition.\n");
 

+               if (ret >= 0)
+                       ret = -EINVAL;

                goto out_free_image;
        }
 
        ret = am7xxx_init(&ctx);
        if (ret < 0) {
                perror("am7xxx_init");
                goto out_free_image;
        }
 
        ret = am7xxx_init(&ctx);
        if (ret < 0) {
                perror("am7xxx_init");

-               exit_code = EXIT_FAILURE;

                goto out_free_image;
        }
 
                goto out_free_image;
        }
 


@@ -217,28 +227,24 @@ int main(int argc, char *argv[])
        ret = am7xxx_open_device(ctx, &dev, 0);
        if (ret < 0) {
                perror("am7xxx_open_device");
        ret = am7xxx_open_device(ctx, &dev, 0);
        if (ret < 0) {
                perror("am7xxx_open_device");

-               exit_code = EXIT_FAILURE;

                goto cleanup;
        }
 
        ret = am7xxx_close_device(dev);
        if (ret < 0) {
                perror("am7xxx_close_device");
                goto cleanup;
        }
 
        ret = am7xxx_close_device(dev);
        if (ret < 0) {
                perror("am7xxx_close_device");

-               exit_code = EXIT_FAILURE;

                goto cleanup;
        }
 
        ret = am7xxx_open_device(ctx, &dev, device_index);
        if (ret < 0) {
                perror("am7xxx_open_device");
                goto cleanup;
        }
 
        ret = am7xxx_open_device(ctx, &dev, device_index);
        if (ret < 0) {
                perror("am7xxx_open_device");

-               exit_code = EXIT_FAILURE;

                goto cleanup;
        }
 
        ret = am7xxx_get_device_info(dev, &device_info);
        if (ret < 0) {
                perror("am7xxx_get_device_info");
                goto cleanup;
        }
 
        ret = am7xxx_get_device_info(dev, &device_info);
        if (ret < 0) {
                perror("am7xxx_get_device_info");

-               exit_code = EXIT_FAILURE;

                goto cleanup;
        }
        printf("Native resolution: %dx%d\n",
                goto cleanup;
        }
        printf("Native resolution: %dx%d\n",


@@ -247,14 +253,12 @@ int main(int argc, char *argv[])
        ret = am7xxx_set_zoom_mode(dev, zoom);
        if (ret < 0) {
                perror("am7xxx_set_zoom_mode");
        ret = am7xxx_set_zoom_mode(dev, zoom);
        if (ret < 0) {
                perror("am7xxx_set_zoom_mode");

-               exit_code = EXIT_FAILURE;

                goto cleanup;
        }
 
        ret = am7xxx_set_power_mode(dev, power_mode);
        if (ret < 0) {
                perror("am7xxx_set_power_mode");
                goto cleanup;
        }
 
        ret = am7xxx_set_power_mode(dev, power_mode);
        if (ret < 0) {
                perror("am7xxx_set_power_mode");

-               exit_code = EXIT_FAILURE;

                goto cleanup;
        }
 
                goto cleanup;
        }
 


@@ -264,19 +268,19 @@ int main(int argc, char *argv[])
                goto cleanup;
        }
 
                goto cleanup;
        }
 

-

        if ((unsigned int)width > device_info.native_width ||
            (unsigned int)height > device_info.native_height)
        if ((unsigned int)width > device_info.native_width ||
            (unsigned int)height > device_info.native_height)

-               fprintf(stderr, "WARNING: image not fitting the native resolution, it may be displayed wrongly!\n");
+               fprintf(stderr,
+                       "WARNING: image is %dx%d, not fitting the native resolution, it may be displayed wrongly!\n",
+                       width, height);

 
 

-       ret = am7xxx_send_image(dev, format, width, height, image, size);
+       ret = am7xxx_send_image(dev, format, width, height, image, (unsigned int)size);

        if (ret < 0) {
                perror("am7xxx_send_image");
        if (ret < 0) {
                perror("am7xxx_send_image");

-               exit_code = EXIT_FAILURE;

                goto cleanup;
        }
 
                goto cleanup;
        }
 

-       exit_code = EXIT_SUCCESS;
+       ret = 0;

 
 cleanup:
        am7xxx_shutdown(ctx);
 
 cleanup:
        am7xxx_shutdown(ctx);


@@ -285,10 +289,9 @@ out_free_image:
        free(image);
 
 out_close_image_fp:
        free(image);
 
 out_close_image_fp:

-       ret = fclose(image_fp);
-       if (ret == EOF)
+       if (fclose(image_fp) == EOF)

                perror("fclose");
 
 out:
                perror("fclose");
 
 out:

-       exit(exit_code);
+       return ret;

 }
 }