diff options
author | Marcus Meissner <marcus@jet.franken.de> | 2005-11-22 16:49:33 +0000 |
---|---|---|
committer | Marcus Meissner <marcus@jet.franken.de> | 2005-11-22 16:49:33 +0000 |
commit | 236a8b1df6d15d8c3d9e9cd6ae22f73fb6f1d075 (patch) | |
tree | dfc0bd032e4b042788d268988ed751991ce48d8d /camlibs/sipix | |
parent | 37f5ff6e2483778875caf0c95aa10c08f8312dc8 (diff) | |
download | libgphoto2-236a8b1df6d15d8c3d9e9cd6ae22f73fb6f1d075.tar.gz |
fixed strict aliasing problem that gcc 4.1 warns about.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@8292 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/sipix')
-rw-r--r-- | camlibs/sipix/blink2.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/camlibs/sipix/blink2.c b/camlibs/sipix/blink2.c index edfca77c3..34ba6a6cb 100644 --- a/camlibs/sipix/blink2.c +++ b/camlibs/sipix/blink2.c @@ -262,7 +262,11 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename, } for (i = 0; i < dinfo.output_height ; i++ ) { int j; - jpeg_read_scanlines(&dinfo,(JSAMPARRAY)(char*)&rawline,1); + JSAMPROW row[1]; + JSAMPARRAY arr = row; + + row[0] = (JSAMPROW)rawline; + jpeg_read_scanlines(&dinfo,arr,1); memcpy(convline+((dinfo.output_width/16-1)*16+8)*3, rawline+((dinfo.output_width/16-1)*16+8)*3, 8*3); memcpy(convline+pitch/2, rawline, 8*3); |