[GRASS-dev] Re: [GRASS-CVS] glynn: grass6/lib/pngdriver Graph_set.c, 1.1, 1.2 Makefile, 1.4, 1.5 pngdriver.h, 1.3, 1.4 write.c, 1.1, 1.2

[Martin Landa]

Hi,

I am not able to compile pngdriver because of missing read.c, etc.

make: *** No rule to make target `OBJ.i686-pc-linux-gnu/read.o',
needed by `/usr/src/gis/grass6/dist.i686-pc-linux-gnu/lib/libgrass_pngdriver.6.3.cvs.so'.
 Stop.

is there anything I have missed? Thanks!

Martin

2006/11/13, grass at intevation.de <grass at intevation.de>:
> Author: glynn
>
> Update of /grassrepository/grass6/lib/pngdriver
> In directory doto:/tmp/cvs-serv12051/lib/pngdriver
>
> Modified Files:
>         Graph_set.c Makefile pngdriver.h write.c
> Log Message:
> Initialise framebuffer from $GRASS_PNGFILE if $GRASS_PNG_READ = TRUE
>
>
> Index: Graph_set.c
> ===================================================================
> RCS file: /grassrepository/grass6/lib/pngdriver/Graph_set.c,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -d -r1.1 -r1.2
> --- Graph_set.c 1 Jun 2006 17:40:22 -0000       1.1
> +++ Graph_set.c 13 Nov 2006 14:29:25 -0000      1.2
> @@ -92,6 +92,10 @@
>
>         modified = 1;
>
> +       p = getenv("GRASS_PNG_READ");
> +       if (p && strcmp(p, "TRUE") == 0)
> +               read_image();
> +
>         return 0;
>  }
>
>
> Index: Makefile
> ===================================================================
> RCS file: /grassrepository/grass6/lib/pngdriver/Makefile,v
> retrieving revision 1.4
> retrieving revision 1.5
> diff -u -d -r1.4 -r1.5
> --- Makefile    19 Sep 2006 10:18:48 -0000      1.4
> +++ Makefile    13 Nov 2006 14:29:25 -0000      1.5
> @@ -24,11 +24,13 @@
>         Raster_RGB.o            \
>         Raster_int.o            \
>         Respond.o               \
> +       read.o                  \
> +       read_ppm.o              \
>         write.o                 \
>         write_ppm.o
>
>  ifneq ($(USE_PNG),)
> -  LIB_OBJS += write_png.o
> +  LIB_OBJS += read_png.o write_png.o
>  endif
>
>  include $(MODULE_TOPDIR)/include/Make/Lib.make
>
> Index: pngdriver.h
> ===================================================================
> RCS file: /grassrepository/grass6/lib/pngdriver/pngdriver.h,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -d -r1.3 -r1.4
> --- pngdriver.h 19 Sep 2006 10:18:48 -0000      1.3
> +++ pngdriver.h 13 Nov 2006 14:29:25 -0000      1.4
> @@ -22,10 +22,16 @@
>
>  extern int linewidth;
>
> +extern void read_image(void);
> +extern void read_ppm(void);
> +extern void read_pgm(void);
> +extern void read_png(void);
> +
>  extern void write_image(void);
>  extern void write_ppm(void);
>  extern void write_pgm(void);
>  extern void write_png(void);
> +
>  extern void init_color_table(void);
>
>  extern void PNG_Box_abs(int,int,int,int);
>
> Index: write.c
> ===================================================================
> RCS file: /grassrepository/grass6/lib/pngdriver/write.c,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -d -r1.1 -r1.2
> --- write.c     1 Jun 2006 17:40:22 -0000       1.1
> +++ write.c     13 Nov 2006 14:29:25 -0000      1.2
> @@ -25,7 +25,7 @@
>                 write_png();
>  #endif
>         else
> -               G_fatal_error("Graph_Close: unknown file type: %s", p);
> +               G_fatal_error("write_image: unknown file type: %s", p);
>
>         modified = 0;
>  }
>
>
> _______________________________________________
> grass-commit mailing list
> grass-commit at grass.itc.it
> http://grass.itc.it/mailman/listinfo/grass-commit
>


-- 
Martin Landa <landa.martin at gmail.com> * http://gama.fsv.cvut.cz/~landa *