SHA256
1
0
forked from pool/dcraw

Accepting request 70247 from home:adra:branches:graphics

update to version 9.08, Spec file updates, Updates in update_dcraw script

OBS-URL: https://build.opensuse.org/request/show/70247
OBS-URL: https://build.opensuse.org/package/show/graphics/dcraw?expand=0&rev=18
This commit is contained in:
OBS User mrdocs 2011-05-14 15:07:56 +00:00 committed by Git OBS Bridge
parent b097068501
commit 52d6e9db0c
7 changed files with 119 additions and 86 deletions

146
README
View File

@ -70,7 +70,7 @@ http://www.cybercom.net/~dcoffin/dcraw/:
execute permission.
* [16]dcraw.c -- decodes raw photos, extracts thumbnails, and
displays metadata
Supports 405 cameras at last count. Compile with "gcc -o dcraw -O4
Supports 415 cameras at last count. Compile with "gcc -o dcraw -O4
dcraw.c -lm -ljpeg -llcms" or "gcc -o dcraw -O4 dcraw.c -lm
-DNO_JPEG -DNO_LCMS". Run with no arguments to see a usage message.
Don't complain that 16-bit output is too dark -- read the [17]FAQ!
@ -241,17 +241,18 @@ http://www.cybercom.net/~dcoffin/dcraw/:
the [115]CIFF (CRW) spec, and the [116]X3F spec.
Where can I get an assortment of raw photos to test my software?
Try [117]raw.fotosite.pl, [118]www.rawsamples.ch, and [119]Glass
Lantern RAWpository. A "full review" at [120]Imaging Resource
usually includes a few raw shots. For the complete dcraw test
suite (every camera supported by dcraw), I sell a 3-DVD set for
$700 and web-based updates for $300/year.
For the latest cameras, I get samples from [117]Photography
Blog. A "Full Review" at [118]Imaging Resource usually includes
a few raw shots. [119]www.rawsamples.ch is no longer updated,
but it has samples from older cameras. For $700, I sell a
complete test suite on four DVDs containing every camera
supported by dcraw, and provide web-based updates for $300/year.
I'm designing a digital camera. How do I convert its raw photos into
something that dcraw and Adobe Photoshop can open?
Download [121]LibTIFF v3.8.2 and apply [122]this patch. Then use
[123]this C program as a template for converting your photos to
valid [124]Adobe DNG files.
Download [120]LibTIFF v3.8.2 and apply [121]this patch. Then use
[122]this C program as a template for converting your photos to
valid [123]Adobe DNG files.
Why are dcraw output images larger than camera JPEGs?
Any algorithm that combines each pixel with its neighbors is
@ -272,11 +273,11 @@ http://www.cybercom.net/~dcoffin/dcraw/:
Why is 16-bit output dark / unreadable?
If you want pretty pictures straight out of dcraw, stay with
8-bit output. 16-bit linear output is the best raw material for
professional image editors such as [125]Photoshop and
[126]CinePaint, but it's no good for most image viewers.
professional image editors such as [124]Photoshop and
[125]CinePaint, but it's no good for most image viewers.
What does the "-f" (four color RGB) option do?
If you see patterns like [127]this or [128]this in your output
If you see patterns like [126]this or [127]this in your output
images, first try "dcraw -a". If these patterns persist, use
"dcraw -f" to get rid of them.
@ -290,8 +291,8 @@ dcraw -c crw_0001.crw | pnmtopng > crw_0001.png
dcraw -c crw_0001.crw | ppmtobmp > crw_0001.bmp
dcraw -c crw_0001.crw | cjpeg > crw_0001.jpeg
I used the [129]Netpbm toolkit in these examples.
[130]ImageMagick also does command-line format conversions. Both
I used the [128]Netpbm toolkit in these examples.
[129]ImageMagick also does command-line format conversions. Both
are free.
Why don't you implement dcraw as a library?
@ -305,7 +306,7 @@ dcraw -c crw_0001.crw | cjpeg > crw_0001.jpeg
formats that change every day.
There's a simpler way to make dcraw modular and thread-safe: Run
it as a separate process. Eric Raymond [131]explains this
it as a separate process. Eric Raymond [130]explains this
technique here.
Why are there false colors along edges within the image?
@ -321,7 +322,7 @@ dcraw -c crw_0001.crw | cjpeg > crw_0001.jpeg
Variable Number of Gradients (VNG), Patterned Pixel Grouping
(PPG), and Adaptive Homogeneity-Directed (AHD).
[132]The Foveon X3 Capture chip requires a different kind of
[131]The Foveon X3 Capture chip requires a different kind of
interpolation. Unlike CCD arrays, it captures three colors at
every pixel location. But the colors are not well separated, so
the raw data looks very gray. Much processing is needed to
@ -329,36 +330,38 @@ dcraw -c crw_0001.crw | cjpeg > crw_0001.jpeg
How do I get my camera to take raw photos?
For Canon PowerShots that don't output CRW or CR2, you need the
[133]CHDK hack.
[132]CHDK hack.
For some Nikon Coolpix cameras, you need to enable a
[134]special "DIAG RAW" mode.
For Casio cameras, see [135]Maurice Delaney's website or read
[136]this discussion on dpreview.
For the Minolta DiMAGE G400, G500, G530, or G600, go [137]here
(in Russian) or [138]here (in English).
[133]special "DIAG RAW" mode.
For Casio cameras, see [134]Maurice Delaney's website or read
[135]this discussion on dpreview.
For the Minolta DiMAGE G400, G500, G530, or G600, go [136]here
(in Russian) or [137]here (in English).
For the Minolta DiMAGE Z2 and Nikon Coolpix 2100/3100/3700,
[139]go here.
For SMaL cameras, see the [140]camerahacking Forum.
For Agfa and Samsung cameras, [141]go here.
[138]go here.
For SMaL cameras, see the [139]camerahacking Forum.
For Agfa and Samsung cameras, [140]go here.
For other cameras, refer to the User's Manual.
Does dcraw work with my camera?
Most likely, yes. If your camera is not on the Supported list,
try dcraw anyway. If it doesn't work perfectly, don't just sit
quietly waiting for my next version. Ask me if I need any raw
photos, or go ahead and post a photo to your website and e-mail
me the URL. If you don't have a website, use [142]YouSendIt,
[143]RapidShare, [144]Sendshack, [145]ShareFile, [146]sendspace,
or [147]Megaupload.
me the URL. If you don't have a website, use [141]YouSendIt,
[142]RapidShare, [143]Sendshack, [144]ShareFile, [145]sendspace,
or [146]Megaupload.
Before choosing a photo to send, read the next question:
Why does dcraw output have a green tint and weak color?
Because dcraw doesn't have a color matrix for your camera model,
it outputs raw color instead of sRGB. To fix this, I need a
photo of a [148]Wolf Faust, [149]Calibr8, [150]CMP,
[151]GretagMacbeth, or other calibrated color chart. Follow this
photo of a [147]Wolf Faust, [148]Calibr8, [149]CMP,
[150]GretagMacbeth, or other calibrated color chart. Follow this
checklist:
+ Use a real chart, not a printout or screen image.
@ -500,6 +503,8 @@ dcraw -c crw_0001.crw | cjpeg > crw_0001.jpeg
* Fuji FinePix S9100/S9600
* Fuji FinePix S200EXR
* Fuji FinePix HS10/HS11
* Fuji FinePix HS20EXR
* Fuji FinePix F550EXR
* Fuji FinePix X100
* Fuji IS-1
* Hasselblad CFV
@ -514,7 +519,7 @@ dcraw -c crw_0001.crw | cjpeg > crw_0001.jpeg
* Kodak DC25
* Kodak DC40
* Kodak DC50
* Kodak DC120 (also try [152]kdc2tiff)
* Kodak DC120 (also try [151]kdc2tiff)
* Kodak DCS200
* Kodak DCS315C
* Kodak DCS330C
@ -547,11 +552,13 @@ dcraw -c crw_0001.crw | cjpeg > crw_0001.jpeg
* Kodak P880
* Kodak Z980
* Kodak Z981
* Kodak Z990
* Kodak Z1015
* Kodak KAI-0340
* Konica KD-400Z
* Konica KD-510Z
* Leaf AFi 7
* Leaf AFi-II 12
* Leaf Aptus 17
* Leaf Aptus 22
* Leaf Aptus 54S
@ -618,6 +625,7 @@ dcraw -c crw_0001.crw | cjpeg > crw_0001.jpeg
* Nikon D3000
* Nikon D3100
* Nikon D5000
* Nikon D5100
* Nikon D7000
* Nikon E700 ("DIAG RAW" hack)
* Nikon E800 ("DIAG RAW" hack)
@ -670,6 +678,7 @@ dcraw -c crw_0001.crw | cjpeg > crw_0001.jpeg
* Olympus E-P1
* Olympus E-P2
* Olympus E-PL1
* Olympus E-PL1s
* Olympus E-PL2
* Olympus SP310
* Olympus SP320
@ -679,6 +688,7 @@ dcraw -c crw_0001.crw | cjpeg > crw_0001.jpeg
* Olympus SP550UZ
* Olympus SP560UZ
* Olympus SP570UZ
* Olympus XZ-1
* Panasonic DMC-FZ8
* Panasonic DMC-FZ18
* Panasonic DMC-FZ28
@ -739,6 +749,7 @@ dcraw -c crw_0001.crw | cjpeg > crw_0001.jpeg
* Samsung GX10
* Samsung GX20
* Samsung NX10
* Samsung NX11
* Samsung NX100
* Samsung WB550
* Samsung WB2000
@ -760,6 +771,8 @@ dcraw -c crw_0001.crw | cjpeg > crw_0001.jpeg
* Sony DSC-V3
* Sony DSLR-A100
* Sony DSLR-A200
* Sony DSLR-A230
* Sony DSLR-A290
* Sony DSLR-A300
* Sony DSLR-A330
* Sony DSLR-A350
@ -897,39 +910,38 @@ References
114. http://www.adobe.com/products/dng/pdfs/dng_spec.pdf
115. http://xyrion.org/ciff/
116. http://web.archive.org/web/20070317042320/http://www.x3f.info/technotes/FileDocs/X3F_Format.pdf
117. http://raw.fotosite.pl/
118. http://www.rawsamples.ch/
119. http://www.glasslantern.com/RAWpository/
120. http://www.imaging-resource.com/MFR1.HTM
121. http://dl.maptools.org/dl/libtiff/tiff-3.8.2.tar.gz
122. http://www.cybercom.net/~dcoffin/dcraw/libtiff.patch
123. http://www.cybercom.net/~dcoffin/dcraw/elphel_dng.c
124. http://www.adobe.com/products/dng/main.html
125. http://www.adobe.com/products/photoshop/main.html
126. http://cinepaint.sourceforge.net/
127. http://www.cybercom.net/~dcoffin/dcraw/ahd_maze.png
128. http://www.cybercom.net/~dcoffin/dcraw/vng_grid.png
129. http://netpbm.sourceforge.net/
130. http://www.imagemagick.org/
131. http://www.faqs.org/docs/artu/multiprogramchapter.html
132. http://www.dpreview.com/news/0202/02021101foveonx3.asp
133. http://digicanon.narod.ru/
134. http://e2500.narod.ru/raw_format_e.htm
135. http://www.inweb.ch/foto/rawformat.html
136. http://forums.dpreview.com/forums/read.asp?forum=1015&message=4961779
137. http://myfototest.narod.ru/
138. http://forums.dpreview.com/forums/read.asp?forum=1024&message=11773287
139. http://tester13.nm.ru/nikon/
140. http://camerahacks.10.forumer.com/
141. http://forums.dpreview.com/forums/read.asp?forum=1001&message=28484239
142. http://yousendit.com/
143. http://rapidshare.com/
144. http://sendshack.com/
145. http://www.sharefile.com/
146. http://www.sendspace.com/
147. http://www.megaupload.com/
148. http://www.targets.coloraid.de/
149. http://www.calibr8.com/
150. http://www.cmp-color.fr/eng%20digital%20target.html
151. http://www.xrite.com/product_overview.aspx?ID=820
152. http://kdc2tiff.sourceforge.net/
117. http://www.photographyblog.com/
118. http://www.imaging-resource.com/MFR1.HTM
119. http://www.rawsamples.ch/
120. http://dl.maptools.org/dl/libtiff/tiff-3.8.2.tar.gz
121. http://www.cybercom.net/~dcoffin/dcraw/libtiff.patch
122. http://www.cybercom.net/~dcoffin/dcraw/elphel_dng.c
123. http://www.adobe.com/products/dng/main.html
124. http://www.adobe.com/products/photoshop/main.html
125. http://cinepaint.sourceforge.net/
126. http://www.cybercom.net/~dcoffin/dcraw/ahd_maze.png
127. http://www.cybercom.net/~dcoffin/dcraw/vng_grid.png
128. http://netpbm.sourceforge.net/
129. http://www.imagemagick.org/
130. http://www.faqs.org/docs/artu/multiprogramchapter.html
131. http://www.dpreview.com/news/0202/02021101foveonx3.asp
132. http://digicanon.narod.ru/
133. http://e2500.narod.ru/raw_format_e.htm
134. http://www.inweb.ch/foto/rawformat.html
135. http://forums.dpreview.com/forums/read.asp?forum=1015&message=4961779
136. http://myfototest.narod.ru/
137. http://forums.dpreview.com/forums/read.asp?forum=1024&message=11773287
138. http://tester13.nm.ru/nikon/
139. http://camerahacks.10.forumer.com/
140. http://forums.dpreview.com/forums/read.asp?forum=1001&message=28484239
141. http://yousendit.com/
142. http://rapidshare.com/
143. http://sendshack.com/
144. http://www.sharefile.com/
145. http://www.sendspace.com/
146. http://www.megaupload.com/
147. http://www.targets.coloraid.de/
148. http://www.calibr8.com/
149. http://www.cmp-color.fr/eng%20digital%20target.html
150. http://www.xrite.com/product_overview.aspx?ID=820
151. http://kdc2tiff.sourceforge.net/

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:eb019457d6c5f86c5f78a2ff9e50ca262a5ecc502c51cb0fc9077037d2129ca0
size 142081

