← Back to branch summary

~ubuntu-branches/ubuntu/vivid/grass/vivid-proposed

« back to all changes in this revision

Viewing changes to lib/pngdriver/read.c

  • Committer: Package Import Robot
  • Author(s): Bas Couwenberg
  • Date: 2015-02-20 23:12:08 UTC
  • mfrom: (8.2.6 experimental)
  • Revision ID: package-import@ubuntu.com-20150220231208-1u6qvqm84v430b10
Tags: 7.0.0-1~exp1
* New upstream release.
* Update python-ctypes-ternary.patch to use if/else instead of and/or.
* Drop check4dev patch, rely on upstream check.
* Add build dependency on libpq-dev to grass-dev for libpq-fe.h.
* Drop patches applied upstream, refresh remaining patches.
* Update symlinks for images switched from jpg to png.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/pngdriver/read.c
 
1
/*!
 
2
  \file lib/pngdriver/read.c
 
3
 
 
4
  \brief GRASS png display driver - read image (lower level functions)
 
5
 
 
6
  (C) 2007-2014 by Glynn Clements and the GRASS Development Team
 
7
  
 
8
  This program is free software under the GNU General Public License
 
9
  (>=v2). Read the file COPYING that comes with GRASS for details.
 
10
  
 
11
  \author Glynn Clements
 
12
*/
1
13
 
2
14
#include <stdio.h>
3
15
#include <stdlib.h>
9
21
 
10
22
void read_image(void)
11
23
{
12
 
    char *p = file_name + strlen(file_name) - 4;
 
24
    char *p = png.file_name + strlen(png.file_name) - 4;
13
25
 
14
26
    if (G_strcasecmp(p, ".ppm") == 0) {
15
27
        read_ppm();
16
 
        if (has_alpha)
 
28
        if (png.has_alpha)
17
29
            read_pgm();
18
30
    }
19
31
    else if (G_strcasecmp(p, ".bmp") == 0)
25
37
    else
26
38
        G_fatal_error("read_image: unknown file type: %s", p);
27
39
 
28
 
    modified = 0;
 
40
    png.modified = 0;
29
41
}