Mercurial > geeqie.yaz
annotate src/format_nikon.h @ 882:912726c2f5e3
Fix a segfault occuring when opening some collection files.
Skip all lines not starting with a # when only geometry is required.
author | zas_ |
---|---|
date | Sun, 13 Jul 2008 12:36:18 +0000 |
parents | 116346636d42 |
children | 4fe8f9656107 |
rev | line source |
---|---|
51 | 1 /* |
541 | 2 * Geeqie |
3 * (C) 2005 John Ellis | |
475 | 4 * Copyright (C) 2008 The Geeqie Team |
51 | 5 * |
6 * This software is released under the GNU General Public License (GNU GPL). | |
7 * Please read the included file COPYING for more information. | |
8 * This software comes with no warranty of any kind, use at your own risk! | |
9 */ | |
10 | |
11 #ifndef __FORMAT_NIKON_H | |
12 #define __FORMAT_NIKON_H | |
13 | |
14 | |
176
695e1ad3b169
simplified exif.h, moved implementation-specific stuff to exif-int.h
nadvornik
parents:
103
diff
changeset
|
15 #include "exif-int.h" |
51 | 16 |
54
b58cac75ad12
Thu Jun 9 22:23:18 2005 John Ellis <johne@verizon.net>
gqview
parents:
53
diff
changeset
|
17 gint format_nikon_raw(unsigned char *data, const guint len, |
53
00843150f7c8
Tue Jun 7 03:47:03 2005 John Ellis <johne@verizon.net>
gqview
parents:
51
diff
changeset
|
18 guint *image_offset, guint *exif_offset); |
00843150f7c8
Tue Jun 7 03:47:03 2005 John Ellis <johne@verizon.net>
gqview
parents:
51
diff
changeset
|
19 |
54
b58cac75ad12
Thu Jun 9 22:23:18 2005 John Ellis <johne@verizon.net>
gqview
parents:
53
diff
changeset
|
20 #define FORMAT_RAW_NIKON { "nef", \ |
b58cac75ad12
Thu Jun 9 22:23:18 2005 John Ellis <johne@verizon.net>
gqview
parents:
53
diff
changeset
|
21 FORMAT_RAW_MATCH_TIFF_MAKE, 0, "NIKON CORPORATION", 17, \ |
101
847e4bc6b54c
Tue Nov 7 15:35:59 2006 John Ellis <johne@verizon.net>
gqview
parents:
54
diff
changeset
|
22 FORMAT_RAW_EXIF_TIFF, NULL, \ |
54
b58cac75ad12
Thu Jun 9 22:23:18 2005 John Ellis <johne@verizon.net>
gqview
parents:
53
diff
changeset
|
23 "Nikon raw", format_nikon_raw } |
53
00843150f7c8
Tue Jun 7 03:47:03 2005 John Ellis <johne@verizon.net>
gqview
parents:
51
diff
changeset
|
24 |
101
847e4bc6b54c
Tue Nov 7 15:35:59 2006 John Ellis <johne@verizon.net>
gqview
parents:
54
diff
changeset
|
25 /* If your format is basically just TIFF with an embedded jpeg, |
847e4bc6b54c
Tue Nov 7 15:35:59 2006 John Ellis <johne@verizon.net>
gqview
parents:
54
diff
changeset
|
26 * then avoid duplicating code and just stick it here and use the existing nikon parse. |
847e4bc6b54c
Tue Nov 7 15:35:59 2006 John Ellis <johne@verizon.net>
gqview
parents:
54
diff
changeset
|
27 */ |
847e4bc6b54c
Tue Nov 7 15:35:59 2006 John Ellis <johne@verizon.net>
gqview
parents:
54
diff
changeset
|
28 #define FORMAT_RAW_PENTAX { "pef", \ |
103
61e57ef42cf8
Wed Nov 8 11:36:58 2006 John Ellis <johne@verizon.net>
gqview
parents:
101
diff
changeset
|
29 FORMAT_RAW_MATCH_TIFF_MAKE, 0, "PENTAX Corporation", 18, \ |
101
847e4bc6b54c
Tue Nov 7 15:35:59 2006 John Ellis <johne@verizon.net>
gqview
parents:
54
diff
changeset
|
30 FORMAT_RAW_EXIF_TIFF, NULL, \ |
847e4bc6b54c
Tue Nov 7 15:35:59 2006 John Ellis <johne@verizon.net>
gqview
parents:
54
diff
changeset
|
31 "Pentax raw", format_nikon_raw } |
847e4bc6b54c
Tue Nov 7 15:35:59 2006 John Ellis <johne@verizon.net>
gqview
parents:
54
diff
changeset
|
32 |
277 | 33 #define FORMAT_RAW_SAMSUNG { "pef", \ |
34 FORMAT_RAW_MATCH_TIFF_MAKE, 0, "SAMSUNG TECHWIN", 15, \ | |
35 FORMAT_RAW_EXIF_TIFF, NULL, \ | |
36 "Samsung raw", format_nikon_raw } | |
51 | 37 |
38 gint format_nikon_makernote(ExifData *exif, unsigned char *tiff, guint offset, | |
54
b58cac75ad12
Thu Jun 9 22:23:18 2005 John Ellis <johne@verizon.net>
gqview
parents:
53
diff
changeset
|
39 guint size, ExifByteOrder bo); |
51 | 40 |
53
00843150f7c8
Tue Jun 7 03:47:03 2005 John Ellis <johne@verizon.net>
gqview
parents:
51
diff
changeset
|
41 #define FORMAT_EXIF_NIKON { FORMAT_EXIF_MATCH_MAKERNOTE, "Nikon\x00", 6, "Nikon", format_nikon_makernote }, \ |
00843150f7c8
Tue Jun 7 03:47:03 2005 John Ellis <johne@verizon.net>
gqview
parents:
51
diff
changeset
|
42 { FORMAT_EXIF_MATCH_MAKE, "NIKON", 5, "Nikon", format_nikon_makernote } |
51 | 43 |
44 | |
45 #endif |