3
dcraw-9.08.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1d87c91790c00f3af7659bdbe5191ea65a1c6c1e750949cf15acba5c07df6b4a
size 142375

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Sat May 14 12:05:25 UTC 2011 - asterios.dramis@gmail.com
- updated to version 9.08
dcraw - revision 1.443
* Support the Fuji HS20EXR/F550EXR, Kodak Z990, Leaf AFi-II 12, Nikon D5100
and Samsung NX11 and NX100.
dcparse - revision 1.73
* Improved parsing of Fuji images.
- Spec file updates:
* Small fix if suse_version is not set.
-------------------------------------------------------------------
Mon Apr 4 20:18:58 UTC 2011 - asterios.dramis@gmail.com

View File

@ -19,14 +19,14 @@
Name: dcraw
Version: 9.07
Version: 9.08
Release: 1
Summary: Raw Digital Photo Decoding
License: PERMISSIVE-OSI-COMPLIANT
Url: http://www.cybercom.net/~dcoffin/dcraw/
Group: Productivity/Graphics/Convertors
# http://www.cybercom.net/~dcoffin/dcraw/archive/dcraw-9.07.tar.gz
# http://www.cybercom.net/~dcoffin/dcraw/archive/dcraw-9.08.tar.gz
Source0: %{name}-%{version}.tar.bz2
#*** NOTE: run "sh update_dcraw" to update to latest version of the following sources ("wget", "rcs" and "lynx" packages are required for the update).
Source1: README
@ -155,7 +155,7 @@ rm -rf %{buildroot}
%dir %{_mandir}/pl/man1
%dir %{_mandir}/pt
%dir %{_mandir}/pt/man1
%if 0%{?suse_version} < 1130
%if 0%{?suse_version} && 0%{?suse_version} < 1130
%dir %{_mandir}/ru
%dir %{_mandir}/ru/man1
%endif

