mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cairo-util: Only look at first two bytes for jpegs

Browse Source 
The next two bytes aren't fixed.
This commit is contained in:
Kristian Høgsberg
2012-02-08 10:11:42 -05:00
parent 035ac94c17
commit 902865c757
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/cairo-util.c
+4 -3
View File
@@ -1,5 +1,6 @@
/* /*
* Copyright © 2008 Kristian Høgsberg * Copyright © 2008 Kristian Høgsberg
* Copyright © 2012 Intel Corporation
* *
* Permission to use, copy, modify, distribute, and sell this software and its * Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that * documentation for any purpose is hereby granted without fee, provided that
@@ -518,7 +519,7 @@ load_image(const char *filename)
{ {
cairo_surface_t *surface; cairo_surface_t *surface;
static const unsigned char png_header[] = { 0x89, 'P', 'N', 'G' }; static const unsigned char png_header[] = { 0x89, 'P', 'N', 'G' };
static const unsigned char jpeg_header[] = { 0xff, 0xd8, 0xff, 0xe0 }; static const unsigned char jpeg_header[] = { 0xff, 0xd8 };
unsigned char header[4]; unsigned char header[4];
FILE *fp; FILE *fp;
@@ -528,9 +529,9 @@ load_image(const char *filename)
fread(header, sizeof header, 1, fp); fread(header, sizeof header, 1, fp);
rewind(fp); rewind(fp);
if (memcmp(header, png_header, sizeof header) == 0) if (memcmp(header, png_header, sizeof png_header) == 0)
surface = load_png(fp); surface = load_png(fp);
else if (memcmp(header, jpeg_header, sizeof header) == 0) else if (memcmp(header, jpeg_header, sizeof jpeg_header) == 0)
surface = load_jpeg(fp); surface = load_jpeg(fp);
else { else {
fprintf(stderr, "unrecognized file header for %s: " fprintf(stderr, "unrecognized file header for %s: "