diff --git a/README b/README index ec3a88e..91f7c03 100644 --- a/README +++ b/README @@ -71,8 +71,8 @@ http://www.cybercom.net/~dcoffin/dcraw/: execute permission. * [17]dcraw.c -- decodes raw photos, extracts thumbnails, and displays metadata - Supports 525 cameras at last count. Compile with "gcc -o dcraw -O4 - dcraw.c -lm -ljasper -ljpeg -llcms" or "gcc -o dcraw -O4 dcraw.c + Supports 582 cameras at last count. Compile with "gcc -o dcraw -O4 + dcraw.c -lm -ljasper -ljpeg -llcms2" or "gcc -o dcraw -O4 dcraw.c -lm -DNODEPS". Run with no arguments to see a usage message. Don't complain that 16-bit output is too dark -- read the [18]FAQ! * [19]UNIX manpage for dcraw @@ -245,8 +245,8 @@ http://www.cybercom.net/~dcoffin/dcraw/: For the latest cameras, I get samples from [118]Photography Blog. A "Full Review" at [119]Imaging Resource usually includes a few raw shots. [120]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 + but it has samples from older cameras. For $800, I sell a + complete test suite on six 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 @@ -377,6 +377,7 @@ dcraw -c crw_0001.crw | cjpeg > crw_0001.jpeg * [152]Adobe Digital Negative (DNG) * AgfaPhoto DC-833m + * Alcatel 5035D * Apple QuickTake 100 * Apple QuickTake 150 * Apple QuickTake 200 @@ -386,6 +387,7 @@ dcraw -c crw_0001.crw | cjpeg > crw_0001.jpeg * AVT F-201C * AVT F-510C * AVT F-810C + * Baumer TXG14 * Canon PowerShot 600 * Canon PowerShot A5 * Canon PowerShot A5 Zoom @@ -402,6 +404,7 @@ dcraw -c crw_0001.crw | cjpeg > crw_0001.jpeg * Canon PowerShot A650 (CHDK hack) * Canon PowerShot A710 IS (CHDK hack) * Canon PowerShot A720 IS (CHDK hack) + * Canon PowerShot A3300 IS (CHDK hack) * Canon PowerShot Pro70 * Canon PowerShot Pro90 IS * Canon PowerShot Pro1 @@ -417,6 +420,7 @@ dcraw -c crw_0001.crw | cjpeg > crw_0001.jpeg * Canon PowerShot G11 * Canon PowerShot G12 * Canon PowerShot G15 + * Canon PowerShot G16 * Canon PowerShot S2 IS (CHDK hack) * Canon PowerShot S3 IS (CHDK hack) * Canon PowerShot S5 IS (CHDK hack) @@ -431,6 +435,7 @@ dcraw -c crw_0001.crw | cjpeg > crw_0001.jpeg * Canon PowerShot S95 * Canon PowerShot S100 * Canon PowerShot S110 + * Canon PowerShot S120 * Canon PowerShot SX1 IS * Canon PowerShot SX110 IS (CHDK hack) * Canon PowerShot SX120 IS (CHDK hack) @@ -451,6 +456,7 @@ dcraw -c crw_0001.crw | cjpeg > crw_0001.jpeg * Canon EOS 40D * Canon EOS 50D * Canon EOS 60D + * Canon EOS 70D * Canon EOS 300D / Digital Rebel / Kiss Digital * Canon EOS 350D / Digital Rebel XT / Kiss Digital N * Canon EOS 400D / Digital Rebel XTi / Kiss Digital X @@ -483,6 +489,7 @@ dcraw -c crw_0001.crw | cjpeg > crw_0001.jpeg * Casio QV-R41 * Casio QV-R51 * Casio QV-R61 + * Casio EX-FH100 * Casio EX-S20 * Casio EX-S100 * Casio EX-Z4 @@ -502,14 +509,13 @@ dcraw -c crw_0001.crw | cjpeg > crw_0001.jpeg * Casio Exlim Pro 700 * Contax N Digital * Creative PC-CAM 600 + * DJI 4384x3288 * Epson R-D1 * Foculus 531C * Fuji E550 * Fuji E900 * Fuji F700 * Fuji F710 - * Fuji F800 - * Fuji F810 * Fuji S2Pro * Fuji S3Pro * Fuji S5Pro @@ -532,12 +538,17 @@ dcraw -c crw_0001.crw | cjpeg > crw_0001.jpeg * Fuji F600EXR * Fuji F770EXR * Fuji F800EXR + * Fuji F900EXR * Fuji X-Pro1 + * Fuji X-A1 * Fuji X-E1 - * Fuji XF1 + * Fuji X-E2 + * Fuji X-M1 * Fuji X-S1 - * Fuji X100s + * Fuji XF1 + * Fuji XQ1 * Fuji X100 + * Fuji X100s * Fuji X10 * Fuji X20 * Fuji IS-1 @@ -608,6 +619,7 @@ dcraw -c crw_0001.crw | cjpeg > crw_0001.jpeg * Leaf Valeo 17 * Leaf Valeo 22 * Leaf Volare + * Leica C (Typ 112) * Leica Digilux 2 * Leica Digilux 3 * Leica D-LUX2 @@ -615,12 +627,21 @@ dcraw -c crw_0001.crw | cjpeg > crw_0001.jpeg * Leica D-LUX4 * Leica D-LUX5 * Leica D-LUX6 + * Leica M (Typ 240) + * Leica M Monochrom + * Leica M8 + * Leica M9 + * Leica R8 * Leica V-LUX1 * Leica V-LUX2 * Leica V-LUX3 * Leica V-LUX4 + * Leica X VARIO (Typ 107) + * Leica X1 + * Leica X2 * Logitech Fotoman Pixtura * Mamiya ZD + * Matrix 4608x3288 * Micron 2010 * Minolta RD175 * Minolta DiMAGE 5 @@ -649,6 +670,7 @@ dcraw -c crw_0001.crw | cjpeg > crw_0001.jpeg * Nikon D3s * Nikon D3X * Nikon D4 + * Nikon Df * Nikon D40 * Nikon D40X * Nikon D50 @@ -662,17 +684,21 @@ dcraw -c crw_0001.crw | cjpeg > crw_0001.jpeg * Nikon D300 * Nikon D300s * Nikon D600 + * Nikon D610 * Nikon D700 * Nikon D3000 * Nikon D3100 * Nikon D3200 + * Nikon D3300 * Nikon D5000 * Nikon D5100 * Nikon D5200 + * Nikon D5300 * Nikon D7000 * Nikon D7100 * Nikon D800 * Nikon D800E + * Nikon 1 AW1 * Nikon 1 J1 * Nikon 1 J2 * Nikon 1 J3 @@ -704,9 +730,11 @@ dcraw -c crw_0001.crw | cjpeg > crw_0001.jpeg * Nikon Coolpix P7000 * Nikon Coolpix P7100 * Nikon Coolpix P7700 + * Nikon Coolpix P7800 * Nikon Coolpix S6 ("DIAG RAW" hack) * Nokia N95 * Nokia X2 + * Nokia 1200x1600 * Olympus C3030Z * Olympus C5050Z * Olympus C5060WZ @@ -731,9 +759,12 @@ dcraw -c crw_0001.crw | cjpeg > crw_0001.jpeg * Olympus E-510 * Olympus E-520 * Olympus E-620 + * Olympus E-M1 + * Olympus E-M5 * Olympus E-P1 * Olympus E-P2 * Olympus E-P3 + * Olympus E-P5 * Olympus E-PL1 * Olympus E-PL1s * Olympus E-PL2 @@ -741,7 +772,6 @@ dcraw -c crw_0001.crw | cjpeg > crw_0001.jpeg * Olympus E-PL5 * Olympus E-PM1 * Olympus E-PM2 - * Olympus E-M5 * Olympus SP310 * Olympus SP320 * Olympus SP350 @@ -750,9 +780,11 @@ dcraw -c crw_0001.crw | cjpeg > crw_0001.jpeg * Olympus SP550UZ * Olympus SP560UZ * Olympus SP570UZ + * Olympus STYLUS1 * Olympus XZ-1 * Olympus XZ-2 * Olympus XZ-10 + * OmniVision OV5647 (Raspberry Pi) * Panasonic DMC-FZ8 * Panasonic DMC-FZ18 * Panasonic DMC-FZ28 @@ -760,6 +792,7 @@ dcraw -c crw_0001.crw | cjpeg > crw_0001.jpeg * Panasonic DMC-FZ35/FZ38 * Panasonic DMC-FZ40 * Panasonic DMC-FZ50 + * Panasonic DMC-FZ70 * Panasonic DMC-FZ100 * Panasonic DMC-FZ150 * Panasonic DMC-FZ200 @@ -777,20 +810,25 @@ dcraw -c crw_0001.crw | cjpeg > crw_0001.jpeg * Panasonic DMC-GH1 * Panasonic DMC-GH2 * Panasonic DMC-GH3 + * Panasonic DMC-GM1 * Panasonic DMC-GX1 + * Panasonic DMC-GX7 * Panasonic DMC-L1 * Panasonic DMC-L10 * Panasonic DMC-LC1 + * Panasonic DMC-LF1 * Panasonic DMC-LX1 * Panasonic DMC-LX2 * Panasonic DMC-LX3 * Panasonic DMC-LX5 * Panasonic DMC-LX7 + * Panasonic DMC-TZ61 * Pentax *ist D * Pentax *ist DL * Pentax *ist DL2 * Pentax *ist DS * Pentax *ist DS2 + * Pentax GR * Pentax K10D * Pentax K20D * Pentax K100D @@ -799,14 +837,18 @@ dcraw -c crw_0001.crw | cjpeg > crw_0001.jpeg * Pentax K2000/K-m * Pentax K-x * Pentax K-r + * Pentax K-3 * Pentax K-5 * Pentax K-5 II * Pentax K-5 II s + * Pentax K-50 + * Pentax K-500 * Pentax K-7 * Pentax Optio S * Pentax Optio S4 * Pentax Optio 33WR * Pentax Optio 750Z + * Pentax Q7 * Pentax 645D * Phase One LightPhase * Phase One H 10 @@ -820,8 +862,13 @@ dcraw -c crw_0001.crw | cjpeg > crw_0001.jpeg * Pixelink A782 * Polaroid x530 * Redcode R3D format + * Ricoh GR + * Ricoh GX200 + * Ricoh GXR MOUNT A12 + * Ricoh GXR A16 * Rollei d530flex * RoverShot 3320af + * Samsung EK-GN120 * Samsung EX1 * Samsung EX2F * Samsung GX-1S @@ -835,6 +882,8 @@ dcraw -c crw_0001.crw | cjpeg > crw_0001.jpeg * Samsung NX210 * Samsung NX300 * Samsung NX1000 + * Samsung NX1100 + * Samsung NX2000 * Samsung WB550 * Samsung WB2000 * Samsung S85 (hacked) @@ -864,7 +913,10 @@ dcraw -c crw_0001.crw | cjpeg > crw_0001.jpeg * Sony DSC-F828 * Sony DSC-R1 * Sony DSC-RX1 + * Sony DSC-RX1R + * Sony DSC-RX10 * Sony DSC-RX100 + * Sony DSC-RX100M2 * Sony DSC-V3 * Sony DSLR-A100 * Sony DSLR-A200 @@ -881,11 +933,16 @@ dcraw -c crw_0001.crw | cjpeg > crw_0001.jpeg * Sony DSLR-A700 * Sony DSLR-A850 * Sony DSLR-A900 + * Sony ILCE-7 + * Sony ILCE-7R + * Sony ILCE-3000 + * Sony ILCE-5000 * Sony NEX-3 * Sony NEX-3N * Sony NEX-5 * Sony NEX-5N * Sony NEX-5R + * Sony NEX-5T * Sony NEX-6 * Sony NEX-7 * Sony NEX-C3 @@ -916,11 +973,11 @@ References 9. http://www.cybercom.net/~dcoffin/dcraw/dcraw.c 10. http://www.cybercom.net/~dcoffin/resume.html 11. http://www.outbackphoto.com/artofraw/raw_07/essay.html - 12. http://news.com.com/Nikons+photo+encryption+reported+broken/2100-1030_3-5679848.html + 12. http://news.cnet.com/Nikons-photo-encryption-reported-broken/2100-1030_3-5679848.html 13. http://www.dpreview.com/news/0504/05042701davecoffininterview.asp 14. http://www.editorsguild.com/v2/magazine/archives/0705/cover_story.htm - 15. http://www.schnebeck.de/interview-with-dave-coffin-creator-of-dcraw - 16. http://www.ladinamo.org/english/raw-format-the-captive-photo.php + 15. http://archive.is/0FyJw + 16. https://web.archive.org/web/20121015035554/http://www.ladinamo.org/english/raw-format-the-captive-photo.php 17. http://www.cybercom.net/~dcoffin/dcraw/dcraw.c 18. http://www.cybercom.net/~dcoffin/dcraw/#faq 19. http://www.cybercom.net/~dcoffin/dcraw/dcraw.1.html diff --git a/README.SuSE b/README.openSUSE similarity index 100% rename from README.SuSE rename to README.openSUSE diff --git a/dcraw-9.19.tar.gz b/dcraw-9.19.tar.gz deleted file mode 100644 index ca04daf..0000000 --- a/dcraw-9.19.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:851f109348e01c28f005f05c23b07e8d34645933e9eb5306a8aa3527845b8af4 -size 170003 diff --git a/dcraw-9.20.tar.gz b/dcraw-9.20.tar.gz new file mode 100644 index 0000000..59f7807 --- /dev/null +++ b/dcraw-9.20.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aedc39294031d5d777783af9a862eab70b5783cfddea7a2d937a86e6aabb3d94 +size 171270 diff --git a/dcraw.changes b/dcraw.changes index 7752413..0d7bb6a 100644 --- a/dcraw.changes +++ b/dcraw.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Mon Feb 17 21:56:48 UTC 2014 - asterios.dramis@gmail.com + +- Update to version 9.20: + dcraw - revision 1.461 + * Fixed Sony A700 black level. + * Added three temporary color matrices. + * Use Little CMS version 2. + * Support the Kodak 12-megapixel camera(s). + * Can now use "-M" with a DNG file that embeds a bad color matrix. + * Improved support for Nokia cameraphones. + * Support the Alcatel 5235D, Powershot G16 and S120, Pentax K-3, etc. + * Added tone curve for Canon RMF files. + * Copied color matrices from DNG Converter 8.3. + * Support blacklevel patterns up to 64x64. + dcparse - revision 1.75 + * Read the Pentax K-3 MakerNote. +- Renamed README.SuSE to README.openSUSE. +- Added new build requirement liblcms2-devel (removed liblcms-devel). + ------------------------------------------------------------------- Sun Jun 16 20:54:03 UTC 2013 - asterios.dramis@gmail.com diff --git a/dcraw.spec b/dcraw.spec index 8a7b2b5..4cd47da 100644 --- a/dcraw.spec +++ b/dcraw.spec @@ -1,7 +1,7 @@ # # spec file for package dcraw # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: dcraw -Version: 9.19 +Version: 9.20 Release: 0 Summary: Raw Digital Photo Decoding License: GPL-2.0+ @@ -34,14 +34,14 @@ Source5: http://www.cybercom.net/~dcoffin/dcraw/fujiturn.c Source6: http://www.cybercom.net/~dcoffin/dcraw/parse.c Source7: http://www.cybercom.net/~dcoffin/dcraw/rawphoto.c #*** -Source100: README.SuSE +Source100: README.openSUSE Source101: update_dcraw # PATCH-FIX-OPENSUSE fuji_green.c_fix_gcc_warnings.patch asterios.dramis@gmail.com -- Fix gcc implicit declaration warning Patch0: fuji_green.c_fix_gcc_warnings.patch BuildRequires: gettext-runtime BuildRequires: libjasper-devel BuildRequires: libjpeg-devel -BuildRequires: liblcms-devel +BuildRequires: liblcms2-devel Recommends: %{name}-lang = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -62,7 +62,7 @@ for file in *.c ; do LDFLAGS= OTHERFLAGS= if test $file = dcraw.c ; then - LDFLAGS="-lm -ljasper -ljpeg -llcms -DLOCALEDIR=\""%{_datadir}/locale"\"" + LDFLAGS="-lm -ljasper -ljpeg -llcms2 -DLOCALEDIR=\""%{_datadir}/locale"\"" fi if test $file = fuji_green.c ; then LDFLAGS="-lm" @@ -116,7 +116,7 @@ mv badpixels .badpixels %files %defattr(-,root,root,-) -%doc .badpixels README README.SuSE rawphoto.c +%doc .badpixels README README.openSUSE rawphoto.c %{_bindir}/clean_crw %{_bindir}/dcparse %{_bindir}/dcraw diff --git a/parse.c b/parse.c index 9aea891..f0342b3 100644 --- a/parse.c +++ b/parse.c @@ -1,12 +1,12 @@ /* Raw Photo Parser - Copyright 2004-2010 by Dave Coffin, dcoffin a cybercom o net + Copyright 2004-2014 by Dave Coffin, dcoffin a cybercom o net This program displays raw metadata for all raw photo formats. It is free for all uses. - $Revision: 1.74 $ - $Date: 2012/01/24 07:15:43 $ + $Revision: 1.75 $ + $Date: 2014/01/14 20:40:01 $ */ #include @@ -254,10 +254,12 @@ void parse_makernote (int base, int level) val = get2(); /* should be 42 decimal */ offset = get4(); fseek (ifp, offset-8, SEEK_CUR); - } else if (!strcmp (buf,"OLYMPUS")) { + } else if (!strcmp (buf,"OLYMPUS") || + !strcmp (buf,"PENTAX ")) { base = ftell(ifp)-10; fseek (ifp, -2, SEEK_CUR); - order = get2(); get2(); + order = get2(); + if (buf[0] == 'O') get2(); } else if (!strncmp (buf,"SONY",4) || !strcmp (buf,"Panasonic")) { goto nf; @@ -369,8 +371,8 @@ void sony_decrypt (unsigned *data, int len, int start, int key) for (p=0; p < 127; p++) pad[p] = htonl(pad[p]); } - while (len--) - *data++ ^= pad[p++ & 127] = pad[(p+1) & 127] ^ pad[(p+65) & 127]; + while (len-- && p++) + *data++ ^= pad[(p-1) & 127] = pad[p & 127] ^ pad[(p+64) & 127]; } int parse_tiff_ifd (int base, int level)