29
parse.c
View File

@ -5,8 +5,8 @@
This program displays raw metadata for all raw photo formats.
It is free for all uses.
$Revision: 1.72 $
$Date: 2010/12/17 03:16:26 $
$Revision: 1.73 $
$Date: 2011/05/11 03:29:49 $
*/
#include <stdio.h>
@ -221,19 +221,21 @@ void parse_makernote (int base, int level)
} else if (!strcmp (buf,"OLYMPUS")) {
base = ftell(ifp)-10;
fseek (ifp, -2, SEEK_CUR);
order = get2();
val = get2();
} else if (!strncmp (buf,"FUJIFILM",8) ||
!strncmp (buf,"SONY",4) ||
order = get2(); get2();
} else if (!strncmp (buf,"SONY",4) ||
!strcmp (buf,"Panasonic")) {
order = 0x4949;
goto nf;
} else if (!strncmp (buf,"FUJIFILM",8)) {
base = ftell(ifp)-10;
nf: order = 0x4949;
fseek (ifp, 2, SEEK_CUR);
} else if (!strcmp (buf,"OLYMP") ||
!strcmp (buf,"LEICA") ||
!strcmp (buf,"Ricoh") ||
!strcmp (buf,"EPSON"))
fseek (ifp, -2, SEEK_CUR);
else if (!strcmp (buf,"AOC"))
else if (!strcmp (buf,"AOC") ||
!strcmp (buf,"QVC"))
fseek (ifp, -4, SEEK_CUR);
else {
fseek (ifp, -10, SEEK_CUR);
@ -444,7 +446,7 @@ int parse_tiff_ifd (int base, int level)
*/
void parse_tiff (int base, int level)
{
int doff, ifd=0;
int doff, ifd=0, sorder=order;
fseek (ifp, base, SEEK_SET);
order = get2();
@ -455,6 +457,7 @@ void parse_tiff (int base, int level)
printf ("%*sIFD #%d:\n", level*2, "", ifd++);
if (parse_tiff_ifd (base, level)) break;
}
order = sorder;
}
void parse_minolta (int base)
@ -839,7 +842,7 @@ void parse_fuji (int offset)
fseek (ifp, offset, SEEK_SET);
if (!(len = get4())) return;
printf ("Fuji table at %d:\n",len);
printf ("Fuji Image %c:\n", offset < 100 ? 'S':'R');
fseek (ifp, len, SEEK_SET);
entries = get4();
if (entries > 255) return;
@ -1007,9 +1010,13 @@ void identify()
toff = get4();
tlen = get4();
parse_fuji (92);
if (toff > 120) parse_fuji (120);
fseek (ifp, 100, SEEK_SET);
parse_tiff (get4(),0);
if (toff > 120) {
parse_fuji (120);
fseek (ifp, 128, SEEK_SET);
parse_tiff (get4(),0);
}
parse_thumb (toff,0);
} else if (!memcmp (head,"RIFF",4)) {
fseek (ifp, 0, SEEK_SET);

View File

@ -12,8 +12,10 @@ mv .badpixels badpixels
( URL="http://www.cybercom.net/~dcoffin/dcraw/" ; echo -e "$URL:\n" ; LC_ALL=C lynx -display_charset=utf-8 -dump "$URL" | sed '1d;3,4d' ) >README
wget -N http://www.cybercom.net/~dcoffin/dcraw/RCS/dcraw.c,v
rlog dcraw.c >dcraw.log
wget -N http://www.cybercom.net/~dcoffin/dcraw/RCS/parse.c,v
rlog parse.c >parse.log
echo
echo "Please check, whether packaged file list is up to date."
echo "You can look at dcraw.log for the complete change log."
echo "You can look at dcraw.log and parse.log for the complete change log."
echo "Before submit, please call:"
echo "rm dcraw.c,v dcraw.log"
echo "rm dcraw.c,v dcraw.log parse.c,v parse.log"