From dbf5d92605a9db10e3e3cb154d03a515c5d5c5af Mon Sep 17 00:00:00 2001 From: reinelt Date: Sun, 8 May 2005 04:32:45 +0000 Subject: [lcd4linux @ 2005-05-08 04:32:43 by reinelt] CodingStyle added and applied git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@547 3ae390bd-cb1e-0410-b409-cd5a39f66f1f --- drv_Image.c | 672 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 335 insertions(+), 337 deletions(-) (limited to 'drv_Image.c') diff --git a/drv_Image.c b/drv_Image.c index 196ead1..de4e3e7 100644 --- a/drv_Image.c +++ b/drv_Image.c @@ -1,4 +1,4 @@ -/* $Id: drv_Image.c,v 1.11 2005/01/18 06:30:23 reinelt Exp $ +/* $Id: drv_Image.c,v 1.12 2005/05/08 04:32:44 reinelt Exp $ * * new style Image (PPM/PNG) Driver for LCD4Linux * @@ -23,6 +23,9 @@ * * * $Log: drv_Image.c,v $ + * Revision 1.12 2005/05/08 04:32:44 reinelt + * CodingStyle added and applied + * * Revision 1.11 2005/01/18 06:30:23 reinelt * added (C) to all copyright statements * @@ -120,19 +123,19 @@ #include #endif -static char Name[]="Image"; +static char Name[] = "Image"; -static enum {PPM, PNG} Format; +static enum { PPM, PNG } Format; static unsigned int fg_col, bg_col, hg_col; -static int pixel = -1; /* pointsize in pixel */ -static int pgap = 0; /* gap between points */ -static int rgap = 0; /* row gap between lines */ -static int cgap = 0; /* column gap between characters */ -static int border = 0; /* window border */ +static int pixel = -1; /* pointsize in pixel */ +static int pgap = 0; /* gap between points */ +static int rgap = 0; /* row gap between lines */ +static int cgap = 0; /* column gap between characters */ +static int border = 0; /* window border */ -static int dimx, dimy; /* total window dimension in pixel */ +static int dimx, dimy; /* total window dimension in pixel */ static unsigned char *drv_IMG_FB = NULL; @@ -143,336 +146,330 @@ static int dirty = 1; /****************************************/ #ifdef WITH_PPM -static int drv_IMG_flush_PPM (void) +static int drv_IMG_flush_PPM(void) { - static int seq=0; - static unsigned char *bitbuf=NULL; - static unsigned char *rowbuf=NULL; - int xsize, ysize, row, col; - unsigned char R[3], G[3], B[3]; - char path[256], tmp[256], buffer[256]; - int fd; - - xsize = 2*border + (DCOLS/XRES-1)*cgap + DCOLS*pixel + (DCOLS-1)*pgap; - ysize = 2*border + (DROWS/YRES-1)*rgap + DROWS*pixel + (DROWS-1)*pgap; - - if (bitbuf == NULL) { - if ((bitbuf = malloc(xsize*ysize*sizeof(*bitbuf))) == NULL) { - error ("%s: malloc(%d) failed: %s", Name, xsize*ysize*sizeof(*bitbuf), strerror(errno)); - return -1; + static int seq = 0; + static unsigned char *bitbuf = NULL; + static unsigned char *rowbuf = NULL; + int xsize, ysize, row, col; + unsigned char R[3], G[3], B[3]; + char path[256], tmp[256], buffer[256]; + int fd; + + xsize = 2 * border + (DCOLS / XRES - 1) * cgap + DCOLS * pixel + (DCOLS - 1) * pgap; + ysize = 2 * border + (DROWS / YRES - 1) * rgap + DROWS * pixel + (DROWS - 1) * pgap; + + if (bitbuf == NULL) { + if ((bitbuf = malloc(xsize * ysize * sizeof(*bitbuf))) == NULL) { + error("%s: malloc(%d) failed: %s", Name, xsize * ysize * sizeof(*bitbuf), strerror(errno)); + return -1; + } } - } - - if (rowbuf == NULL) { - if ((rowbuf = malloc(3*xsize*sizeof(*rowbuf))) == NULL) { - error ("Raster: malloc(%d) failed: %s", 3*xsize*sizeof(*rowbuf), strerror(errno)); - return -1; + + if (rowbuf == NULL) { + if ((rowbuf = malloc(3 * xsize * sizeof(*rowbuf))) == NULL) { + error("Raster: malloc(%d) failed: %s", 3 * xsize * sizeof(*rowbuf), strerror(errno)); + return -1; + } } - } - - memset (bitbuf, 0, xsize*ysize*sizeof(*bitbuf)); - - for (row = 0; row < DROWS; row++) { - int y = border + (row/YRES)*rgap + row*(pixel+pgap); - for (col = 0; col < DCOLS; col++) { - int x = border + (col/XRES)*cgap + col*(pixel+pgap); - int a, b; - for (a = 0; a < pixel; a++) - for (b = 0; b < pixel; b++) - bitbuf[y*xsize+x+a*xsize+b] = drv_IMG_FB[row*DCOLS+col]+1; + + memset(bitbuf, 0, xsize * ysize * sizeof(*bitbuf)); + + for (row = 0; row < DROWS; row++) { + int y = border + (row / YRES) * rgap + row * (pixel + pgap); + for (col = 0; col < DCOLS; col++) { + int x = border + (col / XRES) * cgap + col * (pixel + pgap); + int a, b; + for (a = 0; a < pixel; a++) + for (b = 0; b < pixel; b++) + bitbuf[y * xsize + x + a * xsize + b] = drv_IMG_FB[row * DCOLS + col] + 1; + } + } + + snprintf(path, sizeof(path), output, seq++); + qprintf(tmp, sizeof(tmp), "%s.tmp", path); + + /* remove the file */ + unlink(tmp); + + /* avoid symlink security hole: */ + /* open it with O_EXCL will fail if the file exists. */ + /* This should not happen because we just unlinked it. */ + if ((fd = open(tmp, O_WRONLY | O_CREAT | O_EXCL, 0644)) < 0) { + error("%s: open(%s) failed: %s", Name, tmp, strerror(errno)); + return -1; } - } - - snprintf (path, sizeof(path), output, seq++); - qprintf(tmp, sizeof(tmp), "%s.tmp", path); - - /* remove the file */ - unlink (tmp); - - /* avoid symlink security hole: */ - /* open it with O_EXCL will fail if the file exists. */ - /* This should not happen because we just unlinked it. */ - if ((fd = open(tmp, O_WRONLY | O_CREAT | O_EXCL, 0644))<0) { - error ("%s: open(%s) failed: %s", Name, tmp, strerror(errno)); - return -1; - } - - qprintf(buffer, sizeof(buffer), "P6\n%d %d\n255\n", xsize, ysize); - if (write (fd, buffer, strlen(buffer)) < 0) { - error ("%s: write(%s) failed: %s", Name, tmp, strerror(errno)); - return -1; - } - - R[0] = 0xff & bg_col>>16; - G[0] = 0xff & bg_col>>8; - B[0] = 0xff & bg_col; - - R[1] = 0xff & hg_col>>16; - G[1] = 0xff & hg_col>>8; - B[1] = 0xff & hg_col; - - R[2] = 0xff & fg_col>>16; - G[2] = 0xff & fg_col>>8; - B[2] = 0xff & fg_col; - - for (row = 0; row < ysize; row++) { - int c = 0; - for (col = 0; col < xsize; col++) { - int i = bitbuf[row*xsize+col]; - rowbuf[c++] = R[i]; - rowbuf[c++] = G[i]; - rowbuf[c++] = B[i]; + + qprintf(buffer, sizeof(buffer), "P6\n%d %d\n255\n", xsize, ysize); + if (write(fd, buffer, strlen(buffer)) < 0) { + error("%s: write(%s) failed: %s", Name, tmp, strerror(errno)); + return -1; } - if (write (fd, rowbuf, c) < 0) { - error ("%s: write(%s) failed: %s", Name, tmp, strerror(errno)); - break; + + R[0] = 0xff & bg_col >> 16; + G[0] = 0xff & bg_col >> 8; + B[0] = 0xff & bg_col; + + R[1] = 0xff & hg_col >> 16; + G[1] = 0xff & hg_col >> 8; + B[1] = 0xff & hg_col; + + R[2] = 0xff & fg_col >> 16; + G[2] = 0xff & fg_col >> 8; + B[2] = 0xff & fg_col; + + for (row = 0; row < ysize; row++) { + int c = 0; + for (col = 0; col < xsize; col++) { + int i = bitbuf[row * xsize + col]; + rowbuf[c++] = R[i]; + rowbuf[c++] = G[i]; + rowbuf[c++] = B[i]; + } + if (write(fd, rowbuf, c) < 0) { + error("%s: write(%s) failed: %s", Name, tmp, strerror(errno)); + break; + } } - } - - if (close (fd) < 0) { - error ("%s: close(%s) failed: %s", Name, tmp, strerror(errno)); - return -1; - } - if (rename (tmp, path)<0) { - error ("%s: rename(%s) failed: %s", Name, tmp, strerror(errno)); - return -1; - } - - return 0; + + if (close(fd) < 0) { + error("%s: close(%s) failed: %s", Name, tmp, strerror(errno)); + return -1; + } + if (rename(tmp, path) < 0) { + error("%s: rename(%s) failed: %s", Name, tmp, strerror(errno)); + return -1; + } + + return 0; } #endif #ifdef WITH_PNG -static int drv_IMG_flush_PNG (void) +static int drv_IMG_flush_PNG(void) { - static int seq = 0; - int xsize, ysize, row, col; - char path[256], tmp[256]; - FILE *fp; int fd; - gdImagePtr im; - int bg, hg, fg; - - xsize = 2*border + (DCOLS/XRES-1)*cgap + DCOLS*pixel + (DCOLS-1)*pgap; - ysize = 2*border + (DROWS/YRES-1)*rgap + DROWS*pixel + (DROWS-1)*pgap; - - im = gdImageCreate(xsize, ysize); - - /* first color = background */ - bg = gdImageColorAllocate(im, - 0xff & bg_col>>16, - 0xff & bg_col>>8, - 0xff & bg_col); - - hg = gdImageColorAllocate(im, - 0xff & hg_col>>16, - 0xff & hg_col>>8, - 0xff & hg_col); - - - fg = gdImageColorAllocate(im, - 0xff & fg_col>>16, - 0xff & fg_col>>8, - 0xff & fg_col); - - - for (row = 0; row < DROWS; row++) { - int y = border + (row/YRES)*rgap + row*(pixel+pgap); - for (col = 0; col < DCOLS; col++) { - int x = border + (col/XRES)*cgap + col*(pixel+pgap); - gdImageFilledRectangle(im, x, y, x + pixel - 1 , y + pixel - 1, - drv_IMG_FB[row*DCOLS+col]? fg : hg); + static int seq = 0; + int xsize, ysize, row, col; + char path[256], tmp[256]; + FILE *fp; + int fd; + gdImagePtr im; + int bg, hg, fg; + + xsize = 2 * border + (DCOLS / XRES - 1) * cgap + DCOLS * pixel + (DCOLS - 1) * pgap; + ysize = 2 * border + (DROWS / YRES - 1) * rgap + DROWS * pixel + (DROWS - 1) * pgap; + + im = gdImageCreate(xsize, ysize); + + /* first color = background */ + bg = gdImageColorAllocate(im, 0xff & bg_col >> 16, 0xff & bg_col >> 8, 0xff & bg_col); + + hg = gdImageColorAllocate(im, 0xff & hg_col >> 16, 0xff & hg_col >> 8, 0xff & hg_col); + + + fg = gdImageColorAllocate(im, 0xff & fg_col >> 16, 0xff & fg_col >> 8, 0xff & fg_col); + + + for (row = 0; row < DROWS; row++) { + int y = border + (row / YRES) * rgap + row * (pixel + pgap); + for (col = 0; col < DCOLS; col++) { + int x = border + (col / XRES) * cgap + col * (pixel + pgap); + gdImageFilledRectangle(im, x, y, x + pixel - 1, y + pixel - 1, drv_IMG_FB[row * DCOLS + col] ? fg : hg); + } + } + + snprintf(path, sizeof(path), output, seq++); + qprintf(tmp, sizeof(tmp), "%s.tmp", path); + + /* remove the file */ + unlink(tmp); + + /* avoid symlink security hole: */ + /* open it with O_EXCL will fail if the file exists. */ + /* This should not happen because we just unlinked it. */ + if ((fd = open(tmp, O_WRONLY | O_CREAT | O_EXCL, 0644)) < 0) { + error("%s: open(%s) failed: %s", Name, tmp, strerror(errno)); + return -1; + } + + if ((fp = fdopen(fd, "w")) == NULL) { + error("%s: fdopen(%s) failed: %s\n", Name, tmp, strerror(errno)); + close(fd); + return -1; + } + + gdImagePng(im, fp); + gdImageDestroy(im); + + + if (fclose(fp) != 0) { + error("%s: fclose(%s) failed: %s\n", Name, tmp, strerror(errno)); + return -1; + } + + if (rename(tmp, path) < 0) { + error("%s: rename(%s) failed: %s\n", Name, tmp, strerror(errno)); + return -1; } - } - - snprintf (path, sizeof(path), output, seq++); - qprintf (tmp, sizeof(tmp), "%s.tmp", path); - - /* remove the file */ - unlink (tmp); - - /* avoid symlink security hole: */ - /* open it with O_EXCL will fail if the file exists. */ - /* This should not happen because we just unlinked it. */ - if ((fd = open(tmp, O_WRONLY | O_CREAT | O_EXCL, 0644))<0) { - error ("%s: open(%s) failed: %s", Name, tmp, strerror(errno)); - return -1; - } - - if ((fp = fdopen(fd, "w")) == NULL) { - error("%s: fdopen(%s) failed: %s\n", Name, tmp, strerror(errno)); - close (fd); - return -1; - } - - gdImagePng(im, fp); - gdImageDestroy(im); - - - if (fclose (fp) != 0) { - error("%s: fclose(%s) failed: %s\n", Name, tmp, strerror(errno)); - return -1; - } - - if (rename (tmp, path) < 0) { - error("%s: rename(%s) failed: %s\n", Name, tmp, strerror(errno)); - return -1; - } - - return 0; + + return 0; } #endif -static void drv_IMG_flush (void) +static void drv_IMG_flush(void) { - switch (Format) { - case PPM: + switch (Format) { + case PPM: #ifdef WITH_PPM - drv_IMG_flush_PPM(); + drv_IMG_flush_PPM(); #endif - break; - case PNG: + break; + case PNG: #ifdef WITH_PNG - drv_IMG_flush_PNG(); + drv_IMG_flush_PNG(); #endif - break; - } + break; + } } -static void drv_IMG_timer (void *notused) +static void drv_IMG_timer(void *notused) { - /* avoid compiler warning */ - notused = notused; + /* avoid compiler warning */ + notused = notused; - if (dirty) { - drv_IMG_flush(); - dirty = 0; - } + if (dirty) { + drv_IMG_flush(); + dirty = 0; + } } static void drv_IMG_blit(const int row, const int col, const int height, const int width) { - int r, c; - - for (r=row; r