Hello community, here is the log from the commit of package dcraw checked in at Thu Aug 17 18:13:23 CEST 2006. -------- --- dcraw/dcraw.changes 2006-08-02 13:15:59.000000000 +0200 +++ dcraw/dcraw.changes 2006-08-17 17:37:12.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Aug 17 17:35:46 CEST 2006 - postadal@suse.cz + +- updated to RCS 1.340 + * improved support for the Olympus E-330 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dcraw.spec ++++++ --- /var/tmp/diff_new_pack.YUbBEE/_old 2006-08-17 18:13:14.000000000 +0200 +++ /var/tmp/diff_new_pack.YUbBEE/_new 2006-08-17 18:13:14.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package dcraw (Version 1.338) +# spec file for package dcraw (Version 1.340) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,7 +12,7 @@ Name: dcraw BuildRequires: libjpeg-devel liblcms-devel -Version: 1.338 +Version: 1.340 Release: 1 License: distributable, Other License(s), see package Group: Productivity/Graphics/Convertors @@ -77,6 +77,9 @@ %doc %_mandir/man*/* %changelog -n dcraw +* Thu Aug 17 2006 - postadal@suse.cz +- updated to RCS 1.340 + * improved support for the Olympus E-330 * Wed Aug 02 2006 - postadal@suse.cz - updated to RCS 1.338 * added "-H 2" option for rudimentary highlight recovery ++++++ README ++++++ --- dcraw/README 2006-08-02 13:33:54.000000000 +0200 +++ dcraw/README 2006-08-17 17:35:09.000000000 +0200 @@ -125,58 +125,59 @@ * [48]PhotoReviewer by Ben Haller * [49]Picasa from Google * [50]Picture Arena by Felix Schwarz - * [51]PiXPO by How2Share Technologies - * [52]PolyView by Polybytes - * [53]PowerShovel-II by Luc Minnebo - * [54]RAW Developer by Iridient Digital - * [55]Raw Magick - * [56]RawConvert by Jason Swain - * [57]RawDrop by Frank Siegert - * [58]RawShooter from pixmantec - * [59]RawView by Jari Savolainen - * [60]Serif PhotoPlus, PanoramaPlus, and AlbumPlus - * [61]SharpRaw by Duane DeSieno - * [62]SilverFast DCPro by LaserSoft Imaging - * [63]StudioLine Photo by H&M Software - * [64]ViewIt by Zdzislaw Losvik - * [65]Viewer n5 by Dmitry Fedorov - * [66]VueScan by Ed Hamrick + * [51]PixInsight by Pleiades Software + * [52]PiXPO by How2Share Technologies + * [53]PolyView by Polybytes + * [54]PowerShovel-II by Luc Minnebo + * [55]RAW Developer by Iridient Digital + * [56]Raw Magick + * [57]RawConvert by Jason Swain + * [58]RawDrop by Frank Siegert + * [59]RawShooter from pixmantec + * [60]RawView by Jari Savolainen + * [61]Serif PhotoPlus, PanoramaPlus, and AlbumPlus + * [62]SharpRaw by Duane DeSieno + * [63]SilverFast DCPro by LaserSoft Imaging + * [64]StudioLine Photo by H&M Software + * [65]ViewIt by Zdzislaw Losvik + * [66]Viewer n5 by Dmitry Fedorov + * [67]VueScan by Ed Hamrick Frequently Asked Questions I don't have a C compiler. Could you send me an executable? No, but Francisco Montilla provides Mac OS and Windows - executables [67]on his website. And Benjamin Lebsanft has - volunteered to maintain [68]Windows executables optimized for + executables [68]on his website. And Benjamin Lebsanft has + volunteered to maintain [69]Windows executables optimized for specific CPUs. If you're familiar with the DOS command line but don't know C, - you can install this [69]free C compiler for Windows and + you can install this [70]free C compiler for Windows and compile dcraw.c quite easily. How can I read the EXIF data (shutter speed, aperture, etc.)? - [70]Phil Harvey's ExifTool provides a unified Perl-based EXIF + [71]Phil Harvey's ExifTool provides a unified Perl-based EXIF reader (and editor!) for all cameras and file formats. "dcraw -i -v" is much faster, but provides less information. How can I read NEF files from Nikon scanners? - Dcraw only supports cameras. Try [71]this simple program for + Dcraw only supports cameras. Try [72]this simple program for scanners. How can I read Nikon Dust Off images (NDF files)? - [72]Use this program. + [73]Use this program. Do you have any specifications describing raw photo formats? Yes, but they tend to omit important details, like how to decompress the raw image or decrypt private metadata. See the - [73]TIFF spec, the [74]TIFF/EP spec, the [75]Adobe DNG spec, - the [76]CIFF (CRW) spec, and the [77]X3F spec. + [74]TIFF spec, the [75]TIFF/EP spec, the [76]Adobe DNG spec, + the [77]CIFF (CRW) spec, and the [78]X3F spec. I'm designing a digital camera. How do I convert its raw photos into something that dcraw and Adobe Photoshop can open? - Download [78]LibTIFF v3.8.0 and apply [79]this patch. Then use - [80]this C program as a template for converting your photos to - valid [81]Adobe DNG files. + Download [79]LibTIFF v3.8.0 and apply [80]this patch. Then use + [81]this C program as a template for converting your photos to + valid [82]Adobe DNG files. I shot a raw photo with no light. Why does it appear all noisy, when it should be solid black? @@ -192,11 +193,11 @@ 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 [82]Photoshop and - [83]CinePaint, but it's no good for most image viewers. + professional image editors such as [83]Photoshop and + [84]CinePaint, but it's no good for most image viewers. What does the "-f" (four color RGB) option do? - If you see patterns like [84]this or [85]this in your output + If you see patterns like [85]this or [86]this in your output images, first try "dcraw -a". If these patterns persist, use "dcraw -f" to get rid of them. @@ -210,8 +211,8 @@ dcraw -c crw_0001.crw | ppmtobmp > crw_0001.bmp dcraw -c crw_0001.crw | cjpeg > crw_0001.jpeg - I used the [86]Netpbm toolkit in these examples. - [87]ImageMagick also does command-line format conversions. Both + I used the [87]Netpbm toolkit in these examples. + [88]ImageMagick also does command-line format conversions. Both are free. Why don't you implement dcraw as a library? @@ -225,7 +226,7 @@ file 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 [88]explains this + Run it as a separate process. Eric Raymond [89]explains this technique here. Why are there false colors along edges within the image? @@ -241,7 +242,7 @@ Variable Number of Gradients (VNG), and Adaptive Homogeneity-Directed (AHD). - [89]The Foveon X3 Capture chip requires a different kind of + [90]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 @@ -249,14 +250,14 @@ How do I get my camera to take raw photos? For some Nikon Coolpix cameras, you need to enable a - [90]special "DIAG RAW" mode. - For Casio cameras, see [91]Maurice Delaney's website or read - [92]this discussion on dpreview. - For the Minolta DiMAGE G400, G500, G530, or G600, go [93]here - (in Russian) or [94]here (in English). + [91]special "DIAG RAW" mode. + For Casio cameras, see [92]Maurice Delaney's website or read + [93]this discussion on dpreview. + For the Minolta DiMAGE G400, G500, G530, or G600, go [94]here + (in Russian) or [95]here (in English). For the Minolta DiMAGE Z2 and Nikon Coolpix 2100/3100/3700, - [95]go here. - For SMaL cameras, see the [96]camerahacking Forum. + [96]go here. + For SMaL cameras, see the [97]camerahacking Forum. For other cameras, refer to the User's Manual. @@ -264,7 +265,7 @@ Most likely, yes. The cameras listed below are supported. If your camera is not on the list, try dcraw anyway. If it doesn't work, post a raw image to a website and e-mail me the URL. If - you don't have a website, use [97]Dropload or [98]YouSendIt. + you don't have a website, use [98]Dropload or [99]YouSendIt. Ideally, your sample image should show a standard white card or color chart in direct sunlight, with other colors in the @@ -342,11 +343,11 @@ + Imacon Ixpress 22-megapixel + Imacon Ixpress 39-megapixel + ISG 2020x1520 - + Kodak DC20 (see [99]Oliver Hartman's page) - + Kodak DC25 (see [100]Jun-ichiro Itoh's page) + + Kodak DC20 (see [100]Oliver Hartman's page) + + Kodak DC25 (see [101]Jun-ichiro Itoh's page) + Kodak DC40 + Kodak DC50 - + Kodak DC120 (also try [101]kdc2tiff) + + Kodak DC120 (also try [102]kdc2tiff) + Kodak DCS315C + Kodak DCS330C + Kodak DCS420 @@ -546,54 +547,55 @@ 48. http://www.sticksoftware.com/software/PhotoReviewer.html 49. http://www.picasa.com/ 50. http://www.picturearena.com/ - 51. http://www.pixpo.com/ - 52. http://www.polybytes.com/ - 53. http://lens.liteserv.com/download/powershovel2.php - 54. http://www.iridientdigital.com/ - 55. http://www.rawmagick.com/ - 56. http://www.i-graph.com/ - 57. http://www.wizards.de/rawdrop - 58. http://www.pixmantec.com/ - 59. http://www.through-the-lens.net/ - 60. http://www.serif.com/ - 61. http://www.logicaldesigns.com/ - 62. http://www.silverfast.com/ - 63. http://www.studioline.net/ - 64. http://www.hexcat.com/viewit/ - 65. http://www.dimin.net/software/viewer/ - 66. http://www.hamrick.com/ - 67. http://www.insflug.org/raw/ - 68. http://www.lebsanft.org/blog/index.php?cat=9 - 69. http://www.delorie.com/djgpp/ - 70. http://www.sno.phy.queensu.ca/~phil/exiftool/ - 71. http://www.cybercom.net/~dcoffin/dcraw/scan.c - 72. http://www.cybercom.net/~dcoffin/dcraw/read_ndf.c - 73. http://partners.adobe.com/asn/developer/PDFS/TN/TIFF6.pdf - 74. http://www.map.tu.chiba-u.ac.jp/IEC/100/TA2/recdoc/N4378.pdf - 75. http://www.adobe.com/products/dng/pdfs/dng_spec.pdf - 76. http://xyrion.org/ciff/ - 77. http://www.x3f.info/technotes/FileDocs/X3F_Format.pdf - 78. http://dl.maptools.org/dl/libtiff/tiff-3.8.0.tar.gz - 79. http://www.cybercom.net/~dcoffin/dcraw/libtiff.patch - 80. http://www.cybercom.net/~dcoffin/dcraw/elphel_dng.c - 81. http://www.adobe.com/products/dng/main.html - 82. http://www.adobe.com/products/photoshop/main.html - 83. http://cinepaint.sourceforge.net/ - 84. http://www.cybercom.net/~dcoffin/dcraw/ahd_maze.png - 85. http://www.cybercom.net/~dcoffin/dcraw/vng_grid.png - 86. http://netpbm.sourceforge.net/ - 87. http://www.imagemagick.org/ - 88. http://www.faqs.org/docs/artu/multiprogramchapter.html - 89. http://www.dpreview.com/news/0202/02021101foveonx3.asp - 90. http://e2500.narod.ru/raw_format_e.htm - 91. http://www.inweb.ch/foto/rawformat.html - 92. http://forums.dpreview.com/forums/read.asp?forum=1015&message=4961779 - 93. http://myfototest.narod.ru/ - 94. http://forums.dpreview.com/forums/read.asp?forum=1024&message=11773287 - 95. http://tester13.nm.ru/nikon/ - 96. http://www.camerahacking.com/ - 97. http://dropload.com/ - 98. http://yousendit.com/ - 99. http://www.planet-interkom.de/oliver.hartmann/dc20secr.htm - 100. http://www.itojun.org/diary/19961113/index.eng.html - 101. http://kdc2tiff.sourceforge.net/ + 51. http://pleiades-astrophoto.com/ + 52. http://www.pixpo.com/ + 53. http://www.polybytes.com/ + 54. http://lens.liteserv.com/download/powershovel2.php + 55. http://www.iridientdigital.com/ + 56. http://www.rawmagick.com/ + 57. http://www.i-graph.com/ + 58. http://www.wizards.de/rawdrop + 59. http://www.pixmantec.com/ + 60. http://www.through-the-lens.net/ + 61. http://www.serif.com/ + 62. http://www.logicaldesigns.com/ + 63. http://www.silverfast.com/ + 64. http://www.studioline.net/ + 65. http://www.hexcat.com/viewit/ + 66. http://www.dimin.net/software/viewer/ + 67. http://www.hamrick.com/ + 68. http://www.insflug.org/raw/ + 69. http://www.lebsanft.org/blog/index.php?cat=9 + 70. http://www.delorie.com/djgpp/ + 71. http://www.sno.phy.queensu.ca/~phil/exiftool/ + 72. http://www.cybercom.net/~dcoffin/dcraw/scan.c + 73. http://www.cybercom.net/~dcoffin/dcraw/read_ndf.c + 74. http://partners.adobe.com/asn/developer/PDFS/TN/TIFF6.pdf + 75. http://www.map.tu.chiba-u.ac.jp/IEC/100/TA2/recdoc/N4378.pdf + 76. http://www.adobe.com/products/dng/pdfs/dng_spec.pdf + 77. http://xyrion.org/ciff/ + 78. http://www.x3f.info/technotes/FileDocs/X3F_Format.pdf + 79. http://dl.maptools.org/dl/libtiff/tiff-3.8.0.tar.gz + 80. http://www.cybercom.net/~dcoffin/dcraw/libtiff.patch + 81. http://www.cybercom.net/~dcoffin/dcraw/elphel_dng.c + 82. http://www.adobe.com/products/dng/main.html + 83. http://www.adobe.com/products/photoshop/main.html + 84. http://cinepaint.sourceforge.net/ + 85. http://www.cybercom.net/~dcoffin/dcraw/ahd_maze.png + 86. http://www.cybercom.net/~dcoffin/dcraw/vng_grid.png + 87. http://netpbm.sourceforge.net/ + 88. http://www.imagemagick.org/ + 89. http://www.faqs.org/docs/artu/multiprogramchapter.html + 90. http://www.dpreview.com/news/0202/02021101foveonx3.asp + 91. http://e2500.narod.ru/raw_format_e.htm + 92. http://www.inweb.ch/foto/rawformat.html + 93. http://forums.dpreview.com/forums/read.asp?forum=1015&message=4961779 + 94. http://myfototest.narod.ru/ + 95. http://forums.dpreview.com/forums/read.asp?forum=1024&message=11773287 + 96. http://tester13.nm.ru/nikon/ + 97. http://www.camerahacking.com/ + 98. http://dropload.com/ + 99. http://yousendit.com/ + 100. http://www.planet-interkom.de/oliver.hartmann/dc20secr.htm + 101. http://www.itojun.org/diary/19961113/index.eng.html + 102. http://kdc2tiff.sourceforge.net/ ++++++ dcraw.c ++++++ --- dcraw/dcraw.c 2006-07-31 23:39:29.000000000 +0200 +++ dcraw/dcraw.c 2006-08-08 17:10:01.000000000 +0200 @@ -19,11 +19,11 @@ copy them from an earlier, non-GPL Revision of dcraw.c, or (c) purchase a license from the author. - $Revision: 1.338 $ - $Date: 2006/07/31 21:34:50 $ + $Revision: 1.340 $ + $Date: 2006/08/08 15:06:13 $ */ -#define VERSION "8.28" +#define VERSION "8.29" #define _GNU_SOURCE #define _USE_MATH_DEFINES @@ -1608,6 +1608,7 @@ } if (ble > bls) black /= (ble - bls) * height; free (data); + maximum = 0xfff; } void CLASS olympus_cseries_load_raw() @@ -3985,6 +3986,7 @@ for (i=19; i--; ) str[i] = fgetc(ifp); else fread (str, 19, 1, ifp); + memset (&t, 0, sizeof t); if (sscanf (str, "%d:%d:%d %d:%d:%d", &t.tm_year, &t.tm_mon, &t.tm_mday, &t.tm_hour, &t.tm_min, &t.tm_sec) != 6) return; @@ -4519,7 +4521,10 @@ switch (tiff_compress) { case 0: case 1: load_raw = tiff_bps > 8 ? - &CLASS unpacked_load_raw : &CLASS eight_bit_load_raw; break; + &CLASS unpacked_load_raw : &CLASS eight_bit_load_raw; + if (tiff_ifd[raw].bytes * 5 == raw_width * raw_height * 8) + load_raw = &CLASS olympus_e300_load_raw; + break; case 6: case 7: case 99: load_raw = &CLASS lossless_jpeg_load_raw; break; case 262: @@ -4777,6 +4782,7 @@ struct tm t; fseek (ifp, 0, SEEK_SET); + memset (&t, 0, sizeof t); do { fgets (line, 128, ifp); if ((val = strchr(line,'='))) @@ -4949,6 +4955,7 @@ } else if (!memcmp(tag,"IDIT",4) && size < 64) { fread (date, 64, 1, ifp); date[size] = 0; + memset (&t, 0, sizeof t); if (sscanf (date, "%*s %s %d %d:%d:%d %d", month, &t.tm_mday, &t.tm_hour, &t.tm_min, &t.tm_sec, &t.tm_year) == 6) { for (i=0; i < 12 && strcmp(mon[i],month); i++); @@ -6109,13 +6116,8 @@ !strcmp(model,"E-500")) { width -= 20; maximum = 0xfc30; - if (fsize <= 15728640) { - maximum = 0xfff; - load_raw = &CLASS olympus_e300_load_raw; - } } else if (!strcmp(model,"E-330")) { width -= 30; - load_raw = &CLASS olympus_e300_load_raw; } else if (!strcmp(model,"C770UZ")) { height = 1718; width = 2304; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org