diff -Nru dcraw-8.99/.badpixels dcraw-9.17/.badpixels --- dcraw-8.99/.badpixels 2006-12-23 21:02:28.000000000 +0000 +++ dcraw-9.17/.badpixels 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ -# .badpixels file for my Canon PowerShot G2, serial no. 4624504380 -# dcraw will use this file if run in the same directory, or in any -# subdirectory. - -# Always use "dcraw -d -j -t 0" when locating bad pixels!! - -# Format is: pixel column, pixel row, UNIX time of death - -# This pixel went bad between August 1 and 4, 2002 - 962 91 1028350000 -# This pixel went bad between January 9 and 30, 2003 - 902 877 1043000000 - -# These are only visible in low light, so I haven't dated them: - 621 943 0 -1285 1067 0 -1286 1067 0 -2181 1532 0 - -# I swept these up 4/19/2005 - 763 36 1110000000 -1827 466 1110000000 - -# low light - 198 1288 1110000000 - 346 328 1110000000 - 429 273 1110000000 - 621 943 1110000000 - 624 874 1110000000 - 848 400 1110000000 -1682 1686 1110000000 -1892 1250 1110000000 -2234 484 1110000000 -2242 618 1110000000 - - 555 698 1135100000 # December 20-21, 2005 - 640 157 1139000000 # February 2-5, 2006 diff -Nru dcraw-8.99/Makefile dcraw-9.17/Makefile --- dcraw-8.99/Makefile 2013-01-03 16:12:14.000000000 +0000 +++ dcraw-9.17/Makefile 2013-01-03 15:45:16.000000000 +0000 @@ -1,6 +1,7 @@ # Executables CC = gcc INSTALL= /usr/bin/install +PREFIX = /usr/local # Flags CFLAGS = -I. -O4 -g -Wall @@ -12,7 +13,7 @@ default: dcraw dcparse dcfujiturn dcfujiturn16 dcfujigreen dccleancrw dcraw: dcraw.o - $(CC) -o $@ dcraw.o -lm -ljpeg -llcms + $(CC) -o $@ dcraw.o -lm -ljpeg -llcms -ljasper dcparse: parse.o $(CC) -o $@ parse.o @@ -35,6 +36,7 @@ rm -f dcfujiturn16 dcraw.o: dcraw.c + $(CC) -c -o $@ dcraw.c parse.o: parse.c @@ -51,10 +53,19 @@ clean_crw.o: clean_crw.c install: dcraw dcparse dcfujiturn dcfujiturn16 dcfujigreen dccleancrw - $(INSTALL) dcraw $(DESTDIR)/usr/bin - $(INSTALL) dcraw.1 $(DESTDIR)/usr/share/man/man1 - $(INSTALL) dcparse $(DESTDIR)/usr/bin - $(INSTALL) dcfujiturn $(DESTDIR)/usr/bin - $(INSTALL) dcfujiturn16 $(DESTDIR)/usr/bin - $(INSTALL) dcfujigreen $(DESTDIR)/usr/bin - $(INSTALL) dccleancrw $(DESTDIR)/usr/bin + $(INSTALL) -D dcraw $(DESTDIR)/$(PREFIX)/bin/dcraw + $(INSTALL) -D dcparse $(DESTDIR)/$(PREFIX)/bin/dcparse + $(INSTALL) -D dcfujiturn $(DESTDIR)/$(PREFIX)/bin/dcfujiturn + $(INSTALL) -D dcfujiturn16 $(DESTDIR)/$(PREFIX)/bin/dcfujiturn16 + $(INSTALL) -D dcfujigreen $(DESTDIR)/$(PREFIX)/bin/dcfujigreen + $(INSTALL) -D dccleancrw $(DESTDIR)/$(PREFIX)/bin/dccleancrw + $(INSTALL) -D dcraw.1 $(DESTDIR)/$(PREFIX)/share/man/man1/dcraw.1 + for file in $(wildcard dcraw_*.1); do \ + lang=`echo $${file} | sed 's/dcraw_//' | sed 's/\.1//'`; \ + $(INSTALL) -D $${file} $(DESTDIR)/$(PREFIX)/share/man/$${lang}/man1/dcraw.1; \ + done; + for file in $(wildcard dcraw_*.po); do \ + lang=`echo $${file} | sed 's/dcraw_//' | sed 's/\.po//'`; \ + $(INSTALL) -d $(DESTDIR)/$(PREFIX)/share/locale/$${lang}/LC_MESSAGES; \ + msgfmt -o $(DESTDIR)/$(PREFIX)/share/locale/$${lang}/LC_MESSAGES/dcraw.mo $${file}; \ + done; diff -Nru dcraw-8.99/Makefile~ dcraw-9.17/Makefile~ --- dcraw-8.99/Makefile~ 1970-01-01 00:00:00.000000000 +0000 +++ dcraw-9.17/Makefile~ 2013-01-03 15:43:34.000000000 +0000 @@ -0,0 +1,71 @@ +# Executables +CC = gcc +INSTALL= /usr/bin/install +PREFIX = /usr/local + +# Flags +CFLAGS = -I. -O4 -g -Wall + +SRC = dcraw.c parse.c fujiturn.c fuji_green.c clean_crw.c +OBJ = dcraw.o parse.o fujiturn.o fujiturn16.o fuji_green.o clean_crw.o + +# Targets +default: dcraw dcparse dcfujiturn dcfujiturn16 dcfujigreen dccleancrw + +dcraw: dcraw.o + $(CC) -o $@ dcraw.o -lm -ljpeg -llcms + +dcparse: parse.o + $(CC) -o $@ parse.o + +dcfujiturn: fujiturn.o + $(CC) -o $@ fujiturn.o + +dcfujiturn16: fujiturn16.o + $(CC) -o $@ fujiturn16.o + +dcfujigreen: fuji_green.o + $(CC) -o $@ fuji_green.o -lm + +dccleancrw: clean_crw.o + $(CC) -o $@ clean_crw.o + +clean: + rm -f core *.o + rm -f dcraw dcparse dcfujiturn dcfujigreen dccleancrw + rm -f dcfujiturn16 + +dcraw.o: dcraw.c + $(CC) -c -o $@ dcraw.c + +parse.o: parse.c + +fixdates.o: fixdates.c + +fujiturn.o: fujiturn.c + +fujiturn16.o: fujiturn.c + $(CC) -c -D_16BIT -o $@ fujiturn.c + +fuji_green.o: fuji_green.c + $(CC) -c -include netinet/in.h -o $@ fuji_green.c + +clean_crw.o: clean_crw.c + +install: dcraw dcparse dcfujiturn dcfujiturn16 dcfujigreen dccleancrw + $(INSTALL) -D dcraw $(DESTDIR)/$(PREFIX)/bin/dcraw + $(INSTALL) -D dcparse $(DESTDIR)/$(PREFIX)/bin/dcparse + $(INSTALL) -D dcfujiturn $(DESTDIR)/$(PREFIX)/bin/dcfujiturn + $(INSTALL) -D dcfujiturn16 $(DESTDIR)/$(PREFIX)/bin/dcfujiturn16 + $(INSTALL) -D dcfujigreen $(DESTDIR)/$(PREFIX)/bin/dcfujigreen + $(INSTALL) -D dccleancrw $(DESTDIR)/$(PREFIX)/bin/dccleancrw + $(INSTALL) -D dcraw.1 $(DESTDIR)/$(PREFIX)/share/man/man1/dcraw.1 + for file in $(wildcard dcraw_*.1); do \ + lang=`echo $${file} | sed 's/dcraw_//' | sed 's/\.1//'`; \ + $(INSTALL) -D $${file} $(DESTDIR)/$(PREFIX)/share/man/$${lang}/man1/dcraw.1; \ + done; + for file in $(wildcard dcraw_*.po); do \ + lang=`echo $${file} | sed 's/dcraw_//' | sed 's/\.po//'`; \ + $(INSTALL) -d $(DESTDIR)/$(PREFIX)/share/locale/$${lang}/LC_MESSAGES; \ + msgfmt -o $(DESTDIR)/$(PREFIX)/share/locale/$${lang}/LC_MESSAGES/dcraw.mo $${file}; \ + done; diff -Nru dcraw-8.99/dcraw.1 dcraw-9.17/dcraw.1 --- dcraw-8.99/dcraw.1 2013-01-03 16:12:14.000000000 +0000 +++ dcraw-9.17/dcraw.1 2013-01-03 13:09:39.000000000 +0000 @@ -10,6 +10,7 @@ .\" http://www.cybercom.net/~dcoffin .\" .TH dcraw 1 "May 14, 2009" +.LO 1 .SH NAME dcraw - command-line decoder for raw digital photos .SH SYNOPSIS @@ -48,6 +49,12 @@ cannot decode JPEG files!! .SH REPAIR OPTIONS .TP +.B -I +Read the raw pixels from standard input in CPU byte order with +no header. Use +.B dcraw -E -4 +to get the raw pixel values. +.TP .B -P deadpixels.txt Read the dead pixel list from this file instead of ".badpixels". See @@ -175,7 +182,12 @@ .B -D Same as .BR -d , -but totally raw (no color scaling). +but with the original unscaled pixel values. +.TP +.B -E +Same as +.BR -D , +but masked pixels are not cropped. .TP .B -h Output a half-size color image. Twice as fast as diff -Nru dcraw-8.99/dcraw.c dcraw-9.17/dcraw.c --- dcraw-8.99/dcraw.c 2009-12-25 18:51:25.000000000 +0000 +++ dcraw-9.17/dcraw.c 2013-01-03 13:09:39.000000000 +0000 @@ -1,6 +1,6 @@ /* dcraw.c -- Dave Coffin's raw photo decoder - Copyright 1997-2009 by Dave Coffin, dcoffin a cybercom o net + Copyright 1997-2012 by Dave Coffin, dcoffin a cybercom o net This is a command-line ANSI C program to convert raw photos from any digital camera on any computer running any operating system. @@ -19,11 +19,11 @@ *If you have not modified dcraw.c in any way, a link to my homepage qualifies as "full source code". - $Revision: 1.432 $ - $Date: 2009/12/25 18:51:16 $ + $Revision: 1.454 $ + $Date: 2012/12/23 19:25:36 $ */ -#define VERSION "8.99" +#define DCRAW_VERSION "9.17" #ifndef _GNU_SOURCE #define _GNU_SOURCE @@ -41,15 +41,20 @@ #include #include #include -/* - NO_JPEG disables decoding of compressed Kodak DC120 files. - NO_LCMS disables the "-p" option. - */ -#ifndef NO_JPEG -#include + +#ifdef NODEPS +#define NO_JASPER +#define NO_JPEG +#define NO_LCMS #endif +#ifndef NO_JASPER +#include /* Decode RED camera movies */ +#endif +#ifndef NO_JPEG +#include /* Decode compressed Kodak DC120 photos */ +#endif /* and Adobe Lossy DNGs */ #ifndef NO_LCMS -#include +#include /* Support color profiles */ #endif #ifdef LOCALEDIR #include @@ -57,7 +62,8 @@ #else #define _(String) (String) #endif -#ifdef DJGPP + +#if defined(DJGPP) || defined(__MINGW32__) #define fseeko fseek #define ftello ftell #else @@ -92,9 +98,12 @@ #define LONG_BIT (8 * sizeof (long)) #endif -#define ushort UshORt -typedef unsigned char uchar; -typedef unsigned short ushort; +#if !defined(uchar) +#define uchar unsigned char +#endif +#if !defined(ushort) +#define ushort unsigned short +#endif /* All global variables are defined here, and all functions that @@ -114,14 +123,15 @@ unsigned thumb_length, meta_length, profile_length; unsigned thumb_misc, *oprof, fuji_layout, shot_select=0, multi_out=0; unsigned tiff_nifds, tiff_samples, tiff_bps, tiff_compress; -unsigned black, maximum, mix_green, raw_color, zero_is_bad; +unsigned black, cblack[4], maximum, mix_green, raw_color, zero_is_bad; unsigned zero_after_ff, is_raw, dng_version, is_foveon, data_error; unsigned tile_width, tile_length, gpsdata[32], load_flags; ushort raw_height, raw_width, height, width, top_margin, left_margin; ushort shrink, iheight, iwidth, fuji_width, thumb_width, thumb_height; -int flip, tiff_flip, colors; +ushort *raw_image, (*image)[4]; +ushort white[8][8], curve[0x10000], cr2_slice[3], sraw_mul[4]; +int mask[8][4], flip, tiff_flip, colors; double pixel_aspect, aber[4]={1,1,1,1}, gamm[6]={ 0.45,4.5,0,0,0,0 }; -ushort (*image)[4], white[8][8], curve[0x10000], cr2_slice[3], sraw_mul[4]; float bright=1, user_mul[4]={0,0,0,0}, threshold=0; int half_size=0, four_color_rgb=0, document_mode=0, highlight=0; int verbose=0, use_auto_wb=0, use_camera_wb=0, use_camera_matrix=-1; @@ -146,6 +156,7 @@ struct tiff_ifd { int width, height, bps, comp, phint, offset, flip, samples, bytes; + int tile_width, tile_length; } tiff_ifd[10]; struct ph1 { @@ -167,7 +178,7 @@ #define LIM(x,min,max) MAX(min,MIN(x,max)) #define ULIM(x,y,z) ((y) < (z) ? LIM(x,y,z) : LIM(x,z,y)) #define CLIP(x) LIM(x,0,65535) -#define SWAP(a,b) { a ^= b; a ^= (b ^= a); } +#define SWAP(a,b) { a=a+b; b=a-b; a=a-b; } /* In order to inline this calculation, I make the risky @@ -208,6 +219,9 @@ 3 G R G R G R 3 B G B G B G 3 R G R G R G 3 G B G B G B */ +#define RAW(row,col) \ + raw_image[(row)*raw_width+(col)] + #define FC(row,col) \ (filters >> ((((row) << 1 & 14) + ((col) & 1)) << 1) & 3) @@ -215,9 +229,9 @@ image[((row) >> shrink)*iwidth + ((col) >> shrink)][FC(row,col)] #define BAYER2(row,col) \ - image[((row) >> shrink)*iwidth + ((col) >> shrink)][fc(row,col)] + image[((row) >> shrink)*iwidth + ((col) >> shrink)][fcol(row,col)] -int CLASS fc (int row, int col) +int CLASS fcol (int row, int col) { static const char filter[16][16] = { { 2,1,1,3,2,3,2,0,3,2,3,0,1,2,1,0 }, @@ -236,9 +250,17 @@ { 0,2,0,3,1,0,0,1,1,3,3,2,3,2,2,1 }, { 2,1,3,2,3,1,2,1,0,3,0,2,0,2,0,2 }, { 0,3,1,0,0,2,0,3,2,1,3,1,1,3,1,3 } }; - - if (filters != 1) return FC(row,col); - return filter[(row+top_margin) & 15][(col+left_margin) & 15]; + static const char filter2[6][6] = + { { 1,1,0,1,1,2 }, + { 1,1,2,1,1,0 }, + { 2,0,1,0,2,1 }, + { 1,1,2,1,1,0 }, + { 1,1,0,1,1,2 }, + { 0,2,1,2,0,1 } }; + + if (filters == 1) return filter[(row+top_margin)&15][(col+left_margin)&15]; + if (filters == 2) return filter2[(row+6) % 6][(col+6) % 6]; + return FC(row,col); } #ifndef __GLIBC__ @@ -347,20 +369,6 @@ swab (pixel, pixel, count*2); } -void CLASS canon_black (double dark[2], int nblack) -{ - int c, diff, row, col; - - if (!nblack) return; - FORC(2) dark[c] /= nblack >> 1; - if ((diff = dark[0] - dark[1])) - for (row=0; row < height; row++) - for (col=1; col < width; col+=2) - BAYER(row,col) += diff; - dark[1] += diff; - black = (dark[0] + dark[1] + 1) / 2; -} - void CLASS canon_600_fixed_wb (int temp) { static const short mul[4][5] = { @@ -480,14 +488,13 @@ void CLASS canon_600_load_raw() { uchar data[1120], *dp; - ushort pixel[896], *pix; - int irow, row, col, val; - static const short mul[4][2] = - { { 1141,1145 }, { 1128,1109 }, { 1178,1149 }, { 1128,1109 } }; + ushort *pix; + int irow, row; for (irow=row=0; irow < height; irow++) { - if (fread (data, 1, raw_width*5/4, ifp) < raw_width*5/4) derror(); - for (dp=data, pix=pixel; dp < data+1120; dp+=10, pix+=8) { + if (fread (data, 1, 1120, ifp) < 1120) derror(); + pix = raw_image + row*raw_width; + for (dp=data; dp < data+1120; dp+=10, pix+=8) { pix[0] = (dp[0] << 2) + (dp[1] >> 6 ); pix[1] = (dp[2] << 2) + (dp[1] >> 4 & 3); pix[2] = (dp[3] << 2) + (dp[1] >> 2 & 3); @@ -497,14 +504,16 @@ pix[6] = (dp[7] << 2) + (dp[9] >> 4 & 3); pix[7] = (dp[8] << 2) + (dp[9] >> 6 ); } - for (col=0; col < width; col++) - BAYER(row,col) = pixel[col]; - for (col=width; col < raw_width; col++) - black += pixel[col]; if ((row+=2) > height) row = 1; } - if (raw_width > width) - black = black / ((raw_width - width) * height) - 4; +} + +void CLASS canon_600_correct() +{ + int row, col, val; + static const short mul[4][2] = + { { 1141,1145 }, { 1128,1109 }, { 1178,1149 }, { 1128,1109 } }; + for (row=0; row < height; row++) for (col=0; col < width; col++) { if ((val = BAYER(row,col) - black) < 0) val = 0; @@ -518,23 +527,6 @@ black = 0; } -void CLASS remove_zeroes() -{ - unsigned row, col, tot, n, r, c; - - for (row=0; row < height; row++) - for (col=0; col < width; col++) - if (BAYER(row,col) == 0) { - tot = n = 0; - for (r = row-2; r <= row+2; r++) - for (c = col-2; c <= col+2; c++) - if (r < height && c < width && - FC(r,c) == FC(row,col) && BAYER(r,c)) - tot += (n++,BAYER(r,c)); - if (n) BAYER(row,col) = tot/n; - } -} - int CLASS canon_s2is() { unsigned row; @@ -710,23 +702,20 @@ return ret; } -void CLASS canon_compressed_load_raw() +void CLASS canon_load_raw() { ushort *pixel, *prow, *huff[2]; - int nblocks, lowbits, i, c, row, r, col, save, val, nblack=0; - unsigned irow, icol; + int nblocks, lowbits, i, c, row, r, save, val; int block, diffbuf[64], leaf, len, diff, carry=0, pnum=0, base[2]; - double dark[2] = { 0,0 }; crw_init_tables (tiff_compress, huff); - pixel = (ushort *) calloc (raw_width*8, sizeof *pixel); - merror (pixel, "canon_compressed_load_raw()"); lowbits = canon_has_lowbits(); if (!lowbits) maximum = 0x3ff; fseek (ifp, 540 + lowbits*raw_height*raw_width/4, SEEK_SET); zero_after_ff = 1; getbits(-1); for (row=0; row < raw_height; row+=8) { + pixel = raw_image + row*raw_width; nblocks = MIN (8, raw_height-row) * raw_width >> 6; for (block=0; block < nblocks; block++) { memset (diffbuf, 0, sizeof diffbuf); @@ -764,21 +753,8 @@ } fseek (ifp, save, SEEK_SET); } - for (r=0; r < 8; r++) { - irow = row - top_margin + r; - if (irow >= height) continue; - for (col=0; col < raw_width; col++) { - icol = col - left_margin; - if (icol < width) - BAYER(irow,icol) = pixel[r*raw_width+col]; - else if (col > 1 && (unsigned) (col-left_margin+2) > width+3) - dark[icol & 1] += (nblack++,pixel[r*raw_width+col]); - } - } } - free (pixel); FORC(2) free (huff[c]); - canon_black (dark, nblack); } /* @@ -901,10 +877,8 @@ void CLASS lossless_jpeg_load_raw() { - int jwide, jrow, jcol, val, jidx, i, j, row=0, col=0, nblack=0; - double dark[2] = { 0,0 }; + int jwide, jrow, jcol, val, jidx, i, j, row=0, col=0; struct jhead jh; - int min=INT_MAX; ushort *rp; if (!ljpeg_start (&jh, 0)) return; @@ -912,10 +886,10 @@ for (jrow=0; jrow < jh.high; jrow++) { rp = ljpeg_row (jrow, &jh); + if (load_flags & 1) + row = jrow & 1 ? height-1-jrow/2 : jrow/2; for (jcol=0; jcol < jwide; jcol++) { - val = *rp++; - if (jh.bits <= 12) - val = curve[val & 0xfff]; + val = curve[*rp++]; if (cr2_slice[0]) { jidx = jrow*jwide + jcol; i = jidx / (cr2_slice[1]*jh.high); @@ -927,21 +901,12 @@ } if (raw_width == 3984 && (col -= 2) < 0) col += (row--,raw_width); - if ((unsigned) (row-top_margin) < height) { - if ((unsigned) (col-left_margin) < width) { - BAYER(row-top_margin,col-left_margin) = val; - if (min > val) min = val; - } else if (col > 1 && (unsigned) (col-left_margin+2) > width+3) - dark[(col-left_margin) & 1] += (nblack++,val); - } + if (row >= 0) RAW(row,col) = val; if (++col >= raw_width) col = (row++,0); } } ljpeg_end (&jh); - canon_black (dark, nblack); - if (!strcasecmp(make,"KODAK")) - black = min; } void CLASS canon_sraw_load_raw() @@ -976,7 +941,7 @@ sscanf (cp, "%d.%d.%d", v, v+1, v+2); ver = (v[0]*1000 + v[1])*1000 + v[2]; hue = (jh.sraw+1) << 2; - if (unique_id == 0x80000218 && ver > 1000006 && ver < 3000000) + if (unique_id >= 0x80000281 || (unique_id == 0x80000218 && ver > 1000006)) hue = jh.sraw << 1; ip = (short (*)[4]) image; rp = ip[0]; @@ -994,16 +959,21 @@ else ip[col][c] = (ip[col-1][c] + ip[col+1][c] + 1) >> 1; } for ( ; rp < ip[0]; rp+=4) { - if (unique_id < 0x80000218) { - pix[0] = rp[0] + rp[2] - 512; - pix[2] = rp[0] + rp[1] - 512; - pix[1] = rp[0] + ((-778*rp[1] - (rp[2] << 11)) >> 12) - 512; - } else { + if (unique_id == 0x80000218 || + unique_id == 0x80000250 || + unique_id == 0x80000261 || + unique_id == 0x80000281 || + unique_id == 0x80000287) { rp[1] = (rp[1] << 2) + hue; rp[2] = (rp[2] << 2) + hue; - pix[0] = rp[0] + (( 200*rp[1] + 22929*rp[2]) >> 14); + pix[0] = rp[0] + (( 50*rp[1] + 22929*rp[2]) >> 14); pix[1] = rp[0] + ((-5640*rp[1] - 11751*rp[2]) >> 14); pix[2] = rp[0] + ((29040*rp[1] - 101*rp[2]) >> 14); + } else { + if (unique_id < 0x80000218) rp[0] -= 512; + pix[0] = rp[0] + rp[2]; + pix[2] = rp[0] + rp[1]; + pix[1] = rp[0] + ((-778*rp[1] - (rp[2] << 11)) >> 12); } FORC3 rp[c] = CLIP(pix[c] * sraw_mul[c] >> 10); } @@ -1011,31 +981,25 @@ maximum = 0x3fff; } -void CLASS adobe_copy_pixel (int row, int col, ushort **rp) +void CLASS adobe_copy_pixel (unsigned row, unsigned col, ushort **rp) { - unsigned r, c; + int c; - r = row -= top_margin; - c = col -= left_margin; if (is_raw == 2 && shot_select) (*rp)++; - if (filters) { - if (fuji_width) { - r = row + fuji_width - 1 - (col >> 1); - c = row + ((col+1) >> 1); - } - if (r < height && c < width) - BAYER(r,c) = **rp < 0x1000 ? curve[**rp] : **rp; + if (raw_image) { + if (row < raw_height && col < raw_width) + RAW(row,col) = curve[**rp]; *rp += is_raw; } else { - if (r < height && c < width) + if (row < height && col < width) FORC(tiff_samples) - image[row*width+col][c] = (*rp)[c] < 0x1000 ? curve[(*rp)[c]]:(*rp)[c]; + image[row*width+col][c] = curve[(*rp)[c]]; *rp += tiff_samples; } if (is_raw == 2 && shot_select) (*rp)--; } -void CLASS adobe_dng_load_raw_lj() +void CLASS lossless_dng_load_raw() { unsigned save, trow=0, tcol=0, jwide, jrow, jcol, row, col; struct jhead jh; @@ -1064,13 +1028,13 @@ } } -void CLASS adobe_dng_load_raw_nc() +void CLASS packed_dng_load_raw() { ushort *pixel, *rp; int row, col; pixel = (ushort *) calloc (raw_width * tiff_samples, sizeof *pixel); - merror (pixel, "adobe_dng_load_raw_nc()"); + merror (pixel, "packed_dng_load_raw()"); for (row=0; row < raw_height; row++) { if (tiff_bps == 16) read_shorts (pixel, raw_width * tiff_samples); @@ -1087,14 +1051,16 @@ void CLASS pentax_load_raw() { - ushort bit[2][13], huff[4097]; - int row, col, diff, c, i; + ushort bit[2][15], huff[4097]; + int dep, row, col, diff, c, i; ushort vpred[2][2] = {{0,0},{0,0}}, hpred[2]; fseek (ifp, meta_offset, SEEK_SET); - FORC(13) bit[0][c] = get2(); - FORC(13) bit[1][c] = fgetc(ifp); - FORC(13) + dep = (get2() + 12) & 15; + fseek (ifp, 12, SEEK_CUR); + FORC(dep) bit[0][c] = get2(); + FORC(dep) bit[1][c] = fgetc(ifp); + FORC(dep) for (i=bit[0][c]; i <= ((bit[0][c]+(4096 >> bit[1][c])-1) & 4095); ) huff[++i] = bit[1][c] << 8 | c; huff[0] = 12; @@ -1105,13 +1071,12 @@ diff = ljpeg_diff (huff); if (col < 2) hpred[col] = vpred[row & 1][col] += diff; else hpred[col & 1] += diff; - if ((unsigned) (row-top_margin) < height && col < width) - BAYER(row-top_margin,col) = hpred[col & 1]; - if (hpred[col & 1] >> 12) derror(); + RAW(row,col) = hpred[col & 1]; + if (hpred[col & 1] >> tiff_bps) derror(); } } -void CLASS nikon_compressed_load_raw() +void CLASS nikon_load_raw() { static const uchar nikon_tree[][32] = { { 0,1,5,1,1,1,1,1,1,2,0,0,0,0,0,0, /* 12-bit lossy */ @@ -1170,31 +1135,13 @@ if (col < 2) hpred[col] = vpred[row & 1][col] += diff; else hpred[col & 1] += diff; if ((ushort)(hpred[col & 1] + min) >= max) derror(); - if ((unsigned) (col-left_margin) < width) - BAYER(row,col-left_margin) = curve[LIM((short)hpred[col & 1],0,0x3fff)]; + RAW(row,col) = curve[LIM((short)hpred[col & 1],0,0x3fff)]; } } free (huff); } /* - Figure out if a NEF file is compressed. These fancy heuristics - are only needed for the D100, thanks to a bug in some cameras - that tags all images as "compressed". - */ -int CLASS nikon_is_compressed() -{ - uchar test[256]; - int i; - - fseek (ifp, data_offset, SEEK_SET); - fread (test, 1, 256, ifp); - for (i=15; i < 256; i+=16) - if (test[i]) return 1; - return 0; -} - -/* Returns 1 for a Coolpix 995, 0 for anything else. */ int CLASS nikon_e995() @@ -1268,35 +1215,6 @@ return nz > 20; } -/* - The Fuji Super CCD is just a Bayer grid rotated 45 degrees. - */ -void CLASS fuji_load_raw() -{ - ushort *pixel; - int wide, row, col, r, c; - - fseek (ifp, (top_margin*raw_width + left_margin) * 2, SEEK_CUR); - wide = fuji_width << !fuji_layout; - pixel = (ushort *) calloc (wide, sizeof *pixel); - merror (pixel, "fuji_load_raw()"); - for (row=0; row < raw_height; row++) { - read_shorts (pixel, wide); - fseek (ifp, 2*(raw_width - wide), SEEK_CUR); - for (col=0; col < wide; col++) { - if (fuji_layout) { - r = fuji_width - 1 - col + (row >> 1); - c = col + ((row+1) >> 1); - } else { - r = fuji_width - 1 + row - (col >> 1); - c = row + ((col+1) >> 1); - } - BAYER(r,c) = pixel[col]; - } - } - free (pixel); -} - void CLASS jpeg_thumb(); void CLASS ppm_thumb() @@ -1311,6 +1229,21 @@ free (thumb); } +void CLASS ppm16_thumb() +{ + int i; + char *thumb; + thumb_length = thumb_width*thumb_height*3; + thumb = (char *) calloc (thumb_length,2); + merror (thumb, "ppm16_thumb()"); + read_shorts ((ushort *) thumb, thumb_length); + for (i=0; i < thumb_length; i++) + thumb[i] = ((ushort *) thumb)[i] >> 8; + fprintf (ofp, "P6\n%d %d\n255\n", thumb_width, thumb_height); + fwrite (thumb, 1, thumb_length, ofp); + free (thumb); +} + void CLASS layer_thumb() { int i, c; @@ -1349,7 +1282,7 @@ void CLASS rollei_load_raw() { uchar pixel[10]; - unsigned iten=0, isix, i, buffer=0, row, col, todo[16]; + unsigned iten=0, isix, i, buffer=0, todo[16]; isix = raw_width * raw_height * 5 / 8; while (fread (pixel, 1, 10, ifp) == 10) { @@ -1362,19 +1295,15 @@ todo[i] = isix++; todo[i+1] = buffer >> (14-i)*5; } - for (i=0; i < 16; i+=2) { - row = todo[i] / raw_width - top_margin; - col = todo[i] % raw_width - left_margin; - if (row < height && col < width) - BAYER(row,col) = (todo[i+1] & 0x3ff); - } + for (i=0; i < 16; i+=2) + raw_image[todo[i]] = (todo[i+1] & 0x3ff); } maximum = 0x3ff; } -int CLASS bayer (unsigned row, unsigned col) +int CLASS raw (unsigned row, unsigned col) { - return (row < height && col < width) ? BAYER(row,col) : 0; + return (row < raw_height && col < raw_width) ? RAW(row,col) : 0; } void CLASS phase_one_flat_field (int is_float, int nc) @@ -1395,19 +1324,19 @@ else mrow[(c+1)*wide+x] = (num - mrow[c*wide+x]) / head[5]; } if (y==0) continue; - rend = head[1]-top_margin + y*head[5]; - for (row = rend-head[5]; row < height && row < rend; row++) { + rend = head[1] + y*head[5]; + for (row = rend-head[5]; row < raw_height && row < rend; row++) { for (x=1; x < wide; x++) { for (c=0; c < nc; c+=2) { mult[c] = mrow[c*wide+x-1]; mult[c+1] = (mrow[c*wide+x] - mult[c]) / head[4]; } - cend = head[0]-left_margin + x*head[4]; - for (col = cend-head[4]; col < width && col < cend; col++) { - c = nc > 2 ? FC(row,col) : 0; + cend = head[0] + x*head[4]; + for (col = cend-head[4]; col < raw_width && col < cend; col++) { + c = nc > 2 ? FC(row-top_margin,col-left_margin) : 0; if (!(c & 1)) { - c = BAYER(row,col) * mult[c]; - BAYER(row,col) = LIM(c,0,65535); + c = RAW(row,col) * mult[c]; + RAW(row,col) = LIM(c,0,65535); } for (c=0; c < nc; c+=2) mult[c] += mult[c+1]; @@ -1461,37 +1390,37 @@ num = num * i + poly[j]; curve[i] = LIM(num+i,0,65535); } apply: /* apply to whole image */ - for (row=0; row < height; row++) - for (col = (tag & 1)*ph1.split_col; col < width; col++) - BAYER(row,col) = curve[BAYER(row,col)]; + for (row=0; row < raw_height; row++) + for (col = (tag & 1)*ph1.split_col; col < raw_width; col++) + RAW(row,col) = curve[RAW(row,col)]; } else if (tag == 0x400) { /* Sensor defects */ while ((len -= 8) >= 0) { - col = get2() - left_margin; - row = get2() - top_margin; + col = get2(); + row = get2(); type = get2(); get2(); - if (col >= width) continue; + if (col >= raw_width) continue; if (type == 131) /* Bad column */ - for (row=0; row < height; row++) - if (FC(row,col) == 1) { + for (row=0; row < raw_height; row++) + if (FC(row-top_margin,col-left_margin) == 1) { for (sum=i=0; i < 4; i++) - sum += val[i] = bayer (row+dir[i][0], col+dir[i][1]); + sum += val[i] = raw (row+dir[i][0], col+dir[i][1]); for (max=i=0; i < 4; i++) { dev[i] = abs((val[i] << 2) - sum); if (dev[max] < dev[i]) max = i; } - BAYER(row,col) = (sum - val[max])/3.0 + 0.5; + RAW(row,col) = (sum - val[max])/3.0 + 0.5; } else { for (sum=0, i=8; i < 12; i++) - sum += bayer (row+dir[i][0], col+dir[i][1]); - BAYER(row,col) = 0.5 + sum * 0.0732233 + - (bayer(row,col-2) + bayer(row,col+2)) * 0.3535534; + sum += raw (row+dir[i][0], col+dir[i][1]); + RAW(row,col) = 0.5 + sum * 0.0732233 + + (raw(row,col-2) + raw(row,col+2)) * 0.3535534; } else if (type == 129) { /* Bad pixel */ - if (row >= height) continue; - j = (FC(row,col) != 1) * 4; + if (row >= raw_height) continue; + j = (FC(row-top_margin,col-left_margin) != 1) * 4; for (sum=0, i=j; i < j+8; i++) - sum += bayer (row+dir[i][0], col+dir[i][1]); - BAYER(row,col) = (sum + 4) >> 3; + sum += raw (row+dir[i][0], col+dir[i][1]); + RAW(row,col) = (sum + 4) >> 3; } } } else if (tag == 0x401) { /* All-color flat fields */ @@ -1525,11 +1454,11 @@ for (i=0; i < 2; i++) for (j=0; j < head[i+1]*head[i+3]; j++) xval[i][j] = get2(); - for (row=0; row < height; row++) - for (col=0; col < width; col++) { + for (row=0; row < raw_height; row++) + for (col=0; col < raw_width; col++) { cfrac = (float) col * head[3] / raw_width; cfrac -= cip = cfrac; - num = BAYER(row,col) * 0.5; + num = RAW(row,col) * 0.5; for (i=cip; i < cip+2; i++) { for (k=j=0; j < head[1]; j++) if (num < xval[0][k = head[1]*i+j]) break; @@ -1537,9 +1466,8 @@ (xval[0][k] - num) / (xval[0][k] - xval[0][k-1]); mult[i-cip] = yval[0][k-1] * frac + yval[0][k] * (1-frac); } - i = ((mult[0] * (1-cfrac) + mult[1] * cfrac) - * (row + top_margin) + num) * 2; - BAYER(row,col) = LIM(i,0,65535); + i = ((mult[0] * (1-cfrac) + mult[1] * cfrac) * row + num) * 2; + RAW(row,col) = LIM(i,0,65535); } free (yval[0]); } @@ -1547,29 +1475,22 @@ void CLASS phase_one_load_raw() { - int row, col, a, b; - ushort *pixel, akey, bkey, mask; + int a, b, i; + ushort akey, bkey, mask; fseek (ifp, ph1.key_off, SEEK_SET); akey = get2(); bkey = get2(); mask = ph1.format == 1 ? 0x5555:0x1354; - fseek (ifp, data_offset + top_margin*raw_width*2, SEEK_SET); - pixel = (ushort *) calloc (raw_width, sizeof *pixel); - merror (pixel, "phase_one_load_raw()"); - for (row=0; row < height; row++) { - read_shorts (pixel, raw_width); - for (col=0; col < raw_width; col+=2) { - a = pixel[col+0] ^ akey; - b = pixel[col+1] ^ bkey; - pixel[col+0] = (a & mask) | (b & ~mask); - pixel[col+1] = (b & mask) | (a & ~mask); + fseek (ifp, data_offset, SEEK_SET); + read_shorts (raw_image, raw_width*raw_height); + if (ph1.format) + for (i=0; i < raw_width*raw_height; i+=2) { + a = raw_image[i+0] ^ akey; + b = raw_image[i+1] ^ bkey; + raw_image[i+0] = (a & mask) | (b & ~mask); + raw_image[i+1] = (b & mask) | (a & ~mask); } - for (col=0; col < width; col++) - BAYER(row,col) = pixel[col+left_margin]; - } - free (pixel); - phase_one_correct(); } unsigned CLASS ph1_bithuff (int nbits, ushort *huff) @@ -1635,15 +1556,12 @@ if (ph1.format == 5 && pixel[col] < 256) pixel[col] = curve[pixel[col]]; } - if ((unsigned) (row-top_margin) < height) - for (col=0; col < width; col++) { - i = (pixel[col+left_margin] << 2) - - ph1.black + black[row][col >= ph1.split_col]; - if (i > 0) BAYER(row-top_margin,col) = i; - } + for (col=0; col < raw_width; col++) { + i = (pixel[col] << 2) - ph1.black + black[row][col >= ph1.split_col]; + if (i > 0) RAW(row,col) = i; + } } free (pixel); - phase_one_correct(); maximum = 0xfffc - ph1.black; } @@ -1655,18 +1573,16 @@ if (!ljpeg_start (&jh, 0)) return; order = 0x4949; ph1_bits(-1); - for (row=-top_margin; row < height; row++) { - pred[0] = pred[1] = 0x8000; - for (col=-left_margin; col < raw_width-left_margin; col+=2) { + for (row=0; row < raw_height; row++) { + pred[0] = pred[1] = 0x8000 + load_flags; + for (col=0; col < raw_width; col+=2) { FORC(2) len[c] = ph1_huff(jh.huff[0]); FORC(2) { diff = ph1_bits(len[c]); if ((diff & (1 << (len[c]-1))) == 0) diff -= (1 << len[c]) - 1; if (diff == 65535) diff = -32768; - pred[c] += diff; - if (row >= 0 && (unsigned)(col+c) < width) - BAYER(row,col+c) = pred[c]; + RAW(row,col+c) = pred[c] += diff; } } } @@ -1676,32 +1592,45 @@ void CLASS leaf_hdr_load_raw() { - ushort *pixel; + ushort *pixel=0; unsigned tile=0, r, c, row, col; - pixel = (ushort *) calloc (raw_width, sizeof *pixel); - merror (pixel, "leaf_hdr_load_raw()"); + if (!filters) { + pixel = (ushort *) calloc (raw_width, sizeof *pixel); + merror (pixel, "leaf_hdr_load_raw()"); + } FORC(tiff_samples) for (r=0; r < raw_height; r++) { if (r % tile_length == 0) { fseek (ifp, data_offset + 4*tile++, SEEK_SET); - fseek (ifp, get4() + 2*left_margin, SEEK_SET); + fseek (ifp, get4(), SEEK_SET); } if (filters && c != shot_select) continue; + if (filters) pixel = raw_image + r*raw_width; read_shorts (pixel, raw_width); - if ((row = r - top_margin) >= height) continue; - for (col=0; col < width; col++) - if (filters) BAYER(row,col) = pixel[col]; - else image[row*width+col][c] = pixel[col]; + if (!filters && (row = r - top_margin) < height) + for (col=0; col < width; col++) + image[row*width+col][c] = pixel[col+left_margin]; } - free (pixel); if (!filters) { maximum = 0xffff; raw_color = 1; + free (pixel); } } -void CLASS unpacked_load_raw(); +void CLASS unpacked_load_raw() +{ + int row, col, bits=0; + + while (1 << ++bits < maximum); + read_shorts (raw_image, raw_width*raw_height); + for (row=0; row < raw_height; row++) + for (col=0; col < raw_width; col++) + if ((RAW(row,col) >>= load_flags) >> bits + && (unsigned) (row-top_margin) < height + && (unsigned) (col-left_margin) < width) derror(); +} void CLASS sinar_4shot_load_raw() { @@ -1716,6 +1645,8 @@ unpacked_load_raw(); return; } + free (raw_image); + raw_image = 0; free (image); image = (ushort (*)[4]) calloc ((iheight=height)*(iwidth=width), sizeof *image); @@ -1730,7 +1661,7 @@ if ((r = row-top_margin - (shot >> 1 & 1)) >= height) continue; for (col=0; col < raw_width; col++) { if ((c = col-left_margin - (shot & 1)) >= width) continue; - image[r*width+c][FC(row,col)] = pixel[col]; + image[r*width+c][FC(row,col)] = pixel[col]; } } } @@ -1757,10 +1688,9 @@ else bwide = (pwide = raw_width) * tiff_bps / 8; rbits = bwide * 8 - pwide * tiff_bps; if (load_flags & 1) bwide = bwide * 16 / 15; - fseek (ifp, top_margin*bwide, SEEK_CUR); bite = 8 + (load_flags & 24); - half = (height+1) >> 1; - for (irow=0; irow < height; irow++) { + half = (raw_height+1) >> 1; + for (irow=0; irow < raw_height; irow++) { row = irow; if (load_flags & 2 && (row = irow % half * 2 + irow / half) == 1 && @@ -1779,59 +1709,30 @@ bitbuf |= (unsigned) (fgetc(ifp) << i); } val = bitbuf << (64-tiff_bps-vbits) >> (64-tiff_bps); - i = (col ^ (bite == 24)) - left_margin; - if ((unsigned) i < width) - BAYER(row,i) = val << (load_flags >> 6); - else if (load_flags & 32) - black += val; + RAW(row,col ^ (load_flags >> 6)) = val; if (load_flags & 1 && (col % 10) == 9 && fgetc(ifp) && col < width+left_margin) derror(); } vbits -= rbits; } - if (load_flags & 32 && pwide > width) - black /= (pwide - width) * height; -} - -void CLASS unpacked_load_raw() -{ - ushort *pixel; - int row, col, bits=0; - - while (1 << ++bits < maximum); - fseek (ifp, (top_margin*raw_width + left_margin) * 2, SEEK_CUR); - pixel = (ushort *) calloc (width, sizeof *pixel); - merror (pixel, "unpacked_load_raw()"); - for (row=0; row < height; row++) { - read_shorts (pixel, width); - fseek (ifp, 2*(raw_width - width), SEEK_CUR); - for (col=0; col < width; col++) - if ((BAYER2(row,col) = pixel[col]) >> bits) derror(); - } - free (pixel); } void CLASS nokia_load_raw() { uchar *data, *dp; - ushort *pixel, *pix; - int dwide, row, c; + int rev, dwide, row, col, c; + rev = 3 * (order == 0x4949); dwide = raw_width * 5 / 4; - data = (uchar *) malloc (dwide + raw_width*2); + data = (uchar *) malloc (dwide*2); merror (data, "nokia_load_raw()"); - pixel = (ushort *) (data + dwide); for (row=0; row < raw_height; row++) { - if (fread (data, 1, dwide, ifp) < dwide) derror(); - for (dp=data, pix=pixel; pix < pixel+raw_width; dp+=5, pix+=4) - FORC4 pix[c] = (dp[c] << 2) | (dp[4] >> (c << 1) & 3); - if (row < top_margin) - FORC(width) black += pixel[c]; - else - FORC(width) BAYER(row-top_margin,c) = pixel[c]; + if (fread (data+dwide, 1, dwide, ifp) < dwide) derror(); + FORC(dwide) data[c] = data[dwide+(c ^ rev)]; + for (dp=data, col=0; col < raw_width; dp+=5, col+=4) + FORC4 RAW(row,col+c) = (dp[c] << 2) | (dp[4] >> (c << 1) & 3); } free (data); - if (top_margin) black /= top_margin * width; maximum = 0x3ff; } @@ -1869,8 +1770,7 @@ } } else if ((nonz[i & 1] = pana_bits(8)) || i > 11) pred[i & 1] = nonz[i & 1] << 4 | pana_bits(4); - if (col < width) - if ((BAYER(row,col) = pred[col & 1]) > 4098) derror(); + if ((RAW(row,col) = pred[col & 1]) > 4098 && col < width) derror(); } } @@ -1901,19 +1801,19 @@ carry[2] = carry[0] > 16 ? 0 : carry[2]+1; if (col >= width) continue; if (row < 2 && col < 2) pred = 0; - else if (row < 2) pred = BAYER(row,col-2); - else if (col < 2) pred = BAYER(row-2,col); + else if (row < 2) pred = RAW(row,col-2); + else if (col < 2) pred = RAW(row-2,col); else { - w = BAYER(row,col-2); - n = BAYER(row-2,col); - nw = BAYER(row-2,col-2); + w = RAW(row,col-2); + n = RAW(row-2,col); + nw = RAW(row-2,col-2); if ((w < nw && nw < n) || (n < nw && nw < w)) { if (ABS(w-nw) > 32 || ABS(n-nw) > 32) pred = w + n - nw; else pred = (w + n) >> 1; } else pred = ABS(w-nw) > ABS(n-nw) ? w : n; } - if ((BAYER(row,col) = pred + ((diff << 2) | low)) >> 12) derror(); + if ((RAW(row,col) = pred + ((diff << 2) | low)) >> 12) derror(); } } } @@ -1935,13 +1835,13 @@ } if ((box < 12) && (box & 1)) { for (col=0; col < 1533; col++, row ^= 1) - if (col != 1) BAYER(row,col) = (col+1) & 2 ? + if (col != 1) RAW(row,col) = (col+1) & 2 ? pixel[col/2-1] + pixel[col/2+1] : pixel[col/2] << 1; - BAYER(row,1) = pixel[1] << 1; - BAYER(row,1533) = pixel[765] << 1; + RAW(row,1) = pixel[1] << 1; + RAW(row,1533) = pixel[765] << 1; } else for (col=row & 1; col < 1534; col+=2) - BAYER(row,col) = pixel[col/2] << 1; + RAW(row,col) = pixel[col/2] << 1; } maximum = 0xff << 1; } @@ -2009,7 +1909,7 @@ } for (row=0; row < height; row++) for (col=0; col < width; col++) - BAYER(row,col) = curve[pixel[row+2][col+2]]; + RAW(row,col) = curve[pixel[row+2][col+2]]; maximum = 0x3ff; } @@ -2096,8 +1996,8 @@ for (x=0; x < width/2; x++) { val = (buf[c][y+1][x] << 4) / mul[c]; if (val < 0) val = 0; - if (c) BAYER(row+y*2+c-1,x*2+2-c) = val; - else BAYER(row+r*2+y,x*2+y) = val; + if (c) RAW(row+y*2+c-1,x*2+2-c) = val; + else RAW(row+r*2+y,x*2+y) = val; } memcpy (buf[c][0]+!c, buf[c][2], sizeof buf[c][0]-2*!c); } @@ -2107,13 +2007,13 @@ if ((x+y) & 1) { r = x ? x-1 : x+1; s = x+1 < width ? x+1 : x-1; - val = (BAYER(y,x)-2048)*2 + (BAYER(y,r)+BAYER(y,s))/2; + val = (RAW(y,x)-2048)*2 + (RAW(y,r)+RAW(y,s))/2; if (val < 0) val = 0; - BAYER(y,x) = val; + RAW(y,x) = val; } } - for (i=0; i < iheight*iwidth*4; i++) - image[0][i] = curve[image[0][i]]; + for (i=0; i < height*width; i++) + raw_image[i] = curve[raw_image[i]]; maximum = 0x3fff; } @@ -2122,6 +2022,7 @@ #ifdef NO_JPEG void CLASS kodak_jpeg_load_raw() {} +void CLASS lossy_dng_load_raw() {} #else METHODDEF(boolean) @@ -2166,16 +2067,74 @@ jpeg_read_scanlines (&cinfo, buf, 1); pixel = (JSAMPLE (*)[3]) buf[0]; for (col=0; col < width; col+=2) { - BAYER(row+0,col+0) = pixel[col+0][1] << 1; - BAYER(row+1,col+1) = pixel[col+1][1] << 1; - BAYER(row+0,col+1) = pixel[col][0] + pixel[col+1][0]; - BAYER(row+1,col+0) = pixel[col][2] + pixel[col+1][2]; + RAW(row+0,col+0) = pixel[col+0][1] << 1; + RAW(row+1,col+1) = pixel[col+1][1] << 1; + RAW(row+0,col+1) = pixel[col][0] + pixel[col+1][0]; + RAW(row+1,col+0) = pixel[col][2] + pixel[col+1][2]; } } jpeg_finish_decompress (&cinfo); jpeg_destroy_decompress (&cinfo); maximum = 0xff << 1; } + +void CLASS lossy_dng_load_raw() +{ + struct jpeg_decompress_struct cinfo; + struct jpeg_error_mgr jerr; + JSAMPARRAY buf; + JSAMPLE (*pixel)[3]; + unsigned sorder=order, ntags, opcode, deg, i, j, c; + unsigned save=data_offset-4, trow=0, tcol=0, row, col; + ushort curve[3][256]; + double coeff[9], tot; + + fseek (ifp, meta_offset, SEEK_SET); + order = 0x4d4d; + ntags = get4(); + while (ntags--) { + opcode = get4(); get4(); get4(); + if (opcode != 8) + { fseek (ifp, get4(), SEEK_CUR); continue; } + fseek (ifp, 20, SEEK_CUR); + if ((c = get4()) > 2) break; + fseek (ifp, 12, SEEK_CUR); + if ((deg = get4()) > 8) break; + for (i=0; i <= deg && i < 9; i++) + coeff[i] = getreal(12); + for (i=0; i < 256; i++) { + for (tot=j=0; j <= deg; j++) + tot += coeff[j] * pow(i/255.0, j); + curve[c][i] = tot*0xffff; + } + } + order = sorder; + cinfo.err = jpeg_std_error (&jerr); + jpeg_create_decompress (&cinfo); + while (trow < raw_height) { + fseek (ifp, save+=4, SEEK_SET); + if (tile_length < INT_MAX) + fseek (ifp, get4(), SEEK_SET); + jpeg_stdio_src (&cinfo, ifp); + jpeg_read_header (&cinfo, TRUE); + jpeg_start_decompress (&cinfo); + buf = (*cinfo.mem->alloc_sarray) + ((j_common_ptr) &cinfo, JPOOL_IMAGE, cinfo.output_width*3, 1); + while (cinfo.output_scanline < cinfo.output_height && + (row = trow + cinfo.output_scanline) < height) { + jpeg_read_scanlines (&cinfo, buf, 1); + pixel = (JSAMPLE (*)[3]) buf[0]; + for (col=0; col < cinfo.output_width && tcol+col < width; col++) { + FORC3 image[row*width+tcol+col][c] = curve[c][pixel[col][c]]; + } + } + jpeg_abort_decompress (&cinfo); + if ((tcol += tile_width) >= raw_width) + trow += tile_length + (tcol = 0); + } + jpeg_destroy_decompress (&cinfo); + maximum = 0xffff; +} #endif void CLASS kodak_dc120_load_raw() @@ -2189,7 +2148,7 @@ if (fread (pixel, 1, 848, ifp) < 848) derror(); shift = row * mul[row & 3] + add[row & 3]; for (col=0; col < width; col++) - BAYER(row,col) = (ushort) pixel[(col + shift) % 848]; + RAW(row,col) = (ushort) pixel[(col + shift) % 848]; } maximum = 0xff; } @@ -2197,25 +2156,16 @@ void CLASS eight_bit_load_raw() { uchar *pixel; - unsigned row, col, val, lblack=0; + unsigned row, col; pixel = (uchar *) calloc (raw_width, sizeof *pixel); merror (pixel, "eight_bit_load_raw()"); - fseek (ifp, top_margin*raw_width, SEEK_CUR); - for (row=0; row < height; row++) { + for (row=0; row < raw_height; row++) { if (fread (pixel, 1, raw_width, ifp) < raw_width) derror(); - for (col=0; col < raw_width; col++) { - val = curve[pixel[col]]; - if ((unsigned) (col-left_margin) < width) - BAYER(row,col-left_margin) = val; - else lblack += val; - } + for (col=0; col < raw_width; col++) + RAW(row,col) = curve[pixel[col]]; } free (pixel); - if (raw_width > width+1) - black = lblack / ((raw_width - width) * height); - if (!strncmp(model,"DC2",3)) - black = 0; maximum = curve[0xff]; } @@ -2277,15 +2227,11 @@ pixel[pi] = val = pred + ljpeg_diff (huff[chess]); if (val >> 8) derror(); val = curve[pixel[pi++]]; - if ((unsigned) (col-left_margin) < width) - BAYER(row,col-left_margin) = val; - else black += val; + RAW(row,col) = val; } } free (pixel); FORC(2) free (huff[c]); - if (raw_width > width) - black /= (raw_width - width) * height; } int CLASS kodak_65000_decode (short *out, int bsize) @@ -2345,7 +2291,7 @@ len = MIN (256, width-col); ret = kodak_65000_decode (buf, len); for (i=0; i < len; i++) - if ((BAYER(row,col+i) = curve[ret ? buf[i] : + if ((RAW(row,col+i) = curve[ret ? buf[i] : (pred[i & 1] += buf[i])]) >> 12) derror(); } } @@ -2383,6 +2329,8 @@ int row, col, len, c, i, rgb[3]; ushort *ip=image[0]; + if (raw_image) free (raw_image); + raw_image = 0; for (row=0; row < height; row++) for (col=0; col < width; col+=256) { len = MIN (256, width-col); @@ -2436,20 +2384,13 @@ for (i=26; i-- > 22; ) key = key << 8 | head[i]; fseek (ifp, data_offset, SEEK_SET); - pixel = (ushort *) calloc (raw_width, sizeof *pixel); - merror (pixel, "sony_load_raw()"); - for (row=0; row < height; row++) { + for (row=0; row < raw_height; row++) { + pixel = raw_image + row*raw_width; if (fread (pixel, 2, raw_width, ifp) < raw_width) derror(); sony_decrypt ((unsigned int *) pixel, raw_width/2, !row, key); - for (col=9; col < left_margin; col++) - black += ntohs(pixel[col]); - for (col=0; col < width; col++) - if ((BAYER(row,col) = ntohs(pixel[col+left_margin])) >> 14) - derror(); + for (col=0; col < raw_width; col++) + if ((pixel[col] = ntohs(pixel[col])) >> 14) derror(); } - free (pixel); - if (left_margin > 9) - black /= (left_margin-9) * height; maximum = 0x3ff0; } @@ -2472,7 +2413,7 @@ if ((diff & (1 << (len-1))) == 0) diff -= (1 << len) - 1; if ((sum += diff) >> 12) derror(); - if (row < height) BAYER(row,col) = sum; + if (row < height) RAW(row,col) = sum; } } @@ -2486,7 +2427,7 @@ merror (data, "sony_arw2_load_raw()"); for (row=0; row < height; row++) { fread (data, 1, raw_width, ifp); - for (dp=data, col=0; col < width-30; dp+=16) { + for (dp=data, col=0; col < raw_width-30; dp+=16) { max = 0x7ff & (val = sget4(dp)); min = 0x7ff & val >> 11; imax = 0x0f & val >> 22; @@ -2501,7 +2442,7 @@ bit += 7; } for (i=0; i < 16; i++, col+=2) - BAYER(row,col) = curve[pix[i] << 1] >> 1; + RAW(row,col) = curve[pix[i] << 1] >> 2; col -= col & 1 ? 1:31; } } @@ -2518,10 +2459,9 @@ { 7, 7, 0, 0, 63, 55, 47, 39, 31, 23, 15, 7, 0 }, { 3, 3, 0, 0, 63, 47, 31, 15, 0 } }; int low, high=0xff, carry=0, nbits=8; - int s, count, bin, next, i, sym[3]; + int pix, s, count, bin, next, i, sym[3]; uchar diff, pred[]={0,0}; ushort data=0, range=0; - unsigned pix, row, col; fseek (ifp, seg[0][1]+1, SEEK_SET); getbits(-1); @@ -2567,12 +2507,8 @@ diff = diff ? -diff : 0x80; if (ftell(ifp) + 12 >= seg[1][1]) diff = 0; - pred[pix & 1] += diff; - row = pix / raw_width - top_margin; - col = pix % raw_width - left_margin; - if (row < height && col < width) - BAYER(row,col) = pred[pix & 1]; - if (!(pix & 1) && HOLE(row)) pix += 2; + raw_image[pix] = pred[pix & 1] += diff; + if (!(pix & 1) && HOLE(pix / raw_width)) pix += 2; } maximum = 0xff; } @@ -2609,21 +2545,21 @@ for (row=2; row < height-2; row++) { if (!HOLE(row)) continue; for (col=1; col < width-1; col+=4) { - val[0] = BAYER(row-1,col-1); - val[1] = BAYER(row-1,col+1); - val[2] = BAYER(row+1,col-1); - val[3] = BAYER(row+1,col+1); - BAYER(row,col) = median4(val); + val[0] = RAW(row-1,col-1); + val[1] = RAW(row-1,col+1); + val[2] = RAW(row+1,col-1); + val[3] = RAW(row+1,col+1); + RAW(row,col) = median4(val); } for (col=2; col < width-2; col+=4) if (HOLE(row-2) || HOLE(row+2)) - BAYER(row,col) = (BAYER(row,col-2) + BAYER(row,col+2)) >> 1; + RAW(row,col) = (RAW(row,col-2) + RAW(row,col+2)) >> 1; else { - val[0] = BAYER(row,col-2); - val[1] = BAYER(row,col+2); - val[2] = BAYER(row-2,col); - val[3] = BAYER(row+2,col); - BAYER(row,col) = median4(val); + val[0] = RAW(row,col-2); + val[1] = RAW(row,col+2); + val[2] = RAW(row-2,col); + val[3] = RAW(row+2,col); + RAW(row,col) = median4(val); } } } @@ -2648,6 +2584,58 @@ if (holes) fill_holes (holes); } +void CLASS redcine_load_raw() +{ +#ifndef NO_JASPER + int c, row, col; + jas_stream_t *in; + jas_image_t *jimg; + jas_matrix_t *jmat; + jas_seqent_t *data; + ushort *img, *pix; + + jas_init(); + in = jas_stream_fopen (ifname, "rb"); + jas_stream_seek (in, data_offset+20, SEEK_SET); + jimg = jas_image_decode (in, -1, 0); + if (!jimg) longjmp (failure, 3); + jmat = jas_matrix_create (height/2, width/2); + merror (jmat, "redcine_load_raw()"); + img = (ushort *) calloc ((height+2)*(width+2), 2); + merror (img, "redcine_load_raw()"); + FORC4 { + jas_image_readcmpt (jimg, c, 0, 0, width/2, height/2, jmat); + data = jas_matrix_getref (jmat, 0, 0); + for (row = c >> 1; row < height; row+=2) + for (col = c & 1; col < width; col+=2) + img[(row+1)*(width+2)+col+1] = data[(row/2)*(width/2)+col/2]; + } + for (col=1; col <= width; col++) { + img[col] = img[2*(width+2)+col]; + img[(height+1)*(width+2)+col] = img[(height-1)*(width+2)+col]; + } + for (row=0; row < height+2; row++) { + img[row*(width+2)] = img[row*(width+2)+2]; + img[(row+1)*(width+2)-1] = img[(row+1)*(width+2)-3]; + } + for (row=1; row <= height; row++) { + pix = img + row*(width+2) + (col = 1 + (FC(row,1) & 1)); + for ( ; col <= width; col+=2, pix+=2) { + c = (((pix[0] - 0x800) << 3) + + pix[-(width+2)] + pix[width+2] + pix[-1] + pix[1]) >> 2; + pix[0] = LIM(c,0,4095); + } + } + for (row=0; row < height; row++) + for (col=0; col < width; col++) + RAW(row,col) = curve[img[(row+1)*(width+2)+col+1]]; + free (img); + jas_matrix_destroy (jmat); + jas_image_destroy (jimg); + jas_stream_close (in); +#endif +} + /* RESTRICTED code starts here */ void CLASS foveon_decoder (unsigned size, unsigned code) @@ -2721,36 +2709,21 @@ } } -void CLASS foveon_load_camf() -{ - unsigned key, i, val; - - fseek (ifp, meta_offset, SEEK_SET); - key = get4(); - fread (meta_data, 1, meta_length, ifp); - for (i=0; i < meta_length; i++) { - key = (key * 1597 + 51749) % 244944; - val = key * (INT64) 301593171 >> 24; - meta_data[i] ^= ((((key << 8) - val) >> 1) + val) >> 17; - } -} - -void CLASS foveon_load_raw() +void CLASS foveon_sd_load_raw() { struct decode *dindex; short diff[1024]; unsigned bitbuf=0; - int pred[3], fixed, row, col, bit=-1, c, i; + int pred[3], row, col, bit=-1, c, i; - fixed = get4(); read_shorts ((ushort *) diff, 1024); - if (!fixed) foveon_decoder (1024, 0); + if (!load_flags) foveon_decoder (1024, 0); for (row=0; row < height; row++) { memset (pred, 0, sizeof pred); - if (!bit && !fixed && atoi(model+2) < 14) get4(); + if (!bit && !load_flags && atoi(model+2) < 14) get4(); for (col=bit=0; col < width; col++) { - if (fixed) { + if (load_flags) { bitbuf = get4(); FORC3 pred[2-c] += diff[bitbuf >> c*10 & 0x3ff]; } @@ -2767,10 +2740,83 @@ FORC3 image[row*width+col][c] = pred[c]; } } - if (document_mode) - for (i=0; i < height*width*4; i++) - if ((short) image[0][i] < 0) image[0][i] = 0; - foveon_load_camf(); +} + +void CLASS foveon_huff (ushort *huff) +{ + int i, j, clen, code; + + huff[0] = 8; + for (i=0; i < 13; i++) { + clen = getc(ifp); + code = getc(ifp); + for (j=0; j < 256 >> clen; ) + huff[code+ ++j] = clen << 8 | i; + } + get2(); +} + +void CLASS foveon_dp_load_raw() +{ + unsigned c, roff[4], row, col, diff; + ushort huff[258], vpred[2][2], hpred[2]; + + fseek (ifp, 8, SEEK_CUR); + foveon_huff (huff); + roff[0] = 48; + FORC3 roff[c+1] = -(-(roff[c] + get4()) & -16); + FORC3 { + fseek (ifp, data_offset+roff[c], SEEK_SET); + getbits(-1); + vpred[0][0] = vpred[0][1] = vpred[1][0] = vpred[1][1] = 512; + for (row=0; row < height; row++) { + for (col=0; col < width; col++) { + diff = ljpeg_diff(huff); + if (col < 2) hpred[col] = vpred[row & 1][col] += diff; + else hpred[col & 1] += diff; + image[row*width+col][c] = hpred[col & 1]; + } + } + } +} + +void CLASS foveon_load_camf() +{ + unsigned type, wide, high, i, j, row, col, diff; + ushort huff[258], vpred[2][2] = {{512,512},{512,512}}, hpred[2]; + + fseek (ifp, meta_offset, SEEK_SET); + type = get4(); get4(); get4(); + wide = get4(); + high = get4(); + if (type == 2) { + fread (meta_data, 1, meta_length, ifp); + for (i=0; i < meta_length; i++) { + high = (high * 1597 + 51749) % 244944; + wide = high * (INT64) 301593171 >> 24; + meta_data[i] ^= ((((high << 8) - wide) >> 1) + wide) >> 17; + } + } else if (type == 4) { + free (meta_data); + meta_data = (char *) malloc (meta_length = wide*high*3/2); + merror (meta_data, "foveon_load_camf()"); + foveon_huff (huff); + get4(); + getbits(-1); + for (j=row=0; row < high; row++) { + for (col=0; col < wide; col++) { + diff = ljpeg_diff(huff); + if (col < 2) hpred[col] = vpred[row & 1][col] += diff; + else hpred[col & 1] += diff; + if (col & 1) { + meta_data[j++] = hpred[0] >> 4; + meta_data[j++] = hpred[0] << 4 | hpred[1] >> 8; + meta_data[j++] = hpred[1]; + } + } + } + } else + fprintf (stderr,_("%s has unknown CAMF type %d.\n"), ifname, type); } const char * CLASS foveon_camf_param (const char *block, const char *param) @@ -2834,6 +2880,7 @@ void *dp; unsigned dim[3]; + if (!name) return 0; dp = foveon_camf_matrix (dim, name); if (!dp) return 0; memcpy (ptr, dp, size*4); @@ -2914,6 +2961,7 @@ if (verbose) fprintf (stderr,_("Foveon interpolation...\n")); + foveon_load_camf(); foveon_fixed (dscr, 4, "DarkShieldColRange"); foveon_fixed (ppm[0][0], 27, "PostPolyMatrix"); foveon_fixed (satlev, 3, "SaturationLevel"); @@ -3292,6 +3340,91 @@ /* RESTRICTED code ends here */ +void CLASS crop_masked_pixels() +{ + int row, col; + unsigned r, c, m, mblack[8], zero, val; + + if (load_raw == &CLASS phase_one_load_raw || + load_raw == &CLASS phase_one_load_raw_c) + phase_one_correct(); + if (fuji_width) { + for (row=0; row < raw_height-top_margin*2; row++) { + for (col=0; col < fuji_width << !fuji_layout; col++) { + if (fuji_layout) { + r = fuji_width - 1 - col + (row >> 1); + c = col + ((row+1) >> 1); + } else { + r = fuji_width - 1 + row - (col >> 1); + c = row + ((col+1) >> 1); + } + if (r < height && c < width) + BAYER(r,c) = RAW(row+top_margin,col+left_margin); + } + } + } else { + for (row=0; row < height; row++) + for (col=0; col < width; col++) + BAYER2(row,col) = RAW(row+top_margin,col+left_margin); + } + if (mask[0][3]) goto mask_set; + if (load_raw == &CLASS canon_load_raw || + load_raw == &CLASS lossless_jpeg_load_raw) { + mask[0][1] = mask[1][1] = 2; + mask[0][3] = -2; + goto sides; + } + if (load_raw == &CLASS canon_600_load_raw || + load_raw == &CLASS sony_load_raw || + (load_raw == &CLASS eight_bit_load_raw && strncmp(model,"DC2",3)) || + load_raw == &CLASS kodak_262_load_raw || + (load_raw == &CLASS packed_load_raw && (load_flags & 32))) { +sides: + mask[0][0] = mask[1][0] = top_margin; + mask[0][2] = mask[1][2] = top_margin+height; + mask[0][3] += left_margin; + mask[1][1] += left_margin+width; + mask[1][3] += raw_width; + } + if (load_raw == &CLASS nokia_load_raw) { + mask[0][2] = top_margin; + mask[0][3] = width; + } +mask_set: + memset (mblack, 0, sizeof mblack); + for (zero=m=0; m < 8; m++) + for (row=mask[m][0]; row < mask[m][2]; row++) + for (col=mask[m][1]; col < mask[m][3]; col++) { + c = FC(row-top_margin,col-left_margin); + mblack[c] += val = RAW(row,col); + mblack[4+c]++; + zero += !val; + } + if (load_raw == &CLASS canon_600_load_raw && width < raw_width) { + black = (mblack[0]+mblack[1]+mblack[2]+mblack[3]) / + (mblack[4]+mblack[5]+mblack[6]+mblack[7]) - 4; + canon_600_correct(); + } else if (zero < mblack[4] && mblack[5] && mblack[6] && mblack[7]) + FORC4 cblack[c] = mblack[c] / mblack[4+c]; +} + +void CLASS remove_zeroes() +{ + unsigned row, col, tot, n, r, c; + + for (row=0; row < height; row++) + for (col=0; col < width; col++) + if (BAYER(row,col) == 0) { + tot = n = 0; + for (r = row-2; r <= row+2; r++) + for (c = col-2; c <= col+2; c++) + if (r < height && c < width && + FC(r,c) == FC(row,col) && BAYER(r,c)) + tot += (n++,BAYER(r,c)); + if (n) BAYER(row,col) = tot/n; + } +} + /* Seach from the current directory up to the root looking for a ".badpixels" file, and fix those pixels now. @@ -3340,7 +3473,7 @@ for (r = row-rad; r <= row+rad; r++) for (c = col-rad; c <= col+rad; c++) if ((unsigned) r < height && (unsigned) c < width && - (r != row || c != col) && fc(r,c) == fc(row,col)) { + (r != row || c != col) && fcol(r,c) == fcol(row,col)) { tot += BAYER2(r,c); n++; } @@ -3392,6 +3525,8 @@ BAYER(row,col) = MAX (BAYER(row,col) - ntohs(pixel[col]), 0); } free (pixel); + fclose (fp); + memset (cblack, 0, sizeof cblack); black = 0; } @@ -3566,7 +3701,7 @@ void CLASS wavelet_denoise() { float *fimg=0, *temp, thold, mul[2], avg, diff; - int scale=1, size, lev, hpass, lpass, row, col, nc, c, i, wlast; + int scale=1, size, lev, hpass, lpass, row, col, nc, c, i, wlast, blk[2]; ushort *window[4]; static const float noise[] = { 0.8002,0.2735,0.1202,0.0585,0.0291,0.0152,0.0080,0.0044 }; @@ -3576,6 +3711,7 @@ while (maximum << scale < 0x10000) scale++; maximum <<= --scale; black <<= scale; + FORC4 cblack[c] <<= scale; if ((size = iheight*iwidth) < 0x15550000) fimg = (float *) malloc ((size*3 + iheight + iwidth) * sizeof *fimg); merror (fimg, "wavelet_denoise()"); @@ -3588,7 +3724,7 @@ lpass = size*((lev & 1)+1); for (row=0; row < iheight; row++) { hat_transform (temp, fimg+hpass+row*iwidth, 1, iwidth, 1 << lev); - for (col=0; col < iwidth; col++) + for (col=0; col < iwidth; col++) fimg[lpass + row*iwidth + col] = temp[col] * 0.25; } for (col=0; col < iwidth; col++) { @@ -3610,8 +3746,10 @@ image[i][c] = CLIP(SQR(fimg[i]+fimg[lpass+i])/0x10000); } if (filters && colors == 3) { /* pull G1 and G3 closer together */ - for (row=0; row < 2; row++) + for (row=0; row < 2; row++) { mul[row] = 0.125 * pre_mul[FC(row+1,0) | 1] / pre_mul[FC(row,0) | 1]; + blk[row] = cblack[FC(row,0) | 1]; + } for (i=0; i < 4; i++) window[i] = (ushort *) fimg + width*i; for (wlast=-1, row=1; row < height-1; row++) { @@ -3624,8 +3762,8 @@ thold = threshold/512; for (col = (FC(row,0) & 1)+1; col < width-1; col+=2) { avg = ( window[0][col-1] + window[0][col+1] + - window[2][col-1] + window[2][col+1] - black*4 ) - * mul[row & 1] + (window[1][col] - black) * 0.5 + black; + window[2][col-1] + window[2][col+1] - blk[~row & 1]*4 ) + * mul[row & 1] + (window[1][col] + blk[row & 1]) * 0.5; avg = avg < 0 ? 0 : sqrt(avg); diff = sqrt(BAYER(row,col)) - avg; if (diff < -thold) diff += thold; @@ -3659,12 +3797,12 @@ for (x=col; x < col+8 && x < right; x++) FORC4 { if (filters) { - c = FC(y,x); - val = BAYER(y,x); + c = fcol(y,x); + val = BAYER2(y,x); } else val = image[y*width+x][c]; if (val > maximum-25) goto skip_block; - if ((val -= black) < 0) val = 0; + if ((val -= cblack[c]) < 0) val = 0; sum[c] += val; sum[c+4]++; if (filters) break; @@ -3679,7 +3817,7 @@ for (row=0; row < 8; row++) for (col=0; col < 8; col++) { c = FC(row,col); - if ((val = white[row][col] - black) > 0) + if ((val = white[row][col] - cblack[c]) > 0) sum[c] += val; sum[c+4]++; } @@ -3713,7 +3851,7 @@ for (i=0; i < size*4; i++) { val = image[0][i]; if (!val) continue; - val -= black; + val -= cblack[i & 3]; val *= scale_mul[i & 3]; image[0][i] = CLIP(val); } @@ -3759,7 +3897,7 @@ merror (img, "pre_interpolate()"); for (row=0; row < height; row++) for (col=0; col < width; col++) { - c = fc(row,col); + c = fcol(row,col); img[row*width+col][c] = image[(row >> 1)*iwidth+(col >> 1)][c]; } free (image); @@ -3767,8 +3905,9 @@ shrink = 0; } } - if (filters && colors == 3) { - if ((mix_green = four_color_rgb)) colors++; + if (filters > 1000 && colors == 3) { + if (four_color_rgb && colors++) + mix_green = !half_size; else { for (row = FC(1,0) >> 1; row < height; row+=2) for (col = FC(row,1) & 1; col < width; col+=2) @@ -3791,11 +3930,11 @@ for (y=row-1; y != row+2; y++) for (x=col-1; x != col+2; x++) if (y < height && x < width) { - f = fc(y,x); + f = fcol(y,x); sum[f] += image[y*width+x][f]; sum[f+4]++; } - f = fc(row,col); + f = fcol(row,col); FORCC if (c != f && sum[c+4]) image[row*width+col][c] = sum[c] / sum[c+4]; } @@ -3803,29 +3942,31 @@ void CLASS lin_interpolate() { - int code[16][16][32], *ip, sum[4]; - int c, i, x, y, row, col, shift, color; + int code[16][16][32], size=16, *ip, sum[4]; + int f, c, i, x, y, row, col, shift, color; ushort *pix; if (verbose) fprintf (stderr,_("Bilinear interpolation...\n")); - + if (filters == 2) size = 6; border_interpolate(1); - for (row=0; row < 16; row++) - for (col=0; col < 16; col++) { - ip = code[row][col]; + for (row=0; row < size; row++) + for (col=0; col < size; col++) { + ip = code[row][col]+1; + f = fcol(row,col); memset (sum, 0, sizeof sum); for (y=-1; y <= 1; y++) for (x=-1; x <= 1; x++) { shift = (y==0) + (x==0); - if (shift == 2) continue; - color = fc(row+y,col+x); + color = fcol(row+y,col+x); + if (color == f) continue; *ip++ = (width*y + x)*4 + color; *ip++ = shift; *ip++ = color; sum[color] += 1 << shift; } + code[row][col][0] = (ip - code[row][col]) / 3; FORCC - if (c != fc(row,col)) { + if (c != f) { *ip++ = c; *ip++ = 256 / sum[c]; } @@ -3833,9 +3974,9 @@ for (row=1; row < height-1; row++) for (col=1; col < width-1; col++) { pix = image[row*width+col]; - ip = code[row & 15][col & 15]; + ip = code[row % size][col % size]; memset (sum, 0, sizeof sum); - for (i=8; i--; ip+=3) + for (i=*ip++; i--; ip+=3) sum[ip[2]] += pix[ip[0]] << ip[1]; for (i=colors; --i; ip+=2) pix[ip[0]] = sum[ip[0]] * ip[1] >> 8; @@ -3847,7 +3988,7 @@ "Interpolation using a Threshold-based variable number of gradients" - described in http://scien.stanford.edu/class/psych221/projects/99/tingchen/algodep/vargra.html + described in http://scien.stanford.edu/pages/labsite/1999/psych221/projects/99/tingchen/algodep/vargra.html I've extended the basic idea to work with non-Bayer filter arrays. Gradients are numbered clockwise from NW=0 to W=7. @@ -3879,27 +4020,28 @@ +1,+0,+2,+1,0,0x10 }, chood[] = { -1,-1, -1,0, -1,+1, 0,+1, +1,+1, +1,0, +1,-1, 0,-1 }; ushort (*brow[5])[4], *pix; - int prow=7, pcol=1, *ip, *code[16][16], gval[8], gmin, gmax, sum[4]; + int prow=8, pcol=2, *ip, *code[16][16], gval[8], gmin, gmax, sum[4]; int row, col, x, y, x1, x2, y1, y2, t, weight, grads, color, diag; int g, diff, thold, num, c; lin_interpolate(); if (verbose) fprintf (stderr,_("VNG interpolation...\n")); - if (filters == 1) prow = pcol = 15; - ip = (int *) calloc ((prow+1)*(pcol+1), 1280); + if (filters == 1) prow = pcol = 16; + if (filters == 2) prow = pcol = 6; + ip = (int *) calloc (prow*pcol, 1280); merror (ip, "vng_interpolate()"); - for (row=0; row <= prow; row++) /* Precalculate for VNG */ - for (col=0; col <= pcol; col++) { + for (row=0; row < prow; row++) /* Precalculate for VNG */ + for (col=0; col < pcol; col++) { code[row][col] = ip; for (cp=terms, t=0; t < 64; t++) { y1 = *cp++; x1 = *cp++; y2 = *cp++; x2 = *cp++; weight = *cp++; grads = *cp++; - color = fc(row+y1,col+x1); - if (fc(row+y2,col+x2) != color) continue; - diag = (fc(row,col+1) == color && fc(row+1,col) == color) ? 2:1; + color = fcol(row+y1,col+x1); + if (fcol(row+y2,col+x2) != color) continue; + diag = (fcol(row,col+1) == color && fcol(row+1,col) == color) ? 2:1; if (abs(y1-y2) == diag && abs(x1-x2) == diag) continue; *ip++ = (y1*width + x1)*4 + color; *ip++ = (y2*width + x2)*4 + color; @@ -3912,8 +4054,8 @@ for (cp=chood, g=0; g < 8; g++) { y = *cp++; x = *cp++; *ip++ = (y*width + x) * 4; - color = fc(row,col); - if (fc(row+y,col+x) != color && fc(row+y*2,col+x*2) == color) + color = fcol(row,col); + if (fcol(row+y,col+x) != color && fcol(row+y*2,col+x*2) == color) *ip++ = (y*width + x) * 8 + color; else *ip++ = 0; @@ -3926,7 +4068,7 @@ for (row=2; row < height-2; row++) { /* Do VNG interpolation */ for (col=2; col < width-2; col++) { pix = image[row*width+col]; - ip = code[row & prow][col & pcol]; + ip = code[row % prow][col % pcol]; memset (gval, 0, sizeof gval); while ((g = ip[0]) != INT_MAX) { /* Calculate gradients */ diff = ABS(pix[g] - pix[ip[1]]) << ip[2]; @@ -3949,7 +4091,7 @@ } thold = gmin + (gmax >> 1); memset (sum, 0, sizeof sum); - color = fc(row,col); + color = fcol(row,col); for (num=g=0; g < 8; g++,ip+=2) { /* Average the neighbors */ if (gval[g] <= thold) { FORCC @@ -4370,12 +4512,13 @@ unsigned offset=0, entries, tag, type, len, save, c; unsigned ver97=0, serial=0, i, wbi=0, wb[4]={0,0,0,0}; uchar buf97[324], ci, cj, ck; - short sorder=order; + short morder, sorder=order; char buf[10]; /* The MakerNote might have its own TIFF header (possibly with its own byte-order!), or it might just be a table. */ + if (!strcmp(make,"Nokia")) return; fread (buf, 1, 10, ifp); if (!strncmp (buf,"KDK" ,3) || /* these aren't TIFF tables */ !strncmp (buf,"VER" ,3) || @@ -4403,10 +4546,12 @@ base = ftell(ifp)-10; fseek (ifp, -2, SEEK_CUR); order = get2(); get2(); - } else if (!strncmp (buf,"FUJIFILM",8) || - !strncmp (buf,"SONY",4) || + } 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") || @@ -4416,14 +4561,19 @@ else if (!strcmp (buf,"AOC") || !strcmp (buf,"QVC")) fseek (ifp, -4, SEEK_CUR); - else fseek (ifp, -10, SEEK_CUR); - + else { + fseek (ifp, -10, SEEK_CUR); + if (!strncmp(make,"SAMSUNG",7)) + base = ftell(ifp); + } entries = get2(); if (entries > 1000) return; + morder = order; while (entries--) { + order = morder; tiff_get (base, &tag, &type, &len, &save); tag |= uptag << 16; - if (tag == 2 && strstr(make,"NIKON")) + if (tag == 2 && strstr(make,"NIKON") && !iso_speed) iso_speed = (get2(),get2()); if (tag == 4 && len > 26 && len < 35) { if ((i=(get4(),get2())) != 0x7fff && !iso_speed) @@ -4453,15 +4603,31 @@ cam_mul[0] = getreal(type); cam_mul[2] = getreal(type); } + if (tag == 0xd && type == 7 && get2() == 0xaaaa) { + for (c=i=2; (ushort) c != 0xbbbb && i < len; i++) + c = c << 8 | fgetc(ifp); + while ((i+=4) < len-5) + if (get4() == 257 && (i=len) && (c = (get4(),fgetc(ifp))) < 3) + flip = "065"[c]-'0'; + } if (tag == 0x10 && type == 4) unique_id = get4(); if (tag == 0x11 && is_raw && !strncmp(make,"NIKON",5)) { fseek (ifp, get4()+base, SEEK_SET); parse_tiff_ifd (base); } - if (tag == 0x14 && len == 2560 && type == 7) { - fseek (ifp, 1248, SEEK_CUR); - goto get2_256; + if (tag == 0x14 && type == 7) { + if (len == 2560) { + fseek (ifp, 1248, SEEK_CUR); + goto get2_256; + } + fread (buf, 1, 10, ifp); + if (!strncmp(buf,"NRW ",4)) { + fseek (ifp, strcmp(buf+4,"0100") ? 46:1546, SEEK_CUR); + cam_mul[0] = get4() << 2; + cam_mul[1] = get4() + get4(); + cam_mul[2] = get4() << 2; + } } if (tag == 0x15 && type == 2 && is_raw) fread (model, 64, 1, ifp); @@ -4516,33 +4682,36 @@ fread (buf97, 324, 1, ifp); } } + if (tag == 0xa1 && type == 7) { + order = 0x4949; + fseek (ifp, 140, SEEK_CUR); + FORC3 cam_mul[c] = get4(); + } if (tag == 0xa4 && type == 3) { fseek (ifp, wbi*48, SEEK_CUR); FORC3 cam_mul[c] = get2(); } - if (tag == 0xa7 && (unsigned) (ver97-200) < 12 && !cam_mul[0]) { + if (tag == 0xa7 && (unsigned) (ver97-200) < 17) { ci = xlat[0][serial & 0xff]; cj = xlat[1][fgetc(ifp)^fgetc(ifp)^fgetc(ifp)^fgetc(ifp)]; ck = 0x60; for (i=0; i < 324; i++) buf97[i] ^= (cj += ci * ck++); - i = "66666>666;6A"[ver97-200] - '0'; + i = "66666>666;6A;:;55"[ver97-200] - '0'; FORC4 cam_mul[c ^ (c >> 1) ^ (i & 1)] = sget2 (buf97 + (i & -2) + c*2); } if (tag == 0x200 && len == 3) shot_order = (get4(),get4()); if (tag == 0x200 && len == 4) - black = (get2()+get2()+get2()+get2())/4; + FORC4 cblack[c ^ c >> 1] = get2(); if (tag == 0x201 && len == 4) goto get2_rggb; - if (tag == 0x220 && len == 53) - meta_offset = ftell(ifp) + 14; - if (tag == 0x401 && type == 4 && len == 4) { - black = (get4()+get4()+get4()+get4())/4; - } + if (tag == 0x220 && type == 7) + meta_offset = ftell(ifp); + if (tag == 0x401 && type == 4 && len == 4) + FORC4 cblack[c ^ c >> 1] = get4(); if (tag == 0xe01) { /* Nikon Capture Note */ - type = order; order = 0x4949; fseek (ifp, 22, SEEK_CUR); for (offset=22; offset+22 < len; offset += 22+i) { @@ -4552,7 +4721,6 @@ if (tag == 0x76a43207) flip = get2(); else fseek (ifp, i, SEEK_CUR); } - order = type; } if (tag == 0xe80 && len == 256 && type == 7) { fseek (ifp, 48, SEEK_CUR); @@ -4571,8 +4739,7 @@ for (i=0; i < 3; i++) FORC3 cmatrix[i][c] = ((short) get2()) / 256.0; if ((tag == 0x1012 || tag == 0x20400600) && len == 4) - for (black = i=0; i < 4; i++) - black += get2() << 2; + FORC4 cblack[c ^ c >> 1] = get2(); if (tag == 0x1017 || tag == 0x20400100) cam_mul[0] = get2() / 256.0; if (tag == 0x1018 || tag == 0x20400100) @@ -4592,7 +4759,7 @@ if (tag == 0x2040) parse_makernote (base, 0x2040); if (tag == 0xb028) { - fseek (ifp, get4(), SEEK_SET); + fseek (ifp, get4()+base, SEEK_SET); parse_thumb_note (base, 136, 137); } if (tag == 0x4001 && len > 500) { @@ -4600,9 +4767,14 @@ fseek (ifp, i, SEEK_CUR); get2_rggb: FORC4 cam_mul[c ^ (c >> 1)] = get2(); - fseek (ifp, 22, SEEK_CUR); + i = len >> 3 == 164 ? 112:22; + fseek (ifp, i, SEEK_CUR); FORC4 sraw_mul[c ^ (c >> 1)] = get2(); } + if (tag == 0xa021) + FORC4 cam_mul[c ^ (c >> 1)] = get4(); + if (tag == 0xa028) + FORC4 cam_mul[c ^ (c >> 1)] -= get4(); next: fseek (ifp, save, SEEK_SET); } @@ -4631,6 +4803,7 @@ return; t.tm_year -= 1900; t.tm_mon -= 1; + t.tm_isdst = -1; if (mktime(&t) > 0) timestamp = mktime(&t); } @@ -4640,7 +4813,7 @@ unsigned kodak, entries, tag, type, len, save, c; double expo; - kodak = !strncmp(make,"EASTMAN",7); + kodak = !strncmp(make,"EASTMAN",7) && tiff_nifds < 3; entries = get2(); while (entries--) { tiff_get (base, &tag, &type, &len, &save); @@ -4708,7 +4881,8 @@ static const char *mod[] = { "","DCB2","Volare","Cantare","CMost","Valeo 6","Valeo 11","Valeo 22", "Valeo 11p","Valeo 17","","Aptus 17","Aptus 22","Aptus 75","Aptus 65", - "Aptus 54S","Aptus 65S","Aptus 75S","AFi 5","AFi 6","AFi 7" }; + "Aptus 54S","Aptus 65S","Aptus 75S","AFi 5","AFi 6","AFi 7", + "","","","","","","","","","","","","","","","","","AFi-II 12" }; float romm_cam[3][3]; fseek (ifp, offset, SEEK_SET); @@ -4758,6 +4932,8 @@ FORC4 fscanf (ifp, "%d", neut+c); FORC3 cam_mul[c] = (float) neut[0] / neut[c+1]; } + if (!strcmp(data,"Rows_data")) + load_flags = get4(); parse_mos (from); fseek (ifp, skip+from, SEEK_SET); } @@ -4781,7 +4957,7 @@ unsigned entries, tag, type, len, save; int i, c, wbi=-2, wbtemp=6500; float mul[3]={1,1,1}, num; - static const int wbtag[]={ 0xfa25,0xfa28,0xfa27,0xfa29,-1,-1,0xfa2a }; + static const int wbtag[] = { 64037,64040,64039,64041,-1,-1,64042 }; entries = get2(); if (entries > 1024) return; @@ -4804,22 +4980,26 @@ } if (tag == 2317) linear_table (len); if (tag == 6020) iso_speed = getint(type); - if (tag == 0xfa0d) wbi = fgetc(ifp); + if (tag == 64013) wbi = fgetc(ifp); if ((unsigned) wbi < 7 && tag == wbtag[wbi]) FORC3 cam_mul[c] = get4(); + if (tag == 64019) width = getint(type); + if (tag == 64020) height = (getint(type)+1) & -2; fseek (ifp, save, SEEK_SET); } } void CLASS parse_minolta (int base); +int CLASS parse_tiff (int base); int CLASS parse_tiff_ifd (int base) { unsigned entries, tag, type, len, plen=16, save; int ifd, use_cm=0, cfa, i, j, c, ima_len=0; + int blrr=1, blrc=1, dblack[] = { 0,0,0,0 }; char software[64], *cbuf, *cp; uchar cfa_pat[16], cfa_pc[] = { 0,1,2,3 }, tab[256]; - double dblack, cc[4][4], cm[4][3], cam_xyz[4][3], num; + double cc[4][4], cm[4][3], cam_xyz[4][3], num; double ab[]={ 1,1,1,1 }, asn[] = { 0,0,0,0 }, xyz[] = { 1,1,1 }; unsigned sony_curve[] = { 0,0,0,0,0,4095 }; unsigned *buf, sony_offset=0, sony_length=0, sony_key=0; @@ -4837,6 +5017,10 @@ while (entries--) { tiff_get (base, &tag, &type, &len, &save); switch (tag) { + case 5: width = get2(); break; + case 6: height = get2(); break; + case 7: width += get2(); break; + case 9: filters = get2(); break; case 17: case 18: if (type == 3 && len == 1) cam_mul[(tag-17)*2] = get2() / 256.0; @@ -4857,18 +5041,27 @@ thumb_offset = ftell(ifp) - 2; thumb_length = len; break; - case 2: case 256: /* ImageWidth */ + case 61440: /* Fuji HS10 table */ + parse_tiff_ifd (base); + break; + case 2: case 256: case 61441: /* ImageWidth */ tiff_ifd[ifd].width = getint(type); break; - case 3: case 257: /* ImageHeight */ + case 3: case 257: case 61442: /* ImageHeight */ tiff_ifd[ifd].height = getint(type); break; case 258: /* BitsPerSample */ + case 61443: tiff_ifd[ifd].samples = len & 7; - tiff_ifd[ifd].bps = get2(); + tiff_ifd[ifd].bps = getint(type); + break; + case 61446: + raw_height = 0; + load_raw = &CLASS packed_load_raw; + load_flags = get4() && (filters=0x16161616) ? 24:80; break; case 259: /* Compression */ - tiff_ifd[ifd].comp = get2(); + tiff_ifd[ifd].comp = getint(type); break; case 262: /* PhotometricInterpretation */ tiff_ifd[ifd].phint = get2(); @@ -4887,16 +5080,22 @@ load_raw = &CLASS panasonic_load_raw; load_flags = 0x2008; case 273: /* StripOffset */ - case 513: + case 513: /* JpegIFOffset */ + case 61447: tiff_ifd[ifd].offset = get4()+base; - if (!tiff_ifd[ifd].bps) { + if (!tiff_ifd[ifd].bps && tiff_ifd[ifd].offset > 0) { fseek (ifp, tiff_ifd[ifd].offset, SEEK_SET); if (ljpeg_start (&jh, 1)) { tiff_ifd[ifd].comp = 6; - tiff_ifd[ifd].width = jh.wide << (jh.clrs == 2); + tiff_ifd[ifd].width = jh.wide; tiff_ifd[ifd].height = jh.high; tiff_ifd[ifd].bps = jh.bits; tiff_ifd[ifd].samples = jh.clrs; + if (!(jh.sraw || (jh.clrs & 1))) + tiff_ifd[ifd].width *= jh.clrs; + i = order; + parse_tiff (tiff_ifd[ifd].offset + 12); + order = i; } } break; @@ -4908,8 +5107,12 @@ break; case 279: /* StripByteCounts */ case 514: + case 61448: tiff_ifd[ifd].bytes = get4(); break; + case 61454: + FORC3 cam_mul[(4-c) % 3] = getint(type); + break; case 305: case 11: /* Software */ fgets (software, 64, ifp); if (!strncmp(software,"Adobe",5) || @@ -4927,10 +5130,10 @@ fread (artist, 64, 1, ifp); break; case 322: /* TileWidth */ - tile_width = getint(type); + tiff_ifd[ifd].tile_width = getint(type); break; case 323: /* TileLength */ - tile_length = getint(type); + tiff_ifd[ifd].tile_length = getint(type); break; case 324: /* TileOffsets */ tiff_ifd[ifd].offset = len > 1 ? ftell(ifp) : get4(); @@ -4973,7 +5176,9 @@ FORC4 cam_mul[c ^ (c < 2)] = get2(); break; case 29459: - FORC4 cam_mul[c ^ (c >> 1)] = get2(); + FORC4 cam_mul[c] = get2(); + i = (cam_mul[1] == 1024 && cam_mul[2] == 1024) << 1; + SWAP (cam_mul[i],cam_mul[i+1]) break; case 33405: /* Model2 */ fgets (model2, 64, ifp); @@ -5055,7 +5260,9 @@ break; case 46279: if (!ima_len) break; - fseek (ifp, 78, SEEK_CUR); + fseek (ifp, 38, SEEK_CUR); + case 46274: + fseek (ifp, 40, SEEK_CUR); raw_width = get4(); raw_height = get4(); left_margin = get4() & 7; @@ -5073,7 +5280,9 @@ flip = (get2() >> 7) * 90; if (width * height * 6 == ima_len) { if (flip % 180 == 90) SWAP(width,height); - filters = flip = 0; + raw_width = width; + raw_height = height; + left_margin = top_margin = filters = flip = 0; } sprintf (model, "Ixpress %d-Mp", height*width/1000000); load_raw = &CLASS imacon_full_load_raw; @@ -5131,12 +5340,30 @@ case 50712: /* LinearizationTable */ linear_table (len); break; + case 50713: /* BlackLevelRepeatDim */ + blrr = get2(); + blrc = get2(); + break; + case 61450: + blrr = blrc = 2; case 50714: /* BlackLevel */ + black = getreal(type); + if (!filters || !~filters) break; + dblack[0] = black; + dblack[1] = (blrc == 2) ? getreal(type):dblack[0]; + dblack[2] = (blrr == 2) ? getreal(type):dblack[0]; + dblack[3] = (blrc == 2 && blrr == 2) ? getreal(type):dblack[1]; + if (colors == 3) + filters |= ((filters >> 2 & 0x22222222) | + (filters << 2 & 0x88888888)) & filters << 1; + FORC4 cblack[filters >> (c << 1) & 3] = dblack[c]; + black = 0; + break; case 50715: /* BlackLevelDeltaH */ case 50716: /* BlackLevelDeltaV */ - for (dblack=i=0; i < len; i++) - dblack += getreal(type); - black += dblack/len + 0.5; + for (num=i=0; i < len; i++) + num += getreal(type); + black += num/len + 0.5; break; case 50717: /* WhiteLevel */ maximum = getint(type); @@ -5183,6 +5410,14 @@ height = getint(type) - top_margin; width = getint(type) - left_margin; break; + case 50830: /* MaskedAreas */ + for (i=0; i < len && i < 32; i++) + mask[0][i] = getint(type); + black = 0; + break; + case 51009: /* OpcodeList2 */ + meta_offset = ftell(ifp); + break; case 64772: /* Kodak P-series */ if (len < 13) break; fseek (ifp, 16, SEEK_CUR); @@ -5227,21 +5462,26 @@ return 0; } -void CLASS parse_tiff (int base) +int CLASS parse_tiff (int base) { - int doff, max_samp=0, raw=-1, thm=-1, i; - struct jhead jh; + int doff; fseek (ifp, base, SEEK_SET); order = get2(); - if (order != 0x4949 && order != 0x4d4d) return; + if (order != 0x4949 && order != 0x4d4d) return 0; get2(); - memset (tiff_ifd, 0, sizeof tiff_ifd); - tiff_nifds = 0; while ((doff = get4())) { fseek (ifp, doff+base, SEEK_SET); if (parse_tiff_ifd (base)) break; } + return 1; +} + +void CLASS apply_tiff() +{ + int max_samp=0, raw=-1, thm=-1, i; + struct jhead jh; + thumb_misc = 16; if (thumb_offset) { fseek (ifp, thumb_offset, SEEK_SET); @@ -5265,34 +5505,17 @@ data_offset = tiff_ifd[i].offset; tiff_flip = tiff_ifd[i].flip; tiff_samples = tiff_ifd[i].samples; + tile_width = tiff_ifd[i].tile_width; + tile_length = tiff_ifd[i].tile_length; raw = i; } } - fuji_width *= (raw_width+1)/2; - if (tiff_ifd[0].flip) tiff_flip = tiff_ifd[0].flip; + if (!tile_width ) tile_width = INT_MAX; + if (!tile_length) tile_length = INT_MAX; + for (i=tiff_nifds; i--; ) + if (tiff_ifd[i].flip) tiff_flip = tiff_ifd[i].flip; if (raw >= 0 && !load_raw) switch (tiff_compress) { - case 0: case 1: - switch (tiff_bps) { - case 8: load_raw = &CLASS eight_bit_load_raw; break; - case 12: load_raw = &CLASS packed_load_raw; - if (tiff_ifd[raw].phint == 2) - load_flags = 6; - if (strncmp(make,"PENTAX",6)) break; - case 14: - case 16: load_raw = &CLASS unpacked_load_raw; break; - } - if (tiff_ifd[raw].bytes*5 == raw_width*raw_height*8) { - tiff_bps = 12; - maximum = 0xffff; - load_raw = &CLASS packed_load_raw; - load_flags = 273; - } - break; - case 6: case 7: case 99: - load_raw = &CLASS lossless_jpeg_load_raw; break; - case 262: - load_raw = &CLASS kodak_262_load_raw; break; case 32767: if (tiff_ifd[raw].bytes == raw_width*raw_height) { tiff_bps = 12; @@ -5305,10 +5528,38 @@ load_flags = 79; case 32769: load_flags++; - case 32773: - load_raw = &CLASS packed_load_raw; break; + case 32770: + case 32773: goto slr; + case 0: case 1: + if (tiff_ifd[raw].bytes*5 == raw_width*raw_height*8) { + load_flags = 81; + tiff_bps = 12; + } slr: + switch (tiff_bps) { + case 8: load_raw = &CLASS eight_bit_load_raw; break; + case 12: if (tiff_ifd[raw].phint == 2) + load_flags = 6; + load_raw = &CLASS packed_load_raw; break; + case 14: load_flags = 0; + case 16: load_raw = &CLASS unpacked_load_raw; break; + } + break; + case 6: case 7: case 99: + load_raw = &CLASS lossless_jpeg_load_raw; break; + case 262: + load_raw = &CLASS kodak_262_load_raw; break; case 34713: - load_raw = &CLASS nikon_compressed_load_raw; break; + if ((raw_width+9)/10*16*raw_height == tiff_ifd[raw].bytes) { + load_raw = &CLASS packed_load_raw; + load_flags = 1; + } else if (raw_width*raw_height*2 == tiff_ifd[raw].bytes) { + load_raw = &CLASS unpacked_load_raw; + load_flags = 4; + order = 0x4d4d; + } else + load_raw = &CLASS nikon_load_raw; break; + case 34892: + load_raw = &CLASS lossy_dng_load_raw; break; case 65535: load_raw = &CLASS pentax_load_raw; break; case 65000: @@ -5322,14 +5573,16 @@ } if (!dng_version) if ( (tiff_samples == 3 && tiff_ifd[raw].bytes && - tiff_bps != 14 && tiff_bps != 2048) + tiff_bps != 14 && tiff_bps != 2048 && + tiff_compress != 32769 && tiff_compress != 32770) || (tiff_bps == 8 && !strstr(make,"KODAK") && !strstr(make,"Kodak") && !strstr(model2,"DEBUG RAW"))) is_raw = 0; for (i=0; i < tiff_nifds; i++) if (i != raw && tiff_ifd[i].samples == max_samp && tiff_ifd[i].width * tiff_ifd[i].height / SQR(tiff_ifd[i].bps+1) > - thumb_width * thumb_height / SQR(thumb_misc+1)) { + thumb_width * thumb_height / SQR(thumb_misc+1) + && tiff_ifd[i].comp != 34892) { thumb_width = tiff_ifd[i].width; thumb_height = tiff_ifd[i].height; thumb_offset = tiff_ifd[i].offset; @@ -5344,10 +5597,12 @@ write_thumb = &CLASS layer_thumb; break; case 1: - if (tiff_ifd[thm].bps > 8) - thumb_load_raw = &CLASS kodak_thumb_load_raw; - else + if (tiff_ifd[thm].bps <= 8) write_thumb = &CLASS ppm_thumb; + else if (!strcmp(make,"Imacon")) + write_thumb = &CLASS ppm16_thumb; + else + thumb_load_raw = &CLASS kodak_thumb_load_raw; break; case 65000: thumb_load_raw = tiff_ifd[thm].phint == 6 ? @@ -5422,7 +5677,7 @@ } else while (isdigit(*--jext)) { if (*jext != '9') { - (*jext)++; + (*jext)++; break; } *jext = '0'; @@ -5690,7 +5945,7 @@ case 0x21a: ph1.tag_21a = data; break; case 0x21c: strip_offset = data+base; break; case 0x21d: ph1.black = data; break; - case 0x222: ph1.split_col = data - left_margin; break; + case 0x222: ph1.split_col = data; break; case 0x223: ph1.black_off = data+base; break; case 0x301: model[63] = 0; @@ -5731,11 +5986,16 @@ if ((width = get2()) == 4284) width += 3; } else if (tag == 0x130) { fuji_layout = fgetc(ifp) >> 7; - load_raw = fgetc(ifp) & 8 ? - &CLASS unpacked_load_raw : &CLASS fuji_load_raw; - } - if (tag == 0x2ff0) + fuji_width = !(fgetc(ifp) & 8); + } else if (tag == 0x2ff0) { FORC4 cam_mul[c ^ 1] = get2(); + } else if (tag == 0xc000) { + c = order; + order = 0x4949; + if ((width = get4()) > 10000) width = get4(); + height = get4(); + order = c; + } fseek (ifp, save+len, SEEK_SET); } height <<= fuji_layout; @@ -5762,7 +6022,7 @@ hlen = get4(); if (get4() == 0x48454150) /* "HEAP" */ parse_ciff (save+hlen, len-hlen); - parse_tiff (save+6); + if (parse_tiff (save+6)) apply_tiff(); fseek (ifp, save+len, SEEK_SET); } return 1; @@ -5876,6 +6136,35 @@ data_offset += (INT64) get4() << 32; } +void CLASS parse_redcine() +{ + unsigned i, len, rdvo; + + order = 0x4d4d; + is_raw = 0; + fseek (ifp, 52, SEEK_SET); + width = get4(); + height = get4(); + fseek (ifp, 0, SEEK_END); + fseek (ifp, -(i = ftello(ifp) & 511), SEEK_CUR); + if (get4() != i || get4() != 0x52454f42) { + fprintf (stderr,_("%s: Tail is missing, parsing from head...\n"), ifname); + fseek (ifp, 0, SEEK_SET); + while ((len = get4()) != EOF) { + if (get4() == 0x52454456) + if (is_raw++ == shot_select) + data_offset = ftello(ifp) - 8; + fseek (ifp, len-8, SEEK_CUR); + } + } else { + rdvo = get4(); + fseek (ifp, 12, SEEK_CUR); + is_raw = get4(); + fseeko (ifp, rdvo+8 + shot_select*4, SEEK_SET); + data_offset = get4(); + } +} + char * CLASS foveon_gets (int offset, char *str, int len) { int i; @@ -5908,13 +6197,20 @@ switch (tag) { case 0x47414d49: /* IMAG */ case 0x32414d49: /* IMA2 */ - fseek (ifp, 12, SEEK_CUR); + fseek (ifp, 8, SEEK_CUR); + pent = get4(); wide = get4(); high = get4(); if (wide > raw_width && high > raw_height) { + switch (pent) { + case 5: load_flags = 1; + case 6: load_raw = &CLASS foveon_sd_load_raw; break; + case 30: load_raw = &CLASS foveon_dp_load_raw; break; + default: load_raw = 0; + } raw_width = wide; raw_height = high; - data_offset = off+24; + data_offset = off+28; } fseek (ifp, off+28, SEEK_SET); if (fgetc(ifp) == 0xff && fgetc(ifp) == 0xd8 @@ -5931,10 +6227,8 @@ } break; case 0x464d4143: /* CAMF */ - meta_offset = off+24; + meta_offset = off+8; meta_length = len-28; - if (meta_length > 0x20000) - meta_length = 0x20000; break; case 0x504f5250: /* PROP */ pent = (get4(),get4()); @@ -5993,10 +6287,14 @@ { 9805,-2689,-1312,-5803,13064,3068,-2438,3075,8775 } }, { "Canon EOS D60", 0, 0xfa0, { 6188,-1341,-890,-7168,14489,2937,-2640,3228,8483 } }, + { "Canon EOS 5D Mark III", 0, 0x3c80, + { 6722,-635,-963,-4287,12460,2028,-908,2162,5668 } }, { "Canon EOS 5D Mark II", 0, 0x3cf0, { 4716,603,-830,-7798,15474,2480,-1496,1937,6651 } }, { "Canon EOS 5D", 0, 0xe6c, { 6347,-479,-972,-8297,15954,2480,-1968,2131,7649 } }, + { "Canon EOS 6D", 0, 0x3c82, + { 7034,-804,-1014,-4420,12564,2058,-851,1994,5758 } }, { "Canon EOS 7D", 0, 0x3510, { 6844,-996,-856,-3876,11761,2396,-593,1772,6198 } }, { "Canon EOS 10D", 0, 0xfa0, @@ -6011,6 +6309,8 @@ { 6071,-747,-856,-7653,15365,2441,-2025,2553,7315 } }, { "Canon EOS 50D", 0, 0x3d93, { 4920,616,-593,-6493,13964,2784,-1774,3178,7005 } }, + { "Canon EOS 60D", 0, 0x2ff7, + { 6719,-994,-925,-4408,12426,2211,-887,2129,6051 } }, { "Canon EOS 300D", 0, 0xfa0, { 8197,-2000,-1118,-6714,14335,2592,-2536,3178,8266 } }, { "Canon EOS 350D", 0, 0xfff, @@ -6021,8 +6321,18 @@ { 5784,-262,-821,-7539,15064,2672,-1982,2681,7427 } }, { "Canon EOS 500D", 0, 0x3479, { 4763,712,-646,-6821,14399,2640,-1921,3276,6561 } }, + { "Canon EOS 550D", 0, 0x3dd7, + { 6941,-1164,-857,-3825,11597,2534,-416,1540,6039 } }, + { "Canon EOS 600D", 0, 0x3510, + { 6461,-907,-882,-4300,12184,2378,-819,1944,5931 } }, + { "Canon EOS 650D", 0, 0x354d, + { 6602,-841,-939,-4472,12458,2247,-975,2039,6148 } }, { "Canon EOS 1000D", 0, 0xe43, { 6771,-1139,-977,-7818,15123,2928,-1244,1437,7533 } }, + { "Canon EOS 1100D", 0, 0x3510, + { 6444,-904,-893,-4563,12308,2535,-903,2016,6728 } }, + { "Canon EOS M", 0, 0, + { 6602,-841,-939,-4472,12458,2247,-975,2039,6148 } }, { "Canon EOS-1Ds Mark III", 0, 0x3bb0, { 5859,-211,-930,-8255,16017,2353,-1732,1887,7448 } }, { "Canon EOS-1Ds Mark II", 0, 0xe80, @@ -6037,12 +6347,14 @@ { 6264,-582,-724,-8312,15948,2504,-1744,1919,8664 } }, { "Canon EOS-1DS", 0, 0xe20, { 4374,3631,-1743,-7520,15212,2472,-2892,3632,8161 } }, + { "Canon EOS-1D X", 0, 0x3c4e, + { 6847,-614,-1014,-4669,12737,2139,-1197,2488,6846 } }, { "Canon EOS-1D", 0, 0xe20, { 6806,-179,-1020,-8097,16415,1687,-3267,4236,7690 } }, { "Canon EOS", 0, 0, { 8197,-2000,-1118,-6714,14335,2592,-2536,3178,8266 } }, { "Canon PowerShot A530", 0, 0, - { 0 } }, /* don't want the A5 matrix */ + { 0 } }, /* don't want the A5 matrix */ { "Canon PowerShot A50", 0, 0, { -5300,9846,1776,3436,684,3939,-5540,9879,6200,-1404,11175,217 } }, { "Canon PowerShot A5", 0, 0, @@ -6051,6 +6363,12 @@ { 11093,-3906,-1028,-5047,12492,2879,-1003,1750,5561 } }, { "Canon PowerShot G11", 0, 0, { 12177,-4817,-1069,-1612,9864,2049,-98,850,4471 } }, + { "Canon PowerShot G12", 0, 0, + { 13244,-5501,-1248,-1508,9858,1935,-270,1083,4366 } }, + { "Canon PowerShot G15", 0, 0, + { 7474,-2301,-567,-4056,11456,2975,-222,716,4181 } }, + { "Canon PowerShot G1 X", 0, 0, + { 7378,-1255,-1043,-4088,12251,2048,-876,1946,5805 } }, { "Canon PowerShot G1", 0, 0, { -4778,9467,2172,4743,-1141,4344,-5146,9908,6077,-1566,11051,557 } }, { "Canon PowerShot G2", 0, 0, @@ -6083,6 +6401,16 @@ { 9976,-3810,-832,-7115,14463,2906,-901,989,7889 } }, { "Canon PowerShot S90", 0, 0, { 12374,-5016,-1049,-1677,9902,2078,-83,852,4683 } }, + { "Canon PowerShot S95", 0, 0, + { 13440,-5896,-1279,-1236,9598,1931,-180,1001,4651 } }, + { "Canon PowerShot S100", 0, 0, + { 7968,-2565,-636,-2873,10697,2513,180,667,4211 } }, + { "Canon PowerShot S110", 0, 0, + { 8039,-2643,-654,-3783,11230,2930,-206,690,4194 } }, + { "Canon PowerShot SX1 IS", 0, 0, + { 6578,-259,-502,-5974,13030,3309,-308,1058,4970 } }, + { "Canon PowerShot SX50 HS", 0, 0, + { 12432,-4753,-1247,-2110,10691,1629,-412,1623,4926 } }, { "Canon PowerShot A470", 0, 0, /* DJC */ { 12513,-4407,-1242,-2680,10276,2405,-878,2215,4734 } }, { "Canon PowerShot A610", 0, 0, /* DJC */ @@ -6099,14 +6427,16 @@ { 14573,-5482,-1546,-1266,9799,1468,-1040,1912,3810 } }, { "Canon PowerShot S3 IS", 0, 0, /* DJC */ { 14062,-5199,-1446,-4712,12470,2243,-1286,2028,4836 } }, - { "Canon PowerShot SX1 IS", 0, 0, - { 6578,-259,-502,-5974,13030,3309,-308,1058,4970 } }, { "Canon PowerShot SX110 IS", 0, 0, /* DJC */ - { 14134,-5576,-1527,-1991,10719,1273,-1158,1929,3581 } }, + { 14134,-5576,-1527,-1991,10719,1273,-1158,1929,3581 } }, + { "Canon PowerShot SX220", 0, 0, /* DJC */ + { 13898,-5076,-1447,-1405,10109,1297,-244,1860,3687 } }, { "CASIO EX-S20", 0, 0, /* DJC */ { 11634,-3924,-1128,-4968,12954,2015,-1588,2648,7206 } }, { "CASIO EX-Z750", 0, 0, /* DJC */ { 10819,-3873,-1099,-4903,13730,1175,-1755,3751,4632 } }, + { "CASIO EX-Z10", 128, 0xfff, /* DJC */ + { 9790,-3338,-603,-2321,10222,2099,-344,1273,4799 } }, { "CINE 650", 0, 0, { 3390,480,-500,-800,3610,340,-550,2336,1192 } }, { "CINE 660", 0, 0, @@ -6117,50 +6447,76 @@ { 7777,1285,-1053,-9280,16543,2916,-3677,5679,7060 } }, { "EPSON R-D1", 0, 0, { 6827,-1878,-732,-8429,16012,2564,-704,592,7145 } }, - { "FUJIFILM FinePix E550", 0, 0, + { "FUJIFILM E550", 0, 0, { 11044,-3888,-1120,-7248,15168,2208,-1531,2277,8069 } }, - { "FUJIFILM FinePix E900", 0, 0, + { "FUJIFILM E900", 0, 0, { 9183,-2526,-1078,-7461,15071,2574,-2022,2440,8639 } }, - { "FUJIFILM FinePix F8", 0, 0, - { 11044,-3888,-1120,-7248,15168,2208,-1531,2277,8069 } }, - { "FUJIFILM FinePix F7", 0, 0, + { "FUJIFILM F5", 0, 0, + { 13690,-5358,-1474,-3369,11600,1998,-132,1554,4395 } }, + { "FUJIFILM F6", 0, 0, + { 13690,-5358,-1474,-3369,11600,1998,-132,1554,4395 } }, + { "FUJIFILM F77", 0, 0xfe9, + { 13690,-5358,-1474,-3369,11600,1998,-132,1554,4395 } }, + { "FUJIFILM F7", 0, 0, { 10004,-3219,-1201,-7036,15047,2107,-1863,2565,7736 } }, - { "FUJIFILM FinePix S100FS", 514, 0, + { "FUJIFILM F8", 0, 0, + { 13690,-5358,-1474,-3369,11600,1998,-132,1554,4395 } }, + { "FUJIFILM S100FS", 514, 0, { 11521,-4355,-1065,-6524,13767,3058,-1466,1984,6045 } }, - { "FUJIFILM FinePix S20Pro", 0, 0, + { "FUJIFILM S200EXR", 512, 0x3fff, + { 11401,-4498,-1312,-5088,12751,2613,-838,1568,5941 } }, + { "FUJIFILM S20Pro", 0, 0, { 10004,-3219,-1201,-7036,15047,2107,-1863,2565,7736 } }, - { "FUJIFILM FinePix S2Pro", 128, 0, + { "FUJIFILM S2Pro", 128, 0, { 12492,-4690,-1402,-7033,15423,1647,-1507,2111,7697 } }, - { "FUJIFILM FinePix S3Pro", 0, 0, + { "FUJIFILM S3Pro", 0, 0, { 11807,-4612,-1294,-8927,16968,1988,-2120,2741,8006 } }, - { "FUJIFILM FinePix S5Pro", 0, 0, + { "FUJIFILM S5Pro", 0, 0, { 12300,-5110,-1304,-9117,17143,1998,-1947,2448,8100 } }, - { "FUJIFILM FinePix S5000", 0, 0, + { "FUJIFILM S5000", 0, 0, { 8754,-2732,-1019,-7204,15069,2276,-1702,2334,6982 } }, - { "FUJIFILM FinePix S5100", 0, 0x3e00, + { "FUJIFILM S5100", 0, 0, { 11940,-4431,-1255,-6766,14428,2542,-993,1165,7421 } }, - { "FUJIFILM FinePix S5500", 0, 0x3e00, + { "FUJIFILM S5500", 0, 0, { 11940,-4431,-1255,-6766,14428,2542,-993,1165,7421 } }, - { "FUJIFILM FinePix S5200", 0, 0, + { "FUJIFILM S5200", 0, 0, { 9636,-2804,-988,-7442,15040,2589,-1803,2311,8621 } }, - { "FUJIFILM FinePix S5600", 0, 0, + { "FUJIFILM S5600", 0, 0, { 9636,-2804,-988,-7442,15040,2589,-1803,2311,8621 } }, - { "FUJIFILM FinePix S6", 0, 0, + { "FUJIFILM S6", 0, 0, { 12628,-4887,-1401,-6861,14996,1962,-2198,2782,7091 } }, - { "FUJIFILM FinePix S7000", 0, 0, + { "FUJIFILM S7000", 0, 0, { 10190,-3506,-1312,-7153,15051,2238,-2003,2399,7505 } }, - { "FUJIFILM FinePix S9000", 0, 0, + { "FUJIFILM S9000", 0, 0, { 10491,-3423,-1145,-7385,15027,2538,-1809,2275,8692 } }, - { "FUJIFILM FinePix S9500", 0, 0, + { "FUJIFILM S9500", 0, 0, { 10491,-3423,-1145,-7385,15027,2538,-1809,2275,8692 } }, - { "FUJIFILM FinePix S9100", 0, 0, + { "FUJIFILM S9100", 0, 0, { 12343,-4515,-1285,-7165,14899,2435,-1895,2496,8800 } }, - { "FUJIFILM FinePix S9600", 0, 0, + { "FUJIFILM S9600", 0, 0, { 12343,-4515,-1285,-7165,14899,2435,-1895,2496,8800 } }, { "FUJIFILM IS-1", 0, 0, { 21461,-10807,-1441,-2332,10599,1999,289,875,7703 } }, { "FUJIFILM IS Pro", 0, 0, { 12300,-5110,-1304,-9117,17143,1998,-1947,2448,8100 } }, + { "FUJIFILM HS10 HS11", 0, 0xf68, + { 12440,-3954,-1183,-1123,9674,1708,-83,1614,4086 } }, + { "FUJIFILM HS20EXR", 0, 0, + { 13690,-5358,-1474,-3369,11600,1998,-132,1554,4395 } }, + { "FUJIFILM HS3", 0, 0, + { 13690,-5358,-1474,-3369,11600,1998,-132,1554,4395 } }, + { "FUJIFILM X100", 0, 0, + { 12161,-4457,-1069,-5034,12874,2400,-795,1724,6904 } }, + { "FUJIFILM X10", 0, 0, + { 13509,-6199,-1254,-4430,12733,1865,-331,1441,5022 } }, + { "FUJIFILM X-Pro1", 0, 0, + { 10413,-3996,-993,-3721,11640,2361,-733,1540,6011 } }, + { "FUJIFILM X-E1", 0, 0, + { 10413,-3996,-993,-3721,11640,2361,-733,1540,6011 } }, + { "FUJIFILM XF1", 0, 0, + { 13509,-6199,-1254,-4430,12733,1865,-331,1441,5022 } }, + { "FUJIFILM X-S1", 0, 0, + { 13509,-6199,-1254,-4430,12733,1865,-331,1441,5022 } }, { "Imacon Ixpress", 0, 0, /* DJC */ { 7025,-1415,-704,-5188,13765,1424,-1248,2742,6038 } }, { "KODAK NC2000", 0, 0, @@ -6177,15 +6533,15 @@ { 10592,-2206,-967,-1944,11685,230,2206,670,1273 } }, { "KODAK EOSDCS3B", 0, 0, { 9898,-2700,-940,-2478,12219,206,1985,634,1031 } }, - { "Kodak DCS520C", 180, 0, + { "Kodak DCS520C", 178, 0, { 24542,-10860,-3401,-1490,11370,-297,2858,-605,3225 } }, - { "Kodak DCS560C", 188, 0, + { "Kodak DCS560C", 177, 0, { 20482,-7172,-3125,-1033,10410,-285,2542,226,3136 } }, - { "Kodak DCS620C", 180, 0, + { "Kodak DCS620C", 177, 0, { 23617,-10175,-3149,-2054,11749,-272,2586,-489,3453 } }, - { "Kodak DCS620X", 185, 0, + { "Kodak DCS620X", 176, 0, { 13095,-6231,154,12221,-21,-2137,895,4602,2258 } }, - { "Kodak DCS660C", 214, 0, + { "Kodak DCS660C", 173, 0, { 18244,-6351,-2739,-791,11193,-521,3711,-129,2802 } }, { "Kodak DCS720X", 0, 0, { 11775,-5884,950,9556,1846,-1286,-1019,6221,2728 } }, @@ -6209,6 +6565,10 @@ { 12805,-4662,-1376,-7480,15267,2360,-1626,2194,7904 } }, { "KODAK EasyShare Z980", 0, 0, { 11313,-3559,-1101,-3893,11891,2257,-1214,2398,4908 } }, + { "KODAK EasyShare Z981", 0, 0, + { 12729,-4717,-1188,-1367,9187,2582,274,860,4411 } }, + { "KODAK EasyShare Z990", 0, 0xfed, + { 11749,-4048,-1309,-1867,10572,1489,-138,1449,4522 } }, { "KODAK EASYSHARE Z1015", 0, 0xef1, { 11265,-4286,-992,-4694,12343,2647,-1090,1523,5447 } }, { "Leaf CMost", 0, 0, @@ -6263,6 +6623,10 @@ { 10231,-2769,-1255,-8301,15900,2552,-797,680,7148 } }, { "NIKON D3000", 0, 0, { 8736,-2458,-935,-9075,16894,2251,-1354,1242,8263 } }, + { "NIKON D3100", 0, 0, + { 7911,-2167,-813,-5327,13150,2408,-1288,2483,7968 } }, + { "NIKON D3200", 0, 0xfb9, + { 7013,-1408,-635,-5268,12902,2640,-1470,2801,7379 } }, { "NIKON D300", 0, 0, { 9030,-1992,-715,-8465,16302,2255,-2689,3217,8069 } }, { "NIKON D3X", 0, 0, @@ -6275,16 +6639,26 @@ { 8819,-2543,-911,-9025,16928,2151,-1329,1213,8449 } }, { "NIKON D40", 0, 0, { 6992,-1668,-806,-8138,15748,2543,-874,850,7897 } }, + { "NIKON D4", 0, 0, + { 8598,-2848,-857,-5618,13606,2195,-1002,1773,7137 } }, { "NIKON D5000", 0, 0xf00, { 7309,-1403,-519,-8474,16008,2622,-2433,2826,8064 } }, + { "NIKON D5100", 0, 0x3de6, + { 8198,-2239,-724,-4871,12389,2798,-1043,2050,7181 } }, { "NIKON D50", 0, 0, { 7732,-2422,-789,-8238,15884,2498,-859,783,7330 } }, + { "NIKON D600", 0, 0x3e07, + { 8178,-2245,-609,-4857,12394,2776,-1207,2086,7298 } }, { "NIKON D60", 0, 0, { 8736,-2458,-935,-9075,16894,2251,-1354,1242,8263 } }, + { "NIKON D7000", 0, 0, + { 8198,-2239,-724,-4871,12389,2798,-1043,2050,7181 } }, { "NIKON D700", 0, 0, { 8139,-2171,-663,-8747,16541,2295,-1925,2008,8093 } }, { "NIKON D70", 0, 0, { 7732,-2422,-789,-8238,15884,2498,-859,783,7330 } }, + { "NIKON D800", 0, 0, + { 7866,-2108,-555,-4869,12483,2681,-1176,2069,7501 } }, { "NIKON D80", 0, 0, { 8629,-2410,-883,-9055,16940,2171,-1490,1363,8520 } }, { "NIKON D90", 0, 0xf00, @@ -6297,6 +6671,8 @@ { 13142,-4152,-1596,-4655,12374,2282,-1769,2696,6711} }, { "NIKON E2500", 0, 0, { -5547,11762,2189,5814,-558,3342,-4924,9840,5949,688,9083,96 } }, + { "NIKON E3200", 0, 0, /* DJC */ + { 9846,-2085,-1019,-3278,11109,2170,-774,2134,5745 } }, { "NIKON E4300", 0, 0, /* copied from Minolta DiMAGE Z2 */ { 11280,-3564,-1370,-4655,12374,2282,-1423,2168,5396 } }, { "NIKON E4500", 0, 0, @@ -6315,6 +6691,16 @@ { 7971,-2314,-913,-8451,15762,2894,-1442,1520,7610 } }, { "NIKON COOLPIX P6000", 0, 0, { 9698,-3367,-914,-4706,12584,2368,-837,968,5801 } }, + { "NIKON COOLPIX P7000", 0, 0, + { 11432,-3679,-1111,-3169,11239,2202,-791,1380,4455 } }, + { "NIKON COOLPIX P7100", 0, 0, + { 11053,-4269,-1024,-1976,10182,2088,-526,1263,4469 } }, + { "NIKON COOLPIX P7700", 200, 0, + { 10321,-3920,-931,-2750,11146,1824,-442,1545,5539 } }, + { "NIKON 1 V2", 0, 0, + { 6588,-1305,-693,-3277,10987,2634,-355,2016,5106 } }, + { "NIKON 1 ", 0, 0, + { 8994,-2667,-865,-4594,12324,2552,-699,1786,6260 } }, { "OLYMPUS C5050", 0, 0, { 10508,-3124,-1273,-6079,14294,1901,-1653,2306,6237 } }, { "OLYMPUS C5060", 0, 0, @@ -6325,11 +6711,11 @@ { 10793,-3791,-1146,-7498,15177,2488,-1390,1577,7321 } }, { "OLYMPUS C80", 0, 0, { 8606,-2509,-1014,-8238,15714,2703,-942,979,7760 } }, - { "OLYMPUS E-10", 0, 0xffc0, + { "OLYMPUS E-10", 0, 0xffc, { 12745,-4500,-1416,-6062,14542,1580,-1934,2256,6603 } }, - { "OLYMPUS E-1", 0, 0xfff0, + { "OLYMPUS E-1", 0, 0, { 11846,-4767,-945,-7027,15878,1089,-2699,4122,8311 } }, - { "OLYMPUS E-20", 0, 0xffc0, + { "OLYMPUS E-20", 0, 0xffc, { 13173,-4732,-1499,-5807,14036,1895,-2045,2452,7142 } }, { "OLYMPUS E-300", 0, 0, { 7828,-1761,-348,-5788,14071,1830,-2853,4518,6557 } }, @@ -6339,7 +6725,7 @@ { 8144,-1861,-1111,-7763,15894,1929,-1865,2542,7607 } }, { "OLYMPUS E-3", 0, 0xf99, { 9487,-2875,-1115,-7533,15606,2010,-1618,2100,7389 } }, - { "OLYMPUS E-400", 0, 0xfff0, + { "OLYMPUS E-400", 0, 0, { 6169,-1483,-21,-7107,14761,2536,-2904,3580,8568 } }, { "OLYMPUS E-410", 0, 0xf6a, { 8856,-2582,-1026,-7761,15766,2082,-2009,2575,7469 } }, @@ -6347,16 +6733,40 @@ { 8746,-2425,-1095,-7594,15612,2073,-1780,2309,7416 } }, { "OLYMPUS E-450", 0, 0xfd2, { 8745,-2425,-1095,-7594,15613,2073,-1780,2309,7416 } }, - { "OLYMPUS E-500", 0, 0xfff0, + { "OLYMPUS E-500", 0, 0, { 8136,-1968,-299,-5481,13742,1871,-2556,4205,6630 } }, { "OLYMPUS E-510", 0, 0xf6a, { 8785,-2529,-1033,-7639,15624,2112,-1783,2300,7817 } }, { "OLYMPUS E-520", 0, 0xfd2, { 8344,-2322,-1020,-7596,15635,2048,-1748,2269,7287 } }, - { "OLYMPUS E-620", 0, 0xfb9, + { "OLYMPUS E-5", 0, 0xeec, + { 11200,-3783,-1325,-4576,12593,2206,-695,1742,7504 } }, + { "OLYMPUS E-600", 0, 0xfaf, + { 8453,-2198,-1092,-7609,15681,2008,-1725,2337,7824 } }, + { "OLYMPUS E-620", 0, 0xfaf, { 8453,-2198,-1092,-7609,15681,2008,-1725,2337,7824 } }, { "OLYMPUS E-P1", 0, 0xffd, { 8343,-2050,-1021,-7715,15705,2103,-1831,2380,8235 } }, + { "OLYMPUS E-P2", 0, 0xffd, + { 8343,-2050,-1021,-7715,15705,2103,-1831,2380,8235 } }, + { "OLYMPUS E-P3", 0, 0, + { 7575,-2159,-571,-3722,11341,2725,-1434,2819,6271 } }, + { "OLYMPUS E-PL1s", 0, 0, + { 11409,-3872,-1393,-4572,12757,2003,-709,1810,7415 } }, + { "OLYMPUS E-PL1", 0, 0, + { 11408,-4289,-1215,-4286,12385,2118,-387,1467,7787 } }, + { "OLYMPUS E-PL2", 0, 0, + { 15030,-5552,-1806,-3987,12387,1767,-592,1670,7023 } }, + { "OLYMPUS E-PL3", 0, 0, + { 7575,-2159,-571,-3722,11341,2725,-1434,2819,6271 } }, + { "OLYMPUS E-PL5", 0, 0xfcb, + { 8380,-2630,-639,-2887,10725,2496,-627,1427,5438 } }, + { "OLYMPUS E-PM1", 0, 0, + { 7575,-2159,-571,-3722,11341,2725,-1434,2819,6271 } }, + { "OLYMPUS E-PM2", 0, 0, + { 8380,-2630,-639,-2887,10725,2496,-627,1427,5438 } }, + { "OLYMPUS E-M5", 0, 0xfe1, + { 8380,-2630,-639,-2887,10725,2496,-627,1427,5438 } }, { "OLYMPUS SP350", 0, 0, { 12078,-4836,-1069,-6671,14306,2578,-786,939,7418 } }, { "OLYMPUS SP3", 0, 0, @@ -6371,6 +6781,10 @@ { 10915,-3677,-982,-5587,12986,2911,-1168,1968,6223 } }, { "OLYMPUS SP570UZ", 0, 0, { 11522,-4044,-1146,-4736,12172,2904,-988,1829,6039 } }, + { "OLYMPUS XZ-1", 0, 0, + { 10901,-4095,-1074,-1141,9208,2293,-62,1417,5158 } }, + { "OLYMPUS XZ-2", 0, 0, + { 9777,-3483,-925,-2886,11297,1800,-602,1663,5134 } }, { "PENTAX *ist DL2", 0, 0, { 10504,-2438,-1189,-8603,16207,2531,-1022,863,12242 } }, { "PENTAX *ist DL", 0, 0, @@ -6395,67 +6809,151 @@ { 11057,-3604,-1155,-5152,13046,2329,-282,375,8104 } }, { "PENTAX K-x", 0, 0, { 8843,-2837,-625,-5025,12644,2668,-411,1234,7410 } }, + { "PENTAX K-r", 0, 0, + { 9895,-3077,-850,-5304,13035,2521,-883,1768,6936 } }, + { "PENTAX K-5 II", 0, 0, + { 8170,-2725,-639,-4440,12017,2744,-771,1465,6599 } }, + { "PENTAX K-5", 0, 0, + { 8713,-2833,-743,-4342,11900,2772,-722,1543,6247 } }, { "PENTAX K-7", 0, 0, { 9142,-2947,-678,-8648,16967,1663,-2224,2898,8615 } }, - { "Panasonic DMC-FZ8", 0, 0xf7f0, + { "PENTAX 645D", 0, 0x3e00, + { 10646,-3593,-1158,-3329,11699,1831,-667,2874,6287 } }, + { "Panasonic DMC-FZ8", 0, 0xf7f, { 8986,-2755,-802,-6341,13575,3077,-1476,2144,6379 } }, { "Panasonic DMC-FZ18", 0, 0, { 9932,-3060,-935,-5809,13331,2753,-1267,2155,5575 } }, - { "Panasonic DMC-FZ28", 15, 0xfff, + { "Panasonic DMC-FZ28", 15, 0xf96, { 10109,-3488,-993,-5412,12812,2916,-1305,2140,5543 } }, - { "Panasonic DMC-FZ30", 0, 0xf94c, + { "Panasonic DMC-FZ30", 0, 0xf94, { 10976,-4029,-1141,-7918,15491,2600,-1670,2071,8246 } }, - { "Panasonic DMC-FZ35", 147, 0xfff, + { "Panasonic DMC-FZ3", 143, 0, { 9938,-2780,-890,-4604,12393,2480,-1117,2304,4620 } }, - { "Panasonic DMC-FZ50", 0, 0xfff0, /* aka "LEICA V-LUX1" */ + { "Panasonic DMC-FZ4", 143, 0, + { 13639,-5535,-1371,-1698,9633,2430,316,1152,4108 } }, + { "Panasonic DMC-FZ50", 0, 0, + { 7906,-2709,-594,-6231,13351,3220,-1922,2631,6537 } }, + { "LEICA V-LUX1", 0, 0, { 7906,-2709,-594,-6231,13351,3220,-1922,2631,6537 } }, { "Panasonic DMC-L10", 15, 0xf96, { 8025,-1942,-1050,-7920,15904,2100,-2456,3005,7039 } }, - { "Panasonic DMC-L1", 0, 0xf7fc, /* aka "LEICA DIGILUX 3" */ + { "Panasonic DMC-L1", 0, 0xf7f, { 8054,-1885,-1025,-8349,16367,2040,-2805,3542,7629 } }, - { "Panasonic DMC-LC1", 0, 0, /* aka "LEICA DIGILUX 2" */ + { "LEICA DIGILUX 3", 0, 0xf7f, + { 8054,-1885,-1025,-8349,16367,2040,-2805,3542,7629 } }, + { "Panasonic DMC-LC1", 0, 0, + { 11340,-4069,-1275,-7555,15266,2448,-2960,3426,7685 } }, + { "LEICA DIGILUX 2", 0, 0, { 11340,-4069,-1275,-7555,15266,2448,-2960,3426,7685 } }, - { "Panasonic DMC-LX1", 0, 0xf7f0, /* aka "LEICA D-LUX2" */ + { "Panasonic DMC-LX1", 0, 0xf7f, { 10704,-4187,-1230,-8314,15952,2501,-920,945,8927 } }, - { "Panasonic DMC-LX2", 0, 0, /* aka "LEICA D-LUX3" */ + { "LEICA D-LUX2", 0, 0xf7f, + { 10704,-4187,-1230,-8314,15952,2501,-920,945,8927 } }, + { "Panasonic DMC-LX2", 0, 0, + { 8048,-2810,-623,-6450,13519,3272,-1700,2146,7049 } }, + { "LEICA D-LUX3", 0, 0, { 8048,-2810,-623,-6450,13519,3272,-1700,2146,7049 } }, - { "Panasonic DMC-LX3", 15, 0xfff, /* aka "LEICA D-LUX4" */ + { "Panasonic DMC-LX3", 15, 0, { 8128,-2668,-655,-6134,13307,3161,-1782,2568,6083 } }, + { "LEICA D-LUX 4", 15, 0, + { 8128,-2668,-655,-6134,13307,3161,-1782,2568,6083 } }, + { "Panasonic DMC-LX5", 143, 0, + { 10909,-4295,-948,-1333,9306,2399,22,1738,4582 } }, + { "LEICA D-LUX 5", 143, 0, + { 10909,-4295,-948,-1333,9306,2399,22,1738,4582 } }, + { "Panasonic DMC-LX7", 143, 0, + { 10148,-3743,-991,-2837,11366,1659,-701,1893,4899 } }, + { "LEICA D-LUX 6", 143, 0, + { 10148,-3743,-991,-2837,11366,1659,-701,1893,4899 } }, + { "Panasonic DMC-FZ100", 143, 0xfff, + { 16197,-6146,-1761,-2393,10765,1869,366,2238,5248 } }, + { "LEICA V-LUX 2", 143, 0xfff, + { 16197,-6146,-1761,-2393,10765,1869,366,2238,5248 } }, + { "Panasonic DMC-FZ150", 143, 0xfff, + { 11904,-4541,-1189,-2355,10899,1662,-296,1586,4289 } }, + { "LEICA V-LUX 3", 143, 0xfff, + { 11904,-4541,-1189,-2355,10899,1662,-296,1586,4289 } }, + { "Panasonic DMC-FZ200", 143, 0xfff, + { 8112,-2563,-740,-3730,11784,2197,-941,2075,4933 } }, + { "LEICA V-LUX 4", 143, 0xfff, + { 8112,-2563,-740,-3730,11784,2197,-941,2075,4933 } }, { "Panasonic DMC-FX150", 15, 0xfff, { 9082,-2907,-925,-6119,13377,3058,-1797,2641,5609 } }, - { "Panasonic DMC-G1", 15, 0xfff, + { "Panasonic DMC-G10", 0, 0, + { 10113,-3400,-1114,-4765,12683,2317,-377,1437,6710 } }, + { "Panasonic DMC-G1", 15, 0xf94, { 8199,-2065,-1056,-8124,16156,2033,-2458,3022,7220 } }, + { "Panasonic DMC-G2", 15, 0xf3c, + { 10113,-3400,-1114,-4765,12683,2317,-377,1437,6710 } }, + { "Panasonic DMC-G3", 143, 0xfff, + { 6763,-1919,-863,-3868,11515,2684,-1216,2387,5879 } }, + { "Panasonic DMC-G5", 143, 0xfff, + { 7798,-2562,-740,-3879,11584,2613,-1055,2248,5434 } }, { "Panasonic DMC-GF1", 15, 0xf92, { 7888,-1902,-1011,-8106,16085,2099,-2353,2866,7330 } }, + { "Panasonic DMC-GF2", 143, 0xfff, + { 7888,-1902,-1011,-8106,16085,2099,-2353,2866,7330 } }, + { "Panasonic DMC-GF3", 143, 0xfff, + { 9051,-2468,-1204,-5212,13276,2121,-1197,2510,6890 } }, + { "Panasonic DMC-GF5", 143, 0xfff, + { 8228,-2945,-660,-3938,11792,2430,-1094,2278,5793 } }, { "Panasonic DMC-GH1", 15, 0xf92, { 6299,-1466,-532,-6535,13852,2969,-2331,3112,5984 } }, + { "Panasonic DMC-GH2", 15, 0xf95, + { 7780,-2410,-806,-3913,11724,2484,-1018,2390,5298 } }, + { "Panasonic DMC-GH3", 144, 0, + { 6559,-1752,-491,-3672,11407,2586,-962,1875,5130 } }, + { "Panasonic DMC-GX1", 143, 0, + { 6763,-1919,-863,-3868,11515,2684,-1216,2387,5879 } }, { "Phase One H 20", 0, 0, /* DJC */ { 1313,1855,-109,-6715,15908,808,-327,1840,6020 } }, + { "Phase One H 25", 0, 0, + { 2905,732,-237,-8134,16626,1476,-3038,4253,7517 } }, { "Phase One P 2", 0, 0, { 2905,732,-237,-8134,16626,1476,-3038,4253,7517 } }, { "Phase One P 30", 0, 0, { 4516,-245,-37,-7020,14976,2173,-3206,4671,7087 } }, { "Phase One P 45", 0, 0, { 5053,-24,-117,-5684,14076,1702,-2619,4492,5849 } }, - { "Phase One P65", 0, 0, /* DJC */ - { 8522,1268,-1916,-7706,16350,1358,-2397,4344,4923 } }, + { "Phase One P40", 0, 0, + { 8035,435,-962,-6001,13872,2320,-1159,3065,5434 } }, + { "Phase One P65", 0, 0, + { 8035,435,-962,-6001,13872,2320,-1159,3065,5434 } }, + { "RED ONE", 704, 0xffff, /* DJC */ + { 21014,-7891,-2613,-3056,12201,856,-2203,5125,8042 } }, + { "SAMSUNG EX1", 0, 0x3e00, + { 8898,-2498,-994,-3144,11328,2066,-760,1381,4576 } }, + { "SAMSUNG EX2F", 0, 0x7ff, + { 10648,-3897,-1055,-2022,10573,1668,-492,1611,4742 } }, + { "SAMSUNG NX2", 0, 0xfff, /* NX20, NX200, NX210 */ + { 6933,-2268,-753,-4921,13387,1647,-803,1641,6096 } }, + { "SAMSUNG NX1000", 0, 0, + { 6933,-2268,-753,-4921,13387,1647,-803,1641,6096 } }, + { "SAMSUNG NX", 0, 0, /* NX5, NX10, NX11, NX100 */ + { 10332,-3234,-1168,-6111,14639,1520,-1352,2647,8331 } }, + { "SAMSUNG WB2000", 0, 0xfff, + { 12093,-3557,-1155,-1000,9534,1733,-22,1787,4576 } }, { "SAMSUNG GX-1", 0, 0, { 10504,-2438,-1189,-8603,16207,2531,-1022,863,12242 } }, - { "SAMSUNG S85", 0, 0, /* DJC */ + { "SAMSUNG S85", 0, 0xffff, /* DJC */ { 11885,-3968,-1473,-4214,12299,1916,-835,1655,5549 } }, { "Sinar", 0, 0, /* DJC */ { 16442,-2956,-2422,-2877,12128,750,-1136,6066,4559 } }, - { "SONY DSC-F828", 491, 0, + { "SONY DSC-F828", 0, 0, { 7924,-1910,-777,-8226,15459,2998,-1517,2199,6818,-7242,11401,3481 } }, { "SONY DSC-R1", 512, 0, { 8512,-2641,-694,-8042,15670,2526,-1821,2117,7414 } }, { "SONY DSC-V3", 0, 0, { 7511,-2571,-692,-7894,15088,3060,-948,1111,8128 } }, + { "SONY DSC-RX100", 200, 0, + { 8651,-2754,-1057,-3464,12207,1373,-568,1398,4434 } }, + { "SONY DSC-RX1", 128, 0, + { 6344,-1612,-462,-4863,12477,2681,-865,1786,6899 } }, { "SONY DSLR-A100", 0, 0xfeb, { 9437,-2811,-774,-8405,16215,2290,-710,596,7181 } }, - { "SONY DSLR-A200", 0, 0, - { 9847,-3091,-928,-8485,16345,2225,-715,595,7103 } }, - { "SONY DSLR-A230", 0, 0, /* copied */ + { "SONY DSLR-A290", 0, 0, + { 6038,-1484,-579,-9145,16746,2512,-875,746,7218 } }, + { "SONY DSLR-A2", 0, 0, { 9847,-3091,-928,-8485,16345,2225,-715,595,7103 } }, { "SONY DSLR-A300", 0, 0, { 9847,-3091,-928,-8485,16345,2225,-715,595,7103 } }, @@ -6465,14 +6963,54 @@ { 6038,-1484,-578,-9146,16746,2513,-875,746,7217 } }, { "SONY DSLR-A380", 0, 0, { 6038,-1484,-579,-9145,16746,2512,-875,746,7218 } }, - { "SONY DSLR-A5", 254, 0x1ffe, + { "SONY DSLR-A390", 0, 0, + { 6038,-1484,-579,-9145,16746,2512,-875,746,7218 } }, + { "SONY DSLR-A450", 128, 0xfeb, { 4950,-580,-103,-5228,12542,3029,-709,1435,7371 } }, - { "SONY DSLR-A700", 254, 0x1ffe, + { "SONY DSLR-A580", 128, 0xfeb, + { 5932,-1492,-411,-4813,12285,2856,-741,1524,6739 } }, + { "SONY DSLR-A5", 128, 0xfeb, + { 4950,-580,-103,-5228,12542,3029,-709,1435,7371 } }, + { "SONY DSLR-A700", 126, 0, { 5775,-805,-359,-8574,16295,2391,-1943,2341,7249 } }, - { "SONY DSLR-A850", 256, 0x1ffe, + { "SONY DSLR-A850", 128, 0, { 5413,-1162,-365,-5665,13098,2866,-608,1179,8440 } }, - { "SONY DSLR-A900", 254, 0x1ffe, - { 5209,-1072,-397,-8845,16120,2919,-1618,1803,8654 } } + { "SONY DSLR-A900", 128, 0, + { 5209,-1072,-397,-8845,16120,2919,-1618,1803,8654 } }, + { "SONY NEX-5N", 128, 0, + { 5991,-1456,-455,-4764,12135,2980,-707,1425,6701 } }, + { "SONY NEX-5R", 128, 0, + { 6129,-1545,-418,-4930,12490,2743,-977,1693,6615 } }, + { "SONY NEX-3", 138, 0, /* DJC */ + { 6907,-1256,-645,-4940,12621,2320,-1710,2581,6230 } }, + { "SONY NEX-5", 116, 0, /* DJC */ + { 6807,-1350,-342,-4216,11649,2567,-1089,2001,6420 } }, + { "SONY NEX-3", 128, 0, /* Adobe */ + { 6549,-1550,-436,-4880,12435,2753,-854,1868,6976 } }, + { "SONY NEX-5", 128, 0, /* Adobe */ + { 6549,-1550,-436,-4880,12435,2753,-854,1868,6976 } }, + { "SONY NEX-6", 128, 0, + { 6129,-1545,-418,-4930,12490,2743,-977,1693,6615 } }, + { "SONY NEX-7", 128, 0, + { 5491,-1192,-363,-4951,12342,2948,-911,1722,7192 } }, + { "SONY NEX", 128, 0, /* NEX-C3, NEX-F3 */ + { 5991,-1456,-455,-4764,12135,2980,-707,1425,6701 } }, + { "SONY SLT-A33", 128, 0, + { 6069,-1221,-366,-5221,12779,2734,-1024,2066,6834 } }, + { "SONY SLT-A35", 128, 0, + { 5986,-1618,-415,-4557,11820,3120,-681,1404,6971 } }, + { "SONY SLT-A37", 128, 0, + { 5991,-1456,-455,-4764,12135,2980,-707,1425,6701 } }, + { "SONY SLT-A55", 128, 0, + { 5932,-1492,-411,-4813,12285,2856,-741,1524,6739 } }, + { "SONY SLT-A57", 128, 0, + { 5991,-1456,-455,-4764,12135,2980,-707,1425,6701 } }, + { "SONY SLT-A65", 128, 0, + { 5491,-1192,-363,-4951,12342,2948,-911,1722,7192 } }, + { "SONY SLT-A77", 128, 0, + { 5491,-1192,-363,-4951,12342,2948,-911,1722,7192 } }, + { "SONY SLT-A99", 128, 0, + { 6344,-1612,-462,-4863,12477,2681,-865,1786,6899 } }, }; double cam_xyz[4][3]; char name[130]; @@ -6563,8 +7101,32 @@ void CLASS identify() { char head[32], *cp; - int hlen, fsize, i, c, is_canon; + int hlen, flen, fsize, zero_fsize=1, i, c, is_canon; struct jhead jh; + short pana[][6] = { + { 3130, 1743, 4, 0, -6, 0 }, + { 3130, 2055, 4, 0, -6, 0 }, + { 3130, 2319, 4, 0, -6, 0 }, + { 3170, 2103, 18, 0,-42, 20 }, + { 3170, 2367, 18, 13,-42,-21 }, + { 3177, 2367, 0, 0, -1, 0 }, + { 3304, 2458, 0, 0, -1, 0 }, + { 3330, 2463, 9, 0, -5, 0 }, + { 3330, 2479, 9, 0,-17, 4 }, + { 3370, 1899, 15, 0,-44, 20 }, + { 3370, 2235, 15, 0,-44, 20 }, + { 3370, 2511, 15, 10,-44,-21 }, + { 3690, 2751, 3, 0, -8, -3 }, + { 3710, 2751, 0, 0, -3, 0 }, + { 3724, 2450, 0, 0, 0, -2 }, + { 3770, 2487, 17, 0,-44, 19 }, + { 3770, 2799, 17, 15,-44,-19 }, + { 3880, 2170, 6, 0, -6, 0 }, + { 4060, 3018, 0, 0, 0, -2 }, + { 4290, 2391, 3, 0, -8, -1 }, + { 4330, 2439, 17, 15,-44,-19 }, + { 4508, 2962, 0, 0, -3, -4 }, + { 4508, 3330, 0, 0, -3, -6 } }; static const struct { int fsize; char make[12], model[19], withjpeg; @@ -6583,11 +7145,14 @@ { 787456, "Creative", "PC-CAM 600" ,0 }, { 1138688, "Minolta", "RD175" ,0 }, { 3840000, "Foculus", "531C" ,0 }, + { 307200, "Generic", "640x480" ,0 }, { 786432, "AVT", "F-080C" ,0 }, { 1447680, "AVT", "F-145C" ,0 }, { 1920000, "AVT", "F-201C" ,0 }, { 5067304, "AVT", "F-510C" ,0 }, + { 5067316, "AVT", "F-510C" ,0 }, { 10134608, "AVT", "F-510C" ,0 }, + { 10134620, "AVT", "F-510C" ,0 }, { 16157136, "AVT", "F-810C" ,0 }, { 1409024, "Sony", "XCD-SX910CR" ,0 }, { 2818048, "Sony", "XCD-SX910CR" ,0 }, @@ -6600,13 +7165,17 @@ { 6573120, "Canon", "PowerShot A610" ,0 }, { 9219600, "Canon", "PowerShot A620" ,0 }, { 9243240, "Canon", "PowerShot A470" ,0 }, - { 10341600, "Canon", "PowerShot A720" ,0 }, + { 10341600, "Canon", "PowerShot A720 IS",0 }, { 10383120, "Canon", "PowerShot A630" ,0 }, { 12945240, "Canon", "PowerShot A640" ,0 }, { 15636240, "Canon", "PowerShot A650" ,0 }, { 5298000, "Canon", "PowerShot SD300" ,0 }, { 7710960, "Canon", "PowerShot S3 IS" ,0 }, { 15467760, "Canon", "PowerShot SX110 IS",0 }, + { 15534576, "Canon", "PowerShot SX120 IS",0 }, + { 18653760, "Canon", "PowerShot SX20 IS",0 }, + { 19131120, "Canon", "PowerShot SX220 HS",0 }, + { 21936096, "Canon", "PowerShot SX30 IS",0 }, { 5939200, "OLYMPUS", "C770UZ" ,0 }, { 1581060, "NIKON", "E900" ,1 }, /* or E900s,E910 */ { 2465792, "NIKON", "E950" ,1 }, /* or E800,E700 */ @@ -6626,11 +7195,15 @@ { 2937856, "CASIO", "EX-S20" ,1 }, { 4948608, "CASIO", "EX-S100" ,1 }, { 7542528, "CASIO", "EX-Z50" ,1 }, + { 7562048, "CASIO", "EX-Z500" ,1 }, { 7753344, "CASIO", "EX-Z55" ,1 }, { 7816704, "CASIO", "EX-Z60" ,1 }, { 10843712, "CASIO", "EX-Z75" ,1 }, { 10834368, "CASIO", "EX-Z750" ,1 }, { 12310144, "CASIO", "EX-Z850" ,1 }, + { 12489984, "CASIO", "EX-Z8" ,1 }, + { 15499264, "CASIO", "EX-Z1050" ,1 }, + { 18702336, "CASIO", "EX-ZR100" ,1 }, { 7426656, "CASIO", "EX-P505" ,1 }, { 9313536, "CASIO", "EX-P600" ,1 }, { 10979200, "CASIO", "EX-P700" ,1 }, @@ -6641,21 +7214,27 @@ { 15980544, "AGFAPHOTO","DC-833m" ,1 }, { 16098048, "SAMSUNG", "S85" ,1 }, { 16215552, "SAMSUNG", "S85" ,1 }, + { 20487168, "SAMSUNG", "WB550" ,1 }, + { 24000000, "SAMSUNG", "WB550" ,1 }, { 12582980, "Sinar", "" ,0 }, { 33292868, "Sinar", "" ,0 }, { 44390468, "Sinar", "" ,0 } }; static const char *corp[] = { "Canon", "NIKON", "EPSON", "KODAK", "Kodak", "OLYMPUS", "PENTAX", "MINOLTA", "Minolta", "Konica", "CASIO", "Sinar", "Phase One", - "SAMSUNG", "Mamiya", "MOTOROLA" }; + "SAMSUNG", "Mamiya", "MOTOROLA", "LEICA" }; tiff_flip = flip = filters = -1; /* 0 is valid, so -1 is unknown */ raw_height = raw_width = fuji_width = fuji_layout = cr2_slice[0] = 0; maximum = height = width = top_margin = left_margin = 0; cdesc[0] = desc[0] = artist[0] = make[0] = model[0] = model2[0] = 0; iso_speed = shutter = aperture = focal_len = unique_id = 0; + tiff_nifds = 0; + memset (tiff_ifd, 0, sizeof tiff_ifd); memset (gpsdata, 0, sizeof gpsdata); + memset (cblack, 0, sizeof cblack); memset (white, 0, sizeof white); + memset (mask, 0, sizeof mask); thumb_offset = thumb_length = thumb_width = thumb_height = 0; load_raw = thumb_load_raw = 0; write_thumb = &CLASS jpeg_thumb; @@ -6664,7 +7243,7 @@ timestamp = shot_order = tiff_samples = black = is_foveon = 0; mix_green = profile_length = data_error = zero_is_bad = 0; pixel_aspect = is_raw = raw_color = 1; - tile_width = tile_length = INT_MAX; + tile_width = tile_length = 0; for (i=0; i < 4; i++) { cam_mul[i] = i == 1; pre_mul[i] = i < 3; @@ -6672,25 +7251,23 @@ FORC3 rgb_cam[c][i] = c == i; } colors = 3; - for (i=0; i < 0x4000; i++) curve[i] = i; + for (i=0; i < 0x10000; i++) curve[i] = i; order = get2(); hlen = get4(); fseek (ifp, 0, SEEK_SET); fread (head, 1, 32, ifp); fseek (ifp, 0, SEEK_END); - fsize = ftell(ifp); + flen = fsize = ftell(ifp); if ((cp = (char *) memmem (head, 32, "MMMM", 4)) || (cp = (char *) memmem (head, 32, "IIII", 4))) { parse_phase_one (cp-head); - if (cp-head) parse_tiff(0); + if (cp-head && parse_tiff(0)) apply_tiff(); } else if (order == 0x4949 || order == 0x4d4d) { if (!memcmp (head+6,"HEAPCCDR",8)) { data_offset = hlen; - parse_ciff (hlen, fsize - hlen); - } else { - parse_tiff(0); - } + parse_ciff (hlen, flen - hlen); + } else if (parse_tiff(0)) apply_tiff(); } else if (!memcmp (head,"\xff\xd8\xff\xe1",4) && !memcmp (head+6,"Exif",4)) { fseek (ifp, 4, SEEK_SET); @@ -6712,9 +7289,11 @@ } else if (!strcmp (head, "qktk")) { strcpy (make, "Apple"); strcpy (model,"QuickTake 100"); + load_raw = &CLASS quicktake_100_load_raw; } else if (!strcmp (head, "qktn")) { strcpy (make, "Apple"); strcpy (model,"QuickTake 150"); + load_raw = &CLASS kodak_radc_load_raw; } else if (!memcmp (head,"FUJIFILM",8)) { fseek (ifp, 84, SEEK_SET); thumb_offset = get4(); @@ -6727,9 +7306,11 @@ if (is_raw == 2 && shot_select) parse_fuji (i); } - fseek (ifp, 100, SEEK_SET); - data_offset = get4(); + load_raw = &CLASS unpacked_load_raw; + fseek (ifp, 100+28*(shot_select > 0), SEEK_SET); + parse_tiff (data_offset = get4()); parse_tiff (thumb_offset+12); + apply_tiff(); } else if (!memcmp (head,"RIFF",4)) { fseek (ifp, 0, SEEK_SET); parse_riff(); @@ -6744,6 +7325,37 @@ raw_height = get2(); load_raw = &CLASS nokia_load_raw; filters = 0x61616161; + } else if (!memcmp (head,"NOKIARAW",8)) { + strcpy (make, "NOKIA"); + strcpy (model, "X2"); + order = 0x4949; + fseek (ifp, 300, SEEK_SET); + data_offset = get4(); + i = get4(); + width = get2(); + height = get2(); + data_offset += i - width * 5 / 4 * height; + load_raw = &CLASS nokia_load_raw; + filters = 0x61616161; + } else if (!memcmp (head,"ARRI",4)) { + order = 0x4949; + fseek (ifp, 20, SEEK_SET); + width = get4(); + height = get4(); + strcpy (make, "ARRI"); + fseek (ifp, 668, SEEK_SET); + fread (model, 1, 64, ifp); + data_offset = 4096; + load_raw = &CLASS packed_load_raw; + load_flags = 88; + filters = 0x61616161; + } else if (!memcmp (head+4,"RED1",4)) { + strcpy (make, "RED"); + strcpy (model,"ONE"); + parse_redcine(); + load_raw = &CLASS redcine_load_raw; + gamma_curve (1/2.4, 12.92, 1, 4095); + filters = 0x49494949; } else if (!memcmp (head,"DSC-Image",9)) parse_rollei(); else if (!memcmp (head,"PWAD",4)) @@ -6755,14 +7367,15 @@ else if (!memcmp (head,"CI",2)) parse_cine(); else - for (i=0; i < sizeof table / sizeof *table; i++) + for (zero_fsize=i=0; i < sizeof table / sizeof *table; i++) if (fsize == table[i].fsize) { strcpy (make, table[i].make ); strcpy (model, table[i].model); if (table[i].withjpeg) parse_external_jpeg(); } - if (make[0] == 0) parse_smal (0, fsize); + if (zero_fsize) fsize = 0; + if (make[0] == 0) parse_smal (0, flen); if (make[0] == 0) parse_jpeg (is_raw = 0); for (i=0; i < sizeof corp / sizeof *corp; i++) @@ -6780,6 +7393,8 @@ i = strlen(make); /* Remove make from model */ if (!strncasecmp (model, make, i) && model[i++] == ' ') memmove (model, model+i, 64-i); + if (!strncmp (model,"FinePix ",8)) + strcpy (model, model+8); if (!strncmp (model,"Digital Camera ",15)) strcpy (model, model+15); desc[511] = artist[63] = make[63] = model[63] = model2[63] = 0; @@ -6787,18 +7402,19 @@ if (!height) height = raw_height; if (!width) width = raw_width; - if (fuji_width) { - width = height + fuji_width; - height = width - 1; - pixel_aspect = 1; - } if (height == 2624 && width == 3936) /* Pentax K10D and Samsung GX10 */ { height = 2616; width = 3896; } - if (height == 3136 && width == 4864) /* Pentax K20D */ - { height = 3124; width = 4688; } - if (height == 3136 && width == 4736) /* Pentax K-7 */ - { height = 3122; width = 4684; - top_margin = 2; filters = 0x16161616; } + if (height == 3136 && width == 4864) /* Pentax K20D and Samsung GX20 */ + { height = 3124; width = 4688; filters = 0x16161616; } + if (width == 4352 && (!strcmp(model,"K-r") || !strcmp(model,"K-x"))) + { width = 4309; filters = 0x16161616; } + if (width >= 4960 && !strncmp(model,"K-5",3)) + { left_margin = 10; width = 4950; filters = 0x16161616; } + if (width == 4736 && !strcmp(model,"K-7")) + { height = 3122; width = 4684; filters = 0x16161616; top_margin = 2; } + if (width == 7424 && !strcmp(model,"645D")) + { height = 5502; width = 7328; filters = 0x61616161; top_margin = 29; + left_margin = 48; } if (height == 3014 && width == 4096) /* Ricoh GX200 */ width = 4014; if (dng_version) { @@ -6806,14 +7422,14 @@ if (filters) is_raw = tiff_samples; else colors = tiff_samples; if (tiff_compress == 1) - load_raw = &CLASS adobe_dng_load_raw_nc; + load_raw = &CLASS packed_dng_load_raw; if (tiff_compress == 7) - load_raw = &CLASS adobe_dng_load_raw_lj; + load_raw = &CLASS lossless_dng_load_raw; goto dng_skip; } if ((is_canon = !strcmp(make,"Canon"))) load_raw = memcmp (head+6,"HEAPCCDR",8) ? - &CLASS lossless_jpeg_load_raw : &CLASS canon_compressed_load_raw; + &CLASS lossless_jpeg_load_raw : &CLASS canon_load_raw; if (!strcmp(make,"NIKON")) { if (!load_raw) load_raw = &CLASS packed_load_raw; @@ -6831,13 +7447,13 @@ if (height*2 < width) pixel_aspect = 0.5; if (height > width) pixel_aspect = 2; filters = 0; - load_raw = &CLASS foveon_load_raw; simple_coeff(0); } else if (is_canon && tiff_bps == 15) { switch (width) { case 3344: width -= 66; case 3872: width -= 6; } + if (height > width) SWAP(height,width); filters = 0; load_raw = &CLASS canon_sraw_load_raw; } else if (!strcmp(model,"PowerShot 600")) { @@ -6919,7 +7535,7 @@ top_margin = 6; left_margin = 12; goto canon_a5; - } else if (!strcmp(model,"PowerShot A720")) { + } else if (!strcmp(model,"PowerShot A720 IS")) { height = 2472; width = 3298; raw_height = 2480; @@ -6973,6 +7589,49 @@ load_raw = &CLASS packed_load_raw; load_flags = 40; zero_is_bad = 1; + } else if (!strcmp(model,"PowerShot SX120 IS")) { + height = 2742; + width = 3664; + raw_height = 2778; + raw_width = 3728; + top_margin = 18; + left_margin = 16; + filters = 0x49494949; + load_raw = &CLASS packed_load_raw; + load_flags = 40; + zero_is_bad = 1; + } else if (!strcmp(model,"PowerShot SX20 IS")) { + height = 3024; + width = 4032; + raw_height = 3048; + raw_width = 4080; + top_margin = 12; + left_margin = 24; + load_raw = &CLASS packed_load_raw; + load_flags = 40; + zero_is_bad = 1; + } else if (!strcmp(model,"PowerShot SX220 HS")) { + height = 3043; + width = 4072; + raw_height = 3060; + raw_width = 4168; + mask[0][0] = top_margin = 16; + mask[0][2] = top_margin + height; + mask[0][3] = left_margin = 92; + load_raw = &CLASS packed_load_raw; + load_flags = 8; + zero_is_bad = 1; + } else if (!strcmp(model,"PowerShot SX30 IS")) { + height = 3254; + width = 4366; + raw_height = 3276; + raw_width = 4464; + top_margin = 10; + left_margin = 25; + filters = 0x16161616; + load_raw = &CLASS packed_load_raw; + load_flags = 40; + zero_is_bad = 1; } else if (!strcmp(model,"PowerShot Pro90 IS")) { width = 1896; colors = 4; @@ -7036,6 +7695,10 @@ width = 3684; top_margin = 16; left_margin = 8; + if (unique_id > 0x2720000) { + top_margin = 12; + left_margin = 52; + } } else if (is_canon && raw_width == 3944) { height = 2602; width = 3908; @@ -7064,6 +7727,19 @@ top_margin = 12; left_margin = 192; goto canon_cr2; + } else if (is_canon && raw_width == 4160) { + height = 3048; + width = 4048; + top_margin = 11; + left_margin = 104; + } else if (is_canon && raw_width == 4176) { + height = 3045; + width = 4072; + left_margin = 96; + mask[0][0] = top_margin = 17; + mask[0][2] = raw_height; + mask[0][3] = 80; + filters = 0x49494949; } else if (is_canon && raw_width == 4312) { top_margin = 18; left_margin = 22; @@ -7071,6 +7747,12 @@ if (unique_id == 0x80000176) adobe_coeff ("Canon","EOS 450D"); goto canon_cr2; + } else if (is_canon && raw_width == 4352) { + top_margin = 18; + left_margin = 62; + if (unique_id == 0x80000288) + adobe_coeff ("Canon","EOS 1100D"); + goto canon_cr2; } else if (is_canon && raw_width == 4476) { top_margin = 34; left_margin = 90; @@ -7081,39 +7763,69 @@ top_margin = 10; left_margin = 12; filters = 0x49494949; - } else if (is_canon && raw_width == 1208) { + } else if (is_canon && raw_width == 4496) { + height = 3316; + width = 4404; + top_margin = 50; + left_margin = 80; + } else if (is_canon && raw_width == 4832) { top_margin = unique_id == 0x80000261 ? 51:26; left_margin = 62; - raw_width = width *= 4; if (unique_id == 0x80000252) adobe_coeff ("Canon","EOS 500D"); goto canon_cr2; - } else if (is_canon && raw_width == 1280) { + } else if (is_canon && raw_width == 5108) { + top_margin = 13; + left_margin = 98; + goto canon_cr2; + } else if (is_canon && raw_width == 5120) { height -= top_margin = 45; left_margin = 142; - raw_width *= 4; width = 4916; - } else if (is_canon && raw_width == 1340) { + } else if (is_canon && raw_width == 5280) { + top_margin = 52; + left_margin = 72; + if (unique_id == 0x80000301) + adobe_coeff ("Canon","EOS 650D"); + goto canon_cr2; + } else if (is_canon && raw_width == 5344) { top_margin = 51; - left_margin = 158; - raw_width = width *= 4; + left_margin = 142; + if (unique_id == 0x80000269) { + top_margin = 100; + left_margin = 126; + height -= 2; + adobe_coeff ("Canon","EOS-1D X"); + } + if (unique_id == 0x80000270) + adobe_coeff ("Canon","EOS 550D"); + if (unique_id == 0x80000286) + adobe_coeff ("Canon","EOS 600D"); goto canon_cr2; - } else if (is_canon && raw_width == 1448) { - top_margin = 51; + } else if (is_canon && raw_width == 5360) { + top_margin = 51; left_margin = 158; - raw_width = width *= 4; goto canon_cr2; - } else if (is_canon && raw_width == 5108) { - top_margin = 13; - left_margin = 98; -canon_cr2: - height -= top_margin; - width -= left_margin; + } else if (is_canon && raw_width == 5568) { + top_margin = 38; + left_margin = 72; + goto canon_cr2; } else if (is_canon && raw_width == 5712) { height = 3752; width = 5640; top_margin = 20; left_margin = 62; + } else if (is_canon && raw_width == 5792) { + top_margin = 51; + left_margin = 158; +canon_cr2: + height -= top_margin; + width -= left_margin; + } else if (is_canon && raw_width == 5920) { + height = 3870; + width = 5796; + top_margin = 80; + left_margin = 122; } else if (!strcmp(model,"D1")) { cam_mul[0] *= 256/527.0; cam_mul[2] *= 256/317.0; @@ -7131,20 +7843,29 @@ !strcmp(model,"D700")) { width -= 4; left_margin = 2; - } else if (!strcmp(model,"D5000")) { + } else if (!strcmp(model,"D3100")) { + width -= 28; + left_margin = 6; + } else if (!strcmp(model,"D5000") || + !strcmp(model,"D90")) { width -= 42; + } else if (!strcmp(model,"D5100") || + !strcmp(model,"D7000")) { + width -= 44; + } else if (!strcmp(model,"D3200") || + !strcmp(model,"D600") || + !strcmp(model,"D800")) { + width -= 46; + } else if (!strcmp(model,"D4")) { + width -= 52; + left_margin = 2; } else if (!strncmp(model,"D40",3) || !strncmp(model,"D50",3) || !strncmp(model,"D70",3)) { width--; - } else if (!strcmp(model,"D90")) { - width -= 42; } else if (!strcmp(model,"D100")) { - if (tiff_compress == 34713 && !nikon_is_compressed()) { - load_raw = &CLASS packed_load_raw; - load_flags |= 1; + if (load_flags) raw_width = (width += 3) + 3; - } } else if (!strcmp(model,"D200")) { left_margin = 1; width -= 4; @@ -7157,9 +7878,15 @@ else width -= 8; } else if (!strncmp(model,"D300",4)) { width -= 32; - } else if (!strcmp(model,"COOLPIX P6000")) { + } else if (!strcmp(make,"NIKON") && raw_width == 4032) { + adobe_coeff ("NIKON","COOLPIX P7700"); + } else if (!strncmp(model,"COOLPIX P",9)) { load_flags = 24; filters = 0x94949494; + if (model[9] == '7' && iso_speed >= 400) + black = 255; + } else if (!strncmp(model,"1 ",2)) { + height -= 2; } else if (fsize == 1581060) { height = 963; width = 1287; @@ -7224,8 +7951,8 @@ filters = 0x16161616; } if (make[0] == 'O') { - i = find_green (12, 32, 0, fsize/2); - c = find_green (12, 32, 0, 3096); + i = find_green (12, 32, 1188864, 3576832); + c = find_green (12, 32, 2383920, 2387016); if (abs(i) < abs(c)) { SWAP(i,c); load_flags = 24; @@ -7260,26 +7987,24 @@ load_flags = 30; } else if (!strcmp(make,"FUJIFILM")) { if (!strcmp(model+7,"S2Pro")) { - strcpy (model+7," S2Pro"); + strcpy (model,"S2Pro"); height = 2144; width = 2880; flip = 6; - } else - maximum = 0x3e00; - if (is_raw == 2 && shot_select) - maximum = 0x2f00; - top_margin = (raw_height - height)/2; - left_margin = (raw_width - width )/2; - if (is_raw == 2) - data_offset += (shot_select > 0) * ( fuji_layout ? - (raw_width *= 2) : raw_height*raw_width*2 ); - if (load_raw == &CLASS fuji_load_raw) { - fuji_width = width >> !fuji_layout; - width = (height >> fuji_layout) + fuji_width; - raw_height = height; - height = width - 1; - if (~fuji_width & 1) filters = 0x49494949; + } else if (load_raw != &CLASS packed_load_raw) + maximum = (is_raw == 2 && shot_select) ? 0x2f00 : 0x3e00; + top_margin = (raw_height - height) >> 2 << 1; + left_margin = (raw_width - width ) >> 2 << 1; + if (width == 2848) filters = 0x16161616; + if (width == 3328) { + width = 3262; + left_margin = 34; + } + if (width == 4952) { + left_margin = 0; + filters = 2; } + if (fuji_layout) raw_width *= is_raw; } else if (!strcmp(model,"RD175")) { height = 986; width = 1534; @@ -7328,14 +8053,10 @@ order = 0x4d4d; } } else if (!strcmp(model,"*ist D")) { + load_raw = &CLASS unpacked_load_raw; data_error = -1; } else if (!strcmp(model,"*ist DS")) { height -= 2; - } else if (!strcmp(model,"K20D")) { - filters = 0x16161616; - } else if (!strcmp(model,"K-x")) { - width = 4309; - filters = 0x16161616; } else if (!strcmp(model,"Optio S")) { if (fsize == 3178560) { height = 1540; @@ -7374,7 +8095,54 @@ raw_width = fsize/height/2; order = 0x4d4d; load_raw = &CLASS unpacked_load_raw; - maximum = 0xffff; + } else if (!strcmp(make,"SAMSUNG") && raw_width == 4704) { + height -= top_margin = 8; + width -= 2 * (left_margin = 8); + load_flags = 32; + } else if (!strcmp(make,"SAMSUNG") && raw_width == 5632) { + order = 0x4949; + height = 3694; + top_margin = 2; + width = 5574 - (left_margin = 32 + tiff_bps); + if (tiff_bps == 12) load_flags = 80; + } else if (!strcmp(model,"EX1")) { + order = 0x4949; + height -= 20; + top_margin = 2; + if ((width -= 6) > 3682) { + height -= 10; + width -= 46; + top_margin = 8; + } + } else if (!strcmp(model,"WB2000")) { + order = 0x4949; + height -= 3; + top_margin = 2; + if ((width -= 10) > 3718) { + height -= 28; + width -= 56; + top_margin = 8; + } + } else if (fsize == 20487168) { + height = 2808; + width = 3648; + goto wb550; + } else if (fsize == 24000000) { + height = 3000; + width = 4000; +wb550: + strcpy (model, "WB550"); + order = 0x4d4d; + load_raw = &CLASS unpacked_load_raw; + load_flags = 6; + maximum = 0x3df; + } else if (!strcmp(model,"EX2F")) { + height = 3045; + width = 4070; + top_margin = 3; + order = 0x4949; + filters = 0x49494949; + load_raw = &CLASS unpacked_load_raw; } else if (!strcmp(model,"STV680 VGA")) { height = 484; width = 644; @@ -7389,6 +8157,11 @@ width = 1600; load_raw = &CLASS unpacked_load_raw; filters = 0x49494949; + } else if (!strcmp(model,"640x480")) { + height = 480; + width = 640; + load_raw = &CLASS eight_bit_load_raw; + gamma_curve (0.45, 4.5, 1, 255); } else if (!strcmp(model,"F-080C")) { height = 768; width = 1024; @@ -7406,6 +8179,7 @@ width = 2588; load_raw = fsize < 7500000 ? &CLASS eight_bit_load_raw : &CLASS unpacked_load_raw; + data_offset = fsize - width*height*(fsize >> 22); maximum = 0xfff0; } else if (!strcmp(model,"F-810C")) { height = 2469; @@ -7458,6 +8232,19 @@ top_margin = 4; left_margin = 7; filters = 0x61616161; + } else if (raw_width == 7410) { + height = 5502; + width = 7328; + top_margin = 4; + left_margin = 41; + filters = 0x61616161; + } else if (raw_width == 9044) { + height = 6716; + width = 8964; + top_margin = 8; + left_margin = 40; + black += load_flags = 256; + maximum = 0x8101; } else if (raw_width == 4090) { strcpy (model, "V96C"); height -= (top_margin = 6); @@ -7480,8 +8267,10 @@ if (ljpeg_start (&jh, 1) && jh.bits == 15) maximum = 0x1fff; if (tiff_samples > 1) filters = 0; - if (tiff_samples > 1 || tile_length < raw_height) + if (tiff_samples > 1 || tile_length < raw_height) { load_raw = &CLASS leaf_hdr_load_raw; + raw_width = tile_width; + } if ((width | height) == 2048) { if (tiff_samples == 1) { filters = 1; @@ -7515,112 +8304,23 @@ filters = 0x16161616; } } else if (!strcmp(make,"LEICA") || !strcmp(make,"Panasonic")) { - maximum = 0xfff0; - if ((fsize-data_offset) / (width*8/7) == height) + if ((flen - data_offset) / (raw_width*8/7) == raw_height) load_raw = &CLASS panasonic_load_raw; - if (!load_raw) load_raw = &CLASS unpacked_load_raw; - switch (width) { - case 2568: - adobe_coeff ("Panasonic","DMC-LC1"); break; - case 3130: - left_margin = -14; - case 3170: - left_margin += 18; - width = 3096; - if (height > 2326) { - height = 2326; - top_margin = 13; - filters = 0x49494949; - } - zero_is_bad = 1; - adobe_coeff ("Panasonic","DMC-FZ8"); break; - case 3213: - width -= 27; - case 3177: - width -= 10; - filters = 0x49494949; - zero_is_bad = 1; - adobe_coeff ("Panasonic","DMC-L1"); break; - case 3304: - width -= 17; - zero_is_bad = 1; - adobe_coeff ("Panasonic","DMC-FZ30"); break; - case 3330: - width += 43; - left_margin = -6; - maximum = 0xf7f0; - case 3370: - width -= 82; - left_margin += 15; - if (height > 2480) - height = 2480 - (top_margin = 10); - filters = 0x49494949; - zero_is_bad = 1; - adobe_coeff ("Panasonic","DMC-FZ18"); break; - case 3690: - height -= 2; - left_margin = -14; - maximum = 0xf7f0; - case 3770: - width = 3672; - if (--height == 2798 && (height = 2760)) - top_margin = 15; - else filters = 0x49494949; - left_margin += 17; - zero_is_bad = 1; - adobe_coeff ("Panasonic","DMC-FZ50"); break; - case 3710: - width = 3682; - filters = 0x49494949; - adobe_coeff ("Panasonic","DMC-L10"); break; - case 3724: - width -= 14; - if (height == 2450) height -= 2; - case 3836: - width -= 42; -lx3: filters = 0x16161616; - if (make[0] != 'P') - adobe_coeff ("Panasonic","DMC-LX3"); - break; - case 3880: - width -= 22; - left_margin = 6; - zero_is_bad = 1; - adobe_coeff ("Panasonic","DMC-LX1"); break; - case 4060: - width = 3982; - if (height == 2250) goto lx3; - width = 4018; - filters = 0x16161616; - if (!strncmp(model,"DMC-FZ3",7)) { - height -= 2; - adobe_coeff ("Panasonic","DMC-FZ35"); break; - } - filters = 0x49494949; - if (!strcmp(model,"DMC-GH1")) break; - zero_is_bad = 1; - adobe_coeff ("Panasonic","DMC-G1"); break; - case 4172: - case 4396: - width -= 28; - filters = 0x49494949; - adobe_coeff ("Panasonic","DMC-GH1"); break; - case 4290: - height += 38; - left_margin = -14; - filters = 0x49494949; - case 4330: - width = 4248; - if ((height -= 39) == 2400) - top_margin = 15; - left_margin += 17; - adobe_coeff ("Panasonic","DMC-LX2"); break; - case 4508: - height -= 6; - width = 4429; - filters = 0x16161616; - adobe_coeff ("Panasonic","DMC-FX150"); break; + if (!load_raw) { + load_raw = &CLASS unpacked_load_raw; + load_flags = 4; } + zero_is_bad = 1; + if ((height += 12) > raw_height) height = raw_height; + for (i=0; i < sizeof pana / sizeof *pana; i++) + if (raw_width == pana[i][0] && raw_height == pana[i][1]) { + left_margin = pana[i][2]; + top_margin = pana[i][3]; + width += pana[i][4]; + height += pana[i][5]; + } + filters = 0x01010101 * (uchar) "\x94\x61\x49\x16" + [((filters-1) ^ (left_margin & 1) ^ (top_margin << 1)) & 3]; } else if (!strcmp(model,"C770UZ")) { height = 1718; width = 2304; @@ -7631,27 +8331,28 @@ height += height & 1; filters = exif_cfa; if (width == 4100) width -= 4; - if (load_raw == &CLASS olympus_load_raw) { - tiff_bps = 12; - black >>= 4; - } else if (!strcmp(model,"E-10") || - !strncmp(model,"E-20",4)) { - black <<= 2; - } else if (!strcmp(model,"E-300") || - !strcmp(model,"E-500")) { + if (width == 4080) width -= 24; + if (load_raw == &CLASS unpacked_load_raw) + load_flags = 4; + tiff_bps = 12; + if (!strcmp(model,"E-300") || + !strcmp(model,"E-500")) { width -= 20; if (load_raw == &CLASS unpacked_load_raw) { - maximum = 0xfc30; - black = 0; + maximum = 0xfc3; + memset (cblack, 0, sizeof cblack); } } else if (!strcmp(model,"E-330")) { width -= 30; if (load_raw == &CLASS unpacked_load_raw) - maximum = 0xf790; + maximum = 0xf79; } else if (!strcmp(model,"SP550UZ")) { - thumb_length = fsize - (thumb_offset = 0xa39800); + thumb_length = flen - (thumb_offset = 0xa39800); thumb_height = 480; thumb_width = 640; + } else if (!strcmp(model,"XZ-2")) { + load_raw = &CLASS packed_load_raw; + load_flags = 24; } } else if (!strcmp(model,"N Digital")) { height = 2047; @@ -7662,6 +8363,7 @@ } else if (!strcmp(model,"DSC-F828")) { width = 3288; left_margin = 5; + mask[1][3] = -17; data_offset = 862144; load_raw = &CLASS sony_load_raw; filters = 0x9c9c9c9c; @@ -7670,15 +8372,25 @@ } else if (!strcmp(model,"DSC-V3")) { width = 3109; left_margin = 59; + mask[0][1] = 9; data_offset = 787392; load_raw = &CLASS sony_load_raw; } else if (!strcmp(make,"SONY") && raw_width == 3984) { adobe_coeff ("SONY","DSC-R1"); width = 3925; order = 0x4d4d; + } else if (!strcmp(make,"SONY") && raw_width == 5504) { + width -= 8; + } else if (!strcmp(make,"SONY") && raw_width == 6048) { + width -= 24; } else if (!strcmp(model,"DSLR-A100")) { - height--; - width = ++raw_width; + if (width == 3880) { + height--; + width = ++raw_width; + } else { + order = 0x4d4d; + load_flags = 2; + } filters = 0x61616161; } else if (!strcmp(model,"DSLR-A350")) { height -= 4; @@ -7720,15 +8432,8 @@ read_shorts (curve, 256); } else gamma_curve (0, 3.875, 1, 255); load_raw = &CLASS eight_bit_load_raw; - } else if (!strcmp(model,"EASYSHARE Z1015 IS")) { - height = 2742; - width = 3664; - goto ezshare; - } else if (!strcmp(model,"EasyShare Z980")) { - height = 3006; - width = 4016; -ezshare: - data_offset = 0x15000; + } else if (!strncasecmp(model,"EasyShare",9)) { + data_offset = data_offset < 0x15000 ? 0x15000 : 0x17000; load_raw = &CLASS packed_load_raw; } else if (!strcasecmp(make,"KODAK")) { if (filters == UINT_MAX) filters = 0x61616161; @@ -7768,8 +8473,8 @@ data_offset = 15424; } if (!strncmp(model,"DC2",3)) { - height = 242; - if (fsize < 100000) { + raw_height = height = 242; + if (flen < 100000) { raw_width = 256; width = 249; pixel_aspect = (4.0*height) / (3.0*width); } else { @@ -7822,7 +8527,8 @@ load_raw = &CLASS kodak_radc_load_raw; filters = 0x61616161; simple_coeff(2); - } else if (!strcmp(model,"QuickTake 100")) { + } else if (!strncmp(model,"QuickTake",9)) { + if (head[5]) strcpy (model+10, "200"); fseek (ifp, 544, SEEK_SET); height = get2(); width = get2(); @@ -7832,14 +8538,6 @@ fseek (ifp, data_offset-6, SEEK_SET); flip = ~get2() & 3 ? 5:6; } - load_raw = &CLASS quicktake_100_load_raw; - filters = 0x61616161; - } else if (!strcmp(model,"QuickTake 150")) { - data_offset = 738 - head[5]; - if (head[5]) strcpy (model+10, "200"); - load_raw = &CLASS kodak_radc_load_raw; - height = 480; - width = 640; filters = 0x61616161; } else if (!strcmp(make,"Rollei") && !load_raw) { switch (raw_width) { @@ -7904,6 +8602,11 @@ height = 1931; width = 2570; raw_width = 3904; + } else if (!strcmp(model,"EX-Z500")) { + height = 1937; + width = 2577; + raw_width = 3904; + filters = 0x16161616; } else if (!strcmp(model,"EX-Z55")) { height = 1960; width = 2570; @@ -7929,6 +8632,21 @@ width = 3279; raw_width = 4928; maximum = 0xfff; + } else if (!strcmp(model,"EX-Z8")) { + height = 2467; + width = 3281; + raw_height = 2502; + raw_width = 4992; + maximum = 0xfff; + } else if (fsize == 15499264) { /* EX-Z1050 or EX-Z1080 */ + height = 2752; + width = 3672; + raw_width = 5632; + } else if (!strcmp(model,"EX-ZR100")) { + height = 3044; + width = 4072; + raw_width = 4096; + load_flags = 80; } else if (!strcmp(model,"EX-P505")) { height = 1928; width = 2568; @@ -7957,26 +8675,41 @@ } } dng_skip: + if (fuji_width) { + fuji_width = width >> !fuji_layout; + if (~fuji_width & 1) filters = 0x49494949; + width = (height >> fuji_layout) + fuji_width; + height = width - 1; + pixel_aspect = 1; + } else { + if (raw_height < height) raw_height = height; + if (raw_width < width ) raw_width = width; + } if (!tiff_bps) tiff_bps = 12; if (!maximum) maximum = (1 << tiff_bps) - 1; if (!load_raw || height < 22) is_raw = 0; +#ifdef NO_JASPER + if (load_raw == &CLASS redcine_load_raw) { + fprintf (stderr,_("%s: You must link dcraw with %s!!\n"), + ifname, "libjasper"); + is_raw = 0; + } +#endif #ifdef NO_JPEG - if (load_raw == &CLASS kodak_jpeg_load_raw) { - fprintf (stderr,_("%s: You must link dcraw with libjpeg!!\n"), ifname); + if (load_raw == &CLASS kodak_jpeg_load_raw || + load_raw == &CLASS lossy_dng_load_raw) { + fprintf (stderr,_("%s: You must link dcraw with %s!!\n"), + ifname, "libjpeg"); is_raw = 0; } #endif if (!cdesc[0]) - strcpy (cdesc, colors == 3 ? "RGB":"GMCY"); + strcpy (cdesc, colors == 3 ? "RGBG":"GMCY"); if (!raw_height) raw_height = height; if (!raw_width ) raw_width = width; if (filters && colors == 3) - for (i=0; i < 32; i+=4) { - if ((filters >> i & 15) == 9) - filters |= 2 << i; - if ((filters >> i & 15) == 6) - filters |= 8 << i; - } + filters |= ((filters >> 2 & 0x22222222) | + (filters << 2 & 0x88888888)) & filters << 1; notraw: if (flip == -1) flip = tiff_flip; if (flip == -1) flip = 0; @@ -8104,7 +8837,7 @@ for (j=0; j < 3; j++) { for (num = k=0; k < 3; k++) num += xyzd50_srgb[i][k] * inverse[j][k]; - oprof[pbody[j*3+23]/4+i+2] = num * 0x10000 + 0.5; + oprof[pbody[j*3+23]/4+i+2] = num * 0x10000 + 0.5; } for (i=0; i < phead[0]/4; i++) oprof[i] = htonl(oprof[i]); @@ -8132,7 +8865,7 @@ FORC3 img[c] = CLIP((int) out[c]); } else if (document_mode) - img[0] = img[FC(row,col)]; + img[0] = img[fcol(row,col)]; FORCC histogram[c][img[c] >> 3]++; } if (colors == 4 && output_color) colors = 3; @@ -8330,8 +9063,8 @@ strncpy (th->desc, desc, 512); strncpy (th->make, make, 64); strncpy (th->model, model, 64); - strcpy (th->soft, "dcraw v"VERSION); - t = gmtime (×tamp); + strcpy (th->soft, "dcraw v"DCRAW_VERSION); + t = localtime (×tamp); sprintf (th->date, "%04d:%02d:%02d %02d:%02d:%02d", t->tm_year+1900,t->tm_mon+1,t->tm_mday,t->tm_hour,t->tm_min,t->tm_sec); strncpy (th->artist, artist, 64); @@ -8411,10 +9144,10 @@ int CLASS main (int argc, const char **argv) { - int arg, status=0; + int arg, status=0, quality, i, c; int timestamp_only=0, thumbnail_only=0, identify_only=0; int user_qual=-1, user_black=-1, user_sat=-1, user_flip=-1; - int use_fuji_rotate=1, write_to_stdout=0, quality, i, c; + int use_fuji_rotate=1, write_to_stdout=0, read_from_stdin=0; const char *sp, *bpfile=0, *dark_frame=0, *write_ext; char opm, opt, *ofname, *cp; struct utimbuf ut; @@ -8433,7 +9166,7 @@ #endif if (argc == 1) { - printf(_("\nRaw photo decoder \"dcraw\" v%s"), VERSION); + printf(_("\nRaw photo decoder \"dcraw\" v%s"), DCRAW_VERSION); printf(_("\nby Dave Coffin, dcoffin a cybercom o net\n")); printf(_("\nUsage: %s [OPTION]... [FILE]...\n\n"), argv[0]); puts(_("-v Print verbose messages")); @@ -8528,8 +9261,10 @@ case 'a': use_auto_wb = 1; break; case 'w': use_camera_wb = 1; break; case 'M': use_camera_matrix = (opm == '+'); break; - case 'D': - case 'd': document_mode = 1 + (opt == 'D'); + case 'I': read_from_stdin = 1; break; + case 'E': document_mode++; + case 'D': document_mode++; + case 'd': document_mode++; case 'j': use_fuji_rotate = 0; break; case 'W': no_auto_bright = 1; break; case 'T': output_tiff = 1; break; @@ -8561,6 +9296,7 @@ } for ( ; arg < argc; arg++) { status = 1; + raw_image = 0; image = 0; oprof = 0; meta_data = ofname = 0; @@ -8646,12 +9382,21 @@ } else if (!is_raw) fprintf (stderr,_("Cannot decode file %s\n"), ifname); if (!is_raw) goto next; - shrink = filters && - (half_size || threshold || aber[0] != 1 || aber[2] != 1); + shrink = filters && (half_size || (!identify_only && + (threshold || aber[0] != 1 || aber[2] != 1))); iheight = (height + shrink) >> shrink; iwidth = (width + shrink) >> shrink; if (identify_only) { if (verbose) { + if (document_mode == 3) { + top_margin = left_margin = fuji_width = 0; + height = raw_height; + if (width <= raw_width * 8 / tiff_bps) + width = raw_width * 8 / tiff_bps; + else width = raw_width; + } + iheight = (height + shrink) >> shrink; + iwidth = (width + shrink) >> shrink; if (use_fuji_rotate) { if (fuji_width) { fuji_width = (fuji_width - 1 + shrink) >> shrink; @@ -8669,9 +9414,8 @@ printf (_("Raw colors: %d"), colors); if (filters) { printf (_("\nFilter pattern: ")); - if (!cdesc[3]) cdesc[3] = 'G'; for (i=0; i < 16; i++) - putchar (cdesc[fc(i >> 1,i & 1)]); + putchar (cdesc[fcol(i >> 1,i & 1)]); } printf (_("\nDaylight multipliers:")); FORCC printf (" %f", pre_mul[c]); @@ -8690,12 +9434,17 @@ memcpy (rgb_cam, cmatrix, sizeof cmatrix); raw_color = 0; } - image = (ushort (*)[4]) calloc (iheight*iwidth, sizeof *image); - merror (image, "main()"); if (meta_length) { meta_data = (char *) malloc (meta_length); merror (meta_data, "main()"); } + if (filters || colors == 1) { + raw_image = (ushort *) calloc ((raw_height+7)*raw_width, 2); + merror (raw_image, "main()"); + } else { + image = (ushort (*)[4]) calloc (iheight*iwidth, sizeof *image); + merror (image, "main()"); + } if (verbose) fprintf (stderr,_("Loading %s %s image from %s ...\n"), make, model, ifname); @@ -8703,24 +9452,51 @@ fprintf (stderr,_("%s: \"-s %d\" requests a nonexistent image!\n"), ifname, shot_select); fseeko (ifp, data_offset, SEEK_SET); - (*load_raw)(); + if (raw_image && read_from_stdin) + fread (raw_image, 2, raw_height*raw_width, stdin); + else (*load_raw)(); + if (document_mode == 3) { + top_margin = left_margin = fuji_width = 0; + height = raw_height; + if (width <= raw_width * 8 / tiff_bps) + width = raw_width * 8 / tiff_bps; + else width = raw_width; + } + iheight = (height + shrink) >> shrink; + iwidth = (width + shrink) >> shrink; + if (raw_image) { + image = (ushort (*)[4]) calloc (iheight*iwidth, sizeof *image); + merror (image, "main()"); + crop_masked_pixels(); + free (raw_image); + } if (zero_is_bad) remove_zeroes(); bad_pixels (bpfile); if (dark_frame) subtract (dark_frame); quality = 2 + !fuji_width; if (user_qual >= 0) quality = user_qual; + i = cblack[3]; + FORC3 if (i > cblack[c]) i = cblack[c]; + FORC4 cblack[c] -= i; + black += i; if (user_black >= 0) black = user_black; + FORC4 cblack[c] += black; if (user_sat > 0) maximum = user_sat; #ifdef COLORCHECK colorcheck(); #endif - if (is_foveon && !document_mode) foveon_interpolate(); - if (!is_foveon && document_mode < 2) scale_colors(); + if (is_foveon) { + if (document_mode || load_raw == &CLASS foveon_dp_load_raw) { + for (i=0; i < height*width*4; i++) + if ((short) image[0][i] < 0) image[0][i] = 0; + } else foveon_interpolate(); + } else if (document_mode < 2) + scale_colors(); pre_interpolate(); if (filters && !document_mode) { if (quality == 0) lin_interpolate(); - else if (quality == 1 || colors > 3) + else if (quality == 1 || colors > 3 || filters < 1000) vng_interpolate(); else if (quality == 2) ppg_interpolate(); diff -Nru dcraw-8.99/dcraw_ca.1 dcraw-9.17/dcraw_ca.1 --- dcraw-8.99/dcraw_ca.1 1970-01-01 00:00:00.000000000 +0000 +++ dcraw-9.17/dcraw_ca.1 2013-01-03 13:09:39.000000000 +0000 @@ -0,0 +1,282 @@ +.\" +.\" Catalan manpage for dcraw +.\" +.\" Copyright (c) 2009 by David Coffin +.\" +.\" Es permet la distribució sense restriccions. +.\" +.\" David Coffin +.\" dcoffin a cybercom o net +.\" http://www.cybercom.net/~dcoffin +.\" +.TH dcraw 1 "14 maig 2009" +.LO 1 +.SH NOM +dcraw - descodificador de línea de comandes per a fotos digitals crues (raw) +.SH RESUM +.B dcraw +[\fIOPCIÓ\fR]... [\fIFITXER\fR]... +.SH DESCRIPCIÓ +.B dcraw +descodifica fotos crues, mostra metadades i extreu les miniatures. +.SH OPCIONS GENERALS +.TP +.B -v +Mostra el missatges detallats, a més d'avisos i errors. +.TP +.B -c +Mostra les imatges descodificades o miniatures per la sortida estándar. +.TP +.B -e +Extreu la miniatura generada per la càmera, no la imatge crua. +Aconsegueix o bé un fitxer JPEG o un fitxer PPM, depenent de la càmera. +.TP +.B -z +Canvia les dates de modificació i accés d'un fitxer AVI, JPEG, TIFF +o cru de quan es va fer la foto, assumint que el rellotge de la càmera +estava establert en horari Universal (UTC). +.TP +.B -i +Identifica els fitxers sense descodificar-los. +La sortida d'estat és 0 si +.B dcraw +pot descodificar el darrer fitxer, 1 si no pot. +.B -i -v +mostra les metadades. +.TP +.B "" +.B dcraw +no pot descodificar els fitxers JPEG!! +.SH OPCIONS DE RECUPERACIÓ +.TP +.B -P píxels_morts.txt +Llegeix la llista de píxels morts d'aquest fitxer en comptes de ".badpixels". +Veieu +.B FITXERS +per a una descripció del format. +.TP +.B -K fosc.pgm +Substreu un quadre fosc de les dades crues. Per a generar un +quadre fosc, fes una foto crua sense llum i fes +.BR dcraw\ -D\ -4\ -j\ -t\ 0 . +.TP +.B -k fosc +Quan les ombres apareguin amb boirina, s'ha d'augmentar el nivell de fosc. +Per a mesurar això, aplica +.B pamsumm -mean +al quadre fosc generat amunt. +.TP +.B -S saturació +Si els realçats apareixen roses, cal reduïr el nivell de saturació. +Per a mesurar això, feu una captura d'un objecte brillant i feu +.B dcraw -D -4 -j -c +foto.raw +.B | pamsumm -max +.TP +.B "" +Els valors de fosc i saturació per omissió solen ser adequats. +.TP +.B -n llindar_reducció_soroll +Utilitza un algorisme basat en ondetes per a eliminar el soroll +mantenint el detall. El llindar òptim sol estar entre 100 i 1000. +.TP +.B -C mag_vermella mag_blau +Amplia les capes vermella i blava segons els factors indicats, normalment +de 0.999 a 1.001, per a corregir l'aberració cromàtica. +.TP +.B -H 0 +Exclou totes les sobreexposicions de blanc sòlid (per omissió). +.TP +.B -H 1 +Deixa les sobreexposicions sense excloure en vàries ombres de rosa. +.TP +.B -H 2 +Combina els valors retallats i no retallats en un degradat gradual +a blanc. +.TP +.B -H 3+ +Reconstrueix les sobreexposicions. Els valors baixos afavoreixen +els blancs; els valors alts afavoreixen els colors. Proveu +.B -H 5 +com a compromís. Si no és prou bo, feu +.BR -H\ 9 , +talla les sobreexposicions que no són blanques i enganxa-les sobre +la imatge generada amb +.BR -H\ 3 . +.SH OPCIONS DE COLOR +Per omissió, +.B dcraw +usa balanç de blancs prefixat basat en una carta de colors sota +il·luminació estàndar D65. +.TP +.B -w +Utilitza el balanç de blancs especificat per la càmera. +Si no es troba, mostra un missatge d'avís i utilitza un altre mètode. +.TP +.B -a +Calcula el balanç de blancs fent la mitja de tota la imatge. +.TP +.B -A esquerra amunt ample alt +Calcula el balanç de blancs fent la mitja d'un àrea rectangular. +Primer feu +.B dcraw\ -j\ -t\ 0 +i seleccioneu un àrea de color gris neutre. +.TP +.B -r mul0 mul1 mul2 mul3 +Especifica el teu propi balanç de blancs. +Aquests multiplicadors es poden tallar i enganxar des de la sortida de +.BR dcraw\ -v . +.TP +.BR +M " o " -M +Utiliza (o no utilizis) la matriu de colors incrustada en les metadades +de la càmera. +Si heu seleccionat +.B -w +el seu valor per omissió és +.B +M +, sinò el valor per omissió és +.B -M +Aquesta opció només afecta a les càmeres Olympus, Leaf i Phase One. +.TP +.B -o [0-5] +Selecciona l'espai de color de sortida quan la opció +.B -p +no s'utilitza: + +.B \t0 +\ \ Color cru (únic per a cada càmera) +.br +.B \t1 +\ \ sRGB D65 (per omissió) +.br +.B \t2 +\ \ Adobe RGB (1998) D65 +.br +.B \t3 +\ \ Wide Gamut RGB D65 +.br +.B \t4 +\ \ Kodak ProPhoto RGB D65 +.br +.B \t5 +\ \ XYZ +.TP +.BR -p\ càmera.icm \ [\ -o\ sortida.icm \ ] +Utilitza perfils de color ICC per a definir l'espai de color cru de +la càmera i l'espai de color desitjat (sRGB per omissió). +.TP +.B -p embed +Utilitza el perfil de color ICC associat de la foto crua. +.SH OPCIONS D'INTERPOLACIÓ +.TP +.B -d +Mostra les dades crues com una imatge en escala de grisos sense +interpolació. Útil per a fotografiar documents en blanc i negre. +.TP +.B -D +Igual que +.BR -d , +però totalment cru (sense escalat de color). +.TP +.B -h +Mostra una imatge en color a la meitat de la seva mida original. Doble de ràpid que +.BR -q\ 0 . +.TP +.B -q 0 +Utilitza la interpolació bilineal d'alta velocitat i baixa qualitat. +.TP +.B -q 1 +Utilitza la interpolació de Número Variable de Gradients (VNG). +.TP +.B -q 2 +Utilitza la interpolació per Agrupació de Píxels en Patrons (PPG). +.TP +.B -q 3 +Utilitza la interpolació Adaptativa Dirigida a la Homogeneïtat (AHD). +.TP +.B -f +Interpola RGB com a quatre colors. Useu això si la sortida mostra +retines 2x2 falses amb VNG o laberints amb AHD. +.TP +.B -m numero_de_passes +Després de la interpolació, elimina els artefactes de color aplicant +repetidament un filtre de mediana de 3x3 als canals R-G i B-G. +.SH OPCIONS DE SORTIDA +Per omissió, +.B dcraw +genera fitxers PGM/PPM/PAM de 8 bits, corba gamma BT.709, nivell de +blanc basat en histograma, i cap metadada. +.TP +.B -W +Utilitza nivell de blanc prefixat, ignorant l'histograma de la imatge. +.TP +.B -b lluminositat +Divideix el nivell de blanc per aquest número, per omissió 1.0. +.TP +.B -g potència pendent_picada +Permet triar la corba de gamma, per omissió BT.709 +.RB ( -g\ 2.222\ 4.5 ). +Si preferiu la correcció de gama sRGB, useu +.BR -g\ 2.4\ 12.92 . +Per triar una corba de potència simple, trieu una valor de pendent picada zero. +.TP +.B -6 +Escriu setze bits per mostra en comptes de vuit. +.TP +.B -4 +16 bits lineal, com a +.BR -6\ -W\ -g\ 1\ 1 . +.TP +.B -T +Desa en format TIFF amb metadades en comptes de PGM/PPM/PAM. +.TP +.B -t [0-7,90,180,270] +Gira la imatge de sortida. Per omissió, +.B dcraw +aplica el gir especificat per la càmera. +.B -t 0 +deshabilita tots els girs. +.TP +.B -j +Per a càmeres Fuji\ Super\ CCD, mostra la imatge girada 45 graus. +Per a càmeres sense píxels quadrats, no encongeixis la imatge a la seva +relació d'aspecte correcte. En qualsevol cas, aquesta opció +garantitza que cada píxel de sortida correspon amb un píxel cru. +.TP +.BR "-s [0..N-1]" " o " "-s all" +Si un fitxer conté N imatges crues, trieu descodificar una +concreta o "all" (totes). +Por exemple, les càmeres Fuji\ Super\ CCD\ SR generen +una segona imatge subexposada quatre parades per a mostrar en +detall les sobreexposicions. +.SH FITXERS +.TP +\:./.badpixels, ../.badpixels, ../../.badpixels, ... +Llista els píxels morts de la càmera, per a que +.B dcraw +pugui interpolar al seu voltant. Cada línea especifica la columna, +fila i temps UNIX de la mort de cada píxel. Per exemple: +.sp 1 +.nf + 962 91 1028350000 # va morir entre el 1 i el 4 d'Agost del 2002 +1285 1067 0 # no es sap quan va morir aquest píxel +.fi +.sp 1 +Aquestes coordenades són d'abans del retall o rotació, així que utilitza +.B dcraw -j -t 0 +per a trobar píxels morts. +.SH "VEiEU TAMBÉ" +.BR pgm (5), +.BR ppm (5), +.BR pam (5), +.BR pamsumm (1), +.BR pnmgamma (1), +.BR pnmtotiff (1), +.BR pnmtopng (1), +.BR gphoto2 (1), +.BR cjpeg (1), +.BR djpeg (1) +.SH AUTOR +David Coffin, dcoffin a cybercom o net +.SH TRADUCCIÓ +Paco Rivière, http://pacoriviere.cat/ diff -Nru dcraw-8.99/dcraw_ca.po dcraw-9.17/dcraw_ca.po --- dcraw-8.99/dcraw_ca.po 1970-01-01 00:00:00.000000000 +0000 +++ dcraw-9.17/dcraw_ca.po 2013-01-03 13:09:39.000000000 +0000 @@ -0,0 +1,362 @@ +# Translation of dcraw_ca_ES.po to Catalan (Catalan, Spain) +# Traducció de dcraw_ca_ES.po al Català (Català, España) +# (c) 2009 Dave Coffin dcoffin a cybercom o net, +# Distribute freely. +# Es permet la lliure distribució. +# +msgid "" +msgstr "" +"Project-Id-Version: dcraw 8.94\n" +"Report-Msgid-Bugs-To: dcoffin a cybercom o net\n" +"POT-Creation-Date: 2006-12-21 22:45-0500\n" +"PO-Revision-Date: 2011-07-23 17:00-0400\n" +"Last-Translator: Paco Rivière \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language-Team: \n" + +msgid "%s: Out of memory in %s\n" +msgstr "%s: No hi ha prou memòria a %s\n" + +msgid "Unexpected end of file\n" +msgstr "Final inesperat del fitxer\n" + +msgid "Corrupt data near 0x%llx\n" +msgstr "S'han trobat dades corruptes al costat de 0x%llx\n" + +msgid "%s: decoder table overflow\n" +msgstr "%s: Sobreeiximent de la taula del descodificador\n" + +msgid "Phase One correction...\n" +msgstr "Correcció Phase One...\n" + +msgid "%s: incorrect JPEG dimensions\n" +msgstr "%s: les dimensions JPEG són incorrectes\n" + +msgid "%s: \"%s\" matrix not foundq!\n" +msgstr "%s: No s'ha trobat la matriu \"%s\"!\n" + +msgid "Foveon interpolation...\n" +msgstr "Interpolació Foveon...\n" + +msgid "%s: Invalid white balance \"%s\"\n" +msgstr "%s: El balanç de blancs \"%s\" no es vàlid\n" + +msgid "Fixed dead pixels at:" +msgstr "Píxels morts reparats a:" + +msgid "%s is not a valid PGM file!\n" +msgstr "%s no és un fitxer PGM vàlid!\n" + +msgid "%s has the wrong dimensions!\n" +msgstr "%s té dimensions incorrectes!\n" + +msgid "Wavelet denoising...\n" +msgstr "S'està aplicant el tractament de reducció de soroll d'ondetes...\n" + +msgid "%s: Cannot use camera white balance.\n" +msgstr "%s: No es pot fer servir el balanç de blancs de la càmera.\n" + +msgid "Scaling with darkness %d, saturation %d, and\nmultipliers" +msgstr "Escalant amb foscor %d, saturació %d, i\nmultiplicadors" + +msgid "Correcting chromatic aberration...\n" +msgstr "S'està corregint l'aberració cromàtica...\n" + +msgid "Bilinear interpolation...\n" +msgstr "Interpolació bilineal...\n" + +msgid "VNG interpolation...\n" +msgstr "Interpolació VNG...\n" + +msgid "PPG interpolation...\n" +msgstr "Interpolació PPG...\n" + +msgid "AHD interpolation...\n" +msgstr "Interpolació AHD...\n" + +msgid "Median filter pass %d...\n" +msgstr "Filtre de mediana %d...\n" + +msgid "Blending highlights...\n" +msgstr "S'estant combinant les sobreexposicions...\n" + +msgid "Rebuilding highlights...\n" +msgstr "S'està reconstruïnt les sobreexposicions...\n" + +msgid "Reading metadata from %s ...\n" +msgstr "S'estant llegint les metadades des de %s ...\n" + +msgid "Failed to read metadata from %s\n" +msgstr "Hi ha hagut un error en llegir les metadades de %s\n" + +msgid "%s: You must link dcraw with libjpeg!!\n" +msgstr "%s: Heu d'enllaçar dcraw amb libjpeg!!\n" + +msgid "%s: You must link dcraw with %s!!\n" +msgstr "%s: Heu d'enllaçar dcraw amb %s!!\n" + +msgid "%s has no embedded profile.\n" +msgstr "%s no té cap perfil associat.\n" + +msgid "Cannot open file %s!\n" +msgstr "No es pot obrir el fitxer %s!\n" + +msgid "Applying color profile...\n" +msgstr "S'està aplicant el perfil de color...\n" + +msgid "Building histograms...\n" +msgstr "S'estant construïnt els histogrames...\n" + +msgid "Converting to %s colorspace...\n" +msgstr "S'està convertint a l'espai de colors %s...\n" + +msgid "Rotating image 45 degrees...\n" +msgstr "S'està girant la imatge 45 graus...\n" + +msgid "Stretching the image...\n" +msgstr "S'està encongint la imatge...\n" + +msgid "\nRaw photo decoder \"dcraw\" v%s" +msgstr "\nDescodificador de foto crua (raw) \"dcraw\" v%s" + +msgid "\nby Dave Coffin, dcoffin a cybercom o net\n" +msgstr "\nper Dave Coffin, dcoffin a cybercom o net\n" + +msgid "\nUsage: %s [OPTION]... [FILE]...\n\n" +msgstr "\nÚs: %s [OPCIÓ]... [FITXER]...\n\n" + +msgid "-v Print verbose messages" +msgstr "-v Mostra els missatges detallats" + +msgid "-c Write image data to standard output" +msgstr "-c Mostra les dades de la imatge per la sortida estàndar" + +msgid "-e Extract embedded thumbnail image" +msgstr "-e Extreu la miniatura de la imatge" + +msgid "-i Identify files without decoding them" +msgstr "-i Identifica els arxius sense descodificar-los" + +msgid "-i -v Identify files and show metadata" +msgstr "-i -v Identifica els fitxers i mostra les metadades" + +msgid "-z Change file dates to camera timestamp" +msgstr "-z Reemplaça la data dels fitxers per la marca fixada per la càmera" + +msgid "-a Use automatic white balance" +msgstr "-a Utilitza el balanç de blancs automàtic" + +msgid "-w Use camera white balance, if possible" +msgstr "-w Utilitza el balanç de blancs de la càmera, si és possible" + +msgid "-a Average the whole image for white balance" +msgstr "-a Fes la mitjana de la imatge completa per al balanç de blancs" + +msgid "-A Average a grey box for white balance" +msgstr "-A Fes la mitjana de un rectangle gris per al balanç de blancs" + +msgid "-r Set custom white balance" +msgstr "-r Defineix el balanç de blancs personalitzat" + +msgid "-r <4 numbers> Set custom white balance" +msgstr "-r <4 números> Defineix el balanç de blancs personalitzat" + +msgid "+M/-M Use/don't use an embedded color matrix" +msgstr "+M/-M Utiliza/no utilitzis la matriu de color incrustada" + +msgid "-C Correct chromatic aberration" +msgstr "-C Corregeix l'aberració cromàtica" + +msgid "-P Fix the dead pixels listed in this file" +msgstr "-P Repara els píxels morts llistats al fitxer" + +msgid "-K Subtract dark frame (16-bit raw PGM)" +msgstr "-K Sustreu un quadre fosc (16 bits raw PGM)" + +msgid "-k Set the darkness level" +msgstr "-k Estableix el nivell de foscor" + +msgid "-S Set the saturation level" +msgstr "-S Estableix el nivell de saturació" + +msgid "-n Set threshold for wavelet denoising" +msgstr "-n Estableix el llindar per a reducció de soroll d'ondetes" + +msgid "-H [0-9] Highlight mode (0=clip, 1=unclip, 2=blend, 3+=rebuild)" +msgstr "-H [0-9] Mode de realçat (0=retallar, 1=no retallar, 2=combinar, 3+=reconstruïr)" + +msgid "-t [0-7] Flip image (0=none, 3=180, 5=90CCW, 6=90CW)" +msgstr "-t [0-7] Gira la imatge (0=res, 3=180, 5=90AH, 6=90H)" + +msgid "-o [0-5] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" +msgstr "-o [0-5] Trieu l'espai de color de la sortida (cru,sRGB,Adobe,Wide,ProPhoto,XYZ)" + +msgid "-o Apply output ICC profile from file" +msgstr "-o Aplica el perfil de color ICC de sortida des d'un fitxer" + +msgid "-p Apply camera ICC profile from file or \"embed\"" +msgstr "-p Aplica el perfil ICC de la càmera des d'un fitxer o \"embed\"" + +msgid "-d Document mode (no color, no interpolation)" +msgstr "-d Mode document (sense colors, sense interpolació)" + +msgid "-D Document mode without scaling (totally raw)" +msgstr "-D Mode document sense redimensionat (totalment cru)" + +msgid "-j Don't stretch or rotate raw pixels" +msgstr "-j No encongeixis ni giris els píxels crus" + +msgid "-W Don't automatically brighten the image" +msgstr "-W No ajustis automàticament la brillantor de la imatge" + +msgid "-b Adjust brightness (default = 1.0)" +msgstr "-b Ajusta la brillantor (per omissió = 1.0)" + +msgid "-g

Set custom gamma curve (default = 2.222 4.5)" +msgstr "-g

Estableix una corba de gamma personalitzada (per omissió = 2.222 4.5)" + +msgid "-q [0-3] Set the interpolation quality" +msgstr "-q [0-3] Defineix la qualitat d'interpolació" + +msgid "-h Half-size color image (twice as fast as \"-q 0\")" +msgstr "-h Imatge en color reduïda a la meitat (2 cops més ràpid que \"-q 0\")" + +msgid "-f Interpolate RGGB as four colors" +msgstr "-f Interpola RGGB com a quatre colors" + +msgid "-m Apply a 3x3 median filter to R-G and B-G" +msgstr "-m Aplica un filtre de mediana de 3x3 sobre R-G i B-G" + +msgid "-s [0-99] Select a different raw image from the same file" +msgstr "-s [0-99] Trieu una imatge crua diferent des del mateix fitxer" + +msgid "-s [0..N-1] Select one raw image or \"all\" from each file" +msgstr "-s [0..N-1] Trieu una imatge crua concreta o \"all\" (totes) de cada fitxer" + +msgid "-6 Write 16-bit instead of 8-bit" +msgstr "-6 Escriu 16 bits en comptes de 8 bits" + +msgid "-4 Linear 16-bit, same as \"-6 -W -g 1 1\"" +msgstr "-4 16 bits lineal, com a \"-6 -W -g 1 1\"" + +msgid "-4 Write 16-bit linear instead of 8-bit with gamma" +msgstr "-4 Desa en 16 bits linial en lloc de 8 bits amb gamma" + +msgid "-T Write TIFF instead of PPM" +msgstr "-T Desa TIFF en lloc de PPM" + +msgid "Non-numeric argument to \"-%c\"\n" +msgstr "\"-%c\" requereix un argument numèric\n" + +msgid "Unknown option \"-%c\".\n" +msgstr "Opció desconeguda \"-%c\".\n" + +msgid "No files to process.\n" +msgstr "No hi ha fitxer per processar.\n" + +msgid "Will not write an image to the terminal!\n" +msgstr "No es desarà una imatge al terminal!\n" + +msgid "%s has no timestamp.\n" +msgstr "%s no té marca de data.\n" + +msgid "%s time set to %d.\n" +msgstr "L'hora del fitxer %s s'ha canviat a %d.\n" + +msgid "%s has no thumbnail.\n" +msgstr "%s no té miniatura associada.\n" + +msgid "\nFilename: %s\n" +msgstr "\nNom del fitxer: %s\n" + +msgid "Timestamp: %s" +msgstr "Marca de data: %s" + +msgid "Camera: %s %s\n" +msgstr "Càmera: %s %s\n" + +msgid "Owner: %s\n" +msgstr "Propietari: %s\n" + +msgid "DNG Version: " +msgstr "Versió DNG: " + +msgid "ISO speed: %d\n" +msgstr "Velocitat ISO: %d\n" + +msgid "Shutter: " +msgstr "Obturador: " + +msgid "%0.1f sec\n" +msgstr "%0.1f seg\n" + +msgid "Aperture: f/%0.1f\n" +msgstr "Obertura: f/%0.1f\n" + +msgid "Focal length: %0.1f mm\n" +msgstr "Distància focal: %0.1f mm\n" + +msgid "Secondary pixels: %s\n" +msgstr "Píxels secundaris: %s\n" + +msgid "yes" +msgstr "sí" + +msgid "no" +msgstr "no" + +msgid "Embedded ICC profile: %s\n" +msgstr "Perfil de color ICC associat: %s\n" + +msgid "Decodable with dcraw: %s\n" +msgstr "Descodificable amb dcraw: %s\n" + +msgid "Number of raw images: %d\n" +msgstr "Número d'imatges crues: %d\n" + +msgid "Pixel Aspect Ratio: %0.6f\n" +msgstr "Relació d'aspecte en píxels: %0.6f\n" + +msgid "Thumb size: %4d x %d\n" +msgstr "Mida de la miniatura: %4d x %d\n" + +msgid "Full size: %4d x %d\n" +msgstr "Mida real: %4d x %d\n" + +msgid "Cannot decode file %s\n" +msgstr "No es pot descodificar el fitxer %s\n" + +msgid "Image size: %4d x %d\n" +msgstr "Mida de la imatge: %4d x %d\n" + +msgid "Output size: %4d x %d\n" +msgstr "Mida de sortida: %4d x %d\n" + +msgid "Raw colors: %d" +msgstr "Colors crus: %d" + +msgid "\nFilter pattern: " +msgstr "\nPatró de filtrat: " + +msgid "\nDaylight multipliers:" +msgstr "\nMultiplicadors de llum de dia:" + +msgid "\nCamera multipliers:" +msgstr "\nMultiplicadors de la càmera:" + +msgid "%s is a %s %s image.\n" +msgstr "%s es una imatge %s %s.\n" + +msgid "Loading %s %s image from %s ...\n" +msgstr "S'està carregant la imatge %s %s des de %s ...\n" + +msgid "%s: \"-s %d\" requests a nonexistent image!\n" +msgstr "%s: \"-s %d\" solicita una imatge inexistent!\n" + +msgid "standard output" +msgstr "sortida estàndard" + +msgid "Writing data to %s ...\n" +msgstr "S'estant desant les dades a %s ...\n" diff -Nru dcraw-8.99/dcraw_cs.1 dcraw-9.17/dcraw_cs.1 --- dcraw-8.99/dcraw_cs.1 1970-01-01 00:00:00.000000000 +0000 +++ dcraw-9.17/dcraw_cs.1 2013-01-03 13:09:39.000000000 +0000 @@ -0,0 +1,273 @@ +.\" +.\" Czech manpage for dcraw +.\" +.\" Copyright (c) 2007 by David Coffin +.\" +.\" You may distribute without restriction. +.\" +.\" David Coffin +.\" dcoffin a cybercom o net +.\" http://www.cybercom.net/~dcoffin +.\" +.TH dcraw 1 "6 únor 2008" +.LO 1 +.SH JMÉNO +dcraw - dekodér fotografií v raw formátu pro příkazovou řádku +.SH POUŽITÍ +.B dcraw +[\fIPARAMETRY\fR]... [\fISOUBOR\fR]... +.SH POPIS +.B dcraw +dekóduje fotografie ve formátu raw, zobrazuje metadata a extrahuje náhledy. +.SH OBECNÉ VOLBY +.TP +.B -v +Vypisuje detailnější hlášky, ne jen varování a chyby. +.TP +.B -c +Zapisuje dekódované obrázky nebo náhledy na standardní výstup. +.TP +.B -e +Extrahuje náhledy vložené fotoaparátem do raw souboru. Podle typu +fotoaparátu dostanete buď obrázky ve formátu JPEG nebo PPM. +.TP +.B -z +Změní datum a čas poslední modifikace souboru ve formátu AVI, +JPEG, TIFF nebo raw na datum a čas, kdy byla fotografie pořízena. +Předpokládá, že kamera zapisuje datum v časové zóně UTC. +.TP +.B -i +Vypíše typ souboru, ale neprovede jeho dekódování. +Pokud je návratová hodnota 0 +.B dcraw +dokáže soubor dekódovat, pokud to možné není vrací 1. +.B -i -v +zobrazí metadata souboru. +.TP +.B "" +.B dcraw +nedokáže číst soubory ve formátu JPEG!! +.SH VOLBY PRO OPRAVY +.TP +.B -P vadné_pixely.txt +Seznam vadných pixelů se přečte ze zvoleného souboru místo z ".badpixels". +V sekci +.B SOUBORY +můžete najít popis formátu. +.TP +.B -K temný_snímek.pgm +Odečte temný snímek z dat v raw formátu. Soubor, který bude použit s +tímto parametrem vytvoříme tak, že provedeme expozici ve tmě a výsledek +zkonvertujeme příkazem +.BR dcraw\ -D\ -4\ -j\ -t\ 0 . +.TP +.B -k černá +Pokud jsou stíny příliš světlé, je potřeba zvýšit úroveň černé. +K jejímu zjištění aplikujte +.B pamsumm -mean +na výše uvedený temný snímek. +.TP +.B -S nasycení +Pokud je obraz ve světlech narůžovělý, potřebujete snížit úroveň +nasycení (bílé). +K jejímu zjištění pořiďte snímek něčeho jasného a proveďte příkaz +.B dcraw -D -4 -j -c +foto.raw +.B | pamsumm -max +.TP +.B "" +Výchozí nastavení úrovní černé a nasycení je obvykle správné. +.TP +.B -n hranice_šumu +Použije wavelet transformaci pro redukci šumu při současném zachování +detailů. Vhodná hodnota tohoto parametru bývá mezi 100 a 1000. +.TP +.B -C násobek_červené násobek_modré +Rozšíří červenou a modrou vrstvu o zadaný násobek, který vetšinou nabývá +hodnot mezi 0.999 a 1.001. Používá se ke korekci chromatické aberace. +.TP +.B -H 0 +Všechny přepálené body změní na čistě bílou (výchozí stav). +.TP +.B -H 1 +Nechá přepálené body beze změny, budou mít různé odstíny fialové. +.TP +.B -H 2 +Smísí přepálené a nepřepálené body dohromady do gradientu přecházejícího +do bílé. +.TP +.B -H 3+ +Opraví přepaly. Nižší čísla preferují bílou, vyšší barvy. +Pro začátek je dobré zkusit +.B -H 5 +jako střední volbu. Pokud výsledek není uspokojivý, lze zkusit +.BR -H\ 9 , +zkopírovat přepaly, které nejsou bílé a nakopírovat je do obrázku +vygenerovaného pomocí +.BR -H\ 3 . +.SH VOLBY BAREV +Ve výchozím nastavení +.B dcraw +používá vestavěnou hodnotu vyvážení bílé založenou na expozici +barevné tabulky osvětlené standardní lampou typu D65. +.TP +.B -w +Použije vyvážení bílé dle fotoaparátu. Pokud obrázek tuto informaci +neobsahuje, je vypsáno varování. +.TP +.B -a +Určí vyvážení bíle automaticky jako průměr z celého obrázku. +.TP +.B -A zleva zhora šířka výška +Spočte vyvážení bílé jako průměr ze zadaného obdélníku. +Nejdříve proveďte +.B dcraw\ -j\ -t\ 0 +a vyberte obdélník obsahující střední šedou. +.TP +.B -r nás0 nás1 nás2 nás3 +Zadejte vlastní hodnoty pro výpočet vyvážení bílé. Tyto parametry mohou být +získány jako výstup příkazu +.BR dcraw\ -v . +.TP +.BR +M " nebo " -M +Použije (nepoužije) barevnou matici z metadat obrázku. +Výchozí hodnota je +.B +M +pokud je použit parametr +.B -w +a v ostatních případech +.BR -M . +Tato volba se projeví pouze ve spojení s fotoaparáty Olympus, Leaf a Phase One. +.TP +.B -o [0-5] +Vybere výstupní barevný profil, pokud není současně použita volba +.B -p +: + +.B \t0 +\ \ Raw color (unikátní pro každý fotoaparát) +.br +.B \t1 +\ \ sRGB D65 (výchozí hodnota) +.br +.B \t2 +\ \ Adobe RGB (1998) D65 +.br +.B \t3 +\ \ Wide Gamut RGB D65 +.br +.B \t4 +\ \ Kodak ProPhoto RGB D65 +.br +.B \t5 +\ \ XYZ +.TP +.BR -p\ fotoaparát.icm \ [\ -o\ výstupní.icm \ ] +Použije ICC barevný profil ze souboru fotoaparát.icm. Pro výstup je ve výchozím +nastavení použit profil sRGB a nebo v případě zadání výstupní.icm profil z +tohoto souboru. +.TP +.B -p embed +Použije ICC profil vložený do fotografie. +.SH VOLBY INTERPOLACE +.TP +.B -d +Zobrazí raw data jako černobílý (stupně šedi) obrázek bez jakékoliv +interpolace. Používá se především při fotografování dokumentů. +.TP +.B -D +Stejné jako +.BR -d , +ale výstupem jsou čistá raw data, bez změn barev. +.TP +.B -h +Výstupem je barevný obrázek poloviční velikosti. Dvakrát rychlejší než +.BR -q\ 0 . +.TP +.B -q 0 +Použije velmi rychlou, ale nepříliš kvalitní, bilineární interpolaci. +.TP +.B -q 1 +Použije Variable Number of Gradients (VNG) interpolaci. +.TP +.B -q 2 +Použije Patterned Pixel Grouping (PPG) interpolaci. +.TP +.B -q 3 +Použije Adaptive Homogeneity-Directed (AHD) interpolaci. +.TP +.B -f +Interpoluje RGB jako čtyři barvy. Tuto volbu použijte pokud ve výstupu +vidíte rastr o velikosti 2x2 pixely nebo je výstup rozmazaný. +.TP +.B -m počet_průchodů +Po provedení interpolace odstraní barevné artefakty opakovaným aplikováním +3x3 medián filtru na R-G a B-G kanály. +.SH VOLBY VÝSTUPU +Ve výchozím nastavení +.B dcraw +zapisuje 8-bitový PGM/PPM/PAM obrázek s gamma křivkou BT.709, +úrovní bílé založené na histogramu a neukládá metadata. +.TP +.B -W +Použije pevnou úroveň bílé, ignoruje histogram obrázku. +.TP +.B -b jas +Vydělí úroveň bílé tímto číslem. Výchozí hodnota je 1.0. +.TP +.B -4 +Zapíše 16bitový lineární obrázek (pevná úroveň bílé, bez gamma korekce). +.TP +.B -T +Zapíše obrázek ve formátu TIFF místo PGM/PPM/PAM. +.TP +.B -t [0-7,90,180,270] +Rotuje výstupní obrázek. Ve výchozím nastavení +.B dcraw +použije otočení dle údajů fotoaparátu. +.B -t 0 +zakáže jakékoliv otáčení. +.TP +.B -j +U fotoaparátu Fuji\ Super\ CCD zobrazí obrázek sklopený o 45 stupňů. U +fotoaparátů. které nemají čtvercové pixely neprovádí transformaci obrazu do +korektního poměru stran. Ve všech případech tato volba garantuje, že jeden +pixel ve vyýstupním souboru přesně odpovídá jednomu pixelu čipu. +.TP +.BR "-s [0..N-1]" " nebo " "-s all" +Pokud soubor obsahuje více obrázků, vybere jeden konkrétní a nebo při zadání +"all" dekóduje všechny vložené obrázky. +Například fotoaparáty Fuji\ Super\ CCD\ SR generují druhý obrázek +podexponovaný o 4 EV pro zachování detailů v přepalech. +.SH SOUBORY +.TP +\:./.badpixels, ../.badpixels, ../../.badpixels, ... +Seznam vadných pixelů pro daný fotoaparát. Podle těchto souborů dokáže +.B dcraw +interpolovat obrázek, tak, aby byly vadné pixely skryty a nahrazeny +informacemi z okolních pixelů. Každý řádek obsahuje tři sloupce, které +obsahují ve kterém sloupci a řádku je vadný pixel a kdy byl poškozen. Např.: +.sp 1 +.nf + 962 91 1028350000 # odešel mezi 1. a 4. srpnem 2002 +1285 1067 0 # nevím, kdy pixel umřel +.fi +.sp 1 +Tyto souřadnice se použijí před jakoukoliv transformací, pro jejich nalezení +použijte +.B dcraw -j -t 0 +. +.SH "VIZ TAKÉ" +.BR pgm (5), +.BR ppm (5), +.BR pam (5), +.BR pnmgamma (1), +.BR pnmtotiff (1), +.BR pnmtopng (1), +.BR gphoto2 (1), +.BR cjpeg (1), +.BR djpeg (1) +.SH AUTOR +Napsal David Coffin, dcoffin a cybercom o net +.SH PŘEKLADATEL +Dan Ohnesorg, dan a ohnesorg o cz diff -Nru dcraw-8.99/dcraw_cs.po dcraw-9.17/dcraw_cs.po --- dcraw-8.99/dcraw_cs.po 1970-01-01 00:00:00.000000000 +0000 +++ dcraw-9.17/dcraw_cs.po 2013-01-03 13:09:39.000000000 +0000 @@ -0,0 +1,377 @@ +# Czech translation of dcraw messages. +# (c) 2008 Dave Coffin dcoffin a cybercom o net +# Distribute freely. +# +msgid "" +msgstr "" +"Project-Id-Version: dcraw 8.82\n" +"Report-Msgid-Bugs-To: dcoffin a cybercom o net\n" +"POT-Creation-Date: 2006-12-21 22:45-0500\n" +"PO-Revision-Date: 2011-07-23 17:00-0400\n" +"Last-Translator: Dan Ohnesorg \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +msgid "%s: Out of memory in %s\n" +msgstr "%s: Došla paměť při %s\n" + +msgid "Unexpected end of file\n" +msgstr "Neočekávaný konec souboru\n" + +msgid "Corrupt data near 0x%lx\n" +msgstr "Poškozená data na adrese 0x%lx\n" + +msgid "Corrupt data near 0x%llx\n" +msgstr "Poškozená data na adrese 0x%llx\n" + +msgid "%s: decoder table overflow\n" +msgstr "%s: došlo k přetečení tabulky dekodéru\n" + +msgid "Phase One correction...\n" +msgstr "Phase One korekce...\n" + +msgid "%s: incorrect JPEG dimensions\n" +msgstr "%s: neplatné rozměry JPEG obrázku\n" + +msgid "%s: \"%s\" matrix not found!\n" +msgstr "%s: \"%s\" matice nenalezena!\n" + +msgid "Foveon interpolation...\n" +msgstr "Interpolace Foveon...\n" + +msgid "%s: Invalid white balance \"%s\"\n" +msgstr "%s: Neplatné vyvážení bílé \"%s\"\n" + +msgid "Fixed bad pixels at:" +msgstr "Opraveny vadné pixely v:" + +msgid "Fixed dead pixels at:" +msgstr "Opraveny vadné pixely v:" + +msgid "%s is not a valid PGM file!\n" +msgstr "%s není platný PGM soubor!\n" + +msgid "%s has the wrong dimensions!\n" +msgstr "%s má neplatné rozměry!\n" + +msgid "Wavelet denoising...\n" +msgstr "Odstranění šumu Wavelet transformací...\n" + +msgid "%s: Cannot use camera white balance.\n" +msgstr "%s: Nemohu použít vyvážení bílé dle fotoaparátu.\n" + +msgid "Scaling with black %d, multipliers" +msgstr "Měním velikost přidáním černé %d, násobek" + +msgid "Scaling with darkness %d, saturation %d, and\nmultipliers" +msgstr "Upravuji úroveň černé %d, nasycení %d,\npoměry barevných kanálů" + +msgid "Correcting chromatic aberration...\n" +msgstr "Koriguji chromatickou aberaci...\n" + +msgid "Bilinear interpolation...\n" +msgstr "Bilineární interpolace...\n" + +msgid "VNG interpolation...\n" +msgstr "VNG interpolace...\n" + +msgid "PPG interpolation...\n" +msgstr "PPG interpolace...\n" + +msgid "AHD interpolation...\n" +msgstr "AHD interpolace...\n" + +msgid "Median filter pass %d...\n" +msgstr "Median filtr -- průchod číslo %d...\n" + +msgid "Bilateral filtering...\n" +msgstr "Bilineární filtr...\n" + +msgid "Blending highlights...\n" +msgstr "Zvýraznění hran...\n" + +msgid "Rebuilding highlights...\n" +msgstr "Regenerace stínů...\n" + +msgid "Highlight recovery...\n" +msgstr "Záchrana přesvícení...\n" + +msgid "Reading metadata from %s ...\n" +msgstr "Čtu metadata z %s ...\n" + +msgid "Failed to read metadata from %s\n" +msgstr "Nelze přečíst metadata z %s\n" + +msgid "%s: You must link dcraw with libjpeg!!\n" +msgstr "%s: dcraw musí být slinkován s libjpeg!!\n" + +msgid "%s: You must link dcraw with %s!!\n" +msgstr "%s: dcraw musí být slinkován s %s!!\n" + +msgid "%s has no embedded profile.\n" +msgstr "%s neobsahuje vložený profil.\n" + +msgid "Cannot open file %s!\n" +msgstr "Nemohu otevřít soubor %s!\n" + +msgid "Applying color profile...\n" +msgstr "Aplikuji barevný profil...\n" + +msgid "Building histograms...\n" +msgstr "Počítám histogramy...\n" + +msgid "Converting to %s colorspace...\n" +msgstr "Konvertuji do barevného profilu %s...\n" + +msgid "Rotating image 45 degrees...\n" +msgstr "Otáčím obrázek o 45 °...\n" + +msgid "Stretching the image...\n" +msgstr "Roztahuji obrázek...\n" + +msgid "\nRaw photo decoder \"dcraw\" v%s" +msgstr "\nDekodér fotografií z raw formátu\"dcraw\" v%s" + +msgid "\nby Dave Coffin, dcoffin a cybercom o net\n" +msgstr "\nvytvořil Dave Coffin, dcoffin zavináč cybercom tečka net\n" + +msgid "\nUsage: %s [OPTION]... [FILE]...\n\n" +msgstr "\nPoužití: %s [VOLBY]... [SOUBOR]...\n\n" + +msgid "-v Print verbose messages" +msgstr "-v Zobrazit detailnější informace" + +msgid "-c Write image data to standard output" +msgstr "-c Zapsat obrázek na standardní výstup" + +msgid "-e Extract embedded thumbnail image" +msgstr "-e Extrahovat vložený náhled obrázku" + +msgid "-i Identify files without decoding them" +msgstr "-i Rozpoznat formát souborů, ale nedekódovat je" + +msgid "-i -v Identify files and show metadata" +msgstr "-i -v Rozpoznat formát souborů a zobrazit metadata" + +msgid "-z Change file dates to camera timestamp" +msgstr "-z Nastavit datum a čas souborů podle času pořízení fotografie" + +msgid "-a Use automatic white balance" +msgstr "-a Použít automatické vyvážení bílé" + +msgid "-w Use camera white balance, if possible" +msgstr "-w Použít vyvážení bílé dle údajů fotoaparátu" + +msgid "-a Average the whole image for white balance" +msgstr "-a Nastavit vyvážení bílé dle průměru celého obrázku" + +msgid "-A Average a grey box for white balance" +msgstr "-A Spočítat vyvážení bílé dle obdélníku specifikovaného rozměry" + +msgid "-r Set custom white balance" +msgstr "-r Nastavit vlastní vyvážení bílé" + +msgid "-r <4 numbers> Set custom white balance" +msgstr "-r <4 čísla> Nastav vlastní vyvážení bílé" + +msgid "+M/-M Use/don't use an embedded color matrix" +msgstr "+M/-M Použij/nepoužij vestavěnou barevnou matici" + +msgid "-C Correct chromatic aberration" +msgstr "-C Koriguj chromatickou aberaci" + +msgid "-P Fix the dead pixels listed in this file" +msgstr "-P Opraví vadné pixely na základě zvoleného souboru" + +msgid "-K Subtract dark frame (16-bit raw PGM)" +msgstr "-K Odečti tmavý rám (ve formátu 16 bitového raw PGM)" + +msgid "-k Set black point" +msgstr "-k <číslo> Nastav černý bod" + +msgid "-k Set the black level" +msgstr "-k <číslo> Nastaví úroveň černé" + +msgid "-k Set the darkness level" +msgstr "-k <číslo> Nastaví úroveň černé" + +msgid "-S Set the saturation level" +msgstr "-S <číslo> Nastaví úroveň nasycení" + +msgid "-n Set threshold for wavelet denoising" +msgstr "-n <číslo> Nastav práh pro odstranění šumu wavelet transformací" + +msgid "-H [0-9] Highlight mode (0=clip, 1=no clip, 2+=recover)" +msgstr "-H [0-9] Režim korekce přeexpozice (0=změn na bílou, 1=ponech fialové stíny, 2+=zachránit)" + +msgid "-H [0-9] Highlight mode (0=clip, 1=unclip, 2=blend, 3+=rebuild)" +msgstr "-H [0-9] Režim korekce přeexpozice (0=změn na bílou, 1=ponech fialové stíny,2 = gradient do bílé, 3+=rekonstruovat)" + +msgid "-t [0-7] Flip image (0=none, 3=180, 5=90CCW, 6=90CW)" +msgstr "-t [0-7] Otoč obrázek (0=ne, 3=180°, 5 = 90° doleva, 6=90° doprava)" + +msgid "-o [0-5] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" +msgstr "-o [0-5] Výstupní barevný profil (cru, sRGB, Adobe, Wide, ProPhoto, XYZ)" + +msgid "-o Apply output ICC profile from file" +msgstr "-o Aplikuj ICC barevný profil ze souboru" + +msgid "-p Apply camera ICC profile from file or \"embed\"" +msgstr "-p Použij barevný profil fotoaparátu ze souboru nebo vložený ve fotografii" + +msgid "-d Document mode (no color, no interpolation)" +msgstr "-d Dokumentační režim (bez barev, bez úprav)" + +msgid "-D Document mode without scaling (totally raw)" +msgstr "-D Dokumentační režim bez změny velikosti (čistý raw)" + +msgid "-j Don't stretch or rotate raw pixels" +msgstr "-j Neotáčej ani neměň poměr stran raw pixelů" + +msgid "-W Don't automatically brighten the image" +msgstr "-W Zakáže automatickou úpravu jasu obrázku" + +msgid "-b Adjust brightness (default = 1.0)" +msgstr "-b <číslo> Vlastní jas (výchozí je 1.0)" + +msgid "-q [0-3] Set the interpolation quality" +msgstr "-q [0-3] Nastav kvalitu interpolace" + +msgid "-h Half-size color image (twice as fast as \"-q 0\")" +msgstr "-h Barevný obrázek poloviční velikosti (dvakrát rychlejší než \"-q 0\")" + +msgid "-f Interpolate RGGB as four colors" +msgstr "-f Interpoluj RGGB jako čtyři barvy" + +msgid "-m Apply a 3x3 median filter to R-G and B-G" +msgstr "-m <číslo> Použij medián filtr 3x3 na kanály R-G a B-G" + +msgid "-B Apply bilateral filter to smooth noise" +msgstr "-B Použij bilaterální filter k odstranění šumu" + +msgid "-s [0-99] Select a different raw image from the same file" +msgstr "-s [0-99] Vyber jiný raw obrázek ze stejného souboru" + +msgid "-s [0..N-1] Select one raw image or \"all\" from each file" +msgstr "-s [0..N-1] Vyber jeden nebo \"všechny\" obrázky z každého souboru" + +msgid "-4 Write 16-bit linear instead of 8-bit with gamma" +msgstr "-4 Zapiš 16bitový lineární výstup místo 8bitového s přidáním hodnoty gamma" + +msgid "-T Write TIFF instead of PPM" +msgstr "-T Vytvoř TIFF místo PPM" + +msgid "Non-numeric argument to \"-%c\"\n" +msgstr "Hodnota parametru \"-%c\" není číslo.\n" + +msgid "Unknown option \"-%c\".\n" +msgstr "Neznámý parametr \"-%c\".\n" + +msgid "No files to process.\n" +msgstr "Chybí soubory ke konverzi.\n" + +msgid "Will not write an image to the terminal!\n" +msgstr "Nemohu vypsat obrázek na terminál!\n" + +msgid "%s has no timestamp.\n" +msgstr "%s nemá časové razítko.\n" + +msgid "%s time set to %d.\n" +msgstr "%s čas nastaven na %d.\n" + +msgid "%s has no thumbnail.\n" +msgstr "%s nemá náhled.\n" + +msgid "\nFilename: %s\n" +msgstr "\nNázev souboru: %s\n" + +msgid "Timestamp: %s" +msgstr "Časové razítko: %s" + +msgid "Camera: %s %s\n" +msgstr "Fotoaparát: %s %s\n" + +msgid "Owner: %s\n" +msgstr "Vlastník: %s\n" + +msgid "DNG Version: " +msgstr "Verze DNG: " + +msgid "ISO speed: %d\n" +msgstr "ISO: %d\n" + +msgid "Shutter: " +msgstr "Uzávěrka: " + +msgid "%0.1f sec\n" +msgstr "%0.1f sec\n" + +msgid "Aperture: f/%0.1f\n" +msgstr "Clona: f/%0.1f\n" + +msgid "Focal length: %0.1f mm\n" +msgstr "Ohnisková vzdálenost: %0.1f mm\n" + +msgid "Secondary pixels: %s\n" +msgstr "Sekundární pixely: %s\n" + +msgid "yes" +msgstr "ano" + +msgid "no" +msgstr "ne" + +msgid "Embedded ICC profile: %s\n" +msgstr "Vložený ICC profil: %s\n" + +msgid "Decodable with dcraw: %s\n" +msgstr "Lze dekódovat pomocí dcraw: %s\n" + +msgid "Number of raw images: %d\n" +msgstr "Počet raw obrázků: %d\n" + +msgid "Pixel Aspect Ratio: %0.6f\n" +msgstr "Poměr stran pixelů: %0.6f\n" + +msgid "Thumb size: %4d x %d\n" +msgstr "Velikost náhledu: %4d x %d\n" + +msgid "Full size: %4d x %d\n" +msgstr "Plná velikost: %4d x %d\n" + +msgid "Cannot decode file %s\n" +msgstr "Nemohu dekódovat soubor %s\n" + +msgid "Image size: %4d x %d\n" +msgstr "Velikost obrázku: %4d x %d\n" + +msgid "Output size: %4d x %d\n" +msgstr "Výstupní velikost: %4d x %d\n" + +msgid "Raw colors: %d" +msgstr "Raw barvy: %d" + +msgid "\nFilter pattern: " +msgstr "\nVzor pro filtrování: " + +msgid "\nDaylight multipliers:" +msgstr "\nNásobitel pro denní světlo:" + +msgid "\nCamera multipliers:" +msgstr "\nNásobitel dle fotoaparátu:" + +msgid "%s is a %s %s image.\n" +msgstr "%s je obrázek typu %s %s.\n" + +msgid "Loading %s %s image from %s ...\n" +msgstr "Načítám %s %s obrázky z %s ...\n" + +msgid "%s: \"-s %d\" requests a nonexistent image!\n" +msgstr "%s: \"-s %d\" požaduje neexistující obrázek!\n" + +msgid "standard output" +msgstr "standardní výstup" + +msgid "Writing data to %s ...\n" +msgstr "Zapisuji data do %s ...\n" diff -Nru dcraw-8.99/dcraw_da.1 dcraw-9.17/dcraw_da.1 --- dcraw-8.99/dcraw_da.1 1970-01-01 00:00:00.000000000 +0000 +++ dcraw-9.17/dcraw_da.1 2013-01-03 13:09:39.000000000 +0000 @@ -0,0 +1,280 @@ +.\" +.\" Man page for dcraw +.\" +.\" Copyright (c) 2009 by David Coffin +.\" +.\" You may distribute without restriction. +.\" +.\" David Coffin +.\" dcoffin a cybercom o net +.\" http://www.cybercom.net/~dcoffin +.\" +.TH dcraw 1 "14. maj 2009" +.LO 1 +.SH NAVN +dcraw - kommandolinjeafkoder for rå digitalfotos +.SH SYNTAX +.B dcraw +[\fITILVALG\fR]... [\fIFIL\fR]... +.SH BESKRIVELSE +.B dcraw +afkoder råfotos, viser metadata og udtrækker miniaturbilleder. +.SH GENERELLE TILVALG +.TP +.B -v +Udskriv detaljerede meddelelser, ikke kun advarsler og fejlmeddelelser. +.TP +.B -c +Skriv afkodede billeder eller miniaturbilleder til standard-uddata. +.TP +.B -e +Udtrækker det kamera-skabte miniaturbillede, ikke det rå billede. +Du får enten en JPEG- eller en PPM-fil afhængigt af kameraet. +.TP +.B -z +Ændrer tilgangs- og ændringstidspunkterne for AVI-, JPEG-, TIFF- eller rå- +filen til optagelsestidspunktet under forudsætning af, at kameraets ur var +indstillet til universel tid (UTC). +.TP +.B -i +Identificer filerne, men afkod dem ikke. +Slutstatus er 0 hvis +.B dcraw +kan afkode den sidste fil, og 1 hvis det ikke kan. +.B -i -v +viser metadata. +.TP +.B "" +.B dcraw +kan ikke afkode JPEG-filer!! +.SH REPARATIONSTILVALG +.TP +.B -P dødepunkter.txt +Læs de døde punkter fra denne fil i stedet for fra ".badpixels". +Se +.B FILER +for en beskrivelse af formatet. +.TP +.B -K sortbilled.pgm +Udtræk et sortbillede fra de rå data. Optag et råfoto uden lys +for at lave et sortbillede og kør +.BR dcraw\ -D\ -4\ -j\ -t\ 0 . +.TP +.B -k sortpunkt +Når skyggerne er tågede skal du øge sortpunktsværdien. +For at måle dette, skal du anvende +.B pamsumm -mean +på det sortbillede du lavede ovenfor. +.TP +.B -S mætning +Når højlysene er lyserøde, skal du sænke mætningsværdien. +For at måle dette, skal du optage et billede af noget skinnende og køre +.B dcraw -D -4 -j -c +foto.raw +.B | pamsumm -max +.TP +.B "" +Standardværdierne af sortpunkt og mætning er normalt korrekte. +.TP +.B -n støjtærskelværdi +Brug wavelets for at fjerne støj mens detaljerne bevares. +De bedste tærskeværdier ligger normalt mellem 100 og 1000. +.TP +.B -C rødforst. blåforst. +Forstør de rå røde og blå lag med en given faktor, +typisk mellem 0,999 og 1,001, for at korrigere kromatisk aberration. +.TP +.B -H 0 +Beskær alle højlys til rent hvidt (standard). +.TP +.B -H 1 +Lad højlysene være ubeskårne i forskellige lyserøde nuancer. +.TP +.B -H 2 +Bland beskårne og ubeskårne værdier samme for at få en gradueret udfadning +til hvidt. +.TP +.B -H 3+ +Rekonstruer højlysene. Lavere værdier favoriserer hvidt, højere værdier +favoriserer farver. Prøv +.B -H 5 +så et kompromis. Hvis det ikke er godt nok, prøv +.BR -H\ 9 , +klip de ikke-hvidt højlys ud, og sæt dem ind i et billede lavet med +.BR -H\ 3 . +.SH FARVETILVALG +Normalt bruger +.B dcraw +en fast hvidbalance baseret på et farvekort belyst med +en standard D65-lampe. +.TP +.B -w +Brug den hvidbalance, der er indstillet på kameraet. +Udskriv en advarsel og prøv en anden metode, hvis denne ikke findes. +.TP +.B -a +Beregn hvidbalancen som et gennemsnit for hele billedet. +.TP +.B -A venstre top bredde højde +Beregn hvidbalancen som et gennemsnit for et rektangulært område. +Kør først +.B dcraw\ -j\ -t\ 0 +og vælg et område med neutral grå farve. +.TP +.B -r mul0 mul1 mul2 mul3 +Angiv din egen hvidbalance. +Disse multiplikatorer kan klippes og indsættes fra +.BR dcraw\ -v . +.TP +.BR +M " or " -M +Anvend (eller anvend ikke) en farvematrix fra kameraets metadata. +Standarden er +.B +M +hvis +.B -w +er sat, og +.B -M +ellers. +Dette tilvalg har kun effekt med Olympus-, Leaf- og Phase One-kameraer. +.TP +.B -o [0-5] +Vælg uddata-farverummet når +.B -p +ikke anvendes: + +.B \t0 +\ \ Rå farver (unikke for hvert kamera) +.br +.B \t1 +\ \ sRGB D65 (standard) +.br +.B \t2 +\ \ Adobe RGB (1998) D65 +.br +.B \t3 +\ \ Wide Gamut RGB D65 +.br +.B \t4 +\ \ Kodak ProPhoto RGB D65 +.br +.B \t5 +\ \ XYZ +.TP +.BR -p\ kamera.icm \ [\ -o\ uddata.icm \ ] +Anvend ICC-profiler for at definere kameraets rå farverum og det +ønskede uddata-farverum (sRGB som standard). +.TP +.B -p embed +Anvend den indlejrede ICC-profil fra det rå foto. +.SH INTERPOLATIONSTILVALG +.TP +.B -d +Hvis de rå data som et gråskalabillede uden interpolation. +Godt for affotografering af sort/hvide dokumenter. +.TP +.B -D +Samme som +.BR -d , +men helt rå (ingen farveskalering). +.TP +.B -h +Lav et farvebillede i halv størrelse. Dobbelt så hurtig som +.BR -q\ 0 . +.TP +.B -q 0 +Brug hurtig, lavkvalitets bilineær interpolation. +.TP +.B -q 1 +Brug Variable Number of Gradients (VNG) interpolation. +.TP +.B -q 2 +Brug Patterned Pixel Grouping (PPG) interpolation. +.TP +.B -q 3 +Brug Adaptive Homogeneity-Directed (AHD) interpolation. +.TP +.B -f +Interpoler RGB som fire farver. Brug dette, hvis uddata viser +falske 2x2 mønstre med VNG eller labyrintmønstre med AHD. +.TP +.B -m antal_anvendelser +Fjern farvefejl efter interpolationen med gentagne anvendelser +af et 3x3 median-filter på R-G- og B-G-farvekanalerne. +.SH UDDATATILVALG +Normalt udskriver +.B dcraw +PGM/PPM/PAM med 8 bits pr. farvekanal, en BT.709 gammakurve, +et histogram-baseret hvidniveau og ingen metadata. +.TP +.B -W +Anvende et fast hvidniveau, ignorer billedets histogram. +.TP +.B -b belysning +Divider hvidniveauet med dette tal, standard er 1.0. +.TP +.B -g eksponent hældning +Sæt gammakurven, standard er BT.709 +.RB ( -g\ 2.222\ 4.5 ). +Brug +.BR -g\ 2.4\ 12.92 , +hvis du foretrækker sRGB-gamma. +Sæt hældningen til nul, for at få en simpel eksponentiel kurve. +.TP +.B -6 +Udskriv seksten bits pr. farvekanal i stedet for otte. +.TP +.B -4 +Lineær 16-bits, samme som +.BR -6\ -W\ -g\ 1\ 1 . +.TP +.B -T +Udskriv TIFF med metadata i stedet for PGM/PPM/PAM. +.TP +.B -t [0-7,90,180,270] +Drej uddata-billedet. Normalt drejer +.B dcraw +billedet som angivet i kameraet. +.B -t 0 +udelader alle drejninger. +.TP +.B -j +Vis billedet drejet 45 grader for Fuji\ Super\ CCD kameraer. +Stræk ikke billedet til det korrekte side-forhold for kameraer med +ikke-kvadratiske billedpunkter. Dette tilvalg garanterer at hvert +uddata-punkt svarer til et billedpunkt i råbilledet. +.TP +.BR "-s [0..N-1]" " or " "-s all" +Afkod et eller "all" (alle) billeder, hvis en fil indeholder N rå billeder. +For eksempel laver Fuji\ Super\ CCD\ SR kameraer et andet billede, +undereksponeret med fire trin, for at vise detaljer i højlysene. +.SH FILER +.TP +\:./.badpixels, ../.badpixels, ../../.badpixels, ... +Liste over dit kameras døde billedpunkter, så +.B dcraw +kan interpolere omkring dem. Hver linje angiver søjle, +række og UNIX "dødstidspunkt" for et punkt. For eksempel: +.sp 1 +.nf + 962 91 1028350000 # døde mellem 1. og 4. august 2002 +1285 1067 0 # ved ikke hvornår dette punkt døde +.fi +.sp 1 +Disse koordinater angives før beskæring og drejning af billedet, så anvend +.B dcraw -j -t 0 +til at lokalisere døde billedpunkter. +.SH "SE OGSÅ" +.BR pgm (5), +.BR ppm (5), +.BR pam (5), +.BR pamsumm (1), +.BR pnmgamma (1), +.BR pnmtotiff (1), +.BR pnmtopng (1), +.BR gphoto2 (1), +.BR cjpeg (1), +.BR djpeg (1) +.SH FORFATTER +Skrevet af David Coffin, dcoffin a cybercom o net +.SH OVERSÆTTER +Oversat af Niels Kristian Bech Jensen, nkbj a users o sourceforge o net diff -Nru dcraw-8.99/dcraw_da.po dcraw-9.17/dcraw_da.po --- dcraw-8.99/dcraw_da.po 1970-01-01 00:00:00.000000000 +0000 +++ dcraw-9.17/dcraw_da.po 2013-01-03 13:09:39.000000000 +0000 @@ -0,0 +1,346 @@ +# Danish translation of dcraw messages. +# (c) 2009 Dave Coffin dcoffin a cybercom o net +# Distribute freely. +# +msgid "" +msgstr "" +"Project-Id-Version: dcraw 8.94\n" +"Report-Msgid-Bugs-To: dcoffin a cybercom o net\n" +"POT-Creation-Date: 2006-12-21 22:45-0500\n" +"PO-Revision-Date: 2011-07-23 17:00-0400\n" +"Last-Translator: Niels Kristian Bech Jensen \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +msgid "%s: Out of memory in %s\n" +msgstr "%s: Løbet tør for hukommelse i %s\n" + +msgid "Unexpected end of file\n" +msgstr "Uventet filafslutning\n" + +msgid "Corrupt data near 0x%llx\n" +msgstr "Ødelagte data nær 0x%llx\n" + +msgid "%s: decoder table overflow\n" +msgstr "%s: overløb i afkodningstabel\n" + +msgid "Phase One correction...\n" +msgstr "Phase One-korrektion...\n" + +msgid "%s: incorrect JPEG dimensions\n" +msgstr "%s: forkerte JPEG-dimensioner\n" + +msgid "%s: \"%s\" matrix not found!\n" +msgstr "%s: \"%s\" matrix ikke fundet!\n" + +msgid "Foveon interpolation...\n" +msgstr "Foveon-interpolation...\n" + +msgid "%s: Invalid white balance \"%s\"\n" +msgstr "%s: Ugyldig hvidbalance \"%s\"\n" + +msgid "Fixed dead pixels at:" +msgstr "Døde punkter repareret ved:" + +msgid "%s is not a valid PGM file!\n" +msgstr "%s er ikke en gyldig PGM-fil!\n" + +msgid "%s has the wrong dimensions!\n" +msgstr "%s har de forkerte dimensioner!\n" + +msgid "Wavelet denoising...\n" +msgstr "Wavelet-støjreduktion...\n" + +msgid "%s: Cannot use camera white balance.\n" +msgstr "%s: Kan ikke anvende kamerahvidbalance.\n" + +msgid "Scaling with darkness %d, saturation %d, and\nmultipliers" +msgstr "Skalerer med sortpunkt %d, mætning %d, og\nmultiplikatorer" + +msgid "Correcting chromatic aberration...\n" +msgstr "Korrigerer kromatisk aberration...\n" + +msgid "Bilinear interpolation...\n" +msgstr "Bilineær interpolation...\n" + +msgid "VNG interpolation...\n" +msgstr "VNG-interpolation...\n" + +msgid "PPG interpolation...\n" +msgstr "PPG-interpolation...\n" + +msgid "AHD interpolation...\n" +msgstr "AHD-interpolation...\n" + +msgid "Median filter pass %d...\n" +msgstr "Median-filter, kørsel nr. %d...\n" + +msgid "Blending highlights...\n" +msgstr "Blander højlys...\n" + +msgid "Rebuilding highlights...\n" +msgstr "Rekonstruerer højlys...\n" + +msgid "Reading metadata from %s ...\n" +msgstr "Læser metadata fra %s ...\n" + +msgid "Failed to read metadata from %s\n" +msgstr "Læsning af metadata fra %s mislykkedes\n" + +msgid "%s: You must link dcraw with libjpeg!!\n" +msgstr "%s: Du er nødt til at lænke dcraw med libjpeg!!\n" + +msgid "%s: You must link dcraw with %s!!\n" +msgstr "%s: Du er nødt til at lænke dcraw med %s!!\n" + +msgid "%s has no embedded profile.\n" +msgstr "%s har ingen indlejret profil.\n" + +msgid "Cannot open file %s!\n" +msgstr "Kan ikke åbne filen %s!\n" + +msgid "Applying color profile...\n" +msgstr "Anvender farveprofil...\n" + +msgid "Building histograms...\n" +msgstr "Konstruerer histogrammer...\n" + +msgid "Converting to %s colorspace...\n" +msgstr "Konverterer til %s-farverum...\n" + +msgid "Rotating image 45 degrees...\n" +msgstr "Roterer billedet 45 grader...\n" + +msgid "Stretching the image...\n" +msgstr "Strækker billedet...\n" + +msgid "\nRaw photo decoder \"dcraw\" v%s" +msgstr "\nRåbilledafkoder \"dcraw\" v%s" + +msgid "\nby Dave Coffin, dcoffin a cybercom o net\n" +msgstr "\naf Dave Coffin, dcoffin a cybercom o net\n" + +msgid "\nUsage: %s [OPTION]... [FILE]...\n\n" +msgstr "\nAnvendelse: %s [TILVALG]... [FIL]...\n\n" + +msgid "-v Print verbose messages" +msgstr "-v Skriv detaljerede beskeder" + +msgid "-c Write image data to standard output" +msgstr "-c Skriv billeddata til standarduddata" + +msgid "-e Extract embedded thumbnail image" +msgstr "-e Udtræk det indlejrede miniaturbillede" + +msgid "-i Identify files without decoding them" +msgstr "-i Identificer filer uden at afkode dem" + +msgid "-i -v Identify files and show metadata" +msgstr "-i -v Identificer filer og vis metadata" + +msgid "-z Change file dates to camera timestamp" +msgstr "-z Skift fildatoer til optagelsestidspunkter" + +msgid "-w Use camera white balance, if possible" +msgstr "-w Anvend kamerahvidbalance hvis det er muligt" + +msgid "-a Average the whole image for white balance" +msgstr "-a Beregn hvidbalance som et gennemsnit for hele billedet" + +msgid "-A Average a grey box for white balance" +msgstr "-A Beregn hvidbalance ud fra den angivne del af billedet" + +msgid "-r Set custom white balance" +msgstr "-r Angiv brugerhvidbalance" + +msgid "+M/-M Use/don't use an embedded color matrix" +msgstr "+M/-M Anvend/-ikke en indlejret farvematrice" + +msgid "-C Correct chromatic aberration" +msgstr "-C Korriger for kromatisk aberration" + +msgid "-P Fix the dead pixels listed in this file" +msgstr "-P Reparer de døde punkter angivet i denne fil" + +msgid "-K Subtract dark frame (16-bit raw PGM)" +msgstr "-K Fratræk sortbillede (16-bits rå PGM)" + +msgid "-k Set the darkness level" +msgstr "-k Angiv sortpunktsværdi" + +msgid "-S Set the saturation level" +msgstr "-S Angiv mætningsværdi" + +msgid "-n Set threshold for wavelet denoising" +msgstr "-n Angiv tærskelværdi for wavelet-støjreduktion" + +msgid "-H [0-9] Highlight mode (0=clip, 1=unclip, 2=blend, 3+=rebuild)" +msgstr "" +"-H [0-9] Højlys-modus (0=beskær, 1=beskær ikke, 2=bland, 3+=rekonstruer)" + +msgid "-t [0-7] Flip image (0=none, 3=180, 5=90CCW, 6=90CW)" +msgstr "" +"-t [0-7] Drej billedet (0=drej ikke, 3=180, 5=90 mod uret, 6=90 med uret)" + +msgid "-o [0-5] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" +msgstr "-o [0-5] Uddata-farverum (rå,sRGB,Adobe,Wide,ProPhoto,XYZ)" + +msgid "-o Apply output ICC profile from file" +msgstr "-o Anvend ICC-profil fra fil på uddata" + +msgid "-p Apply camera ICC profile from file or \"embed\"" +msgstr "-p Anvend kamera-ICC-profil fra fil eller \"embed\"" + +msgid "-d Document mode (no color, no interpolation)" +msgstr "-d Dokumentationsmodus (ingen farver, ingen interpolation)" + +msgid "-D Document mode without scaling (totally raw)" +msgstr "-D Dokumentationsmodus uden skalering (helt rå)" + +msgid "-j Don't stretch or rotate raw pixels" +msgstr "-j Stræk og drej ikke de rå billedpunkter" + +msgid "-W Don't automatically brighten the image" +msgstr "-W Gør ikke billedet lysere automatisk" + +msgid "-b Adjust brightness (default = 1.0)" +msgstr "-b Juster belysning (standard = 1.0)" + +msgid "-g

Set custom gamma curve (default = 2.222 4.5)" +msgstr "-g Angiv gammakurve (standard = 2.222 4.5)" + +msgid "-q [0-3] Set the interpolation quality" +msgstr "-q [0-3] Angiv interpolationskvalitet" + +msgid "-h Half-size color image (twice as fast as \"-q 0\")" +msgstr "-h Halvstørrelse-interpolation (dobbelt som hurtig som \"-q 0\")" + +msgid "-f Interpolate RGGB as four colors" +msgstr "-f Interpoler RGGB som fire farver" + +msgid "-m Apply a 3x3 median filter to R-G and B-G" +msgstr "-m Anvend et 3x3 median-filter på R-G og B-G" + +msgid "-s [0..N-1] Select one raw image or \"all\" from each file" +msgstr "-s [0..N-1] Vælg et råbillede eller \"all\" (alle) fra hver fil" + +msgid "-6 Write 16-bit instead of 8-bit" +msgstr "-6 Skriv 16-bits i stedet for 8-bits" + +msgid "-4 Linear 16-bit, same as \"-6 -W -g 1 1\"" +msgstr "-4 Lineær 16-bits, det samme som \"-6 -W -g 1 1\"" + +msgid "-4 Write 16-bit linear instead of 8-bit with gamma" +msgstr "-4 Skriv 16-bits i stedet for 8-bits med gamma" + +msgid "-T Write TIFF instead of PPM" +msgstr "-T Skriv TIFF i stedet for PPM" + +msgid "Non-numeric argument to \"-%c\"\n" +msgstr "Ikke-numerisk parameter til \"-%c\"\n" + +msgid "Unknown option \"-%c\".\n" +msgstr "Ukendt tilvalg \"-%c\".\n" + +msgid "No files to process.\n" +msgstr "Ingen filer behandles.\n" + +msgid "Will not write an image to the terminal!\n" +msgstr "Vil ikke udskrive et billede på terminalen!\n" + +msgid "%s has no timestamp.\n" +msgstr "%s har ikke noget optagelsestidspunkt.\n" + +msgid "%s time set to %d.\n" +msgstr "%s tidspunkt sat til %d.\n" + +msgid "%s has no thumbnail.\n" +msgstr "%s har ikke noget miniaturbillede.\n" + +msgid "\nFilename: %s\n" +msgstr "\nFilnavn: %s\n" + +msgid "Timestamp: %s" +msgstr "Optagelsestidspunkt: %s" + +msgid "Camera: %s %s\n" +msgstr "Kamera: %s %s\n" + +msgid "Owner: %s\n" +msgstr "Ejer: %s\n" + +msgid "DNG Version: " +msgstr "DNG-version: " + +msgid "ISO speed: %d\n" +msgstr "ISO-værdi: %d\n" + +msgid "Shutter: " +msgstr "Lukkertid: " + +msgid "%0.1f sec\n" +msgstr "%0.1f sek\n" + +msgid "Aperture: f/%0.1f\n" +msgstr "Blænde: f/%0.1f\n" + +msgid "Focal length: %0.1f mm\n" +msgstr "Brændvidde: %0.1f mm\n" + +msgid "yes" +msgstr "ja" + +msgid "no" +msgstr "nej" + +msgid "Embedded ICC profile: %s\n" +msgstr "Indlejret ICC-profil: %s\n" + +msgid "Number of raw images: %d\n" +msgstr "Antal råbilleder: %d\n" + +msgid "Pixel Aspect Ratio: %0.6f\n" +msgstr "Billedproportioner: %0.6f\n" + +msgid "Thumb size: %4d x %d\n" +msgstr "Miniaturbilledstørrelse: %4d x %d\n" + +msgid "Full size: %4d x %d\n" +msgstr "Fuld billedstørrelse: %4d x %d\n" + +msgid "Cannot decode file %s\n" +msgstr "Kan ikke afkode filen %s\n" + +msgid "Image size: %4d x %d\n" +msgstr "Billedstørrelse: %4d x %d\n" + +msgid "Output size: %4d x %d\n" +msgstr "Uddata-billedstørrelse: %4d x %d\n" + +msgid "Raw colors: %d" +msgstr "Rå farver: %d" + +msgid "\nFilter pattern: " +msgstr "\nFiltermønster: " + +msgid "\nDaylight multipliers:" +msgstr "\nDagslysmultiplikatorer:" + +msgid "\nCamera multipliers:" +msgstr "\nKameramultiplikatorer:" + +msgid "%s is a %s %s image.\n" +msgstr "%s er et %s %s-billede.\n" + +msgid "Loading %s %s image from %s ...\n" +msgstr "Indlæser %s %s-billede fra %s ...\n" + +msgid "%s: \"-s %d\" requests a nonexistent image!\n" +msgstr "%s: \"-s %d\" beder om et ikkeeksisterende billede!\n" + +msgid "standard output" +msgstr "standard-uddata" + +msgid "Writing data to %s ...\n" +msgstr "Skriver data til %s ...\n" diff -Nru dcraw-8.99/dcraw_de.1 dcraw-9.17/dcraw_de.1 --- dcraw-8.99/dcraw_de.1 1970-01-01 00:00:00.000000000 +0000 +++ dcraw-9.17/dcraw_de.1 2013-01-03 13:09:39.000000000 +0000 @@ -0,0 +1,289 @@ +.\" +.\" Man page für dcraw +.\" +.\" Copyright (c) 2009 David Coffin +.\" +.\" Diese Datei darf ohne Einschränkungen weitergegeben werden +.\" +.\" David Coffin +.\" dcoffin a cybercom o net +.\" http://www.cybercom.net/~dcoffin +.\" +.TH dcraw 1 "14. Mai 2009" +.LO 1 +.SH NAME +dcraw - Kommandozeilen Dekoder für RAW Daten von digitalen Kameras +.SH ZUSAMMENFASSUNG +.B dcraw +[\fIOPTIONEN\fR]... [\fIDATEI\fR]... +.SH BESCHREIBUNG +.B dcraw +dekodiert RAW Daten, zeigt Metadaten an und extrahiert Thumbnails. +.SH ALLGEMEINE EINSTELLUNGEN +.TP +.B -v +Gebe zusätzliche Informationen neben Warnungen und Fehlermeldungen aus. +.TP +.B -c +Schreibe dekodierte Bilder oder Thumbnails in die Standardausgabe. +.TP +.B -e +Extrahiere das von der Kamera erzeugte Thumbnail, nicht das RAW Bild. +Die Ausgabe wird, je nach Kamera, eine JPEG oder PPM Datei sein. +.TP +.B -z +Setze die Zugriffs- und Änderungszeit von AVI, JPEG, TIFF oder RAW +Dateien auf den Erstellungszeitpunkt des Fotos (dabei wird angenommen, +dass die Kamera Uhr auf Universal Time (UT) eingestellt ist). +.TP +.B -i +Überprüfe Dateien, aber dekodiere sie nicht. +Gibt 0 zurück, wenn +.B dcraw +sie dekodieren kann, 1 wenn nicht. +.B -i -v +gibt Metadaten aus. +.TP +.B "" +.B dcraw +kann keine JPEG Dateien dekodieren!! +.SH REPARATUREINSTELLUNGEN +.TP +.B -P deadpixels.txt +Lese die Liste toter Pixel aus dieser Datei, anstatt aus ".badpixels". +Siehe +.B DATEIEN +um eine Beschreibung zu finden. +.TP +.B -K dunkelbild.pgm +Subtrahiere ein Dunkelbild von den RAW Daten. Um ein Dunkelbild zu +erzeugen fotografieren Sie ohne Licht und verwenden danach +.BR dcraw\ -D\ -4\ -j\ -t\ 0 . +.TP +.B -k Dunkelheit +Wenn Schatten einen Schleier haben, muss der Dunkelheitsschwellenwert +erhöht werden. +Um diesen zu berechnen, wenden Sie +.B pamsumm -mean +auf das oben erstelle Dunkelbild an. +.TP +.B -S Sättigung +Wenn Spitzenlichter pink aussehen, müssen Sie den Sättigungsschwellenwert +erniedrigen. +Um diesen zu berechnen, nehmen Sie ein Bild von etwas glänzenden auf, und +wenden Sie anschließend +.B dcraw -D -4 -j -c +photo.raw +.B | pamsumm -max +auf das Bild an. +.TP +.B "" +Die Standardwerte für Dunkelheit und Sättigung sind normalerweise richtig. +.TP +.B -n Rauschschwellenwert +Verwende Wavelets um Rauschen zu entfernen und Bilddetails zu erhalten. +Der Schwellenwert sollte zwischen 100 und 1000 liegen. +.TP +.B -C rot_verg blau_verg +Vergrößere die roten oder blauen Kanäle um die angegebenen Werte, +meistens 0.999 bis 1.001, um chromatische Aberration zu korrigieren. +.TP +.B -H 0 +Übersteuere alle Spitzlichter zu völligem weiß (Voreinstellung). +.TP +.B -H 1 +Belässt alle übersteuerten Spitzenlichter in verschiedenen Pink Tönen. +.TP +.B -H 2 +Vermische abgeschnittene und nicht abgeschnittene Werte zu einem +allmählichen Verlauf zu Weiß. +.TP +.B -H 3+ +Rekonstruiert Spitzenlichter. Niedrige Nummern bevorzugen weiß; +hohe Nummern bevorzugen Farben. Verwenden Sie +.B -H 5 +als Kompromiss. Sollte das nicht gut genug sein, probieren Sie +.BR -H\ 9 , +schneiden Sie die nicht weißen Spitzlichter aus, +und kopieren Sie sie in ein Bild, das mit +.B -H 3 +erzeugt wurde. +.SH FARBEINSTELLUNGEN +Standardmäßig verwendet +.B dcraw +einen festen Weißabgleich basierend auf einer, mit einer standard +D65 Lampe beleuchteten, Farbkarte. +.TP +.B -w +Benutze den Weißabgleich der Kamera. Gebe eine Warnung aus, +wenn dieser nicht gefunden wird und verwende eine andere Methode. +.TP +.B -a +Berechne Weißabgleich unter Verwendung des ganzen Bildes. +.TP +.B -A Links Oben Breite Höhe +Berechne Weißabgleich unter Verwendung eines rechteckigen Bereichs. +Benutzen Sie +.B dcraw\ -j\ -t\ 0 +und wählen sie einen Bereich mit neutralen Grauwert. +.TP +.B -r mul0 mul1 mul2 mul3 +Verwende manuellen Weißabgleich. +Diese Multiplikatoren können aus der Ausgabe von +.B dcraw -v +kopiert werden. +.TP +.BR +M " oder " -M +Verwende (oder verwende keine) Farbmatrix aus den Metadaten der Kamera. +Voreinstellung ist +.B +M +oder, wenn +.B -w +gewählt wurde +.BR -M . +Diese Option betrifft nur Olympus, Leaf und Phase One Kameras. +.TP +.B -o [0-5] +Wählt den Farbraum der Ausgabe aus, wenn +.B -p +nicht verwendet wird: + +.B \t0 +\ \ Raw Farbe (abhängig von der jeweiligen Kamera) +.br +.B \t1 +\ \ sRGB D65 (Voreinstellung) +.br +.B \t2 +\ \ Adobe RGB (1998) D65 +.br +.B \t3 +\ \ Wide Gamut RGB D65 +.br +.B \t4 +\ \ Kodak ProPhoto RGB D65 +.br +.B \t5 +\ \ XYZ +.TP +.BR -p\ kamera.icm \ [\ -o\ ausgabe.icm \ ] +Verwende ICC Profile um den RAW Farbraum der Kamera +und den Ausgabe Farbraum zu definieren (Voreinstellung: sRGB). +.TP +.B -p embed +Verwende das in der RAW Datei eingebettete Profil. +.SH INTERPOLATIONSEINSTELLUNGEN +.TP +.B -d +Zeige die RAW Daten als Graustufen Bild ohne Interpolation. +(z.B. gut geeignet für Schwarz-Weiß Dokumente) +.TP +.B -D +Identisch zu +.BR -d , +aber völlig unbearbeitet (ohne Farbskalierung). +.TP +.B -h +Gibt ein Bild mit halber Größe aus, doppelt so schnell wie +.BR -q\ 0 . +.TP +.B -q 0 +Benutze schnelle und qualitativ schlechtere bilineare Interpolation. +.TP +.B -q 1 +Verwende Variable Number of Gradients (VNG) Interpolation. +.TP +.B -q 2 +Verwende Patterned Pixel Grouping (PPG) Interpolation. +.TP +.B -q 3 +Verwende Adaptive Homogeneity-Directed (AHD) Interpolation. +.TP +.B -f +Interpoliere RGB als vier Farben. Verwenden Sie diese Option wenn +die Ausgabe Anzeichen von 2x2 Netzen bei VNG Interpolation oder +Labyrinthstrukturen bei AHD Interpolation zeigt. +.TP +.B -m Anzahl_der_Durchgänge +Säubere Farbartefakte nach der Interpolation, durch wiederholtes +Anwenden eines 3x3 Median Filters auf die R-G und B-G Kanäle. +.SH AUSGABEEINSTELLUNGEN +Standardmäßig gibt +.B dcraw +PGM/PPM/PAM Dateien mit 8-bit Daten, einer BT.709 Gamma Kurve, +einem Histogramm basierten Weißwert und keinen Metadaten aus. +.TP +.B -W +Ignoriere das Histogramm der Datei und verwende einen festen Weißwert. +.TP +.B -b Helligkeit +Teile den Weißwert durch diese Zahl, standardmäßig 1.0 +.TP +.B -g Potenz maximale_Steigung +Die Gammakurve festlegen, standardmäßig BT.709 +.RB ( -g\ 2.222\ 4.5 ). +Wenn Sie die sRGB Gammakurve bevorzugen, verwenden Sie +.BR -g\ 2.4\ 12.92 . +Für eine einfache Potenzfunktion, setzen Sie maximale_Steigung auf 0. +.TP +.B -6 +Schreibe sechzehn Bits pro Sample anstelle von acht. +.TP +.B -4 +Schreibe lineare 16-bit Daten, produziert dasselbe wie +.BR -6\ -W\ -g\ 1\ 1 . +.TP +.B -T +Gibt TIFF mit Metadaten, anstatt PGM/PPM/PAM Dateien, aus. +.TP +.B -t [0-7,90,180,270] +Drehe die Ausgabe. Die Voreinstellung, +.B dcraw +rotiert die Ausgabe nach den Vorgaben der Kamera. +.B -t 0 +deaktiviert jede Rotation. +.TP +.B -j +Neige das Bild um 45 Grad für Fuji\ Super\ CCD Kameras. +Verhindert eine Streckung auf das korrekte Bildverhältnis für +Kameras, die keine quadartischen Pixel haben. Diese Option +garantiert, dass jeder Ausgabepixel einem RAW Pixel entspricht. +.TP +.BR "-s [0..N-1]" " oder " "-s all" +Wenn eine Datei N raw Bilder enthält, wähle eins oder alle ("all") +zum Dekodieren. +Fuji\ Super\ CCD\ SR Kameras zum Beispiel erzeugen ein zweites Bild, +welches vier Blenden unterbelichtet ist, um die Details in den +Spitzenlichtern zu erhalten. +.SH DATEIEN +.TP +\:./.badpixels, ../.badpixels, ../../.badpixels, ... +Liste der toten Pixel Ihrer Kamera, so dass +.B dcraw +um sie herum interpolieren kann. Jede Zeile gibt die Spalte, Zeile und +die UNIX Zeit des Todeszeitpunkts des jeweiligen Pixels an. Zum Beispiel: +.sp 1 +.nf + 962 91 1028350000 # starb zwischen dem 1 und 4 Ausgust 2002 +1285 1067 0 # Todeszeitpunkt unbekannt +.fi +.sp 1 +Diese Koordinaten entsprechen denen vor jeglicher Größenänderung +und Rotation, verwenden Sie also +.B dcraw -j -t 0 +um tote Pixel zu finden. +.SH "SIEHE AUCH" +.BR pgm (5), +.BR ppm (5), +.BR pam (5), +.BR pamsumm (1), +.BR pnmgamma (1), +.BR pnmtotiff (1), +.BR pnmtopng (1), +.BR gphoto2 (1), +.BR cjpeg (1), +.BR djpeg (1) +.SH AUTOR +Geschrieben von David Coffin, dcoffin a cybercom o net +.SH ÜBERSETZUNG +Benjamin Lebsanft, benjamin a lebsanft o org diff -Nru dcraw-8.99/dcraw_de.po dcraw-9.17/dcraw_de.po --- dcraw-8.99/dcraw_de.po 1970-01-01 00:00:00.000000000 +0000 +++ dcraw-9.17/dcraw_de.po 2013-01-03 13:09:39.000000000 +0000 @@ -0,0 +1,387 @@ +# German translation of dcraw messages. +# (c) 2009 Dave Coffin dcoffin a cybercom o net, +# and Benjamin Lebsanft benjamin a lebsanft o org +# Distribute freely. +# +msgid "" +msgstr "" +"Project-Id-Version: dcraw 8.94\n" +"Report-Msgid-Bugs-To: benjamin a lebsanft o org\n" +"POT-Creation-Date: 2006-12-21 22:45-0500\n" +"PO-Revision-Date: 2011-07-23 17:00-0400\n" +"Last-Translator: Benjamin Lebsanft \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +msgid "%s: Out of memory in %s\n" +msgstr "%s: Nicht genügend Speicher bei %s\n" + +msgid "Unexpected end of file\n" +msgstr "Unerwartetes Ende der Datei\n" + +msgid "Corrupt data near 0x%lx\n" +msgstr "Fehlerhafte Daten in der Nähe von 0x%lx\n" + +msgid "Corrupt data near 0x%llx\n" +msgstr "Fehlerhafte Daten in der Nähe von 0x%llx\n" + +msgid "%s: decoder table overflow\n" +msgstr "%s: Dekodiertabelle zu groß\n" + +msgid "Phase One correction...\n" +msgstr "Wende Phase One Korrektur an...\n" + +msgid "%s: incorrect JPEG dimensions\n" +msgstr "%s: falsche JPEG Ausmaße\n" + +msgid "%s: \"%s\" matrix not found!\n" +msgstr "%s: \"%s\" Matrix nicht gefunden!\n" + +msgid "Foveon interpolation...\n" +msgstr "Foveon Interpolation...\n" + +msgid "%s: Invalid white balance \"%s\"\n" +msgstr "%s: Ungültiger Weißabgleich \"%s\"\n" + +msgid "Fixed bad pixels at:" +msgstr "Fehlerhafte Pixel an folgender Stelle repariert:" + +msgid "Fixed dead pixels at:" +msgstr "Tote Pixel an folgender Stelle repariert:" + +msgid "%s is not a valid PGM file!\n" +msgstr "%s ist keine gültiger PGM Datei!\n" + +msgid "%s has the wrong dimensions!\n" +msgstr "%s hat die falschen Ausmaße!\n" + +msgid "Wavelet denoising...\n" +msgstr "Wende Wavelet Rauschentfernung an...\n" + +msgid "%s: Cannot use camera white balance.\n" +msgstr "%s: Kann Kamera Weißabgleich nicht verwenden.\n" + +msgid "Scaling with black %d, multipliers" +msgstr "Skaliere mit Schwarzwert %d, Multiplikatoren" + +msgid "Scaling with darkness %d, saturation %d, and\nmultipliers" +msgstr "Skaliere mit Dunkelheit %d, Sättigung %d, und\nMultiplikatoren" + +msgid "Correcting chromatic aberration...\n" +msgstr "Korrigiere chromatische Aberration...\n" + +msgid "Bilinear interpolation...\n" +msgstr "Bilineare Interpolation...\n" + +msgid "VNG interpolation...\n" +msgstr "VNG Interpolation...\n" + +msgid "PPG interpolation...\n" +msgstr "PPG Interpolation...\n" + +msgid "AHD interpolation...\n" +msgstr "AHD Interpolation...\n" + +msgid "Median filter pass %d...\n" +msgstr "Median Filter Durchgang %d...\n" + +msgid "Bilateral filtering...\n" +msgstr "Bilaterales Filtern...\n" + +msgid "Blending highlights...\n" +msgstr "Vermische Spitzenlichter...\n" + +msgid "Rebuilding highlights...\n" +msgstr "Stelle Spitzenlichter wieder her...\n" + +msgid "Highlight recovery...\n" +msgstr "Rekonstruiere Spitzenlichter...\n" + +msgid "Reading metadata from %s ...\n" +msgstr "Lese Metadaten von %s ...\n" + +msgid "Failed to read metadata from %s\n" +msgstr "Lesen der Metadaten von %s fehlgeschlagen\n" + +msgid "%s: You must link dcraw with libjpeg!!\n" +msgstr "%s: dcraw muss mit libjpeg gelinkt werden!!\n" + +msgid "%s: You must link dcraw with %s!!\n" +msgstr "%s: dcraw muss mit %s gelinkt werden!!\n" + +msgid "%s has no embedded profile.\n" +msgstr "%s hat kein eingebettetes Profil.\n" + +msgid "Cannot open file %s!\n" +msgstr "Kann %s nicht öffnen!\n" + +msgid "Applying color profile...\n" +msgstr "Wende Farbprofil an...\n" + +msgid "Building histograms...\n" +msgstr "Erstelle Histogramme...\n" + +msgid "Converting to %s colorspace...\n" +msgstr "Wandle in %s Farbraum um...\n" + +msgid "Rotating image 45 degrees...\n" +msgstr "Drehe Bild um 45 Grad...\n" + +msgid "Stretching the image...\n" +msgstr "Strecke Bild...\n" + +msgid "\nRaw photo decoder \"dcraw\" v%s" +msgstr "\nRaw Foto Dekoder \"dcraw\" v%s" + +msgid "\nby Dave Coffin, dcoffin a cybercom o net\n" +msgstr "\nvon Dave Coffin, dcoffin a cybercom o net\n" + +msgid "\nUsage: %s [OPTION]... [FILE]...\n\n" +msgstr "\nBenutzung: %s [OPTIONEN]... [DATEI]...\n\n" + +msgid "-v Print verbose messages" +msgstr "-v Gebe zusätzliche Informationen aus" + +msgid "-c Write image data to standard output" +msgstr "-c Schreibe Bild in die Standardausgabe" + +msgid "-e Extract embedded thumbnail image" +msgstr "-e Extrahiere eingebettetes Thumbnail" + +msgid "-i Identify files without decoding them" +msgstr "-i Überprüfe Dateien ohne sie zu dekodieren" + +msgid "-i -v Identify files and show metadata" +msgstr "-i -v Überprüfe Dateien und zeige Metadaten an" + +msgid "-z Change file dates to camera timestamp" +msgstr "-z Ändere Dateizeitstempel auf Kamerazeitstempel" + +msgid "-a Use automatic white balance" +msgstr "-a Verwende automatischen Weißabgleich" + +msgid "-w Use camera white balance, if possible" +msgstr "-w Verwende Kameraweißabgleich, sofern möglich" + +msgid "-a Average the whole image for white balance" +msgstr "-a Benutze das ganze Bild für den Weißabgleich" + +msgid "-A Average a grey box for white balance" +msgstr "-A Benutze ein graues Rechteck für den Weißabgleich" + +msgid "-r Set custom white balance" +msgstr "-r Verwende manuellen Weißabgleich" + +msgid "-r <4 numbers> Set custom white balance" +msgstr "-r <4 Zahlenwerte> Verwende individuellen Weißabgleich" + +msgid "+M/-M Use/don't use an embedded color matrix" +msgstr "+M/-M Verwende/verwende keine in der Datei eingebettete Farbmatrix" + +msgid "-C Correct chromatic aberration" +msgstr "-C Korrigieren chromatische Aberration" + +msgid "-P Fix the dead pixels listed in this file" +msgstr "-P Repariere die in der Datei notierten toten Pixel" + +msgid "-K Subtract dark frame (16-bit raw PGM)" +msgstr "-K Subtrahiere Dunkelbild (16-bit raw PGM)" + +msgid "-k Set black point" +msgstr "-k Setze Schwarzpunkt" + +msgid "-k Set the black level" +msgstr "-k Setze den Schwarzwert" + +msgid "-k Set the darkness level" +msgstr "-k Setze Dunkelheitsschwellenwert" + +msgid "-S Set the saturation level" +msgstr "-S Setze Sättigungsschwellenwert" + +msgid "-n Set threshold for wavelet denoising" +msgstr "-n Schwellenwert für Wavelet Rauschentfernung angeben" + +msgid "-H [0-9] Highlight mode (0=clip, 1=no clip, 2+=recover)" +msgstr "-H [0-9] Spitzenlicht Modus (0=abschneiden, 1=nicht abschneiden, 2+=rekonstruieren)" + +msgid "-H [0-9] Highlight mode (0=clip, 1=unclip, 2=blend, 3+=rebuild)" +msgstr "-H [0-9] Spitzenlicht Modus (0=abschneiden, 1=nicht abschneiden, 2=vermischen, 3+=rekonstruieren)" + +msgid "-t [0-7] Flip image (0=none, 3=180, 5=90CCW, 6=90CW)" +msgstr "-t [0-7] Bild drehen (0=0 Grad, 3=180, 5=90 links, 6=90 rechts)" + +msgid "-o [0-5] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" +msgstr "-o [0-5] Farbraum der Ausgabe (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" + +msgid "-o Apply output ICC profile from file" +msgstr "-o Wende Ausgabe ICC Profil aus Datei an" + +msgid "-p Apply camera ICC profile from file or \"embed\"" +msgstr "-p Wende Kamera ICC Profil aus Datei oder \"embed\"" + +msgid "-d Document mode (no color, no interpolation)" +msgstr "-d Dokumentenmodus (ohne Farbe, keine Interpolation)" + +msgid "-D Document mode without scaling (totally raw)" +msgstr "-D Dokumentenmodus ohne Skalierung (völlig unbearbeitet)" + +msgid "-j Don't stretch or rotate raw pixels" +msgstr "-j Raw Pixel nicht strecken oder drehen" + +msgid "-W Don't automatically brighten the image" +msgstr "-W Helle das Bild nicht automatisch auf" + +msgid "-b Adjust brightness (default = 1.0)" +msgstr "-b Helligkeit anpassen (Voreinstellung 1.0)" + +msgid "-g

Set custom gamma curve (default = 2.222 4.5)" +msgstr "-g

Legt die Gammakurve fest (standardmäßig = 2.222 4.5)" + +msgid "-q [0-3] Set the interpolation quality" +msgstr "-q [0-3] Wählt die Qualität der Interpolation" + +msgid "-h Half-size color image (twice as fast as \"-q 0\")" +msgstr "-h Halbgroßes Farbbild (doppelt so schnell wie \"-q 0\")" + +msgid "-f Interpolate RGGB as four colors" +msgstr "-f Interpoliere RGGB als vier Farben" + +msgid "-m Apply a 3x3 median filter to R-G and B-G" +msgstr "-m Wende einen 3x3 Median Filter auf R-G und B-G an" + +msgid "-B Apply bilateral filter to smooth noise" +msgstr "-B Bilateralen Filter zur Rauschentfernung anwenden" + +msgid "-s [0-99] Select a different raw image from the same file" +msgstr "-s [0-99] Wählt ein anderes Bild aus derselben Datei" + +msgid "-s [0..N-1] Select one raw image or \"all\" from each file" +msgstr "-s [0..N-1] Wählt ein oder \"all\" (alle) RAW Bilder von jeder Datei" + +msgid "-6 Write 16-bit instead of 8-bit" +msgstr "-6 Schreibe 16-bit Daten anstelle von 8-bit" + +msgid "-4 Linear 16-bit, same as \"-6 -W -g 1 1\"" +msgstr "-4 Schreibe lineare 16-bit Daten, produziert dasselbe wie \"-6 -W -g 1 1\"" + +msgid "-4 Write 16-bit linear instead of 8-bit with gamma" +msgstr "-4 Schreibe lineares 16-Bit Bild, anstelle 8-Bit mit Gamma" + +msgid "-T Write TIFF instead of PPM" +msgstr "-T Schreibe TIFF anstelle von PPM Dateien" + +msgid "Non-numeric argument to \"-%c\"\n" +msgstr "Nicht numerisches Argument für \"-%c\"\n" + +msgid "Unknown option \"-%c\".\n" +msgstr "Unbekannte Option \"-%c\".\n" + +msgid "No files to process.\n" +msgstr "Keine Dateien zu bearbeiten\n" + +msgid "Will not write an image to the terminal!\n" +msgstr "Werde kein Bild ins Terminal schreiben!\n" + +msgid "%s has no timestamp.\n" +msgstr "%s hat keinen Zeitstempel.\n" + +msgid "%s time set to %d.\n" +msgstr "%s Zeit auf %d gesetzt.\n" + +msgid "%s has no thumbnail.\n" +msgstr "%s hat kein Thumbnail.\n" + +msgid "\nFilename: %s\n" +msgstr "\nDateiname: %s\n" + +msgid "Timestamp: %s" +msgstr "Zeitstempel: %s" + +msgid "Camera: %s %s\n" +msgstr "Kamera: %s %s\n" + +msgid "Owner: %s\n" +msgstr "Eigentümer: %s\n" + +msgid "DNG Version: " +msgstr "DNG Version: " + +msgid "ISO speed: %d\n" +msgstr "ISO Wert: %d\n" + +msgid "Shutter: " +msgstr "Verschlusszeit: " + +msgid "%0.1f sec\n" +msgstr "%0.1f sek\n" + +msgid "Aperture: f/%0.1f\n" +msgstr "Blende: f/%0.1f\n" + +msgid "Focal length: %0.1f mm\n" +msgstr "Brennweite: %0.1f mm\n" + +msgid "Secondary pixels: %s\n" +msgstr "Sekundär Pixel: %s\n" + +msgid "yes" +msgstr "ja" + +msgid "no" +msgstr "nein" + +msgid "Embedded ICC profile: %s\n" +msgstr "Eingebettetes ICC Profil: %s\n" + +msgid "Decodable with dcraw: %s\n" +msgstr "Mit dcraw dekodierbar: %s\n" + +msgid "Number of raw images: %d\n" +msgstr "Anzahl an RAW Bildern: %d\n" + +msgid "Pixel Aspect Ratio: %0.6f\n" +msgstr "Pixel Seitenverhältnis: %0.6f\n" + +msgid "Thumb size: %4d x %d\n" +msgstr "Größe des Thumbnails: %4d x %d\n" + +msgid "Full size: %4d x %d\n" +msgstr "Volle Größe des Bildes: %4d x %d\n" + +msgid "Cannot decode file %s\n" +msgstr "Kann Datei %s nicht dekodieren\n" + +msgid "Image size: %4d x %d\n" +msgstr "Größe des Bildes: %4d x %d\n" + +msgid "Output size: %4d x %d\n" +msgstr "Größe der Ausgabe: %4d x %d\n" + +msgid "Raw colors: %d" +msgstr "Raw Farben: %d" + +msgid "\nFilter pattern: " +msgstr "\nFilter Muster: " + +msgid "\nDaylight multipliers:" +msgstr "\nTageslicht Multiplikatoren:" + +msgid "\nCamera multipliers:" +msgstr "\nKamera Multiplikatoren:" + +msgid "%s is a %s %s image.\n" +msgstr "%s ist ein %s %s Bild.\n" + +msgid "Loading %s %s image from %s ...\n" +msgstr "Lade %s %s Bild von %s ...\n" + +msgid "%s: \"-s %d\" requests a nonexistent image!\n" +msgstr "%s: \"-s %d\" frägt ein nicht existierendes Bild ab!\n" + +msgid "standard output" +msgstr "Standardausgabe" + +msgid "Writing data to %s ...\n" +msgstr "Schreibe Daten nach %s ...\n" diff -Nru dcraw-8.99/dcraw_eo.1 dcraw-9.17/dcraw_eo.1 --- dcraw-8.99/dcraw_eo.1 1970-01-01 00:00:00.000000000 +0000 +++ dcraw-9.17/dcraw_eo.1 2013-01-03 13:09:39.000000000 +0000 @@ -0,0 +1,278 @@ +.\" +.\" Manpaĝo por dcraw +.\" +.\" Kopirajte 2009 de David Coffin +.\" +.\" Por libera distribuo +.\" +.\" David Coffin +.\" dcoffin a cybercom o net +.\" http://www.cybercom.net/~dcoffin +.\" +.TH dcraw 1 "14 majo 2009" +.LO 1 +.SH NOMO +dcraw - komand-linia deĉifrilo por krudaj ciferecaj fotoj +.SH RESUMO +.B dcraw +[\fIOPCIO\fR]... [\fIDOSIERO\fR]... +.SH PRISKRIBO +.B dcraw +deĉifras krudajn fotojn, montras pridatumon, kaj eltiras bildetojn. +.SH ĜENERALAJ OPCIOJ +.TP +.B -v +Donu abundajn mesaĝojn, ne nur avertojn kaj erarojn. +.TP +.B -c +Skribu deĉifritajn bild(et)ojn al la ĉefeligujo (stdout). +.TP +.B -e +Eltiru la bildeton generitan de la fotilo, ne la krudan bildon. +Estos dosiero aŭ JPEG aŭ PPM, depende de la fotilo. +.TP +.B -z +Por dosiero kruda, TIFF, JPEG, aŭ AVI, ŝanĝu la tempojn de lasta aliro +kaj modifo al la tempo de obturado, supozante ke la fotila horloĝo +tenas Universalan Tempon. +.TP +.B -i +Identigu dosierojn sed ne deĉifru ilin. +Eliru kun 0 se +.B dcraw +povas deĉifri la lastan dosieron, aŭ kun 1 se ĝi ne povas. +.B -i -v +montras pridatumon. +.TP +.B "" +.B dcraw +ne povas deĉifri JPEG-dosierojn!! +.SH RIPARAJ OPCIOJ +.TP +.B -P mortintaj_bilderoj.txt +Legu la liston de mortintaj bilderoj el tiu ĉi dosiero anstataŭ +".badpixels". Vidu sub +.B DOSIEROJ +priskribon de la formato. +.TP +.B -K senlumo.pgm +Subtrahu senluman bildon de la kruda datumo. Por generi tian +bildon, faru jene al senluma kruda foto: +.BR dcraw\ -D\ -4\ -j\ -t\ 0 . +.TP +.B -k senlumo +Kiam ombroj aspektas nebulecaj, necesas levi la senluman nivelon. +Por mezuri ĝin, apliku +.B pamsumm -mean +al la supre generita senluma bildo. +.TP +.B -S saturo +Kiam brilaĵoj aspektas rozkoloraj, necesas mallevi la saturan nivelon. +Por mezuri ĝin, fotu ion brilan kaj faru +.B dcraw -D -4 -j -c +foto.raw +.B | pamsumm -max +.TP +.B "" +La supozaj senlumo kaj saturo plej ofte ĝustas. +.TP +.B -n brua_sojlo +Uzu ondetojn por forviŝi bruon kaj konservi realan detalon. +La plej ĝusta sojlo estu ie inter 100 kaj 1000. +.TP +.B -C ruĝa_grandigo blua_grandigo +Grandigu la krudajn ruĝan kaj bluan tavolojn je ties faktoroj, +tipe inter 0.999 kaj 1.001, por korekti koloran aberacion. +.TP +.B -H 0 +Blankigu ĉiujn brilaĵojn (la supozo). +.TP +.B -H 1 +Lasu brilaĵojn fuksinaj por malkaŝi detalojn. +.TP +.B -H 2 +Miksu limigitajn kaj nelimigitajn valorojn por grade blankigi +la brilaĵojn. +.TP +.B -H 3+ +Rekonstruu brilaĵojn. Malaltaj numeraloj favoras blankecon; +altaj numeraloj favoras kolorojn. Provu +.B -H 5 +kiel kompromison. Se tio ne sufiĉe bonas, faru +.BR -H\ 9 , +eltranĉu la neblankajn brilaĵojn, kaj gluu ilin en foton +generitan per +.BR -H\ 3 . +.SH KOLORAJ OPCIOJ +Laŭ supozo, +.B dcraw +uzas fiksan blank-ekvilibron bazitan sur kolor-karto lumigita +per norma lampo D65. +.TP +.B -w +Uzu la blank-ekvilibron specifitan de la fotilo. +Se tio ne troviĝas, avertu kaj uzu alian metodon. +.TP +.B -a +Kalkulu la blank-ekvilibron per averaĝi la tutan bildon. +.TP +.B -A maldekstro supro larĝeco alteco +Kalkulu la blank-ekvilibron per averaĝi rektangulan areon. +Unue faru +.B dcraw\ -j\ -t\ 0 +kaj elektu areon de neŭtrala griza koloro. +.TP +.B -r mul0 mul1 mul2 mul3 +Specifu propran blank-ekvilibron. +Eblas kopii tiujn ĉi multiplikantojn el la mesaĝoj de +.BR dcraw\ -v . +.TP +.BR +M " aŭ " -M +Uzu (aŭ ne uzu) iun ajn kolor-matricon el la pridatumo. +La supozo estas +.B +M +se +.B -w +uziĝas, +.B -M +alikaze. +Tiu ĉi opcio koncernas nur fotilojn Olympus, Leaf, kaj Phase One. +.TP +.B -o [0-5] +Elektu la eligotan kolorspacon kiam ne uziĝas la opcio +.B -p +: + +.B \t0 +\ \ Kruda koloro (unika por ĉiu fotilo) +.br +.B \t1 +\ \ sRGB D65 (la supozo) +.br +.B \t2 +\ \ Adobe RGB (1998) D65 +.br +.B \t3 +\ \ Wide Gamut RGB D65 +.br +.B \t4 +\ \ Kodak ProPhoto RGB D65 +.br +.B \t5 +\ \ XYZ +.TP +.BR -p\ fotilo.icm \ [\ -o\ eligo.icm \ ] +Uzu ICC profilojn por difini la krudan kolorspacon de la fotilo +kaj la eligotan kolorspacon (sRGB laŭ supozo). +.TP +.B -p embed +Uzu la ICC-profilon internan de la kruda foto. +.SH INTERPOLAJ OPCIOJ +.TP +.B -d +Montru la krudan datumon grizskala sen interpolado. +Estas bone por foti nigrablankajn dokumentojn. +.TP +.B -D +Same kiel +.BR -d , +sed tute krude (sen blank-ekvilibro). +.TP +.B -h +Eligu duon-grandan koloran bildon. Duoble pli rapide ol +.BR -q\ 0 . +.TP +.B -q 0 +Interpolu per simpla bilinia averaĝado. +.TP +.B -q 1 +Interpolu per Variabla Nombro de Gradientoj (VNG). +.TP +.B -q 2 +Interpolu per Ŝablona Bildera Grupigo (PPG). +.TP +.B -q 3 +Interpolu per Adapta Homogena Direkto (AHD). +.TP +.B -f +Interpolu RVB-on kiel kvar kolorojn. Uzu tion ĉi se la eligo +montras falsan 2-je-2 reton per VNG aŭ labirinton per AHD. +.TP +.B -m nombro_de_pasoj +Post interpolado, purigu falsajn kolorojn per ripete apliki +medianan filtrilon 3x3 al la kanaloj R-V kaj B-V. +.SH ELIGAJ OPCIOJ +Laŭ supozo, +.B dcraw +skribas PGM/PPM/PAM kun 8-bita datumo, la gama-kurbo BT.709, +blanka nivelo laŭ histogramo, kaj nenia pridatumo. +.TP +.B -W +Uzu fiksan blankan nivelon, ignorante la bildo-histogramon. +.TP +.B -b heleco +Dividu la blankan nivelon je tiu ĉi nombron, supoze 1.0. +.TP +.B -g potenco origina_deklivo +Agordu la gama-kurbon, supoze BT.709 +.RB ( -g\ 2.222\ 4.5 ). +Se vi preferas la kurbon sRGB, uzu +.BR -g\ 2.4\ 12.92 . +Origina deklivo "0" donas simplan potencan kurbon. +.TP +.B -6 +Skribu 16-bite anstataŭ 8-bite. +.TP +.B -4 +Linie 16-bite, same kiel +.BR -6\ -W\ -g\ 1\ 1 . +.TP +.B -T +Skribu TIFF-on kun pridatumo anstataŭ PGM/PPM/PAM. +.TP +.B -t [0-7,90,180,270] +Turnu la bildon. +.B dcraw +supozas apliki la turnon specifitan de la fotilo. +.B -t 0 +preventas ian ajn turnadon. +.TP +.B -j +Por fotiloj kun Fuji\ Super\ CCD, montru la bildon klinita +45 gradojn. Por fotiloj kun nekvadrataj bilderoj, ne streĉu la +bildon al ĝia ĝusta proporcio. Ĉiakaze, tiu ĉi opcio neprigas, +ke ĉiu eligata bildero respondos unu krudan bilderon. +.TP +.BR "-s [0..N-1]" " aŭ " "-s all" +Se dosiero enhavas N krudajn bildojn, elektu unu aŭ "all" (ĉiujn) +por deĉifri. Ekzemple fotiloj kun Fuji\ Super\ CCD\ SR generas duan +bildon, kvar paŝojn pli malhelan, por montri detalojn en la brilaĵoj. +.SH DOSIEROJ +.TP +\:./.badpixels, ../.badpixels, ../../.badpixels, ... +Listo de mortintaj bilderoj en via fotilo, por ke +.B dcraw +interpolu ĉirkaŭ ili. Ĉiu linio specifas la kolumnon, vicon, +kaj Uniksan tempon de morto por unu bildero. Ekzemple: +.sp 1 +.nf + 962 91 1028350000 # mortis inter 1a kaj 4a aŭgusto 2002 +1285 1067 0 # ne scias kiam mortis tiu ĉi bildero +.fi +.sp 1 +Tiuj ĉi koordinatoj antaŭas ĉian tondadon aŭ rotacion, do uzu +.B dcraw -j -t 0 +por lokalizi mortintajn bilderojn. +.SH "VIDU ANKAŬ" +.BR pgm (5), +.BR ppm (5), +.BR pam (5), +.BR pamsumm (1), +.BR pnmgamma (1), +.BR pnmtotiff (1), +.BR pnmtopng (1), +.BR gphoto2 (1), +.BR cjpeg (1), +.BR djpeg (1) +.SH AŬTORO +David Coffin, dcoffin heliko cybercom punkto net diff -Nru dcraw-8.99/dcraw_eo.po dcraw-9.17/dcraw_eo.po --- dcraw-8.99/dcraw_eo.po 1970-01-01 00:00:00.000000000 +0000 +++ dcraw-9.17/dcraw_eo.po 2013-01-03 13:09:39.000000000 +0000 @@ -0,0 +1,347 @@ +# Esperanto translation of dcraw messages. +# (c) 2009 Dave Coffin dcoffin a cybercom o net +# Distribute freely. +# +msgid "" +msgstr "" +"Project-Id-Version: dcraw 9.10\n" +"Report-Msgid-Bugs-To: dcoffin a cybercom o net\n" +"POT-Creation-Date: 2006-12-21 22:45-0500\n" +"PO-Revision-Date: 2011-07-23 17:00-0400\n" +"Last-Translator: Dave Coffin \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +msgid "%s: Out of memory in %s\n" +msgstr "%s: Mankas memoro en %s\n" + +msgid "Unexpected end of file\n" +msgstr "Neatendita fino de dosiero\n" + +msgid "Corrupt data near 0x%llx\n" +msgstr "Difekta datumo proksime al 0x%llx\n" + +msgid "%s: decoder table overflow\n" +msgstr "%s: deĉifra tabelo tro grandas\n" + +msgid "Phase One correction...\n" +msgstr "Aplikas korektojn de Phase One...\n" + +msgid "%s: incorrect JPEG dimensions\n" +msgstr "%s: malĝustaj JPEG-dimensioj\n" + +msgid "%s: \"%s\" matrix not found!\n" +msgstr "%s: \"%s\" matrico ne trovita!\n" + +msgid "Foveon interpolation...\n" +msgstr "Interpolado de Foveon...\n" + +msgid "%s: Invalid white balance \"%s\"\n" +msgstr "%s: Nevalida blank-ekvilibro \"%s\"\n" + +msgid "Fixed dead pixels at:" +msgstr "Riparis mortintajn bilderojn ĉe:" + +msgid "%s is not a valid PGM file!\n" +msgstr "%s ne estas valida PGM-dosiero!\n" + +msgid "%s has the wrong dimensions!\n" +msgstr "%s havas malĝustajn dimensiojn!\n" + +msgid "Wavelet denoising...\n" +msgstr "Ondeta senbruigo...\n" + +msgid "%s: Cannot use camera white balance.\n" +msgstr "%s: Ne povas uzi fotilan blank-ekvilibron.\n" + +msgid "Scaling with darkness %d, saturation %d, and\nmultipliers" +msgstr "Skalas per senlumo %d, saturo %d, kaj\nmultiplikantoj" + +msgid "Correcting chromatic aberration...\n" +msgstr "Korektas koloran aberacion...\n" + +msgid "Bilinear interpolation...\n" +msgstr "Interpolado bilinia...\n" + +msgid "VNG interpolation...\n" +msgstr "Interpolado VNG...\n" + +msgid "PPG interpolation...\n" +msgstr "Interpolado PPG...\n" + +msgid "AHD interpolation...\n" +msgstr "Interpolado AHD...\n" + +msgid "Median filter pass %d...\n" +msgstr "Mediana filtrilo, %da paso...\n" + +msgid "Blending highlights...\n" +msgstr "Miksas brilaĵojn...\n" + +msgid "Rebuilding highlights...\n" +msgstr "Rekonstruas brilaĵojn...\n" + +msgid "Reading metadata from %s ...\n" +msgstr "Legas pridatumon el %s ...\n" + +msgid "Failed to read metadata from %s\n" +msgstr "Ne povis legi pridatumon el %s\n" + +msgid "%s: Tail is missing, parsing from head...\n" +msgstr "%s: Mankas vosto, necesas legi de kapo...\n" + +msgid "%s: You must link dcraw with libjpeg!!\n" +msgstr "%s: Necesas bindi dcraw-on kun libjpeg!!\n" + +msgid "%s: You must link dcraw with %s!!\n" +msgstr "%s: Necesas bindi dcraw-on kun %s!!\n" + +msgid "%s has no embedded profile.\n" +msgstr "%s ne havas internan profilon.\n" + +msgid "Cannot open file %s!\n" +msgstr "Ne povas malfermi dosieron %s!\n" + +msgid "Applying color profile...\n" +msgstr "Aplikas kolor-profilon...\n" + +msgid "Building histograms...\n" +msgstr "Konstruas histogramojn...\n" + +msgid "Converting to %s colorspace...\n" +msgstr "Konvertas al kolorspaco %s...\n" + +msgid "Rotating image 45 degrees...\n" +msgstr "Turnas bildon 45 gradojn...\n" + +msgid "Stretching the image...\n" +msgstr "Streĉas la bildon...\n" + +msgid "\nRaw photo decoder \"dcraw\" v%s" +msgstr "\nKrudfota deĉifrilo \"dcraw\" v%s" + +msgid "\nby Dave Coffin, dcoffin a cybercom o net\n" +msgstr "\nde Dave Coffin, dcoffin a cybercom o net\n" + +msgid "\nUsage: %s [OPTION]... [FILE]...\n\n" +msgstr "\nUzo: %s [OPCIO]... [DOSIERO]...\n\n" + +msgid "-v Print verbose messages" +msgstr "-v Eligu detalajn mesaĝojn" + +msgid "-c Write image data to standard output" +msgstr "-c Skribu bildodatumon al ĉefeligujo" + +msgid "-e Extract embedded thumbnail image" +msgstr "-e Eltiru internan bildeton" + +msgid "-i Identify files without decoding them" +msgstr "-i Identigu dosierojn sen deĉifri ilin" + +msgid "-i -v Identify files and show metadata" +msgstr "-i -v Identigu dosierojn kaj montru pridatumon" + +msgid "-z Change file dates to camera timestamp" +msgstr "-z Ŝanĝu dosierajn datojn al fotila tempo" + +msgid "-w Use camera white balance, if possible" +msgstr "-w Uzu fotilan blank-ekvilibron, se eblas" + +msgid "-a Average the whole image for white balance" +msgstr "-a Averaĝu la tutan bildon por blank-ekvilibro" + +msgid "-A Average a grey box for white balance" +msgstr "-A Averaĝu grizan rektangulon por blank-ekvilibro" + +msgid "-r Set custom white balance" +msgstr "-r Specifu propran blank-ekvilibron" + +msgid "+M/-M Use/don't use an embedded color matrix" +msgstr "+M/-M Uzu/ne uzu kolor-matricon el pridatumo" + +msgid "-C Correct chromatic aberration" +msgstr "-C Korektu koloran aberacion" + +msgid "-P Fix the dead pixels listed in this file" +msgstr "-P Riparu mortintajn bilderojn listigitajn en tiu ĉi dosiero" + +msgid "-K Subtract dark frame (16-bit raw PGM)" +msgstr "-K Subtrahu senluman bildon (16-bita kruda PGM)" + +msgid "-k Set the darkness level" +msgstr "-k Agordu la senluman nivelon" + +msgid "-S Set the saturation level" +msgstr "-S Agordu la saturan nivelon" + +msgid "-n Set threshold for wavelet denoising" +msgstr "-n Agordu sojlon por ondeta senbruigo" + +msgid "-H [0-9] Highlight mode (0=clip, 1=unclip, 2=blend, 3+=rebuild)" +msgstr "-H [0-9] Traktu brilaĵojn (0=tondu, 1=ne tondu, 2=miksu, 3+=rekonstruu)" + +msgid "-t [0-7] Flip image (0=none, 3=180, 5=90CCW, 6=90CW)" +msgstr "-t [0-7] Turnu bildon (0=ne turnu, 3=180, 5=90mal, 6=90dek)" + +msgid "-o [0-5] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" +msgstr "-o [0-5] Eliga kolorspaco (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" + +msgid "-o Apply output ICC profile from file" +msgstr "-o Apliku eligan ICC-profilon el dosiero" + +msgid "-p Apply camera ICC profile from file or \"embed\"" +msgstr "-p Apliku fotilan ICC-profilon el dosiero aŭ \"embed\"" + +msgid "-d Document mode (no color, no interpolation)" +msgstr "-d Dokumenta reĝimo (sen koloro aŭ interpolado)" + +msgid "-D Document mode without scaling (totally raw)" +msgstr "-D Dokumenta reĝimo sen skalado (tute krude)" + +msgid "-j Don't stretch or rotate raw pixels" +msgstr "-j Nek streĉu nek rotaciigu krudajn bilderojn" + +msgid "-W Don't automatically brighten the image" +msgstr "-W Ne aŭtomate heligu la bildon" + +msgid "-b Adjust brightness (default = 1.0)" +msgstr "-b Agordu helecon (supoze 1.0)" + +msgid "-g

Set custom gamma curve (default = 2.222 4.5)" +msgstr "-g

Agordu gama-kurbon (supoze 2.222 4.5)" + +msgid "-q [0-3] Set the interpolation quality" +msgstr "-q [0-3] Elektu kvaliton de interpolado" + +msgid "-h Half-size color image (twice as fast as \"-q 0\")" +msgstr "-h Duongranda kolora bildo (duoble pli rapide ol \"-q 0\")" + +msgid "-f Interpolate RGGB as four colors" +msgstr "-f Interpolu RGGB-on kiel kvar kolorojn" + +msgid "-m Apply a 3x3 median filter to R-G and B-G" +msgstr "-m Apliku medianan filtrilon 3x3 al R-V kaj B-V" + +msgid "-s [0..N-1] Select one raw image or \"all\" from each file" +msgstr "-s [0..N-1] Elektu unu krudan bildon aŭ \"all\" (ĉiujn) el ĉiu dosiero" + +msgid "-6 Write 16-bit instead of 8-bit" +msgstr "-6 Skribu 16-bite anstataŭ 8-bite" + +msgid "-4 Linear 16-bit, same as \"-6 -W -g 1 1\"" +msgstr "-4 Linie 16-bite, same kiel \"-6 -W -g 1 1\"" + +msgid "-4 Write 16-bit linear instead of 8-bit with gamma" +msgstr "-4 Skribu 16-bite linie anstataŭ 8-bite kun gamo" + +msgid "-T Write TIFF instead of PPM" +msgstr "-T Skribu TIFF-on anstataŭ PPM" + +msgid "Non-numeric argument to \"-%c\"\n" +msgstr "Ne-numerala argumento por \"-%c\"\n" + +msgid "Unknown option \"-%c\".\n" +msgstr "Nekonata opcio \"-%c\".\n" + +msgid "No files to process.\n" +msgstr "Neniuj dosieroj por trakti.\n" + +msgid "Will not write an image to the terminal!\n" +msgstr "Ne skribos bildon al la konzolo!\n" + +msgid "%s has no timestamp.\n" +msgstr "%s ne havas tempostampon.\n" + +msgid "%s time set to %d.\n" +msgstr "%s tempo ŝanĝita al %d.\n" + +msgid "%s has no thumbnail.\n" +msgstr "%s ne havas bildeton.\n" + +msgid "\nFilename: %s\n" +msgstr "\nDosieronomo: %s\n" + +msgid "Timestamp: %s" +msgstr "Tempostampo: %s" + +msgid "Camera: %s %s\n" +msgstr "Fotilo: %s %s\n" + +msgid "Owner: %s\n" +msgstr "Posedanto: %s\n" + +msgid "DNG Version: " +msgstr "DNG-versio: " + +msgid "ISO speed: %d\n" +msgstr "ISO-rapideco: %d\n" + +msgid "Shutter: " +msgstr "Obturado: " + +msgid "%0.1f sec\n" +msgstr "%0.1f sek\n" + +msgid "Aperture: f/%0.1f\n" +msgstr "Aperturo: f/%0.1f\n" + +msgid "Focal length: %0.1f mm\n" +msgstr "Fokusa longeco: %0.1f mm\n" + +msgid "yes" +msgstr "jes" + +msgid "no" +msgstr "ne" + +msgid "Embedded ICC profile: %s\n" +msgstr "Interna ICC-profilo: %s\n" + +msgid "Number of raw images: %d\n" +msgstr "Nombro de krudaj bildoj: %d\n" + +msgid "Pixel Aspect Ratio: %0.6f\n" +msgstr "Bildera proporcio: %0.6f\n" + +msgid "Thumb size: %4d x %d\n" +msgstr "Bildeta grandeco: %4d x %d\n" + +msgid "Full size: %4d x %d\n" +msgstr "Plena grandeco: %4d x %d\n" + +msgid "Cannot decode file %s\n" +msgstr "Ne povas deĉifri dosieron %s\n" + +msgid "Image size: %4d x %d\n" +msgstr "Bilda grandeco: %4d x %d\n" + +msgid "Output size: %4d x %d\n" +msgstr "Eliga grandeco: %4d x %d\n" + +msgid "Raw colors: %d" +msgstr "Krudaj koloroj: %d" + +msgid "\nFilter pattern: " +msgstr "\nFiltrila tekso: " + +msgid "\nDaylight multipliers:" +msgstr "\nTaglumaj multiplikantoj:" + +msgid "\nCamera multipliers:" +msgstr "\nFotilaj multiplikantoj:" + +msgid "%s is a %s %s image.\n" +msgstr "%s estas bildo de %s %s.\n" + +msgid "Loading %s %s image from %s ...\n" +msgstr "Enŝargas bildon de %s %s el %s ...\n" + +msgid "%s: \"-s %d\" requests a nonexistent image!\n" +msgstr "%s: \"-s %d\" petas neekzistantan bildon!\n" + +msgid "standard output" +msgstr "ĉefeligujo" + +msgid "Writing data to %s ...\n" +msgstr "Skribas datumon al %s ...\n" diff -Nru dcraw-8.99/dcraw_es.1 dcraw-9.17/dcraw_es.1 --- dcraw-8.99/dcraw_es.1 1970-01-01 00:00:00.000000000 +0000 +++ dcraw-9.17/dcraw_es.1 2013-01-03 13:09:39.000000000 +0000 @@ -0,0 +1,284 @@ +.\" +.\" Spanish manpage for dcraw +.\" +.\" Copyright (c) 2009 by David Coffin +.\" +.\" Se puede distribuir sin restricciones. +.\" +.\" David Coffin +.\" dcoffin a cybercom o net +.\" http://www.cybercom.net/~dcoffin +.\" +.TH dcraw 1 "14 mayo 2009" +.LO 1 +.SH NOMBRE +dcraw - descodificador de línea de comandos para fotos digitales crudas (raw) +.SH RESUMEN +.B dcraw +[\fIOPCIÓN\fR]... [\fIARCHIVO\fR]... +.SH DESCRIPCIÓN +.B dcraw +descodifica fotos crudas, muestra metadatos y extrae imágenes miniatura. +.SH OPCIONES GENERALES +.TP +.B -v +Mostrar mensajes detalados, no sólo avisos y errores. +.TP +.B -c +Mostrar imágenes descodificadas o imágenes miniatura por salida estándar. +.TP +.B -e +Extraer la imagen miniatura generada por la cámara, no la imagen cruda. +Conseguirás o bien un archivo JPEG o un archivo PPM, dependiendo de la cámara. +.TP +.B -z +Cambiar las fechas de modificación y acceso de un archivo AVI, JPEG, TIFF +o crudo a cuando se tomó la foto, asumiendo que el reloj de la cámara +estaba establecido en horario Universal (UTC). +.TP +.B -i +Identificar archivos sin descodificarlos. +La salida de estado es 0 si +.B dcraw +puede descodificar el último archivo, 1 si él no puede. +.B -i -v +muestra metadatos. +.TP +.B "" +.RB ¡¡ dcraw +no puede descodificar archivos JPEG!! +.SH OPCIONES DE RECUPERACIÓN +.TP +.B -P píxeles_muertos.txt +Leer la lista de píxeles muertos de este archivo en lugar de ".badpixels". +Ver +.B ARCHIVOS +para una descripción del formato. +.TP +.B -K oscuro.pgm +Substraer un cuadro oscuro de los datos crudos. Para generar un +cuadro oscuro, toma una foto cruda sin luz y haz +.BR dcraw\ -D\ -4\ -j\ -t\ 0 . +.TP +.B -k oscuro +Cuando las sombras aparezcan con neblina, se debe incrementar el nivel de oscuro. +Para medir esto, aplicar +.B pamsumm -mean +al cuadro oscuro generado arriba. +.TP +.B -S saturación +Si las altas luces aparecen rosa, se debe reducir el nivel de saturación. +Para medir esto, realizar una captura de algo brillante y hacer +.B dcraw -D -4 -j -c +foto.raw +.B | pamsumm -max +.TP +.B "" +Los valores de oscuro y saturación por defecto suelen ser adecuados. +.TP +.B -n umbral_reducción_ruido +Emplea un algoritmo basado en ondículas para eliminar el ruido +manteniendo el detalle. El umbral óptimo suele estar entre 100 y 1000. +.TP +.B -C mag_roja mag_azul +Ampliar las capas roja y azul segun los factores indicados, tipicamente +de 0.999 a 1.001, para corregir la aberracion cromatica. +.TP +.B -H 0 +Excluir todas las sobreexposiciones de blanco sólido (por defecto). +.TP +.B -H 1 +Dejar las sobreexposiciones sin excluir en varias sombras de rosa. +.TP +.B -H 2 +Combinar valores recortados y no recortados en un degradado gradual +a blanco. +.TP +.B -H 3+ +Reconstruir sobreexposiciones. Los valores bajos favorecen +los blancos; los valores altos favorecen los colores. Prueba +.B -H 5 +como compromiso. Si no es suficientemente bueno, haz +.BR -H\ 9 , +corta las sobreexposiciones que no son blancas y pégalas sobre +la imagen generada con +.BR -H\ 3 . +.SH OPCIONES DE COLOR +Por defecto, +.B dcraw +usa balance de blancos prefijado basado en una carta de color bajo +iluminación estándar D65. +.TP +.B -w +Utilizar el balance de blancos especificado por la cámara. +Si no se encuentra, mostrar un mensaje de aviso y utilizar otro método. +.TP +.B -a +Calcular el balance de blancos promediando la imagen completa. +.TP +.B -A izquierda arriba ancho alto +Calcular el balance de blancos promediando un área rectangular. +Primero hacer +.B dcraw\ -j\ -t\ 0 +y seleccionar un área de color gris neutro. +.TP +.B -r mul0 mul1 mul2 mul3 +Especificar tu propio balance de blancos. +Estos multiplicadores se pueden cortar y pegar desde la salida de +.BR dcraw\ -v . +.TP +.BR +M " o " -M +Utilizar (o no utilizar) matriz de color incrustada en los metadatos +de la cámara. +Por defecto es +.B +M +si +.B -w +es seleccionado, es +.B -M +en otro caso. +Esta opción solo afecta a las cámaras Olympus, Leaf y Phase One. +.TP +.B -o [0-5] +Seleccionar el espacio de color de salida cuando la opción +.B -p +no se utiliza: + +.B \t0 +\ \ Color crudo (único para cada cámara) +.br +.B \t1 +\ \ sRGB D65 (por defecto) +.br +.B \t2 +\ \ Adobe RGB (1998) D65 +.br +.B \t3 +\ \ Wide Gamut RGB D65 +.br +.B \t4 +\ \ Kodak ProPhoto RGB D65 +.br +.B \t5 +\ \ XYZ +.TP +.BR -p\ cámara.icm \ [\ -o\ salida.icm \ ] +Usar perfiles ICC para definir el espacio de color crudo de +la cámara y el espacio de color deseado (sRGB por defecto). +.TP +.B -p embed +Usar el perfil ICC asociado en la foto cruda. +.SH OPCIONES DE INTERPOLACIÓN +.TP +.B -d +Mostrar los datos crudos como una imagen en escala de grises sin +interpolación. Bueno para fotografiar documentos en blanco y negro. +.TP +.B -D +Igual que +.BR -d , +pero totalmente crudo (sin escalado de color). +.TP +.B -h +Mostrar una imagen en color de la mitad del tamaño. Doble de rápido que +.BR -q\ 0 . +.TP +.B -q 0 +Usar interpolación bilineal de alta velocidad y baja calidad. +.TP +.B -q 1 +Usar interpolación de Número Variable de Gradientes (VNG). +.TP +.B -q 2 +Usar interpolación por Agrupación de Píxeles en Patrones (PPG). +.TP +.B -q 3 +Usar interpolación Adaptativa Dirigida a la Homogeneidad (AHD). +.TP +.B -f +Interpolar RGB como cuatro colores. Usar esto si la salida muestra +retinas 2x2 falsas con VNG o laberintos con AHD. +.TP +.B -m numero_de_pasos +Tras la interpolación, elimina los artefactos de color aplicando +repetidamente un filtro de mediana de 3x3 a los canales R-G y B-G. +.SH OPCIONES DE SALIDA +Por defecto, +.B dcraw +genera archivos PGM/PPM/PAM de 8 bits, curva gamma BT.709, nivel de +blanco basado en histograma, y ningún metadato. +.TP +.B -W +Usa nivel de blanco prefijado, ignorando el histograma de la imagen. +.TP +.B -b luminosidad +Divide el nivel de blanco por este número, por defecto 1.0. +.TP +.B -g exponente pendiente_maxima +Establecer curva gamma, por defecto BT.709 +.RB ( -g\ 2.222\ 4.5 ). +Para una gamma sRGB, utilizar +.BR -g\ 2.4\ 12.92 . +Para una curva de potencianción pura, poner a cero la pendiente maxima. +.TP +.B -6 +Escribir dieciseis bits por muestra en lugar de ocho. +.TP +.B -4 +16 bits lineales, equivalente a +.BR -6\ -W\ -g\ 1\ 1 . +.TP +.B -T +Guardar en formato TIFF con metadatos en vez de PGM/PPM/PAM. +.TP +.B -t [0-7,90,180,270] +Girar la imagen de salida. Por defecto, +.B dcraw +aplica el giro especificado por la cámara. +.B -t 0 +deshabilita todos los giros. +.TP +.B -j +Para cámaras Fuji\ Super\ CCD, mostrar la imagen girada 45 grados. +Para cámaras sin píxeles cuadrados, no estrechar la imagen a su +proporción de aspecto correcto. En cualquier caso, esta opción +garantiza que cada píxel de salida corresponte con un píxel crudo. +.TP +.BR "-s [0..N-1]" " o " "-s all" +Si un archivo contiene N imágenes crudas, elegir decodificar una +concreta o "all" (todas). +Por ejemplo, las cámaras Fuji\ Super\ CCD\ SR generan +una segunda imagen infraexpuesta cuatro paradas para mostrar en +detalle las sobreexposiciones. +.SH ARCHIVOS +.TP +\:./.badpixels, ../.badpixels, ../../.badpixels, ... +Listar los píxeles muertos de tu cámara, para que +.B dcraw +pueda interpolar alrededor de ellos. Cada línea especifica la columna, +fila y tiempo UNIX de la muerte de cada píxel. Por ejemplo: +.sp 1 +.nf + 962 91 1028350000 # murió entre el 1 y el 4 de Agosto del 2002 +1285 1067 0 # no se sabe cuándo murió este píxel +.fi +.sp 1 +Estas coordenadas son de antes del recorte o rotación, así que utiliza +.B dcraw -j -t 0 +para encontrar píxeles muertos. +.SH "VÉASE TAMBIÉN" +.BR pgm (5), +.BR ppm (5), +.BR pam (5), +.BR pamsumm (1), +.BR pnmgamma (1), +.BR pnmtotiff (1), +.BR pnmtopng (1), +.BR gphoto2 (1), +.BR cjpeg (1), +.BR djpeg (1) +.SH AUTOR +Written by David Coffin, dcoffin a cybercom o net +.SH TRADUCCIÓN +Traducido por Ioannis Aslanidis, deathwing00 a gentoo o org +y Guillermo Luijk Delgado, guillermo.luijk a orange-ftgroup o com diff -Nru dcraw-8.99/dcraw_es.po dcraw-9.17/dcraw_es.po --- dcraw-8.99/dcraw_es.po 1970-01-01 00:00:00.000000000 +0000 +++ dcraw-9.17/dcraw_es.po 2013-01-03 13:09:39.000000000 +0000 @@ -0,0 +1,389 @@ +# Translation of dcraw_es_ES.po to Spanish (Castillian, Spain) +# Traducción de dcraw_es_ES.po a Español (Castellano, España) +# by Ioannis Aslanidis (deathwing00 a gentoo o org), 2007. +# (c) 2009 Dave Coffin dcoffin a cybercom o net, +# Distribute freely. +# Se permite la libre distribución. +# +msgid "" +msgstr "" +"Project-Id-Version: dcraw 8.94\n" +"Report-Msgid-Bugs-To: dcoffin a cybercom o net\n" +"POT-Creation-Date: 2006-12-21 22:45-0500\n" +"PO-Revision-Date: 2011-07-23 17:00-0400\n" +"Last-Translator: Guillermo Luijk " +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +msgid "%s: Out of memory in %s\n" +msgstr "%s: Memoria insuficiente en %s\n" + +msgid "Unexpected end of file\n" +msgstr "Fin de fichero inesperado\n" + +msgid "Corrupt data near 0x%lx\n" +msgstr "Datos corruptos junto a 0x%lx\n" + +msgid "Corrupt data near 0x%llx\n" +msgstr "Datos corruptos junto a 0x%llx\n" + +msgid "%s: decoder table overflow\n" +msgstr "%s: tabla de descodificador desbordada\n" + +msgid "Phase One correction...\n" +msgstr "Corrección Phase One...\n" + +msgid "%s: incorrect JPEG dimensions\n" +msgstr "%s: dimensiones JPEG incorrectas\n" + +msgid "%s: \"%s\" matrix not found!\n" +msgstr "%s: ¡\"%s\" matriz no encontrada!\n" + +msgid "Foveon interpolation...\n" +msgstr "Interpolación Foveon...\n" + +msgid "%s: Invalid white balance \"%s\"\n" +msgstr "%s: Balance de blanco inválido \"%s\"\n" + +msgid "Fixed bad pixels at:" +msgstr "Píxeles muertos corrigidos en:" + +msgid "Fixed dead pixels at:" +msgstr "Píxeles muertos reparados en:" + +msgid "%s is not a valid PGM file!\n" +msgstr "¡%s no es un archivo PGM válido!\n" + +msgid "%s has the wrong dimensions!\n" +msgstr "¡%s tiene dimensiones incorrectas!\n" + +msgid "Wavelet denoising...\n" +msgstr "Aplicando tratamiento ondicular de reducción de ruido...\n" + +msgid "%s: Cannot use camera white balance.\n" +msgstr "%s: No se puede usar el balance de blanco de la cámara.\n" + +msgid "Scaling with black %d, multipliers" +msgstr "Dimensionando con negro %d, multiplicadores" + +msgid "Scaling with darkness %d, saturation %d, and\nmultipliers" +msgstr "Escalando con oscuro %d, saturación %d, y\nmultiplicadores" + +msgid "Correcting chromatic aberration...\n" +msgstr "Corrigiendo aberracion cromatica...\n" + +msgid "Bilinear interpolation...\n" +msgstr "Interpolación bilinear...\n" + +msgid "VNG interpolation...\n" +msgstr "Interpolación VNG...\n" + +msgid "PPG interpolation...\n" +msgstr "Interpolación PPG...\n" + +msgid "AHD interpolation...\n" +msgstr "Interpolación AHD...\n" + +msgid "Median filter pass %d...\n" +msgstr "Filtro de mediana paso %d...\n" + +msgid "Bilateral filtering...\n" +msgstr "Filtrado bilateral...\n" + +msgid "Blending highlights...\n" +msgstr "Combinando altas luces...\n" + +msgid "Rebuilding highlights...\n" +msgstr "Reconstruyendo altas luces...\n" + +msgid "Highlight recovery...\n" +msgstr "Recuperación de sobreexposición...\n" + +msgid "Reading metadata from %s ...\n" +msgstr "Leyendo metadatos desde %s ...\n" + +msgid "Failed to read metadata from %s\n" +msgstr "La lectura de metadatos de %s ha fallado\n" + +msgid "%s: You must link dcraw with libjpeg!!\n" +msgstr "%s: ¡¡Debe linkar dcraw con libjpeg!!\n" + +msgid "%s: You must link dcraw with %s!!\n" +msgstr "%s: ¡¡Debe linkar dcraw con %s!!\n" + +msgid "%s has no embedded profile.\n" +msgstr "%s no tiene ningún perfil asociado.\n" + +msgid "Cannot open file %s!\n" +msgstr "¡No se puede abrir el archivo %s!\n" + +msgid "Applying color profile...\n" +msgstr "Aplicando perfil de color...\n" + +msgid "Building histograms...\n" +msgstr "Construyendo histogramas...\n" + +msgid "Converting to %s colorspace...\n" +msgstr "Convirtiendo a espacio de color %s...\n" + +msgid "Rotating image 45 degrees...\n" +msgstr "Rotando la imagen 45 grados...\n" + +msgid "Stretching the image...\n" +msgstr "Estrechando la imagen...\n" + +msgid "\nRaw photo decoder \"dcraw\" v%s" +msgstr "\nDescodificador de foto cruda (raw) \"dcraw\" v%s" + +msgid "\nby Dave Coffin, dcoffin a cybercom o net\n" +msgstr "\npor Dave Coffin, dcoffin a cybercom o net\n" + +msgid "\nUsage: %s [OPTION]... [FILE]...\n\n" +msgstr "\nUso: %s [OPCIÓN]... [ARCHIVO]...\n\n" + +msgid "-v Print verbose messages" +msgstr "-v Mostrar mensages detallados" + +msgid "-c Write image data to standard output" +msgstr "-c Mostrar los datos de imagen por la salida estándar" + +msgid "-e Extract embedded thumbnail image" +msgstr "-e Extraer imagen miniatura asociada" + +msgid "-i Identify files without decoding them" +msgstr "-i Identificar los archivos sin descodificarlos" + +msgid "-i -v Identify files and show metadata" +msgstr "-i -v Identificar los archivos y mostrar los metadatos" + +msgid "-z Change file dates to camera timestamp" +msgstr "-z Reemplazar la fecha de los archivos por la marca de fecha de la cámara" + +msgid "-a Use automatic white balance" +msgstr "-a Usar balance de blanco automático" + +msgid "-w Use camera white balance, if possible" +msgstr "-w Usar balance de blanco de la cámara, a ser posible" + +msgid "-a Average the whole image for white balance" +msgstr "-a Promediar la imagen completa para el balance de blancos" + +msgid "-A Average a grey box for white balance" +msgstr "-A Promediar un rectángulo gris para el balance de blancos" + +msgid "-r Set custom white balance" +msgstr "-r Definir balance de blanco personalizado" + +msgid "-r <4 numbers> Set custom white balance" +msgstr "-r <4 números> Definir balance de blanco personalizado" + +msgid "+M/-M Use/don't use an embedded color matrix" +msgstr "+M/-M Utilizar/no utilizar matriz de color incrustada" + +msgid "-C Correct chromatic aberration" +msgstr "-C Corregir la aberracion cromatica" + +msgid "-P Fix the dead pixels listed in this file" +msgstr "-P Reparar los píxeles muertos listados en el archivo" + +msgid "-K Subtract dark frame (16-bit raw PGM)" +msgstr "-K Sustraer cuadro (frame) oscuro (16 bits raw PGM)" + +msgid "-k Set black point" +msgstr "-k Definir el punto negro" + +msgid "-k Set the black level" +msgstr "-k Establecer el nivel de negro" + +msgid "-k Set the darkness level" +msgstr "-k Establecer el nivel de oscuro" + +msgid "-S Set the saturation level" +msgstr "-S Establecer el nivel de saturación" + +msgid "-n Set threshold for wavelet denoising" +msgstr "-n Establecer umbral para reducción de ruido" + +msgid "-H [0-9] Highlight mode (0=clip, 1=no clip, 2+=recover)" +msgstr "-H [0-9] Modo de sobreexposición (0=excluir, 1=no excluir, 2+=recuperar)" + +msgid "-H [0-9] Highlight mode (0=clip, 1=unclip, 2=blend, 3+=rebuild)" +msgstr "-H [0-9] Modo de altas luces (0=recortar, 1=no recortar, 2=combinar, 3+=reconstruir)" + +msgid "-t [0-7] Flip image (0=none, 3=180, 5=90CCW, 6=90CW)" +msgstr "-t [0-7] Rotar la imagen (0=nada, 3=180, 5=90AH, 6=90H)" + +msgid "-o [0-5] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" +msgstr "-o [0-5] Espacio de color de salida (cru,sRGB,Adobe,Wide,ProPhoto,XYZ)" + +msgid "-o Apply output ICC profile from file" +msgstr "-o Aplicar el perfil ICC de salida desde archivo" + +msgid "-p Apply camera ICC profile from file or \"embed\"" +msgstr "-p Aplicar el perfil ICC de la cámara desde archivo o \"embed\"" + +msgid "-d Document mode (no color, no interpolation)" +msgstr "-d Modo documento (sin colores, sin interpolación)" + +msgid "-D Document mode without scaling (totally raw)" +msgstr "-D Modo documento sin redimensionado (totalmente crudo)" + +msgid "-j Don't stretch or rotate raw pixels" +msgstr "-j No estrechar ni rotar píxeles crudos" + +msgid "-W Don't automatically brighten the image" +msgstr "-W No ajustar automáticamente el brillo de la imagen" + +msgid "-b Adjust brightness (default = 1.0)" +msgstr "-b Ajustar el brillo (por defecto = 1.0)" + +msgid "-g

Set custom gamma curve (default = 2.222 4.5)" +msgstr "-g Establecer curva gamma personalizada (por defecto = 2.222 4.5)" + +msgid "-q [0-3] Set the interpolation quality" +msgstr "-q [0-3] Definir la calidad de interpolación" + +msgid "-h Half-size color image (twice as fast as \"-q 0\")" +msgstr "-h Imagen en color de medio tamaño (2 veces más rápido que \"-q 0\")" + +msgid "-f Interpolate RGGB as four colors" +msgstr "-f Interpolar RGGB como cuatro colores" + +msgid "-m Apply a 3x3 median filter to R-G and B-G" +msgstr "-m Aplica un filtro de mediana de 3x3 sobre R-G y B-G" + +msgid "-B Apply bilateral filter to smooth noise" +msgstr "-B Aplicar filtro bilateral para suavizar el ruido" + +msgid "-s [0-99] Select a different raw image from the same file" +msgstr "-s [0-99] Selecionar una imagen cruda diferente desde el mismo archivo" + +msgid "-s [0..N-1] Select one raw image or \"all\" from each file" +msgstr "-s [0..N-1] Selecciona una imagen raw concreta o \"all\" (todas) de cada archivo" + +msgid "-6 Write 16-bit instead of 8-bit" +msgstr "-6 Escribir en 16 bits en lugar de en 8 bits" + +msgid "-4 Linear 16-bit, same as \"-6 -W -g 1 1\"" +msgstr "-4 16 bits lineales, equivalente a \"-6 -W -g 1 1\"" + +msgid "-4 Write 16-bit linear instead of 8-bit with gamma" +msgstr "-4 Guardar en 16 bits linial en vez de 8 bits con gamma" + +msgid "-T Write TIFF instead of PPM" +msgstr "-T Guardar TIFF en vez de PPM" + +msgid "Non-numeric argument to \"-%c\"\n" +msgstr "Argumento no numérico para \"-%c\"\n" + +msgid "Unknown option \"-%c\".\n" +msgstr "Opción desconocida \"-%c\".\n" + +msgid "No files to process.\n" +msgstr "Sin archivos que procesar.\n" + +msgid "Will not write an image to the terminal!\n" +msgstr "¡No se guardará una imagen en el terminal!\n" + +msgid "%s has no timestamp.\n" +msgstr "%s no tiene marca de fecha.\n" + +msgid "%s time set to %d.\n" +msgstr "%s hora establecida como %d.\n" + +msgid "%s has no thumbnail.\n" +msgstr "%s no tiene miniatura asociada.\n" + +msgid "\nFilename: %s\n" +msgstr "\nNombre de archivo: %s\n" + +msgid "Timestamp: %s" +msgstr "Marca de fecha: %s" + +msgid "Camera: %s %s\n" +msgstr "Cámara: %s %s\n" + +msgid "Owner: %s\n" +msgstr "Propietario: %s\n" + +msgid "DNG Version: " +msgstr "Versión DNG: " + +msgid "ISO speed: %d\n" +msgstr "Velocidad ISO: %d\n" + +msgid "Shutter: " +msgstr "Disparador: " + +msgid "%0.1f sec\n" +msgstr "%0.1f seg\n" + +msgid "Aperture: f/%0.1f\n" +msgstr "Obertura: f/%0.1f\n" + +msgid "Focal length: %0.1f mm\n" +msgstr "Distancia focal: %0.1f mm\n" + +msgid "Secondary pixels: %s\n" +msgstr "Píxeles secundarios: %s\n" + +msgid "yes" +msgstr "sí" + +msgid "no" +msgstr "no" + +msgid "Embedded ICC profile: %s\n" +msgstr "Perfil ICC asociado: %s\n" + +msgid "Decodable with dcraw: %s\n" +msgstr "Descodificable con dcraw: %s\n" + +msgid "Number of raw images: %d\n" +msgstr "Número de imágenes crudas: %d\n" + +msgid "Pixel Aspect Ratio: %0.6f\n" +msgstr "Proporción en píxeles: %0.6f\n" + +msgid "Thumb size: %4d x %d\n" +msgstr "Tamaño de la miniatura: %4d x %d\n" + +msgid "Full size: %4d x %d\n" +msgstr "Tamaño real: %4d x %d\n" + +msgid "Cannot decode file %s\n" +msgstr "No se puede descodificar el archivo %s\n" + +msgid "Image size: %4d x %d\n" +msgstr "Tamaño de la imagen: %4d x %d\n" + +msgid "Output size: %4d x %d\n" +msgstr "Tamaño de salida: %4d x %d\n" + +msgid "Raw colors: %d" +msgstr "Colores crudos: %d" + +msgid "\nFilter pattern: " +msgstr "\nPatrón de filtrado: " + +msgid "\nDaylight multipliers:" +msgstr "\nMultiplicadores de luz de día:" + +msgid "\nCamera multipliers:" +msgstr "\nMultiplicadores da cámara:" + +msgid "%s is a %s %s image.\n" +msgstr "%s es una imagen %s %s.\n" + +msgid "Loading %s %s image from %s ...\n" +msgstr "Cargando imagen %s %s desde %s ...\n" + +msgid "%s: \"-s %d\" requests a nonexistent image!\n" +msgstr "%s: \"-s %d\" solicita una imagen inexistente!\n" + +msgid "standard output" +msgstr "salida estándar" + +msgid "Writing data to %s ...\n" +msgstr "Guardando datos en %s ...\n" diff -Nru dcraw-8.99/dcraw_fr.1 dcraw-9.17/dcraw_fr.1 --- dcraw-8.99/dcraw_fr.1 1970-01-01 00:00:00.000000000 +0000 +++ dcraw-9.17/dcraw_fr.1 2013-01-03 13:09:39.000000000 +0000 @@ -0,0 +1,297 @@ +.\" +.\" Page Man de dcraw +.\" +.\" Copyright (c) 2009 by David Coffin +.\" +.\" Vous pouvez distribuer sans aucune restriction. +.\" +.\" David Coffin +.\" dcoffin a cybercom o net +.\" http://www.cybercom.net/~dcoffin +.\" +.TH dcraw 1 "14 mai 2009" +.LO 1 +.SH NOM +dcraw - décodeur en ligne de commande de photos numériques raw +.SH SYNOPSIS +.B dcraw +[\fIOPTION\fR]... [\fIFICHIER\fR]... +.SH DESCRIPTION +.B dcraw +décode des photos numériques raw, affiche les métadonnées et +extrait les vignettes +.SH OPTIONS GENERALES +.TP +.B -v +affiche les messages complets, pas uniquement les erreurs et les +avertissements. +.TP +.B -c +Ecrit les images décodées et les vignettes sur la sortie standard. +.TP +.B -e +Extrait la vignette générée par l'appareil photo (et pas l'image +raw) Vous obtiendrez soit un fichier JPEG soit un fichier PPM en +fonction de l'appareil photo. +.TP +.B -z +Change les dates d'accès et de modification d'un fichier AVI, +JPEG, TIFF ou raw à la date de prise de la photo en supposant que +l'horloge de l'appareil photo soit fixée sur le Temps Universel. +.TP +.B -i +Identifie les fichiers sans les décoder. +Le code de sortie est 0 si +.B dcraw +peut décoder le dernier fichier, 1 sinon. +.B -i -v +montre les métadonnées. +.TP +.B "" +.B dcraw +ne peut pas décoder les fichiers JPEG !! +.SH OPTION DE REPARATION +.TP +.B -P pixelsmorts.txt +Lit la liste des pixels morts depuis ce fichier au lieu de ".badpixels". +Voir +.B FICHIERS +pour une description du format. +.TP +.B -K noir.pgm +Soustrait un noir de la donnée raw. Pour créer un noir, prendre +une photo dans le noir et exécuter +.BR dcraw\ -D\ -4\ -j\ -t\ 0 . +.TP +.B -k niveau_noir +Quand les zones sombres apparaissent brumeuses vous devez augmenter le +niveau de noir. +Pour le mesurer appliquer +.B pamsumm -mean +au noir généré ci-dessus. +.TP +.B -S saturation +Quand les zones claires apparaissent rosées vous devez baisser le niveau +de saturation. +Pour le mesurer prenez une image de quelque chose de brillant et faite +.B dcraw -D -4 -j -c +photo.raw +.B | pamsumm -max +.TP +.B "" +Par défaut le niveau de noir et la saturation sont normalement corrects. +.TP +.B -n seuil_du_bruit +Utilise des ondelettes pour supprimer le bruit tout en préservant +les vrais détails. Le meilleur seuil devrait se trouver quelque +part entre 100 et 1000. +.TP +.B -C mag_rouge mag_bleu +Agrandit les couches bleue et rouge des facteurs passés en paramètre, +typiquement de 0.999 à 1.001 pour corriger l'aberration chromatique. +.TP +.B -H 0 +Limite les zones claires à du blanc pur (par défaut). +.TP +.B -H 1 +Laisse les zones claires sans limite (différentes teintes rosées +peuvent apparaitre). +.TP +.B -H 2 +Combine les valeurs de pixels limitées et illimitées de façon à +obtenir un transition graduelle vers les blancs. +.TP +.B -H 3+ +Reconstruit les zones claires. Les petites valeurs favorisent +les blancs, les valeurs importantes favorisent les couleurs. +Essayez +.B -H 5 +comme un compromis. Si cela n'est pas assez bon utilisez +.BR -H\ 9 , +supprimez les zones claires non blanches et copiez les dans une +image générée avec +.BR -H\ 3 . +.SH OPTIONS DES COULEURS +Par défaut, +.B dcraw +Utilise une balance des blancs fixe basée sur une carte couleur +éclairée par une lampe D65 standard. +.TP +.B -w +Utilise la balance des blancs de la caméra. +Si elle n'est pas trouvée, un avertissement est affiché et une autre +méthode est utilisée. +.TP +.B -a +Calcule la balance des blancs en moyennant toute l'image. +.TP +.B -A gauche haut largeur hauteur +Calcule la balance des blancs en moyennant une zone rectangulaire. +Utilisez +.B dcraw\ -j\ -t\ 0 +et sélectionnez une zone de couleur gris neutre. +.TP +.B -r mul0 mul1 mul2 mul3 +Précisez votre propre balance des blancs. +Ces coefficients multiplicateurs peuvent être copiés et collés depuis +la sortie de +.BR dcraw\ -v . +.TP +.BR +M " ou " -M +Utilise (ou n'utilise pas) une matrice de couleurs contenue dans les +métadonnées de l'appareil photo. +La valeur par défaut est +.B +M +si +.B -w +est positionné, +.B -M +sinon. +Cette option ne concerne que les appareils photo Olympus, Leaf, et Phase One. +.TP +.B -o [0-5] +Sélectionne l'espace de couleur de sortie quand l'option +.B -p +n'est pas utilisée : + +.B \t0 +\ \ couleur raw (différente pour chaque appareil photo) +.br +.B \t1 +\ \ sRGB D65 (par défaut) +.br +.B \t2 +\ \ Adobe RGB (1998) D65 +.br +.B \t3 +\ \ Wide Gamut RGB D65 +.br +.B \t4 +\ \ Kodak ProPhoto RGB D65 +.br +.B \t5 +\ \ XYZ +.TP +.BR -p\ appareilphoto.icm \ [\ -o\ sortie.icm \ ] +Utilise le profil ICC pour définir l'espace de couleur de +l'appareil photo et l'espace de couleur souhaité en sortie +(sRGB par défaut). +.TP +.B -p embed +Utilise le profil ICC contenu dans la photo raw. +.SH OPTIONS D'INTERPOLATION +.TP +.B -d +Montre les données raw comme une image monochrome sans interpolation. +Bon pour photographier des documents en noir et blanc. +.TP +.B -D +Pareil que +.BR -d , +mais complètement raw (aucune mise à l'échelle des couleurs). +.TP +.B -h +Génère une image couleur réduite de moitié. Deux fois plus rapide que +.BR -q\ 0 . +.TP +.B -q 0 +Utilise une interpolation bilinéaire très rapide et de basse qualité. +.TP +.B -q 1 +Utilise une interpolation Nombre Variable de Gradient (VNG). +.TP +.B -q 2 +Utilise une interpolation Regroupement par Motif de Pixel (PPG). +.TP +.B -q 3 +Utilise une interpolation Homogénéité Dirigée et Adaptative (AHD). +.TP +.B -f +Interpole RVB comme quatre couleurs. A utiliser si la sortie +montre des faux motifs 2x2 avec VNG ou des labyrinthes avec AHD. +.TP +.B -m nombre_de_passes +Après l'interpolation, nettoie les artefacts de couleurs en appliquant +un filtre médian 3x3 de façon répétée aux canaux R-V et B-V. +.SH OPTION DE SORTIE +Par défaut, +.B dcraw +écrit des fichiers PGM/PPM/PAM 8 bits, une courbe gamma BT.709, un +niveau de blanc basé sur l'histogramme, et aucune méta donnée. +.TP +.B -W +Utilise un niveau de blanc fixé ignorant l'histogramme de l'image +.TP +.B -b luminosité +Divise le niveau de blanc par cette valeur, 1.0 par défaut. +.TP +.B -g puissance pente_a_l_origine +Fixe la courbe gamma, par défaut BT.709 +.RB ( -g\ 2.222\ 4.5 ). +Si vous préférez le gamma du sRGB, utilisez +.BR -g\ 2.4\ 12.92 . +Pour une simple courbe de puissance, fixez la pente à l'origine à zéro. +.TP +.B -6 +Ecrit seize bits par pixel/canal au lieu de huit. +.TP +.B -4 +16 bits linéaires, équivalent à +.BR -6\ -W\ -g\ 1\ 1 . +.TP +.B -T +Ecrit des fichiers TIFF avec les métadonnées au lieu de +fichiers PGM/PPM/PAM. +.TP +.B -t [0-7,90,180,270] +Change l'orientation de l'image de sortie. Par défaut, +.B dcraw +applique l'orientation spécifiée par l'appareil photo. +.B -t 0 +désactive le changement d'orientation. +.TP +.B -j +Pour les appareils photos Fuji\ Super\ CCD, montre l'image +tournée à 45 degrés. Pour les appareils photos avec des pixels +non carrés, n'étire pas l'image à son rapport hauteur/largeur +réel. Dans tous les cas cette option garantie que chaque pixel +en sortie correspond à un pixel raw. +.TP +.BR "-s [0..N-1]" " ou " "-s all" +Si un fichier contient N images raw, choisissez en une ou "all" +(toutes) pour les décoder. +Par exemple, les appareils photos Fuji\ Super\ CCD\ SR +génèrent une seconde image sous exposée de 4 stops pour montrer +les détails dans les zones claires. +.SH FICHIERS +.TP +\:./.badpixels, ../.badpixels, ../../.badpixels, ... +Liste des pixels morts de votre appareil photo afin que +.B dcraw +puisse interpoler autour d'eux. Chaque ligne spécifie une colonne, +une ligne, et la date UNIX de la mort pour un pixel. Par exemple : +.sp 1 +.nf + 962 91 1028350000 # mort entre le 1er et le 4 Aout 2002 +1285 1067 0 # mort à une date inconnue +.fi +.sp 1 +Ces coordonnées sont celles avant toute rotation ou réduction, +donc utilisez +.B dcraw -j -t 0 +pour identifier les pixels morts. +.SH "VOIR AUSSI" +.BR pgm (5), +.BR ppm (5), +.BR pam (5), +.BR pamsumm (1), +.BR pnmgamma (1), +.BR pnmtotiff (1), +.BR pnmtopng (1), +.BR gphoto2 (1), +.BR cjpeg (1), +.BR djpeg (1) +.SH AUTEUR +Ecrit par David Coffin, dcoffin a cybercom o net +.SH TRADUCTION +Luc Coiffier, luc o coiffier a free o fr diff -Nru dcraw-8.99/dcraw_fr.po dcraw-9.17/dcraw_fr.po --- dcraw-8.99/dcraw_fr.po 1970-01-01 00:00:00.000000000 +0000 +++ dcraw-9.17/dcraw_fr.po 2013-01-03 13:09:39.000000000 +0000 @@ -0,0 +1,386 @@ +# French translation of dcraw messages. +# (c) 2009 Dave Coffin dcoffin a cybercom o net +# Distribute freely. +# +msgid "" +msgstr "" +"Project-Id-Version: dcraw 8.94\n" +"Report-Msgid-Bugs-To: dcoffin a cybercom o net\n" +"POT-Creation-Date: 2006-12-21 22:45-0500\n" +"PO-Revision-Date: 2011-07-23 17:00-0400\n" +"Last-Translator: Luc Coiffier \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +msgid "%s: Out of memory in %s\n" +msgstr "%s : Mémoire insuffisante dans %s\n" + +msgid "Unexpected end of file\n" +msgstr "Fin de fichier inattendue\n" + +msgid "Corrupt data near 0x%lx\n" +msgstr "Donnée corrompue vers 0x%lx\n" + +msgid "Corrupt data near 0x%llx\n" +msgstr "Donnée corrompue vers 0x%llx\n" + +msgid "%s: decoder table overflow\n" +msgstr "%s : table de décodage trop grande\n" + +msgid "Phase One correction...\n" +msgstr "Application de la correction Phase One...\n" + +msgid "%s: incorrect JPEG dimensions\n" +msgstr "%s : mauvaises dimensions JPEG\n" + +msgid "%s: \"%s\" matrix not found!\n" +msgstr "%s : \"%s\" matrice non trouvée !\n" + +msgid "Foveon interpolation...\n" +msgstr "Interpolation Foveon...\n" + +msgid "%s: Invalid white balance \"%s\"\n" +msgstr "%s : Mauvaise balance des blancs \"%s\"\n" + +msgid "Fixed bad pixels at:" +msgstr "Réparation du mauvais pixel en :" + +msgid "Fixed dead pixels at:" +msgstr "Pixels morts corrigés en :" + +msgid "%s is not a valid PGM file!\n" +msgstr "%s n'est pas un fichier PGM valide !\n" + +msgid "%s has the wrong dimensions!\n" +msgstr "%s n'a pas les bonnes dimensions !\n" + +msgid "Wavelet denoising...\n" +msgstr "Réduction du bruit par ondelette...\n" + +msgid "%s: Cannot use camera white balance.\n" +msgstr "%s : Ne peut pas utiliser la balance des blancs de l'appareil photo.\n" + +msgid "Scaling with black %d, multipliers" +msgstr "Mise à l'échelle avec le noir %d, multiplicateurs" + +msgid "Scaling with darkness %d, saturation %d, and\nmultipliers" +msgstr "Mise à l'échelle avec noir %d, saturation %d, et\nmultiplicateurs" + +msgid "Correcting chromatic aberration...\n" +msgstr "Correction de l'aberration chromatique...\n" + +msgid "Bilinear interpolation...\n" +msgstr "Interpolation bilinéaire...\n" + +msgid "VNG interpolation...\n" +msgstr "Interpolation VNG...\n" + +msgid "PPG interpolation...\n" +msgstr "Interpolation PPG...\n" + +msgid "AHD interpolation...\n" +msgstr "Interpolation AHD...\n" + +msgid "Median filter pass %d...\n" +msgstr "Filtre médian passe %d ...\n" + +msgid "Bilateral filtering...\n" +msgstr "Filtrage bilatéral...\n" + +msgid "Blending highlights...\n" +msgstr "Combinaison des hautes lumières...\n" + +msgid "Rebuilding highlights...\n" +msgstr "Reconstruction des hautes lumières...\n" + +msgid "Highlight recovery...\n" +msgstr "Reconstruction des zones claires...\n" + +msgid "Reading metadata from %s ...\n" +msgstr "Lecture des métadonnées depuis %s ...\n" + +msgid "Failed to read metadata from %s\n" +msgstr "Echec de la lecture des métadonnées depuis %s\n" + +msgid "%s: You must link dcraw with libjpeg!!\n" +msgstr "%s : Vous devez linker dcraw avec libjpeg !!\n" + +msgid "%s: You must link dcraw with %s!!\n" +msgstr "%s : Vous devez linker dcraw avec %s !!\n" + +msgid "%s has no embedded profile.\n" +msgstr "%s n'a pas de profil inclu.\n" + +msgid "Cannot open file %s!\n" +msgstr "Ne peut pas ouvrir le fichier %s !\n" + +msgid "Applying color profile...\n" +msgstr "Application du profil de couleur...\n" + +msgid "Building histograms...\n" +msgstr "Construction de l'histogramme...\n" + +msgid "Converting to %s colorspace...\n" +msgstr "Conversion dans l'espace de couleur %s...\n" + +msgid "Rotating image 45 degrees...\n" +msgstr "Rotation de l'image à 45 degrés...\n" + +msgid "Stretching the image...\n" +msgstr "Etirement de l'image...\n" + +msgid "\nRaw photo decoder \"dcraw\" v%s" +msgstr "\nDécodeur de photo raw \"dcraw\" v%s" + +msgid "\nby Dave Coffin, dcoffin a cybercom o net\n" +msgstr "\npar Dave Coffin, dcoffin a cybercom o net\n" + +msgid "\nUsage: %s [OPTION]... [FILE]...\n\n" +msgstr "\nUtilisation : %s [OPTION]... [FICHIER]...\n\n" + +msgid "-v Print verbose messages" +msgstr "-v Afficher tous les messages" + +msgid "-c Write image data to standard output" +msgstr "-c Ecrit l'image sur la sortie standard" + +msgid "-e Extract embedded thumbnail image" +msgstr "-e Extrait la vignette incluse" + +msgid "-i Identify files without decoding them" +msgstr "-i Identifie les fichiers sans les décoder" + +msgid "-i -v Identify files and show metadata" +msgstr "-i -v Identifie les fichiers et affiche les métadonnées" + +msgid "-z Change file dates to camera timestamp" +msgstr "-z Change la date des fichiers à la date de l'appareil photo" + +msgid "-a Use automatic white balance" +msgstr "-a Utilise la balance des blancs automatique" + +msgid "-w Use camera white balance, if possible" +msgstr "-w Utilise la balance des blancs de l'appareil photo si possible" + +msgid "-a Average the whole image for white balance" +msgstr "-a Moyenne toute l'image pour la balance des blancs" + +msgid "-A Average a grey box for white balance" +msgstr "-A Moyenne une zone grise pour la balance des blancs" + +msgid "-r Set custom white balance" +msgstr "-r Fixe une balance des blancs personnalisée" + +msgid "-r <4 numbers> Set custom white balance" +msgstr "-r <4 nombres> Fixe la balance des blancs personnalisée" + +msgid "+M/-M Use/don't use an embedded color matrix" +msgstr "+M/-M Utilise/n'utilise pas une matrice de couleurs incluse" + +msgid "-C Correct chromatic aberration" +msgstr "-C Corrige l'aberration chromatique" + +msgid "-P Fix the dead pixels listed in this file" +msgstr "-P Corrige les pixels morts listés dans ce fichier" + +msgid "-K Subtract dark frame (16-bit raw PGM)" +msgstr "-K Soustrait un noir (raw PGM 16 bits)" + +msgid "-k Set black point" +msgstr "-k Fixe le point noir" + +msgid "-k Set the black level" +msgstr "-k Fixe le point noir" + +msgid "-k Set the darkness level" +msgstr "-k Fixe le niveau de noir" + +msgid "-S Set the saturation level" +msgstr "-S Fixe le niveau de saturation" + +msgid "-n Set threshold for wavelet denoising" +msgstr "-n Fixe le seuil pour la réduction du bruit par ondelette" + +msgid "-H [0-9] Highlight mode (0=clip, 1=no clip, 2+=recover)" +msgstr "-H [0-9] Mode pour les zones claires (0=limitation, 1=sans limitation, 2+=reconstruction)" + +msgid "-H [0-9] Highlight mode (0=clip, 1=unclip, 2=blend, 3+=rebuild)" +msgstr "-H [0-9] Traitement des hautes lumières (0=écrêtement, 1=sans écrêtement, 2=combinaison, 3+=reconstruction)" + +msgid "-t [0-7] Flip image (0=none, 3=180, 5=90CCW, 6=90CW)" +msgstr "-t [0-7] Tourne l'image (0=aucun, 3=180, 5=90 gauche, 6=90 droite)" + +msgid "-o [0-5] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" +msgstr "-o [0-5] Espace de couleur de sortie (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" + +msgid "-o Apply output ICC profile from file" +msgstr "-o Utilise le fichier comme espace de couleur en sortie" + +msgid "-p Apply camera ICC profile from file or \"embed\"" +msgstr "-p Utilise l'espace de couleur de l'appareil photo du fichier ou \"embed\"" + +msgid "-d Document mode (no color, no interpolation)" +msgstr "-d Mode Document (noir et blanc, pas d'interpolation)" + +msgid "-D Document mode without scaling (totally raw)" +msgstr "-D Mode Document sans mise à l'échelle (complètement brut)" + +msgid "-j Don't stretch or rotate raw pixels" +msgstr "-j N'étire pas et ne tourne pas les pixels raw" + +msgid "-W Don't automatically brighten the image" +msgstr "-W N'ajuste pas automatiquement la luminosité de l'image" + +msgid "-b Adjust brightness (default = 1.0)" +msgstr "-b Ajuste la clarté (défaut = 1.0)" + +msgid "-g

Set custom gamma curve (default = 2.222 4.5)" +msgstr "-g

Fixe la courbe gamma (défaut = 2.222 4.5)" + +msgid "-q [0-3] Set the interpolation quality" +msgstr "-q [0-3] Fixe la qualité de l'interpolation" + +msgid "-h Half-size color image (twice as fast as \"-q 0\")" +msgstr "-h Image réduite de moitié (deux fois plus rapide que \"-q 0\")" + +msgid "-f Interpolate RGGB as four colors" +msgstr "-f Interpole RVVB comme quatre couleurs" + +msgid "-m Apply a 3x3 median filter to R-G and B-G" +msgstr "-m Applique un filtre médian 3x3 à R-V et B-V" + +msgid "-B Apply bilateral filter to smooth noise" +msgstr "-B Applique une filtre bilatéral pour réduire le bruit" + +msgid "-s [0-99] Select a different raw image from the same file" +msgstr "-s [0-99] Sélectionne une image raw différente du même fichier" + +msgid "-s [0..N-1] Select one raw image or \"all\" from each file" +msgstr "-s [0..N-1] Sélectionne une image raw ou \"all\" (toutes) pour chaque fichier" + +msgid "-6 Write 16-bit instead of 8-bit" +msgstr "-6 Ecrit 16 bits au lieu de 8 bits" + +msgid "-4 Linear 16-bit, same as \"-6 -W -g 1 1\"" +msgstr "-4 16 bits linéaires, équivalent à \"-6 -W -g 1 1\"" + +msgid "-4 Write 16-bit linear instead of 8-bit with gamma" +msgstr "-4 Ecriture en 16 bits linéaire au lieu de 8 bits avec gamma" + +msgid "-T Write TIFF instead of PPM" +msgstr "-T Ecriture en TIFF au lieu de PPM" + +msgid "Non-numeric argument to \"-%c\"\n" +msgstr "Paramètre non numérique pour \"-%c\"\n" + +msgid "Unknown option \"-%c\".\n" +msgstr "Option inconnue \"-%c\".\n" + +msgid "No files to process.\n" +msgstr "Aucun fichier à traiter.\n" + +msgid "Will not write an image to the terminal!\n" +msgstr "Ne vas pas écrire une image sur la console !\n" + +msgid "%s has no timestamp.\n" +msgstr "%s n'a pas de date.\n" + +msgid "%s time set to %d.\n" +msgstr "date/heure de %s fixée à %d.\n" + +msgid "%s has no thumbnail.\n" +msgstr "%s n'a pas de vignette.\n" + +msgid "\nFilename: %s\n" +msgstr "\nNom du fichier : %s\n" + +msgid "Timestamp: %s" +msgstr "Date/Heure : %s" + +msgid "Camera: %s %s\n" +msgstr "Appareil photo : %s %s\n" + +msgid "Owner: %s\n" +msgstr "Propriétaire : %s\n" + +msgid "DNG Version: " +msgstr "Version DNG : " + +msgid "ISO speed: %d\n" +msgstr "Sensibilité ISO : %d\n" + +msgid "Shutter: " +msgstr "Temps de pose : " + +msgid "%0.1f sec\n" +msgstr "%0.1f s\n" + +msgid "Aperture: f/%0.1f\n" +msgstr "Ouverture : f/%0.1f\n" + +msgid "Focal length: %0.1f mm\n" +msgstr "Focale : %0.1f mm\n" + +msgid "Secondary pixels: %s\n" +msgstr "Pixels secondaires : %s\n" + +msgid "yes" +msgstr "oui" + +msgid "no" +msgstr "non" + +msgid "Embedded ICC profile: %s\n" +msgstr "Profil ICC inclu : %s\n" + +msgid "Decodable with dcraw: %s\n" +msgstr "Décodable par dcraw : %s\n" + +msgid "Number of raw images: %d\n" +msgstr "Nombre d'images raw : %d\n" + +msgid "Pixel Aspect Ratio: %0.6f\n" +msgstr "Ratio largeur/hauteur des pixels : %0.6f\n" + +msgid "Thumb size: %4d x %d\n" +msgstr "Taille de la vignette : %4d x %d\n" + +msgid "Full size: %4d x %d\n" +msgstr "Taille complète : %4d x %d\n" + +msgid "Cannot decode file %s\n" +msgstr "Ne peut pas décoder le fichier %s\n" + +msgid "Image size: %4d x %d\n" +msgstr "Taille de l'image : %4d x %d\n" + +msgid "Output size: %4d x %d\n" +msgstr "Taille de sortie : %4d x %d\n" + +msgid "Raw colors: %d" +msgstr "Couleurs raw : %d" + +msgid "\nFilter pattern: " +msgstr "\nMotif du filtre : " + +msgid "\nDaylight multipliers:" +msgstr "\nCoefficients lumière du jour :" + +msgid "\nCamera multipliers:" +msgstr "\nCoefficients appareil photo :" + +msgid "%s is a %s %s image.\n" +msgstr "%s est une image créée par un %s %s.\n" + +msgid "Loading %s %s image from %s ...\n" +msgstr "Chargement de l'image créée par un %s %s depuis %s ...\n" + +msgid "%s: \"-s %d\" requests a nonexistent image!\n" +msgstr "%s : \"-s %d\" correspond à une image inexistante!\n" + +msgid "standard output" +msgstr "sortie standard" + +msgid "Writing data to %s ...\n" +msgstr "Ecriture des données dans %s ...\n" diff -Nru dcraw-8.99/dcraw_hu.1 dcraw-9.17/dcraw_hu.1 --- dcraw-8.99/dcraw_hu.1 1970-01-01 00:00:00.000000000 +0000 +++ dcraw-9.17/dcraw_hu.1 2013-01-03 13:09:39.000000000 +0000 @@ -0,0 +1,263 @@ +.\" +.\" Man page a dcraw-hoz +.\" +.\" Copyright (c) 2007 by David Coffin +.\" +.\" Szabadon terjeszthető. +.\" +.\" David Coffin +.\" dcoffin a cybercom o net +.\" http://www.cybercom.net/~dcoffin +.\" +.TH dcraw 1 "2007. október 30." +.LO 1 +.SH NÉV +dcraw - parancssori dekódoló program nyers (RAW) digitális fényképekhez +.SH ÁTTEKINTÉS +.B dcraw +[\fIOPCIÓK\fR]... [\fIFÁJLNEV\fR]... +.SH LEÍRÁS +.B dcraw +nyers (RAW) fotókat dekódol, megjeleníti a metaadatokat, kimenti az előnézeti képet. +.SH OPCIÓK +.TP +.B -v +Az összes lépést kilistázza a figyelmeztetések és hibák mellett. +.TP +.B -c +A szabványos kimenetre írja ki a dekódolt vagy előnézeti képet. +.TP +.B -e +Nem a nyers képet, hanem a fényképezőgép által generált előnézeti képet nyeri ki. +Vagy JPEG, vagy pedig PPM fájl lesz az eredmény, fényképezőgéptől függően. +.TP +.B -z +AVI, JPEG, TIFF vagy nyers (RAW) fájl hozzáférési és módosítási idejét +beállítja arra az időpontra, amikor a fotó készült. Feltételezve, hogy a +fényképezőgép órája az egyezményes világidőre volt állítva. +.TP +.B -i +Azonosítja a fájlokat, de nem dekódolja őket. +Visszatérési érték 0, ha a +.B dcraw +képes dekódolni az utolsó fájlt, és 1 amennyiben nem. +.B -i -v +megjeleníti a metaadatokat. +.TP +.B "" +A +.B dcraw +nem dekódol JPEG fájlt!! +.TP +.B -d +A nyers adatot szürkeárnyalatú képként mutatja interpoláció nélkül. +Ez az opció fekete-fehér dokumentumokról készült képekhez alkalmas. +.TP +.B -D +Ugyanaz, mint a +.BR -d , +de teljesen nyers (nincs szín méretezés). +.TP +.B -h +Fele méretű színes képet készít. Kétszer olyan gyors, mint a +.BR -q\ 0 . +.TP +.B -q 0 +Gyors, de gyenge minőségű bilineáris interpolációt alkalmaz. +.TP +.B -q 1 +Változó számú gradiens (VNG) interpoláció használata. +.TP +.B -q 2 +Képpont Mintázat Csoportosító (PPG) interpoláció használata. +.TP +.B -q 3 +Homogeneitás Vezérelt Adaptív (AHD) interpoláció használata. +.TP +.B -f +Az RGB értékeket négy színként interpolálja. Akkor alkalmazható, ha a kimenet +hamis, kétszer-kettes rácsot mutat VNG-vel, vagy cikk-cakkokat AHD-val. +.TP +.B -m menetek_száma +Az interpoláció utáni 3x3-as medián szűrő többszöri alkalmazása az R-G +és a B-G csatornákon a szín-hibák (color artifacts) eltávolítására. +.TP +.B -n zaj_küszöb +Wavelet alkalmazásával csökkenti a zajt, miközben a részleteket megőrzi. +A legjobb küszöbérték 100 és 1000 közé eshet. +.TP +.B -b fényerő +Alapállapotban a +.B dcraw +8-bites PGM/PPM/PAM fájlt ír BT.709-es gamma görbével és +99 százaléknál lévő fehér ponttal. Ha az eredmény túl világos vagy túl sötét, a +.B -b +opcióval állítható. Alapállapotban 1.0. +.TP +.B -4 +16-bites pszeudo-PGM/PPM/PAM írása, gamma és +fehéregyensúly beállítás nélkül, és +.B -b +opció nélkül. +.TP +.B -T +TIFF írása (metaadattal) PGM/PPM/PAM helyett. +.TP +.B -k fekete +Fekete pont beállítása. Az alapbeállítás a fényképezőgéptől függ. +.TP +.B -K sötétkép.pgm +A sötét képet kivonja a nyers adatból. A sötét kép készítéséhez fotózzon egy +nyers (RAW) képet teljes sötétben (pl.: objektív sapkával), és futtassa a +.BR dcraw\ -D\ -4\ -j\ -t\ 0 +parancsot. +.TP +.B -w +A fényképezőgép által megállapított fehéregyensúly használata. +Ha a +.B dcraw +ilyet nem talál, figyelmeztetést ír ki, és az alapértelmezést használja. +.TP +.B -a +A teljes kép átlagolásával számít fehéregyensúlyt. +.TP +.B -A baloldal felső_rész szélesség magasság +A kép megadott területének átlagolásával számít fehéregyensúlyt. +Először futtassa a +.B dcraw\ -j\ -t\ 0 +parancsot, és a kimenetén válasszon egy semleges, szürke színű területet. +.TP +.B -r szorzó0 szorzó1 szorzó2 szorzó3 +Megadható egyedi fehéregyensúly beállítás. +A szorzók kimásolhatók a +.BR dcraw\ -v +parancs kimenetéről. +.TP +nincs fehéregyensúly opció +A dcraw D65-ös lámpával megvilágított szabványos színskála alapján +megállapított rögzített fehéregyensúlyt használ. +.TP +.BR +M " vagy " -M +Használja (vagy sem) bármelyik, a kép metaadataiban található színmátrixot. +Az alapbeállítás +.B +M +ha +.B -w +meg van adva, és +.B -M +különben. +Ez az opció csak az Olympus, Leaf, és Phase One fényképezőgépek +esetén van hatással. +.TP +.B -C piros_szorzó kék_szorzó +A nyers piros és kék csatornákat módosítja a megadott szorzóval. +Többnyire 0.999 és 1.001 közötti érték megfelelő a kromatikus +aberráció javításához. +.TP +.B -H 0 +Minden csúcsfényt teljesen fehérként kezel (alapértelmezett). +.TP +.B -H 1 +Hagyja meg a csúcsfényeket a rózsaszín különböző árnyalataiban. +.TP +.B -H 2 +A levágott és meghagyott csúcsfények keverése, hogy fokozatos legyen az átmenet a fehérbe. +.TP +.B -H 3-9 +A csúcsfények visszanyerése. Az alacsonyabb érték a fehéret, +a magasabb a színeket preferálja. Próbálja a +.B -H 5 +opciót kompromisszumként. Ha az nem elég jó akkor használja a +.BR -H\ 9 , +parancsot, másolja ki a túl fényes, de nem fehér részeket, majd másolja be a +.BR -H\ 3 +opcióval generált képbe. +.TP +.B -o [0-5] +A kimenet színterének (colorspace) kiválasztása, ha a +.B -p +opció nincs megadva: + +.B \t0 +\ \ Nyers színek (minden kamerának egyedi) +.br +.B \t1 +\ \ sRGB D65 (alapértelmezett) +.br +.B \t2 +\ \ Adobe RGB (1998) D65 +.br +.B \t3 +\ \ Wide Gamut RGB D65 +.br +.B \t4 +\ \ Kodak ProPhoto RGB D65 +.br +.B \t5 +\ \ XYZ +.TP +.BR -p\ fényképezőgép.icm \ [\ -o\ kimenet.icm \ ] +ICC profilok használata a fényképezőgép nyers (RAW) színterének (colorspace) +és a kimenet kívánt színterének meghatározására (alapbeállítása sRGB). +.TP +.B -p embed +Az eredeti nyers képben lévő ICC profil használata. +.TP +.B -t [0-7,90,180,270] +Kimenő kép elforgatása. Alapértelmezés szerint a +.B dcraw +a fényképezőgép által meghatározott beállítást használja. +.B -t 0 +Forgatás letiltása. +.TP +.B -s [0-99] +Kiválasztja a dekódolni kívánt képet, amennyiben a nyers fájl több ilyet is +tartalmaz. Például a Fuji\ Super\ CCD\ SR fényképezőgép egy második képet is +generál négy fényértékkel alulexponálva a csúcsfények részleteinek megőrzésére. +.TP +.B -j +A Fuji\ Super\ CCD-vel rendelkező fényképezőgéppel készült képeket 45 fokkal +elforgatva jeleníti meg. +Ha egy fényképezőgéppel készült kép képpontjai nem négyzet alakúak akkor sem +húzza szét a képet az igazi oldalarányoknak megfelelően. Ez az opció biztosítja, +hogy minden egyes kimeneti képpont pontosan egy pontnak feleljen meg a +nyers képen. +.TP +.B "" +A +.B dcraw +figyelmen kívül hagyja a +.B -s +és a +.B -j +opciókat, ha az adott fényképezőgépre nem vonatkoznak. +.SH FÁJLOK +.TP +\:./.rosszképpont, ../.rosszképpont, ../../.rosszképpont, ... +A fényképezőgép halott képpontjainak (dead pixels) felsorolásával a +.B dcraw +interpolálni tud körülöttük. Minden sorban meghatározható az oszlop, +a sor, és a UNIX idő, amikor a képpont tönkrement. Például: +.sp 1 +.nf + 962 91 1028350000 # meghalt Augusztus 1 és 4 között 2002-ben +1285 1067 0 # nem tudni mikor ment tönkre a képpont +.fi +.sp 1 +Ezek a koordináták kivágás és forgatás előtt értendők. A halott képpontok keresésére a +.B dcraw -j -t 0 +parancs használható. +.SH "LÁSD MÉG" +.BR pgm (5), +.BR ppm (5), +.BR pam (5), +.BR pnmgamma (1), +.BR pnmtotiff (1), +.BR pnmtopng (1), +.BR gphoto2 (1), +.BR cjpeg (1), +.BR djpeg (1) +.SH SZERZŐ +Írta David Coffin, dcoffin a cybercom o net +.SH FORDÍTÁS +Sólyom Zoltán, z-one a freemail o hu diff -Nru dcraw-8.99/dcraw_hu.po dcraw-9.17/dcraw_hu.po --- dcraw-8.99/dcraw_hu.po 1970-01-01 00:00:00.000000000 +0000 +++ dcraw-9.17/dcraw_hu.po 2013-01-03 13:09:39.000000000 +0000 @@ -0,0 +1,343 @@ +# Hungarian translation of dcraw messages. +# (c) 2007 Dave Coffin dcoffin a cybercom o net +# Distribute freely. +# +# dcraw üzenetek magyar fordítása. +# Fordítás: Sólyom Zoltán, z-one a freemail o hu +# (c) 2007 Dave Coffin dcoffin a cybercom o net +# Szabadon terjeszthető. +# +msgid "" +msgstr "" +"Project-Id-Version: dcraw 8.78\n" +"Report-Msgid-Bugs-To: dcoffin a cybercom o net\n" +"POT-Creation-Date: 2006-12-21 22:45-0500\n" +"PO-Revision-Date: 2011-07-23 17:00-0400\n" +"Last-Translator: Dave Coffin \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +msgid "%s: Out of memory in %s\n" +msgstr "%s: Nincs elég memória: %s\n" + +msgid "Unexpected end of file\n" +msgstr "A fájl váratlanul véget ért\n" + +msgid "Corrupt data near 0x%lx\n" +msgstr "Hibás adat 0x%lx körül\n" + +msgid "Corrupt data near 0x%llx\n" +msgstr "Hibás adat 0x%llx körül\n" + +msgid "%s: decoder table overflow\n" +msgstr "%s: dekódoló tábla túlcsordulás\n" + +msgid "Phase One correction...\n" +msgstr "Korrekció Phase One...\n" + +msgid "%s: incorrect JPEG dimensions\n" +msgstr "%s: hibás JPEG képméret\n" + +msgid "%s: \"%s\" matrix not found!\n" +msgstr "%s: A \"%s\" mátrix hiányzik!\n" + +msgid "Foveon interpolation...\n" +msgstr "Foveon interpoláció...\n" + +msgid "%s: Invalid white balance \"%s\"\n" +msgstr "%s: Helytelen fehéregyensúly \"%s\"\n" + +msgid "Fixed bad pixels at:" +msgstr "Javított hibás képpont itt:" + +msgid "%s is not a valid PGM file!\n" +msgstr "%s nem igazi PGM fájl!\n" + +msgid "%s has the wrong dimensions!\n" +msgstr "%s méretei hibásak!\n" + +msgid "Wavelet denoising...\n" +msgstr "Zajmentesítés...\n" + +msgid "%s: Cannot use camera white balance.\n" +msgstr "%s: A fényképezőgép fehéregyensúlyát nem tudom használni.\n" + +msgid "Scaling with black %d, multipliers" +msgstr "Átskálázás %d fekete szorzóval" + +msgid "Correcting chromatic aberration...\n" +msgstr "Kromatikus aberráció javítása...\n" + +msgid "Bilinear interpolation...\n" +msgstr "Bilineáris interpoláció...\n" + +msgid "VNG interpolation...\n" +msgstr "VNG interpoláció...\n" + +msgid "PPG interpolation...\n" +msgstr "PPG interpoláció...\n" + +msgid "AHD interpolation...\n" +msgstr "AHD interpoláció...\n" + +msgid "Median filter pass %d...\n" +msgstr "Medián szűrés %d. menete...\n" + +msgid "Blending highlights...\n" +msgstr "Csúcsfények elkeverése...\n" + +msgid "Rebuilding highlights...\n" +msgstr "Csúcsfények visszanyerése...\n" + +msgid "Reading metadata from %s ...\n" +msgstr "Metaadatok beolvasása innen: %s ...\n" + +msgid "Failed to read metadata from %s\n" +msgstr "Nem sikerült a metaadatok kiolvasása innen: %s\n" + +msgid "%s: You must link dcraw with libjpeg!!\n" +msgstr "%s: A dcraw-t a libjpeg-el kell linkelni!!\n" + +msgid "%s: You must link dcraw with %s!!\n" +msgstr "%s: A dcraw-t a %s-el kell linkelni!!\n" + +msgid "%s has no embedded profile.\n" +msgstr "%s nem tartalmaz szín profilt.\n" + +msgid "Cannot open file %s!\n" +msgstr "%s fájl nem nyitható meg!\n" + +msgid "Applying color profile...\n" +msgstr "Szín profil alkalmazása...\n" + +msgid "Building histograms...\n" +msgstr "Hisztogram meghatározása...\n" + +msgid "Converting to %s colorspace...\n" +msgstr "Konvertálás %s színtérbe...\n" + +msgid "Rotating image 45 degrees...\n" +msgstr "A kép 45 fokos elforgatása...\n" + +msgid "Stretching the image...\n" +msgstr "Kép átméretezése...\n" + +msgid "\nRaw photo decoder \"dcraw\" v%s" +msgstr "\nNyers (RAW) fotó dekódoló \"dcraw\" v%s" + +msgid "\nby Dave Coffin, dcoffin a cybercom o net\n" +msgstr "\nírta Dave Coffin, dcoffin a cybercom o net\n" + +msgid "\nUsage: %s [OPTION]... [FILE]...\n\n" +msgstr "\nHasználata: %s [OPCIÓK]... [FÁJLNÉV]...\n\n" + +msgid "-v Print verbose messages" +msgstr "-v Minden üzenet kiírása" + +msgid "-c Write image data to standard output" +msgstr "-c A kép a szabványos kimenetre kerül." + +msgid "-e Extract embedded thumbnail image" +msgstr "-e Előnézeti kép kinyerése" + +msgid "-i Identify files without decoding them" +msgstr "-i Fájlok azonosítása dekódolás nélkül" + +msgid "-i -v Identify files and show metadata" +msgstr "-i -v Fájlok azonosítása, metaadatok listázása" + +msgid "-z Change file dates to camera timestamp" +msgstr "-z Fájl dátumok beállítása a fényképezőgép órája alapján" + +msgid "-w Use camera white balance, if possible" +msgstr "-w A fényképezőgép fehéregyensúlyának használata, ha lehetséges" + +msgid "-a Average the whole image for white balance" +msgstr "-a Teljes kép átlagolása a fehéregyensúly meghatározásához" + +msgid "-A Average a grey box for white balance" +msgstr "-A Fehéregyensúly meghatározása egy képterület szürkére átlagolásával." + +msgid "-r Set custom white balance" +msgstr "-r Tetszőleges fehéregyensúly beállítása" + +msgid "+M/-M Use/don't use an embedded color matrix" +msgstr "+M/-M Beágyazott színmátrix használata/elhagyása" + +msgid "-C Correct chromatic aberration" +msgstr "-C Kromatikus aberráció javítása" + +msgid "-b Adjust brightness (default = 1.0)" +msgstr "-b Fényesség beállítása (alapértelmezés = 1.0)" + +msgid "-n Set threshold for wavelet denoising" +msgstr "-n Zajmentesítés küszöbértékének meghatározása" + +msgid "-k Set black point" +msgstr "-k Fekete pont beállítása" + +msgid "-K Subtract dark frame (16-bit raw PGM)" +msgstr "-K Sötét kép kivonása (16-bites nyers PGM)" + +msgid "-H [0-9] Highlight mode (0=clip, 1=unclip, 2=blend, 3+=rebuild)" +msgstr "-H [0-9] Csúcsfények kezelése (0=levág, 1=meghagy, 2=keverés, 3+=visszanyerés)" + +msgid "-t [0-7] Flip image (0=none, 3=180, 5=90CCW, 6=90CW)" +msgstr "-t [0-7] Kép forgatása (0=nincs, 3=180, 5=90balra, 6=90jobbra)" + +msgid "-o [0-5] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" +msgstr "-o [0-5] Kimenet színtere (nyers,sRGB,Adobe,Wide,ProPhoto,XYZ)" + +msgid "-o Apply output ICC profile from file" +msgstr "-o Kimeneti ICC-profil alkalmazása fájlból" + +msgid "-p Apply camera ICC profile from file or \"embed\"" +msgstr "-p Fényképezőgép ICC-profiljának alkalmazása fájlból, vagy \"embed\"" + +msgid "-d Document mode (no color, no interpolation)" +msgstr "-d Dokumentum mód (fekete fehér, interpoláció nélkül)" + +msgid "-D Document mode without scaling (totally raw)" +msgstr "-D Dokumentum mód méretezés nélkül (teljesen nyers)" + +msgid "-j Don't stretch or rotate raw pixels" +msgstr "-j Ne nyújtsa vagy forgassa a nyers képpontokat" + +msgid "-q [0-3] Set the interpolation quality" +msgstr "-q [0-3] Interpoláció minőségének beállítása" + +msgid "-h Half-size color image (twice as fast as \"-q 0\")" +msgstr "-h Fele méretű színes kép (kétszer olyan gyors mint a \"-q 0\")" + +msgid "-f Interpolate RGGB as four colors" +msgstr "-f RGGB interpolálása négy színként" + +msgid "-m Apply a 3x3 median filter to R-G and B-G" +msgstr "-m 3x3-as medián szűrő alkalmazása az R-G és B-G csatornákon" + +msgid "-s [0-99] Select a different raw image from the same file" +msgstr "-s [0-99] Másik nyers kép kiválasztása ugyanabból a fájlból" + +msgid "-s [0..N-1] Select one raw image or \"all\" from each file" +msgstr "-s [0..N-1] Egy nyers kép kiválasztása, vagy \"all\", az összes kép kiválasztása minden fájlból" + +msgid "-4 Write 16-bit linear instead of 8-bit with gamma" +msgstr "-4 16-bites lineáris kép kiírása 8-bites helyett gammával" + +msgid "-T Write TIFF instead of PPM" +msgstr "-T TIFF írása PPM helyett" + +msgid "Non-numeric argument to \"-%c\"\n" +msgstr "A \"-%c\" opcióhoz egy számot kell megadni\n" + +msgid "Unknown option \"-%c\".\n" +msgstr "Ismeretlen opció \"-%c\".\n" + +msgid "No files to process.\n" +msgstr "Nincs feldolgozásra váró fájl.\n" + +msgid "Will not write an image to the terminal!\n" +msgstr "A dcraw a terminálra nem ír képet!\n" + +msgid "%s has no timestamp.\n" +msgstr "%s dátuma ismeretlen.\n" + +msgid "%s time set to %d.\n" +msgstr "%s dátuma %d-re állítva .\n" + +msgid "%s has no thumbnail.\n" +msgstr "%s -ben nincs előnézeti kép.\n" + +msgid "\nFilename: %s\n" +msgstr "\nFájlnév: %s\n" + +msgid "Timestamp: %s" +msgstr "Dátum/idő: %s" + +msgid "Camera: %s %s\n" +msgstr "Fényképezőgép: %s %s\n" + +msgid "Owner: %s\n" +msgstr "Tulajdonos: %s\n" + +msgid "DNG Version: " +msgstr "DNG Verzió: " + +msgid "ISO speed: %d\n" +msgstr "Érzékenység (ISO) érték: %d\n" + +msgid "Shutter: " +msgstr "Záridő: " + +msgid "%0.1f sec\n" +msgstr "%0.1f sec\n" + +msgid "Aperture: f/%0.1f\n" +msgstr "Rekesznyílás: f/%0.1f\n" + +msgid "Focal length: %0.1f mm\n" +msgstr "Fókusztávolság: %0.1f mm\n" + +msgid "Secondary pixels: %s\n" +msgstr "Másodlagos képpontok: %s\n" + +msgid "yes" +msgstr "igen" + +msgid "no" +msgstr "nem" + +msgid "Embedded ICC profile: %s\n" +msgstr "Beágyazott ICC-profil: %s\n" + +msgid "Decodable with dcraw: %s\n" +msgstr "A dcraw-val dekódolható: %s\n" + +msgid "Number of raw images: %d\n" +msgstr "Nyers képek száma: %d\n" + +msgid "Pixel Aspect Ratio: %0.6f\n" +msgstr "Képpont oldalarány: %0.6f\n" + +msgid "Thumb size: %4d x %d\n" +msgstr "Előnézeti kép mérete: %4d x %d\n" + +msgid "Full size: %4d x %d\n" +msgstr "Teljes méret: %4d x %d\n" + +msgid "Cannot decode file %s\n" +msgstr "%s fájlt a dcraw nem tudja dekódolni!\n" + +msgid "Image size: %4d x %d\n" +msgstr "Kép méret: %4d x %d\n" + +msgid "Output size: %4d x %d\n" +msgstr "Kimenet mérete: %4d x %d\n" + +msgid "Raw colors: %d" +msgstr "Nem kompenzált színek: %d" + +msgid "\nFilter pattern: " +msgstr "\nSzűrő mintázat: " + +msgid "\nDaylight multipliers:" +msgstr "\nNapfény szorzók:" + +msgid "\nCamera multipliers:" +msgstr "\nFényképezőgép szorzók:" + +msgid "%s is a %s %s image.\n" +msgstr "%s a(z) %s %s képe.\n" + +msgid "Loading %s %s image from %s ...\n" +msgstr "%s %s kép betöltése innen: %s ...\n" + +msgid "%s: \"-s %d\" requests a nonexistent image!\n" +msgstr "%s: \"-s %d\" nemlétező képet kér!\n" + +msgid "standard output" +msgstr "szabványos kimenet" + +msgid "Writing data to %s ...\n" +msgstr "Adat kimenete: %s ...\n" diff -Nru dcraw-8.99/dcraw_it.1 dcraw-9.17/dcraw_it.1 --- dcraw-8.99/dcraw_it.1 1970-01-01 00:00:00.000000000 +0000 +++ dcraw-9.17/dcraw_it.1 2013-01-03 13:09:39.000000000 +0000 @@ -0,0 +1,292 @@ +.\" +.\" Man page di dcraw +.\" +.\" Copyright (c) 2009 by David Coffin +.\" +.\" Distribuzione libera senza restrizioni +.\" +.\" David Coffin +.\" dcoffin a cybercom o net +.\" http://www.cybercom.net/~dcoffin +.\" +.TH dcraw 1 "14 maggio 2009" +.LO 1 +.SH NOME +dcraw - Convertitore per foto digitali grezze (RAW) a linea di comando +.SH SOMMARIO +.B dcraw +[\fIOPZIONE\fR]... [\fIFILE\fR]... +.SH DESCRIZIONE +.B dcraw +decodifica foto grezze, mostra i metadati ed estrae le miniature. +.SH OPZIONI GENERALI +.TP +.B -v +Stampa messaggi di testo, non solo avvertimenti ed errori. +.TP +.B -c +Scrive sullo standard output le immagini decodificate o le miniature. +.TP +.B -e +Estrae la miniatura generata dalla fotocamera, non l'immagine grezza. +Può essere un file JPEG o PPM, dipende dalla fotocamera. +.TP +.B -z +Cambia ora e data di accesso del file AVI, JPEG, TIFF o raw con l'ora e la +data dello scatto, assumendo che la fotocamera sia stata sincronizzata +sull'Universal Time. +.TP +.B -i +Identifica i files ma non li decodifica. +Lo stato di uscita è 0 se +.B dcraw +riesce a decodificare l'ultimo file, 1 se non ci riesce. +.B -i -v +mostra i metadati. +.TP +.B "" +.B dcraw +non decodifica i files JPEG!! +.SH OPZIONI PER IL RECUPERO +.TP +.B -P pixelsmorti.txt +Legge l'elenco dei pixels morti da questo file anzichè da ".badpixels". +Vedi +.B FILES +per la descrizione del formato. +.TP +.B -K fotogrammanero.pgm +Sottrae un fotogramma nero ai dati grezzi. Per generare un fotogramma +nero scattare una foto grezza senza luce e lanciare +.BR dcraw\ -D\ -4\ -j\ -t\ 0 . +.TP +.B -k nero +Quando le ombre appaiono velate, occorre alzare il livello del nero. +Per misurarlo, applicare +.B pamsumm -mean +al fotogramma nero generato prima. +.TP +.B -S saturazione +Quando le alte luci appaiono rosa, occorre abbassare il livello di saturazione. +Per misurarlo, scattare una foto a qualcosa di molto chiaro e lanciare +.B dcraw -D -4 -j -c +foto.raw +.B | pamsumm -max +.TP +.B "" +I valori di default per il nero e la saturazione in genere sono corretti. +.TP +.B -n soglia_di_rumore +Usa le wavelets per cancellare il rumore preservando i dettagli. +La soglia migliore dovrebbe rientrare nell'intervallo 100 - 1000. +.TP +.B -C mag_rosso mag_blu +Allarga i livelli grezzi rosso e blu dei fattori indicati, tipicamente +da 0.999 a 1.001, per correggere l'aberrazione cromatica. +.TP +.B -H 0 +Le alte luci vengono clippate e rese come bianco puro (default). +.TP +.B -H 1 +Le alte luci non vengono clippate e vengono rese in varie sfumature di rosa. +.TP +.B -H 2 +Miscela i valori clippati con quelli non clippati in modo da +ottenere una sfumatura graduale verso il bianco. +.TP +.B -H 3+ +Le alte luci vengono recuperate. Con un valore basso risultano +desaturate; con un valore alto vengono ricostruiti i colori. +Provare +.B -H 5 +come compromesso. Se non risulta soddisfacente, usare +.BR -H\ 9 , +copiare le alte luci non bianche ed incollarle nell'immagine ottenuta con +.BR -H\ 3 . +.SH OPZIONI COLORE +Di default, +.B dcraw +utilizza un bilanciamento del bianco fisso, basato su di una +tabella di colori illuminanta da una lampada standard D65. +.TP +.B -w +Utilizza il bilanciamento del bianco specificato dalla fotocamera. +Se non trovato, viene stampato un messaggio di avvertimento e usato +un altro metodo. +.TP +.B -a +Calcola il bilanciamento del bianco dalla media dell'intera immagine. +.TP +.B -A sinistra alto larghezza altezza +Calcola il bilanciamento del bianco dalla media di un'area rettangolare. +Utilizzare +.B dcraw\ -j\ -t\ 0 +e selezionare un'area di colore grigio neutro. +.TP +.B -r mol0 mol1 mol2 mol3 +Specifica il tuo bilanciamento del bianco in modalità grezza. +Questi coefficienti moltiplicativi possono essere tagliati e incollati +dall'uscita di +.BR dcraw\ -v . +.TP +.BR +M " o " -M +Utilizza (o non utilizza) l'eventuale matrice colore +presente nei metadati della fotocamera. +Di default è +.B +M +se è impostato +.BR -w , +altrimenti +.BR -M . +Quest'opzione ha effetto solo sulle fotocamere Olympus, Leaf, e Phase One. +.TP +.B -o [0-5] +Seleziona lo spazio di colore in uscita, quando l'opzione +.B -p +non è usata: + +.B \t0 +\ \ Colori grezzi (caratteristici di ogni fotocamera) +.br +.B \t1 +\ \ sRGB D65 (default) +.br +.B \t2 +\ \ Adobe RGB (1998) D65 +.br +.B \t3 +\ \ Wide Gamut RGB D65 +.br +.B \t4 +\ \ Kodak ProPhoto RGB D65 +.br +.B \t5 +\ \ XYZ +.TP +.BR -p\ fotocamera.icm \ [\ -o\ output.icm \ ] +Usa i profili ICC per definire lo spazio colore grezzo della +fotocamera e lo spazio colore in uscita (sRGB di default). +.TP +.B -p embed +Usa il profilo ICC incorporato nella foto grezza. +.SH OPZIONI DI INTERPOLAZIONE +.TP +.B -d +Mostra i dati grezzi in scala di grigio senza interpolazione. +Adatto per la fotografia in bianco e nero di documenti. +.TP +.B -D +Come +.BR -d , +ma in modo completamente grezzo (senza riscalamento dei colori). +.TP +.B -h +Restituisce l'immagine a colori con dimensioni dimezzate. +Due volte più veloce di +.BR -q\ 0 . +.TP +.B -q 0 +Interpolazione bilineare, veloce e a bassa qualità. +.TP +.B -q 1 +Interpolazione a numero variabile di gradienti (VNG). +.TP +.B -q 2 +Interpolazione a raggruppamento di trame di pixels (PPG). +.TP +.B -q 3 +Interpolazione adattativa orientata all'omogeneità (AHD). +.TP +.B -f +Interpolazione RGB a quattro colori. Usarla se l'output mostra +falsi retini 2x2 con la VNG o labirinti con l'AHD. +.TP +.B -m numero_di_passi +Dopo l'interpolazione, rimuove gli artefatti di colore applicando +iterativamente un filtro mediano 3x3 ai canali R-G e B-G. +.SH OPZIONI DI OUTPUT +Di default, +.B dcraw +scrive in formato PGM/PPM/PAM a 8-bit, con una curva gamma +di BT.709, un livello del bianco basato sugli istogrammi, e +senza metadati. +.TP +.B -W +Utilizza un livello del bianco fisso, ignorando gli istogrammi +dell'immagine +.TP +.B -b luminosità +Divide il livello del bianco per questo numero, di default 1.0. +.TP +.B -g esponente pendenza_piede +Imposta la curva gamma, di default BT.709 +.RB ( -g\ 2.222\ 4.5 ). +Se preferisci il gamma di sRGB, usa +.BR -g\ 2.4\ 12.92 . +Per una semplice curva di potenza, imposta la pendenza del piede +della curva a zero. +.TP +.B -6 +Scrive sedici bit per campione invece di otto. +.TP +.B -4 +16-bit lineari, come +.BR -6\ -W\ -g\ 1\ 1 . +.TP +.B -T +Scrive in TIFF con metadati anzichè in PGM/PPM/PAM. +.TP +.B -t [0-7,90,180,270] +Ruota l'immagine. +.B dcraw +di default applica la rotazione specificata dalla fotocamera. +.B -t 0 +disabilita tutte le rotazioni. +.TP +.B -j +Per fotocamere con sensore Fuji\ Super\ CCD: l'immagine risulta +ruotata di 45 gradi. Per fotocamere che hanno pixel non quadrati, +l'immagine non viene ricampionata per correggere il fattore di forma. +In ogni caso questa opzione garantisce che ogni pixel di uscita +corrisponda ad un pixel dell'immagine grezza. +.TP +.BR "-s [0..N-1]" " o " "-s all" +Se un file contiene N immagini grezze, ne sceglie una o "all" +(tutte) per la decodifica. +Per esempio le reflex dotate di Fuji\ Super\ CCD\ SR +generano una seconda immagine sottoesposta di quattro stops per +mostrare i dettagli nelle alte luci. +.SH FILES +.TP +\:./.badpixels, ../.badpixels, ../../.badpixels, ... +Lista dei pixel difettosi della fotocamera, grazie a cui +.B dcraw +può interpolare attorno ad essi. +Ogni linea del file specifica la colonna, la riga, e la data di +morte (in formato UNIX) di un pixel. +Esempio: +.sp 1 +.nf + 962 91 1028350000 # morto fra l'1 e il 4 Agosto 2002 +1285 1067 0 # non si conosce la data di morte di questo pixel +.fi +.sp 1 +Queste coordinate si riferiscono all'immagine prima che sia +ritagliata o ruotata, per cui usare +.B dcraw -j -t 0 +per localizzare i pixel difettosi. +.SH "VEDI ANCHE" +.BR pgm (5), +.BR ppm (5), +.BR pam (5), +.BR pamsumm (1), +.BR pnmgamma (1), +.BR pnmtotiff (1), +.BR pnmtopng (1), +.BR gphoto2 (1), +.BR cjpeg (1), +.BR djpeg (1) +.SH AUTORE +Scritto da David Coffin, dcoffin a cybercom o net +.SH TRADUZIONE +Alberto Maccaferri, alberto o maccaferri a photoactivity o com diff -Nru dcraw-8.99/dcraw_it.po dcraw-9.17/dcraw_it.po --- dcraw-8.99/dcraw_it.po 1970-01-01 00:00:00.000000000 +0000 +++ dcraw-9.17/dcraw_it.po 2013-01-03 13:09:39.000000000 +0000 @@ -0,0 +1,390 @@ +# Italian translation of dcraw messages. +# (c) 2009 Dave Coffin dcoffin a cybercom o net +# Distribute freely. +# +# Traduzione italiana dei messaggi di dcraw +# (c) 2009 Dave Coffin dcoffin a cybercom o net +# Distribuzione libera +# +msgid "" +msgstr "" +"Project-Id-Version: dcraw 8.94\n" +"Report-Msgid-Bugs-To: dcoffin a cybercom o net\n" +"POT-Creation-Date: 2006-12-21 22:45-0500\n" +"PO-Revision-Date: 2011-07-23 17:00-0400\n" +"Last-Translator: Alberto Maccaferri \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +msgid "%s: Out of memory in %s\n" +msgstr "%s: Memoria insufficiente in %s\n" + +msgid "Unexpected end of file\n" +msgstr "Fine del file inaspettata\n" + +msgid "Corrupt data near 0x%lx\n" +msgstr "Dati corrotti intorno a 0x%lx\n" + +msgid "Corrupt data near 0x%llx\n" +msgstr "Dati corrotti intorno a 0x%llx\n" + +msgid "%s: decoder table overflow\n" +msgstr "%s: tabella di decodifica troppo grande\n" + +msgid "Phase One correction...\n" +msgstr "Applicazione della correzione di Phase One...\n" + +msgid "%s: incorrect JPEG dimensions\n" +msgstr "%s: dimensioni JPEG non corrette\n" + +msgid "%s: \"%s\" matrix not found!\n" +msgstr "%s: \"%s\" matrice non trovata!\n" + +msgid "Foveon interpolation...\n" +msgstr "Interpolazione Foveon...\n" + +msgid "%s: Invalid white balance \"%s\"\n" +msgstr "%s: Bilanciamento del bianco non valido \"%s\"\n" + +msgid "Fixed bad pixels at:" +msgstr "Riparati pixels difettosi in:" + +msgid "Fixed dead pixels at:" +msgstr "Riparati pixels morti in:" + +msgid "%s is not a valid PGM file!\n" +msgstr "%s non è un file PGM valido!\n" + +msgid "%s has the wrong dimensions!\n" +msgstr "%s ha dimensoni non corrette!\n" + +msgid "Wavelet denoising...\n" +msgstr "Riduzione del rumore wavelet...\n" + +msgid "%s: Cannot use camera white balance.\n" +msgstr "%s: Non può usare bilanciamento del bianco della fotocamera.\n" + +msgid "Scaling with black %d, multipliers" +msgstr "Riscalamento con punto del nero a %d, coefficienti moltiplicativi" + +msgid "Scaling with darkness %d, saturation %d, and\nmultipliers" +msgstr "Riscalamento con nero %d, saturazione %d, e\ncoefficienti moltiplicativi" + +msgid "Correcting chromatic aberration...\n" +msgstr "Correzione aberrazione cromatica...\n" + +msgid "Bilinear interpolation...\n" +msgstr "Interpolazione bilineare...\n" + +msgid "VNG interpolation...\n" +msgstr "Interpolazione VNG...\n" + +msgid "PPG interpolation...\n" +msgstr "Interpolazione PPG...\n" + +msgid "AHD interpolation...\n" +msgstr "Interpolazione AHD...\n" + +msgid "Median filter pass %d...\n" +msgstr "Filtro mediano, passo %d...\n" + +msgid "Bilateral filtering...\n" +msgstr "Filtraggio bilaterale...\n" + +msgid "Blending highlights...\n" +msgstr "Miscelazione alte luci...\n" + +msgid "Rebuilding highlights...\n" +msgstr "Ricostruzione alte luci...\n" + +msgid "Highlight recovery...\n" +msgstr "Recupero alte luci...\n" + +msgid "Reading metadata from %s ...\n" +msgstr "Lettura metadati da %s ...\n" + +msgid "Failed to read metadata from %s\n" +msgstr "La lettura dei metadati da %s non è andata a buon fine\n" + +msgid "%s: You must link dcraw with libjpeg!!\n" +msgstr "%s: Devi linkare dcraw con libjpeg!!\n" + +msgid "%s: You must link dcraw with %s!!\n" +msgstr "%s: Devi linkare dcraw con %s!!\n" + +msgid "%s has no embedded profile.\n" +msgstr "%s non ha un profilo incorporato.\n" + +msgid "Cannot open file %s!\n" +msgstr "Non può aprire il file %s!\n" + +msgid "Applying color profile...\n" +msgstr "Applicazione del profilo colore...\n" + +msgid "Building histograms...\n" +msgstr "Ricostruzione istogrammi...\n" + +msgid "Converting to %s colorspace...\n" +msgstr "Conversione allo spazio colore %s...\n" + +msgid "Rotating image 45 degrees...\n" +msgstr "Rotazione immagine di 45 gradi...\n" + +msgid "Stretching the image...\n" +msgstr "Deformazione dell'immagine...\n" + +msgid "\nRaw photo decoder \"dcraw\" v%s" +msgstr "\nConvertitore di foto grezze (raw) \"dcraw\" v%s" + +msgid "\nby Dave Coffin, dcoffin a cybercom o net\n" +msgstr "\ndi Dave Coffin, dcoffin a cybercom o net\n" + +msgid "\nUsage: %s [OPTION]... [FILE]...\n\n" +msgstr "\nUtilizzo: %s [OPZIONE]... [FILE]...\n\n" + +msgid "-v Print verbose messages" +msgstr "-v Stampa messaggi di testo" + +msgid "-c Write image data to standard output" +msgstr "-c Scrive l'immagine sullo standard output " + +msgid "-e Extract embedded thumbnail image" +msgstr "-e Estrae l'anteprima dell'immagine incorporata" + +msgid "-i Identify files without decoding them" +msgstr "-i Identifica i files senza decodificarli" + +msgid "-i -v Identify files and show metadata" +msgstr "-i -v Identifica i files e mostra i metadati" + +msgid "-z Change file dates to camera timestamp" +msgstr "-z Cambia la data del file con la data dell'immagine" + +msgid "-a Use automatic white balance" +msgstr "-a Usa il bilanciamento del bianco automatico" + +msgid "-w Use camera white balance, if possible" +msgstr "-w Usa il bilanciamento del bianco della fotocamera, se possibile" + +msgid "-a Average the whole image for white balance" +msgstr "-a Calcola una media sull'intera immagine per il bilanciamento del bianco" + +msgid "-A Average a grey box for white balance" +msgstr "-A Calcola una media su di un rettangolo grigio per il bilanciamento del bianco" + +msgid "-r Set custom white balance" +msgstr "-r Imposta un bilanciamento del bianco personalizzato" + +msgid "-r <4 numbers> Set custom white balance" +msgstr "-r <4 numeri> Specifica i coefficienti moltiplicativi per il bilanciamento del bianco manuale" + +msgid "+M/-M Use/don't use an embedded color matrix" +msgstr "+M/-M Utilizza/non utilizza la matrice colore incorporata nei metadati" + +msgid "-C Correct chromatic aberration" +msgstr "-C Corregge l'aberrazione cromatica" + +msgid "-P Fix the dead pixels listed in this file" +msgstr "-P Corregge i pixels morti elencati in questo file" + +msgid "-K Subtract dark frame (16-bit raw PGM)" +msgstr "-K Sottrae un fotogramma nero (16-bit raw PGM)" + +msgid "-k Set black point" +msgstr "-k Specifica il punto del nero" + +msgid "-k Set the black level" +msgstr "-k Imposta il livello del nero" + +msgid "-k Set the darkness level" +msgstr "-k Fissa il livello del nero" + +msgid "-S Set the saturation level" +msgstr "-S Fissa il livello di saturazione" + +msgid "-n Set threshold for wavelet denoising" +msgstr "-n Imposta la soglia per la riduzione del rumore wavelet" + +msgid "-H [0-9] Highlight mode (0=clip, 1=no clip, 2+=recover)" +msgstr "-H [0-9] Modalità alte luci (0=clip, 1=no clip, 2+=recupero)" + +msgid "-H [0-9] Highlight mode (0=clip, 1=unclip, 2=blend, 3+=rebuild)" +msgstr "-H [0-9] Modalità alte luci (0=clip, 1=no clip, 2=miscelazione, 3+=ricostruzione)" + +msgid "-t [0-7] Flip image (0=none, 3=180, 5=90CCW, 6=90CW)" +msgstr "-t [0-7] Ruota l'immagine (0=nessuna rotazione, 3=180°, 5=90° in senso anti orario, 6=90° in senso orario)" + +msgid "-o [0-5] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" +msgstr "-o [0-5] Spazio colore in uscita (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" + +msgid "-o Apply output ICC profile from file" +msgstr "-o Converte ad un profilo ICC di output specificato da un file" + +msgid "-p Apply camera ICC profile from file or \"embed\"" +msgstr "-p Assegna il profilo ICC della fotocamera da un file o \"embed\"" + +msgid "-d Document mode (no color, no interpolation)" +msgstr "-d Modalità documento (senza colori, senza interpolazione)" + +msgid "-D Document mode without scaling (totally raw)" +msgstr "-D Modalità documento senza riscalamento (conversione totalmente grezza)" + +msgid "-j Don't stretch or rotate raw pixels" +msgstr "-j Non deforma o ruota i pixels grezzi" + +msgid "-W Don't automatically brighten the image" +msgstr "-W Non schiarisce automaticamente l'immagine" + +msgid "-b Adjust brightness (default = 1.0)" +msgstr "-b Corregge la luminosità (default = 1.0)" + +msgid "-g

Set custom gamma curve (default = 2.222 4.5)" +msgstr "-g Imposta una curva gamma personalizzata (default = 2.222 4.5)" + +msgid "-q [0-3] Set the interpolation quality" +msgstr "-q [0-3] Imposta la qualità di interpolazione" + +msgid "-h Half-size color image (twice as fast as \"-q 0\")" +msgstr "-h Immagine a colori a dimensioni dimezzate (due volte più veloce rispetto a \"-q 0\")" + +msgid "-f Interpolate RGGB as four colors" +msgstr "-f Interpolazione RGGB a quattro colori" + +msgid "-m Apply a 3x3 median filter to R-G and B-G" +msgstr "-m Applica un filtro mediano 3x3 a R-G e B-G" + +msgid "-B Apply bilateral filter to smooth noise" +msgstr "-B Applica un filtro bilaterale di riduzione del rumore" + +msgid "-s [0-99] Select a different raw image from the same file" +msgstr "-s [0-99] Seleziona una diversa immagine dallo stesso file raw" + +msgid "-s [0..N-1] Select one raw image or \"all\" from each file" +msgstr "-s [0..N-1] Seleziona un'immagine grezza o \"all\" (tutte) da ciascun file" + +msgid "-6 Write 16-bit instead of 8-bit" +msgstr "-6 Scrive a 16-bit bit anzichè a 8" + +msgid "-4 Linear 16-bit, same as \"-6 -W -g 1 1\"" +msgstr "-4 16-bit lineari, come \"-6 -W -g 1 1\"" + +msgid "-4 Write 16-bit linear instead of 8-bit with gamma" +msgstr "-4 Converte a 16-bit lineari anzichè a 8-bit con gamma " + +msgid "-T Write TIFF instead of PPM" +msgstr "-T Scrive un TIFF anzichè un­ PPM" + +msgid "Non-numeric argument to \"-%c\"\n" +msgstr "Argomento non numerico per \"-%c\"\n" + +msgid "Unknown option \"-%c\".\n" +msgstr "Opzione sconosciuta \"-%c\".\n" + +msgid "No files to process.\n" +msgstr "Nessun file da processare.\n" + +msgid "Will not write an image to the terminal!\n" +msgstr "Non verrà scritta nessun immagine nel terminale!\n" + +msgid "%s has no timestamp.\n" +msgstr "%s non ha informazioni sulla data.\n" + +msgid "%s time set to %d.\n" +msgstr "%s data/ora impostata a %d.\n" + +msgid "%s has no thumbnail.\n" +msgstr "%s non ha una miniatura.\n" + +msgid "\nFilename: %s\n" +msgstr "\nNome del file: %s\n" + +msgid "Timestamp: %s" +msgstr "Data/Ora: %s" + +msgid "Camera: %s %s\n" +msgstr "Fotocamera: %s %s\n" + +msgid "Owner: %s\n" +msgstr "Proprietario: %s\n" + +msgid "DNG Version: " +msgstr "Versione DNG: " + +msgid "ISO speed: %d\n" +msgstr "Sensibilità ISO: %d\n" + +msgid "Shutter: " +msgstr "Tempo di scatto: " + +msgid "%0.1f sec\n" +msgstr "%0.1f sec\n" + +msgid "Aperture: f/%0.1f\n" +msgstr "Apertura: f/%0.1f\n" + +msgid "Focal length: %0.1f mm\n" +msgstr "Lunghezza focale: %0.1f mm\n" + +msgid "Secondary pixels: %s\n" +msgstr "Pixels secondari: %s\n" + +msgid "yes" +msgstr "sì" + +msgid "no" +msgstr "no" + +msgid "Embedded ICC profile: %s\n" +msgstr "Profilo ICC incorporato: %s\n" + +msgid "Decodable with dcraw: %s\n" +msgstr "Decodificabile con dcraw: %s\n" + +msgid "Number of raw images: %d\n" +msgstr "Numero di immagini grezze: %d\n" + +msgid "Pixel Aspect Ratio: %0.6f\n" +msgstr "Fattore di forma dei pixels: %0.6f\n" + +msgid "Thumb size: %4d x %d\n" +msgstr "Dimensione anteprima: %4d x %d\n" + +msgid "Full size: %4d x %d\n" +msgstr "Grandezza naturale: %4d x %d\n" + +msgid "Cannot decode file %s\n" +msgstr "Non può decodificare il file %s\n" + +msgid "Image size: %4d x %d\n" +msgstr "Dimensione immagine: %4d x %d\n" + +msgid "Output size: %4d x %d\n" +msgstr "Dimensione output: %4d x %d\n" + +msgid "Raw colors: %d" +msgstr "Colori grezzi: %d" + +msgid "\nFilter pattern: " +msgstr "\nTrama del filtro: " + +msgid "\nDaylight multipliers:" +msgstr "\nCoefficienti moltiplicativi per luce solare:" + +msgid "\nCamera multipliers:" +msgstr "\nCoefficienti moltiplicativi della fotocamera:" + +msgid "%s is a %s %s image.\n" +msgstr "%s è un'immagine di %s %s.\n" + +msgid "Loading %s %s image from %s ...\n" +msgstr "Caricamento immagine da %s %s dal file %s ...\n" + +msgid "%s: \"-s %d\" requests a nonexistent image!\n" +msgstr "%s: \"-s %d\" richiesta un'immagine non esistente!\n" + +msgid "standard output" +msgstr "standard output" + +msgid "Writing data to %s ...\n" +msgstr "Scrittura dati sul file %s ...\n" diff -Nru dcraw-8.99/dcraw_nl.po dcraw-9.17/dcraw_nl.po --- dcraw-8.99/dcraw_nl.po 1970-01-01 00:00:00.000000000 +0000 +++ dcraw-9.17/dcraw_nl.po 2013-01-03 13:09:39.000000000 +0000 @@ -0,0 +1,320 @@ +# Dutch translation of dcraw messages. +# (c) 2007 Dave Coffin dcoffin a cybercom o net +# Distribute freely. +# +msgid "" +msgstr "" +"Project-Id-Version: dcraw 8.70\n" +"Report-Msgid-Bugs-To: dcoffin a cybercom o net\n" +"POT-Creation-Date: 2006-12-21 22:45-0500\n" +"PO-Revision-Date: 2011-07-23 17:00-0400\n" +"Last-Translator: René Clerc \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +msgid "%s: Out of memory in %s\n" +msgstr "%s: Geheugen is vol in %s\n" + +msgid "Unexpected end of file\n" +msgstr "Onverwacht bestandseinde\n" + +msgid "Corrupt data near 0x%lx\n" +msgstr "Corrupte gegevens bij 0x%lx\n" + +msgid "Corrupt data near 0x%llx\n" +msgstr "Corrupte gegevens bij 0x%llx\n" + +msgid "%s: decoder table overflow\n" +msgstr "%s: overflow van de decodeertabel\n" + +msgid "Phase One correction...\n" +msgstr "Phase One correctie...\n" + +msgid "%s: incorrect JPEG dimensions\n" +msgstr "%s: incorrecte JPEG dimensies\n" + +msgid "%s: \"%s\" matrix not found!\n" +msgstr "%s: \"%s\" matrix niet gevonden!\n" + +msgid "Foveon interpolation...\n" +msgstr "Foveon interpolatie...\n" + +msgid "%s: Invalid white balance \"%s\"\n" +msgstr "%s: Ongeldige witbalans \"%s\"\n" + +msgid "Fixed bad pixels at:" +msgstr "Foute pixels verholpen bij:" + +msgid "%s is not a valid PGM file!\n" +msgstr "%s is geen geldig PGM-bestand!\n" + +msgid "%s has the wrong dimensions!\n" +msgstr "%s heeft de verkeerde afmetingen!\n" + +msgid "Wavelet denoising...\n" +msgstr "Wavelet ontdoen van ruis...\n" + +msgid "%s: Cannot use camera white balance.\n" +msgstr "%s: Kan de witbalans van de camera niet gebruiken.\n" + +msgid "Scaling with black %d, multipliers" +msgstr "Schalen met zwart %d, vermenigvuldigingsfactoren" + +msgid "Bilinear interpolation...\n" +msgstr "Bilineaire interpolatie...\n" + +msgid "VNG interpolation...\n" +msgstr "VNG interpolatie...\n" + +msgid "PPG interpolation...\n" +msgstr "PPG interpolatie...\n" + +msgid "AHD interpolation...\n" +msgstr "AHD interpolatie...\n" + +msgid "Bilateral filtering...\n" +msgstr "Bilateraal filteren...\n" + +msgid "Highlight recovery...\n" +msgstr "Oplichting herstellen...\n" + +msgid "Reading metadata from %s ...\n" +msgstr "Bezig met lezen van meta-gegevens van %s ...\n" + +msgid "Failed to read metadata from %s\n" +msgstr "Lezen van meta-gegevens gefaald van %s\n" + +msgid "%s: You must link dcraw with libjpeg!!\n" +msgstr "%s: dcraw moet gelinkt worden met libjpeg!!\n" + +msgid "%s: You must link dcraw with %s!!\n" +msgstr "%s: dcraw moet gelinkt worden met %s!!\n" + +msgid "%s has no embedded profile.\n" +msgstr "%s heeft geen ingebed profiel.\n" + +msgid "Cannot open file %s!\n" +msgstr "Kan bestand niet openen %s!\n" + +msgid "Applying color profile...\n" +msgstr "Kleurenprofiel toepassen...\n" + +msgid "Building histograms...\n" +msgstr "Opbouwen histogrammen...\n" + +msgid "Converting to %s colorspace...\n" +msgstr "Omzetten naar %s kleurenruimte...\n" + +msgid "Rotating image 45 degrees...\n" +msgstr "Afbeelding 45 graden roteren...\n" + +msgid "Stretching the image...\n" +msgstr "Afbeelding oprekken...\n" + +msgid "\nRaw photo decoder \"dcraw\" v%s" +msgstr "\nRuwe foto decodeerder \"dcraw\" v%s" + +msgid "\nby Dave Coffin, dcoffin a cybercom o net\n" +msgstr "\ndoor Dave Coffin, dcoffin a cybercom o net\n" + +msgid "\nUsage: %s [OPTION]... [FILE]...\n\n" +msgstr "\nGebruik: %s [OPTION]... [FILE]...\n\n" + +msgid "-v Print verbose messages" +msgstr "-v Meldingen afdrukken" + +msgid "-c Write image data to standard output" +msgstr "-c Schrijf afbeeldingsgegevens naar standaarduitvoer" + +msgid "-e Extract embedded thumbnail image" +msgstr "-e Extraheer ingebed miniatuurvoorbeeld" + +msgid "-i Identify files without decoding them" +msgstr "-i Benoem bestanden zonder ze te decoderen" + +msgid "-i -v Identify files and show metadata" +msgstr "-i -v Benoem bestanden en toon meta-gegevens" + +msgid "-z Change file dates to camera timestamp" +msgstr "-z Verander bestandsdata naar datum van de opname" + +msgid "-a Use automatic white balance" +msgstr "-a Gebruik automatische witbalans" + +msgid "-w Use camera white balance, if possible" +msgstr "-w Gebruik witbalans van de camera, indien mogelijk" + +msgid "-a Average the whole image for white balance" +msgstr "-a Middel de gehele afbeelding voor witbalans" + +msgid "-A Average a grey box for white balance" +msgstr "-A Middle een grijs vlak voor witbalans" + +msgid "-r Set custom white balance" +msgstr "-r Zet handmatige witbalans" + +msgid "-r <4 numbers> Set custom white balance" +msgstr "-r <4 nummers> Zet handmatige witbalans" + +msgid "-b Adjust brightness (default = 1.0)" +msgstr "-b Pas helderheid aan (standaard = 1.0)" + +msgid "-n Set threshold for wavelet denoising" +msgstr "-n Zet grens voor wavelet ontdoen van ruis" + +msgid "-k Set black point" +msgstr "-k Zet zwart punt" + +msgid "-K Subtract dark frame (16-bit raw PGM)" +msgstr "-K Verwijder donker kader (16-bit ruwe PGM)" + +msgid "-H [0-9] Highlight mode (0=clip, 1=no clip, 2+=recover)" +msgstr "-H [0-9] Oplichtingsmodus (0=clip, 1=geen clip, 2+=herstellen)" + +msgid "-t [0-7] Flip image (0=none, 3=180, 5=90CCW, 6=90CW)" +msgstr "-t [0-7] Roteer afbeelding (0=niet, 3=180, 5=90klok-tegen, 6=90klok-mee)" + +msgid "-o [0-5] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" +msgstr "-o [0-5] Toon kleurenruimte (ruw,sRGB,Adobe,Wide,ProPhoto,XYZ)" + +msgid "-o Apply output ICC profile from file" +msgstr "-o Pas uitvoer ICC-profiel toe van bestand" + +msgid "-p Apply camera ICC profile from file or \"embed\"" +msgstr "-p Pas camera ICC-profiel toe van bestand of \"embed\"" + +msgid "-d Document mode (no color, no interpolation)" +msgstr "-d Documentmodus (geen kleur, geen interpolatie)" + +msgid "-D Document mode without scaling (totally raw)" +msgstr "-D Documentmodus zonder schaling (helemaal ruw)" + +msgid "-j Don't stretch or rotate raw pixels" +msgstr "-j Ruwe pixels niet oprekken of roteren" + +msgid "-q [0-3] Set the interpolation quality" +msgstr "-q [0-3] Zet de kwaliteit van de interpolatie" + +msgid "-h Half-size color image (twice as fast as \"-q 0\")" +msgstr "-h Kleurenafbeelding op halve grootte (tweemaal zo snel als \"-q 0\")" + +msgid "-f Interpolate RGGB as four colors" +msgstr "-f Interpoleer RGGB als vier kleuren" + +msgid "-B Apply bilateral filter to smooth noise" +msgstr "-B Pas bilateraal filter to om ruis te vereffenen" + +msgid "-s [0-99] Select a different raw image from the same file" +msgstr "-s [0-99] Selecteer een andere ruwe afbeelding van hetzelfde bestand" + +msgid "-4 Write 16-bit linear instead of 8-bit with gamma" +msgstr "-4 Schrijf 16-bit lineair in plaats van 8-bit met gamma" + +msgid "-T Write TIFF instead of PPM" +msgstr "-T Schrijf TIFF in plaats van PPM" + +msgid "Non-numeric argument to \"-%c\"\n" +msgstr "Geen numeriek argument voor \"-%c\"\n" + +msgid "Unknown option \"-%c\".\n" +msgstr "Onbekende optie \"-%c\".\n" + +msgid "No files to process.\n" +msgstr "Geen bestanden om te verwerken.\n" + +msgid "Will not write an image to the terminal!\n" +msgstr "Zal geen afbeelding naar de terminal wegschrijven!\n" + +msgid "%s has no timestamp.\n" +msgstr "%s heeft geen tijdstempel.\n" + +msgid "%s time set to %d.\n" +msgstr "%s tijd gezet naar %d.\n" + +msgid "%s has no thumbnail.\n" +msgstr "%s heeft geen miniatuurafbeelding.\n" + +msgid "\nFilename: %s\n" +msgstr "\nBestandsnaam: %s\n" + +msgid "Timestamp: %s" +msgstr "Tijd: %s" + +msgid "Camera: %s %s\n" +msgstr "Camera: %s %s\n" + +msgid "DNG Version: " +msgstr "DNG Versie: " + +msgid "ISO speed: %d\n" +msgstr "ISO snelheid: %d\n" + +msgid "Shutter: " +msgstr "Sluiter: " + +msgid "%0.1f sec\n" +msgstr "%0.1f sec\n" + +msgid "Aperture: f/%0.1f\n" +msgstr "Diafragmaopening: f/%0.1f\n" + +msgid "Focal length: %0.1f mm\n" +msgstr "Scherpstelafstand: %0.1f mm\n" + +msgid "Secondary pixels: %s\n" +msgstr "Secondaire pixels: %s\n" + +msgid "yes" +msgstr "ja" + +msgid "no" +msgstr "nee" + +msgid "Embedded ICC profile: %s\n" +msgstr "Ingebed ICC-profiel: %s\n" + +msgid "Decodable with dcraw: %s\n" +msgstr "Decodeerbaar met dcraw: %s\n" + +msgid "Pixel Aspect Ratio: %0.6f\n" +msgstr "Pixel Aspectratio: %0.6f\n" + +msgid "Thumb size: %4d x %d\n" +msgstr "Miniatuurafmetingen: %4d x %d\n" + +msgid "Full size: %4d x %d\n" +msgstr "Volledige grootte: %4d x %d\n" + +msgid "Cannot decode file %s\n" +msgstr "Kan bestand niet decoderen %s\n" + +msgid "Image size: %4d x %d\n" +msgstr "Afmetingen van de afbeelding: %4d x %d\n" + +msgid "Output size: %4d x %d\n" +msgstr "Afmetingen van de uitvoer: %4d x %d\n" + +msgid "Raw colors: %d" +msgstr "Ruwe kleuren: %d" + +msgid "\nFilter pattern: " +msgstr "\nFilterpatroon: " + +msgid "\nDaylight multipliers:" +msgstr "\nDaglicht vermenigvuldigingen:" + +msgid "\nCamera multipliers:" +msgstr "\nCamera vermenigvuldigingen:" + +msgid "%s is a %s %s image.\n" +msgstr "%s is een %s %s afbeelding.\n" + +msgid "Loading %s %s image from %s ...\n" +msgstr "Afbeelding %s %s laden van %s ...\n" + +msgid "standard output" +msgstr "standaard uitvoer" + +msgid "Writing data to %s ...\n" +msgstr "Gegevens wegschrijven naar %s ...\n" diff -Nru dcraw-8.99/dcraw_pl.1 dcraw-9.17/dcraw_pl.1 --- dcraw-8.99/dcraw_pl.1 1970-01-01 00:00:00.000000000 +0000 +++ dcraw-9.17/dcraw_pl.1 2013-01-03 13:09:39.000000000 +0000 @@ -0,0 +1,295 @@ +.\" +.\" Man page for dcraw +.\" +.\" Copyright (c) 2009 by David Coffin +.\" +.\" You may distribute without restriction. +.\" +.\" David Coffin +.\" dcoffin a cybercom o net +.\" http://www.cybercom.net/~dcoffin +.\" +.TH dcraw 1 "14 maj 2009" +.LO 1 +.SH NAZWA +dcraw - dekoder obrazów w formacie raw +.SH SKŁADNIA +.B dcraw +[\fIOPCJE\fR]... [\fIPLIK\fR]... +.SH OPIS +.B dcraw +dekoduje obrazy w formacie raw, wyświetla metadane oraz wyodrębnia miniaturki. +.SH OPCJE PODSTAWOWE +.TP +.B -v +Wyświetl szczegółowe informacje, a nie tylko błędy i ostrzeżenia. +.TP +.B -c +Zapisz zdekodowany obraz lub miniaturę na standardowe wyjście. +.TP +.B -e +Wyodrębnij wygenerowaną przez aparat miniaturkę, a nie obraz raw. +Wynikowy obraz będzie w formacie JPEG lub PPM, w zależności od modelu aparatu. +.TP +.B -z +Zmień daty modyfikacji i ostatniego dostępu plików AVI, JPEG, TIFF lub raw +na datę wykonania obrazu przy założeniu, że zegar aparatu jest +ustawiony na Czas Uniwersalny (UTC). +.TP +.B -i +Tylko zidentyfikuj pliki, nie dekoduj zawartości. +Zwraca wartość 0 jeżeli +.B dcraw +jest w stanie zdekodować ostatni obraz. W innym przypadku zwracana jest wartość 1. +.B -i -v +pokazuje metadane obrazka. +.TP +.B "" +.B dcraw +nie dekoduje obrazów w formacie JPEG!! +.SH OPCJE NAPRAWY OBRAZU +.TP +.B -P martwepiksele.txt +Wczytuje listę martwych pikseli z tego pliku zamiast z ".badpixels". +Zobacz w +.B PLIKI +opis składni tego pliku. +.TP +.B -K czarna_klatka.pgm +Odejmuje czarna klatkę od danych raw. Czarna klatkę wygenerujesz +robiąc zdjecie bez oswietlenia (np.: z obiektywem zasłoniętym dekielkiem), które +wywołaj następująco +.BR dcraw\ -D\ -4\ -j\ -t\ 0 . +.TP +.B -k odciecie_czerni +Kiedy po wywołaniu cienie stają się szare, należy podnieść poziom +odcięcia czerni. +Zmierzyć można poprzez użycie +.B pamsumm -mean +z plikiem czarnej klatki, przygotowanym jak powyżej. +.TP +.B -S nasycenie +Kiedy światła przechodzą w kolor różowy, należy obniżyć poziom nasycenia. +Żeby ustalic właściwy poziom, należy zrobić zdjęcie z czymś lśniącym +w kadrze, a następnie +.B dcraw -D -4 -j -c +fotka.raw +.B | pamsumm -max +.TP +.B "" +Domyślny poziom czerni, jak i nasycenia jest zazwyczaj poprawny i nie +wymaga ingerencji. +.TP +.B -n poziom_redukcji +Użyj falkowej redukcji szumów, pozostawiając jak najwięcej detali. +Najlepszy efekt dają wartości poziomu z przedziału między 100 a 1000. +.TP +.B -C wzm_czerw wzm_nieb +Zwiększ warstwy koloru czerwonego i niebieskiego o podane współczynniki +(zazwyczaj od 0.999 do 1.001) aby zniwelować aberrację chromatyczną. +.TP +.B -H 0 +Przytnij wszystkie światła do koloru białego (domyślne). +.TP +.B -H 1 +Nie przycinaj świateł (pozostaw w różnych odcieniach różu). +.TP +.B -H 2 +Połącz przycięte i nieprzycięte wartości ze sobą aby uzyskać wygładzone +przejście do bieli. +.TP +.B -H 3+ +Rekonstruuj światła. Niskie wartości preferują biel, wyższe preferują +kolory. Spróbuj użyć +.B -H 5 +jako dobrego kompromisu. Gdyby to okazało się niewystarczające, użyj opcji +.BR -H\ 9 , +wyczyść wszystkie inne niż białe światła, a następnie wklej je do obrazka +wygenerowanego przy użyciu +.BR -H\ 3 . +.SH OPCJE KOLORÓW +Domyślnie +.B dcraw +używa stałego balansu bieli w oparciu o próbnik kolorów naświetlony +standardową lampą błyskową D65. +.TP +.B -w +Użyj wartości balansu bieli zapisanej przez aparat. +Jeżeli wartość ta nie zostanie odnaleziona, zostanie wyświetlone +ostrzeżenie i użyta będzie inna metoda jego określenia. +.TP +.B -a +Oblicz balans bieli na podstawie średniej z zawartości całego obrazu. +.TP +.B -A lewo góra szerokość wysokość +Oblicz balans bieli na podstawie średniej z zawartości wybranego +szarego obszaru prostokątnego (np. zdjęcie z szarą kartą). +Przedtem wykonaj +.B dcraw\ -j\ -t\ 0 +, a następnie wybierz obszar o neutralnym, szarym kolorze. +.TP +.B -r mul0 mul1 mul2 mul3 +Podaj własne wartości balansu bieli. Te wartości mogą również zostać +skopiowane z rezultatu działania polecenia +.BR dcraw\ -v . +.TP +.BR +M " lub " -M +Używaj (lub nie używaj) jakichkolwiek macierzy kolorów z metadanych aparatu. +Domyślna wartość to +.B +M +gdy użyto opcji +.BR -w , +lub +.B -M +w przeciwnym wypadku. +Ta opcja dotyczy jedynie aparatów Olympus, Leaf oraz Phase One. +.TP +.B -o [0-5] +Wybierz wynikową przestrzeń kolorów, w przypadku gdy nie użyto parametru +.B -p +: + +.B \t0 +\ \ Surowy kolor (specyficzny dla każdego aparatu) +.br +.B \t1 +\ \ sRGB D65 (domyślna) +.br +.B \t2 +\ \ Adobe RGB (1998) D65 +.br +.B \t3 +\ \ Wide Gamut RGB D65 +.br +.B \t4 +\ \ Kodak ProPhoto RGB D65 +.br +.B \t5 +\ \ XYZ +.TP +.BR -p\ aparat.icm \ [\ -o\ rezultat.icm \ ] +Użyj profilów kolorów ICC do obliczenia surowej przestrzeni kolorów +aparatu oraz wynikowej przestrzeni kolorów (domyślnie sRGB). +.TP +.B -p embed +Użyj profilu ICC osadzonego wewnątrz obrazu w formacie raw. +.SH OPCJE INTERPOLACJI +.TP +.B -d +Zdekoduj obraz raw w skali szarości, bez interpolacji kolorów. +Przydatne przy fotografowaniu czarno-białego tekstu. +.TP +.B -D +Tak samo jak +.BR -d , +lecz bez skalowania kolorów (całkowicie surowy obraz). +.TP +.B -h +Generuj obraz o wymiarach równych połowie oryginału. +Działa dwa razy szybciej niż +.BR -q\ 0 . +.TP +.B -q 0 +Użyj szybkiej, lecz niskiej jakości interpolacji dwuliniowej. +.TP +.B -q 1 +Użyj interpolacji VNG (Variable Number of Gradients). +.TP +.B -q 2 +Użyj interpolacji PPG (Patterned Pixel Grouping). +.TP +.B -q 3 +Użyj interpolacji AHD (Adaptive Homogeneity-Directed, najwyższa jakość). +.TP +.B -f +Interpoluj RGB jako cztery kolory. Użyj tej opcji, jeżeli na wynikowym +obrazie widać niewłaściwe obszary 2x2 (interpolacja VNG) lub mazy (AHD). +.TP +.B -m liczba_przebiegów +Po dokonaniu interpolacji usuń zniekształcenia kolorystyczne poprzez +wielokrotne zastosowanie filtra medianowego (3x3 piksele) do wartości +R-G oraz B-G (różnic składowych). +.SH OPCJE FORMATU WYJŚCIOWEGO +Domyślnie +.B dcraw +zapisuje obrazy PGM/PPM/PAM wykorzystując 8 bitów na składową koloru, +krzywą gamma BT 709, poziom bieli oparty o histogram oraz bez metadanych. +.TP +.B -W +Użyj stałego poziomu bieli, ignorując histogram obrazka. +.TP +.B -b jasnosc +Podziel poziom bieli przez tą wartość (domyślnie 1.0). +.TP +.B -g potęga początkowego_nachylenia +Ustaw krzywą gamma, domyślne BT.709 +.RB ( -g\ 2.222\ 4.5 ). +Jeżeli wolisz współczynnik gamma zgodny z sRGB, użyj +.BR -g\ 2.4\ 12.92 . +Dla zwykłej funkji potęgowej, ustaw nachylenie początkowe na zero. +.TP +.B -6 +Zapisuje 16-bitów na próbkę, zamiast 8-bitów. +.TP +.B -4 +Liniowy zapis 16-bitowy, tak samo jak +.BR -6\ -W\ -g\ 1\ 1 . +.TP +.B -T +Generuj obraz wynikowy w formacie TIFF z metadanymi zamiast +domyślnego formatu PGM/PPM/PAM. +.TP +.B -t [0-7,90,180,270] +Obróć wynikowy obraz. Domyślnie +.B dcraw +obraca obraz stosownie do informacji zapisanej przez aparat. +.B -t 0 +wyłącza obracanie. +.TP +.B -j +W przypadku aparatów Fuji\ Super\ CCD obróć obraz o 45 stopni. +Dla aparatów o innym niż kwadratowy kształcie piksela nie skaluj +obrazu do jego właściwych proporcji. W każdym przypadku użycie tej +opcji gwarantuje, że jeden wynikowy piksel odpowiada dokładnie +jednemu surowemu pikselowi. +.TP +.BR "-s [0..N-1]" " lub " "-s all" +Jeżeli plik zawiera N surowych obrazków, wybierz do zdekodowania +jeden z nich lub "all" (wszystkie). +Przykładowo aparaty Fuji\ Super\ CCD\ SR generują drugi obraz o +zmniejszonej o cztery poziomy ekspozycji, na którym dokładniej +przedstawione są odbłyski. +.SH PLIKI +.TP +\:./.badpixels, ../.badpixels, ../../.badpixels, ... +Lista uszkodzonych pikseli Twojego aparatu, używana po to, aby +.B dcraw +mógł zinterpolować ich wartość ba podstawie sąsiednich pikseli. +Każda linia zawiera kolumnę i wiersz uszkodzonego piksela, oraz +datę (w formacie uniksowym), kiedy nastąpiło uszkodzenie. +Na przykład: +.sp 1 +.nf + 962 91 1028350000 # uszkodzony 1. sierpnia 2002 +1285 1067 0 # nieznana data uszkodzenia +.fi +.sp 1 +Te współrzędne dotyczą obrazu przed przycięciem oraz obrotem, +tak więc użyj polecenia +.B dcraw -j -t 0 +aby zlokalizować uszkodzone piksele. +.SH "ZOBACZ TAKŻE" +.BR pgm (5), +.BR ppm (5), +.BR pam (5), +.BR pnmgamma (1), +.BR pnmtotiff (1), +.BR pnmtopng (1), +.BR gphoto2 (1), +.BR cjpeg (1), +.BR djpeg (1) +.SH AUTOR +.B dcraw +został stworzony przez Davida Coffina, dcoffin a cybercom o net +.SH TŁUMACZENIE +Krzysztof Nowicki krissn a op o pl diff -Nru dcraw-8.99/dcraw_pl.po dcraw-9.17/dcraw_pl.po --- dcraw-8.99/dcraw_pl.po 1970-01-01 00:00:00.000000000 +0000 +++ dcraw-9.17/dcraw_pl.po 2013-01-03 13:09:39.000000000 +0000 @@ -0,0 +1,376 @@ +# Polish translation of dcraw messages. +# (c) 2009 Dave Coffin dcoffin a cybercom o net +# (c) 2009 Krzysztof Nowicki krissn a op o pl +# (c) 2009 Michal Smoczyk msmoczyk a wp o pl +# Distribute freely. +# +msgid "" +msgstr "" +"Project-Id-Version: dcraw 8.94\n" +"Report-Msgid-Bugs-To: dcoffin a cybercom o net\n" +"POT-Creation-Date: 2006-12-21 22:45-0500\n" +"PO-Revision-Date: 2011-07-23 17:00-0400\n" +"Last-Translator: Michal Smoczyk \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +msgid "%s: Out of memory in %s\n" +msgstr "%s: Brak pamięci %s\n" + +msgid "Unexpected end of file\n" +msgstr "Nieoczekiwany koniec pliku\n" + +msgid "Corrupt data near 0x%lx\n" +msgstr "Uszkodzone dane w pobliżu 0x%lx\n" + +msgid "Corrupt data near 0x%llx\n" +msgstr "Uszkodzone dane w pobliżu 0x%llx\n" + +msgid "%s: decoder table overflow\n" +msgstr "%s: przepełnienie tablicy dekodera\n" + +msgid "Phase One correction...\n" +msgstr "Korekcja Phase One...\n" + +msgid "%s: incorrect JPEG dimensions\n" +msgstr "%s: niewłaściwe wymiary obrazu JPEG\n" + +msgid "%s: \"%s\" matrix not found!\n" +msgstr "Nie znaleziono macierzy %s: \"%s\"!\n" + +msgid "Foveon interpolation...\n" +msgstr "Interpolacja Foveon...\n" + +msgid "%s: Invalid white balance \"%s\"\n" +msgstr "%s: Niewłaściwy balans bieli \"%s\"\n" + +msgid "Fixed bad pixels at:" +msgstr "Naprawiono uszkodzone piksele:" + +msgid "Fixed dead pixels at:" +msgstr "Usuwanie martwych pikseli:" + +msgid "%s is not a valid PGM file!\n" +msgstr "%s to nieprawidłowy plik PGM!\n" + +msgid "%s has the wrong dimensions!\n" +msgstr "%s ma niewłaściwe wymiary!\n" + +msgid "Wavelet denoising...\n" +msgstr "Falkowa redukcja szumów...\n" + +msgid "%s: Cannot use camera white balance.\n" +msgstr "%s: Nie można użyć balansu bieli uzyskanego z aparatu.\n" + +msgid "Scaling with black %d, multipliers" +msgstr "Skalowanie z punktem czerni %d, mnożniki" + +msgid "Scaling with darkness %d, saturation %d, and\nmultipliers" +msgstr "Skalowanie z użyciem odcięcia czerni %d, poziomu nasycenia %d,\noraz mnożników" + +msgid "Correcting chromatic aberration...\n" +msgstr "Korygowanie aberracji chromatycznej...\n" + +msgid "Bilinear interpolation...\n" +msgstr "Interpolacja dwuliniowa...\n" + +msgid "VNG interpolation...\n" +msgstr "Interpolacja VNG...\n" + +msgid "PPG interpolation...\n" +msgstr "Interpolacja PPG...\n" + +msgid "AHD interpolation...\n" +msgstr "Interpolacja AHD...\n" + +msgid "Median filter pass %d...\n" +msgstr "Filtr medianowy - przebieg %d...\n" + +msgid "Blending highlights...\n" +msgstr "Wygładzanie świateł...\n" + +msgid "Rebuilding highlights...\n" +msgstr "Przebudowa świateł...\n" + +msgid "Highlight recovery...\n" +msgstr "Rekonstrukcja świateł...\n" + +msgid "Reading metadata from %s ...\n" +msgstr "Czytanie metadanych z %s ...\n" + +msgid "Failed to read metadata from %s\n" +msgstr "Nie udało się odczytać metadanych z %s\n" + +msgid "%s: You must link dcraw with libjpeg!!\n" +msgstr "%s: Musisz zlinkować dcraw z libjpeg!!\n" + +msgid "%s: You must link dcraw with %s!!\n" +msgstr "%s: Musisz zlinkować dcraw z %s!!\n" + +msgid "%s has no embedded profile.\n" +msgstr "%s nie posiada osadzonego profilu.\n" + +msgid "Cannot open file %s!\n" +msgstr "Nie można otworzyć pliku %s!\n" + +msgid "Applying color profile...\n" +msgstr "Stosowanie profilu kolorów...\n" + +msgid "Building histograms...\n" +msgstr "Generacja histogramów...\n" + +msgid "Converting to %s colorspace...\n" +msgstr "Konwersja do przestrzeni kolorów %s...\n" + +msgid "Rotating image 45 degrees...\n" +msgstr "Obracanie obrazu o 45 stopni...\n" + +msgid "Stretching the image...\n" +msgstr "Rozciąganie obrazu...\n" + +msgid "\nRaw photo decoder \"dcraw\" v%s" +msgstr "\nDekoder surowych obrazów \"dcraw\" v%s" + +msgid "\nby Dave Coffin, dcoffin a cybercom o net\n" +msgstr "\nnapisany przez Dave'a Coffina, dcoffin a cybercom o net\n" + +msgid "\nUsage: %s [OPTION]... [FILE]...\n\n" +msgstr "\nUżycie: %s [OPCJE]... [PLIK]...\n\n" + +msgid "-v Print verbose messages" +msgstr "-v Wyświetl dodatkowe komunikaty" + +msgid "-c Write image data to standard output" +msgstr "-c Zapisz obraz wynikowy na standardowe wyjście" + +msgid "-e Extract embedded thumbnail image" +msgstr "-e Wyodrębnij osadzoną miniaturkę" + +msgid "-i Identify files without decoding them" +msgstr "-i Identyfikuj pliki bez ich dekodowania" + +msgid "-i -v Identify files and show metadata" +msgstr "-i -v Identyfikuj pliki i pokaż metadane" + +msgid "-z Change file dates to camera timestamp" +msgstr "-z Ustaw datę dostępu/modyfikacji na czas wykonania zdjęcia" + +msgid "-w Use camera white balance, if possible" +msgstr "-w Jeżeli to możliwe, użyj wartości balansu bieli zapisanej przez aparat" + +msgid "-a Average the whole image for white balance" +msgstr "-a Oblicz balans bieli na podstawie średniej z całego obrazka" + +msgid "-A Average a grey box for white balance" +msgstr "-A Oblicz balans bieli na podstawie średniej szarego obszaru prostokątnego" + +msgid "-r Set custom white balance" +msgstr "-r Użyj własnych wartości balansu bieli" + +msgid "+M/-M Use/don't use an embedded color matrix" +msgstr "+M/-M Używaj/nie używaj zawartych w obrazku macierzy kolorów" + +msgid "-C Correct chromatic aberration" +msgstr "-C Skoryguj aberrację chromatyczną" + +msgid "-P Fix the dead pixels listed in this file" +msgstr "-P Usuń martwe piksele bazując na pliku" + +msgid "-K Subtract dark frame (16-bit raw PGM)" +msgstr "-K Odejmij czarną klatkę (16-bitowy surowy plik PGM)" + +msgid "-k Set black point" +msgstr "-k Ustaw punkt czerni" + +msgid "-k Set the black level" +msgstr "-k Ustaw poziom czerni" + +msgid "-k Set the darkness level" +msgstr "-k Ustaw poziom odcięcia czerni" + +msgid "-S Set the saturation level" +msgstr "-S Ustaw poziom nasycenia" + +msgid "-n Set threshold for wavelet denoising" +msgstr "-n Ustaw próg falkowej redukcji szumów" + +msgid "-H [0-9] Highlight mode (0=clip, 1=no clip, 2+=recover)" +msgstr "-H [0-9] Rekonstrukcja świateł (0=obetnij, 1=pozostaw, 2+=zrekonstruuj)" + +msgid "-H [0-9] Highlight mode (0=clip, 1=unclip, 2=blend, 3+=rebuild)" +msgstr "-H [0-9] Tryb przetwarzania świateł (0=obetnij, 1=nie obcinaj, 2=mieszaj, 3+=rekonstruuj)" + +msgid "-t [0-7] Flip image (0=none, 3=180, 5=90CCW, 6=90CW)" +msgstr "-t [0-7] Obróć obrazek (0=brak, 3=180, 5=90 w lewo, 6=90 w prawo)" + +msgid "-o [0-5] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" +msgstr "-o [0-5] Wyjściowa przestrzeń kolorów (surowa,sRGB,Adobe,Wide,ProPhoto,XYZ)" + +msgid "-o Apply output ICC profile from file" +msgstr "-o Zastosuj profil wyjściowy ICC z pliku" + +msgid "-p Apply camera ICC profile from file or \"embed\"" +msgstr "-p Zastosuj profil ICC aparatu z pliku lub osadzony w obrazie raw" + +msgid "-d Document mode (no color, no interpolation)" +msgstr "-d Tryb dokumentowy (brak interpolacji kolorów)" + +msgid "-D Document mode without scaling (totally raw)" +msgstr "-D Tryb dokumentowy bez skalowania (całkowicie surowy)" + +msgid "-j Don't stretch or rotate raw pixels" +msgstr "-j Nie skaluj ani nie obracaj surowych pikseli" + +msgid "-W Don't automatically brighten the image" +msgstr "-W Nie rozjaśniaj obrazu automatycznie" + +msgid "-b Adjust brightness (default = 1.0)" +msgstr "-b Dostosuj jasność (domyślnie 1.0)" + +msgid "-g

Set custom gamma curve (default = 2.222 4.5)" +msgstr "-g

Ustawia własną krzywą gamma (domyślnie 2.222 4.5)" + +msgid "-q [0-3] Set the interpolation quality" +msgstr "-q [0-3] Ustawia jakość interpolacji" + +msgid "-h Half-size color image (twice as fast as \"-q 0\")" +msgstr "-h Generuj obraz o dwukrotnie mniejszych wymiarach (działa dwukrotnie szybciej niż \"-q 0\")" + +msgid "-f Interpolate RGGB as four colors" +msgstr "-f Interpoluj RGGB jako cztery kolory" + +msgid "-m Apply a 3x3 median filter to R-G and B-G" +msgstr "-m Zastosuj filtr medianowy 3x3 do wartości R-G i B-G" + +msgid "-s [0-99] Select a different raw image from the same file" +msgstr "-s [0-99] Wybierz inny obraz raw z tego samego pliku" + +msgid "-s [0..N-1] Select one raw image or \"all\" from each file" +msgstr "-s [0..N-1] Wybierz pojedynczy obrazek lub \"all\" (wszystkie) z każdego pliku" + +msgid "-6 Write 16-bit instead of 8-bit" +msgstr "-6 Zapisuje obraz 16-bitowy, zamiast 8-bitowego" + +msgid "-4 Linear 16-bit, same as \"-6 -W -g 1 1\"" +msgstr "-4 Liniowy 16-bitowy, tak samo jak \"-6 -W -g 1 1\"" + +msgid "-4 Write 16-bit linear instead of 8-bit with gamma" +msgstr "-4 Zapisuje obraz 16-bitowy, zamiast 8-bitowego z gammą" + +msgid "-T Write TIFF instead of PPM" +msgstr "-T Zapisuje obraz TIFF zamiast PPM" + +msgid "Non-numeric argument to \"-%c\"\n" +msgstr "Nieliczbowy argument dla opcji \"-%c\"\n" + +msgid "Unknown option \"-%c\".\n" +msgstr "Nieznana opcja \"-%c\".\n" + +msgid "No files to process.\n" +msgstr "Brak plików do przetworzenia.\n" + +msgid "Will not write an image to the terminal!\n" +msgstr "Nie można zapisać obrazu bezpośrednio do terminala!\n" + +msgid "%s has no timestamp.\n" +msgstr "%s nie posiada znacznika czasu.\n" + +msgid "%s time set to %d.\n" +msgstr "%s data i czas ustawiony na %d.\n" + +msgid "%s has no thumbnail.\n" +msgstr "%s nie zawiera miniaturki.\n" + +msgid "\nFilename: %s\n" +msgstr "\nNazwa pliku: %s\n" + +msgid "Timestamp: %s" +msgstr "Data/czas: %s" + +msgid "Camera: %s %s\n" +msgstr "Model aparatu: %s %s\n" + +msgid "Owner: %s\n" +msgstr "Właściciel: %s\n" + +msgid "DNG Version: " +msgstr "Wersja DNG: " + +msgid "ISO speed: %d\n" +msgstr "Czułość ISO: %d\n" + +msgid "Shutter: " +msgstr "Migawka: " + +msgid "%0.1f sec\n" +msgstr "%0.1f s\n" + +msgid "Aperture: f/%0.1f\n" +msgstr "Przesłona: f/%0.1f\n" + +msgid "Focal length: %0.1f mm\n" +msgstr "Długość ogniskowej: %0.1f mm\n" + +msgid "Secondary pixels: %s\n" +msgstr "Dodatkowe piksele: %s\n" + +msgid "yes" +msgstr "tak" + +msgid "no" +msgstr "nie" + +msgid "Embedded ICC profile: %s\n" +msgstr "Osadzony profil ICC: %s\n" + +msgid "Decodable with dcraw: %s\n" +msgstr "Dekodowalny przez dcraw: %s\n" + +msgid "Number of raw images: %d\n" +msgstr "Ilość surowych obrazków: %d\n" + +msgid "Pixel Aspect Ratio: %0.6f\n" +msgstr "Proporcje piksela: %0.6f\n" + +msgid "Thumb size: %4d x %d\n" +msgstr "Wielkość miniaturki: %4d x %d\n" + +msgid "Full size: %4d x %d\n" +msgstr "Wymiary pełnego obrazu: %4d x %d\n" + +msgid "Cannot decode file %s\n" +msgstr "Nie można odkodować pliku %s\n" + +msgid "Image size: %4d x %d\n" +msgstr "Wymiary obrazu: %4d x %d\n" + +msgid "Output size: %4d x %d\n" +msgstr "Wymiary obrazu wyjściowego: %4d x %d\n" + +msgid "Raw colors: %d" +msgstr "Surowych kolorów: %d" + +msgid "\nFilter pattern: " +msgstr "\nFiltr: " + +msgid "\nDaylight multipliers:" +msgstr "\nWspółczynniki korekcji światła dziennego:" + +msgid "\nCamera multipliers:" +msgstr "\nWspółczynniki korekcji aparatu:" + +msgid "%s is a %s %s image.\n" +msgstr "%s jest obrazem %s %s.\n" + +msgid "Loading %s %s image from %s ...\n" +msgstr "Ładowanie obrazu %s %s z %s ...\n" + +msgid "%s: \"-s %d\" requests a nonexistent image!\n" +msgstr "%s: \"-s %d\" określa nieistniejący obrazek!\n" + +msgid "standard output" +msgstr "standardowe wyjście" + +msgid "Writing data to %s ...\n" +msgstr "Zapisywanie danych do %s ...\n" diff -Nru dcraw-8.99/dcraw_pt.1 dcraw-9.17/dcraw_pt.1 --- dcraw-8.99/dcraw_pt.1 1970-01-01 00:00:00.000000000 +0000 +++ dcraw-9.17/dcraw_pt.1 2013-01-03 13:09:39.000000000 +0000 @@ -0,0 +1,286 @@ +.\" +.\" Man page for dcraw +.\" +.\" Copyright (c) 2009 by David Coffin +.\" +.\" Você pode redistribuir sem nenhuma restrição. +.\" +.\" David Coffin +.\" dcoffin a cybercom o net +.\" http://www.cybercom.net/~dcoffin +.\" +.TH dcraw 1 "14 de maio de 2009" +.LO 1 +.SH NOME +dcraw - decodificador de linha de comando para fotos cruas (raw) +.SH SINOPSE +.B dcraw +[\fIOPÇÃO\fR]... [\fIARQUIVO\fR]... +.SH DESCRIÇÃO +.B dcraw +decodifica fotos cruas, mostra metadados e extrai miniaturas. +.SH OPÇÕES GERAIS +.TP +.B -v +Imprime mensagens detalhadas, não somente avisos e erros. +.TP +.B -c +Grava as imagens decodificadas ou miniaturas na saída padrão. +.TP +.B -e +Extrai a miniatura gerada pela câmera, e não a imagem crua. +Você obterá uma imagem JPEG ou PPM, dependendo da câmera. +.TP +.B -z +Muda os horários de acesso e modificação de um AVI, JPEG, TIFF ou +arquivo cru para quando a foto foi feita, supondo que o relógio +da câmera foi configurado para Horário Universal. +.TP +.B -i +Identifica os arquivos, mas não os decodifica. +O status de saída é 0 se o +.B dcraw +conseguiu decodificar o último arquivo, e 1 caso contrário. +.B -i -v +mostra metadados. +.TP +.B "" +.B dcraw +não pode decodificar arquivos JPEG!! +.SH OPÇÕES DE REPARO +.TP +.B -P pixelsmortos.txt +Lê a lista de pixels mortos deste arquivo, em vez de ".badpixels" +Veja +.B ARQUIVOS +para uma descrição do formato. +.TP +.B -K escuro.pgm +Subtrai um quadro escuro dos dados crus. Para gerar um quadro escuro, +faça uma foto crua sem nenhuma luz, e depois faça +.BR dcraw\ -D\ -4\ -j\ -t\ 0 . +.TP +.B -k negro +Se as sombras aparecerem embaçadas, você precisa +aumentar o nível de negro. +Para medir isso, aplique +.B pamsumm -mean +ao quadro escuro gerado acima. +.TP +.B -S saturação +Se as áreas claras aparecerem rosadas, você deve diminuir +o nível de saturação. +Para medir isso, faça uma foto de algo brilhante, depois faça +.B dcraw -D -4 -j -c +foto.raw +.B | pamsumm -max +.TP +.B "" +O negro e saturação padrões estão, via de regra, corretos. +.TP +.B -n valor_limite_de_ruído +Usa wavelets para remover ruído, preservando detalhes reais. +O melhor valor deve estar entre 100 e 1000. +.TP +.B -C mag_vermelho mag_azul +Amplia as camadas cruas vermelha e azul pelos fatores dados, +tipicamente 0.999 a 1.001, para corrigir aberrações cromáticas. +.TP +.B -H 0 +Elimina todas as superexposições, substituindo por branco sólido (padrão). +.TP +.B -H 1 +Deixa superexposições não-cortadas em vários tons de rosa. +.TP +.B -H 2 +Mistura valores cortados e não-cortados para obter uma transição +gradual para branco. +.TP +.B -H 3+ +Reconstrói as superexposições. Valores baixos tendem ao branco; +valores altos tendem a cores. Tente +.B -H 5 +como uma medida. Se não for suficiente, faça +.BR -H\ 9 , +elimine as superexposições não-brancas, e cole-as em uma imagem +gerada com +.BR -H\ 3 . +.SH OPÇÕES DE COR +Por padrão, +.B dcraw +usa um balanço de branco fixo baseado em um cartão de cores iluminado +com uma lâmpada padrão D65. +.TP +.B -w +Usa o balanço de branco especificado pela câmera. +Se não for encontrado, imprime um aviso e usa outro método. +.TP +.B -a +Calcula o balanço de branco ponderando a imagem inteira. +.TP +.B -A esquerda alto largura altura +Calcula o balanço de branco ponderando uma área retangular. +Use +.B dcraw\ -j\ -t\ 0 +e selecione uma área de cinza neutro. +.TP +.B -r mul0 mul1 mul2 mul3 +Especifica o seu próprio balanço de branco cru. +Estes multiplicadores podem ser copiados e colados da saída de +.BR dcraw\ -v . +.TP +.BR +M " ou " -M +Usa (ou não) a matriz de cores dos metadados da câmera. +O padrão é +.B +M +se +.B -w +está definido, +.B -M +caso contrário. +Esta opção afeta somente câmeras Olympus, Leaf e Phase One. +.TP +.B -o [0-5] +Selecione o espaço de cor de saída quando a opção +.B -p +não for usada: + +.B \t0 +\ \ Cor crua (específica de cada câmera) +.br +.B \t1 +\ \ sRGB D65 (padrão) +.br +.B \t2 +\ \ Adobe RGB (1998) D65 +.br +.B \t3 +\ \ Wide Gamut RGB D65 +.br +.B \t4 +\ \ Kodak ProPhoto RGB D65 +.br +.B \t5 +\ \ XYZ +.TP +.BR -p\ camera.icm \ [\ -o\ output.icm \ ] +Usa perfis ICC para definir o espaço de cor crua da câmera, +e o desejado espaço de cor de saída (que é sRGB por padrão). +.TP +.B -p embed +Usa o perfil ICC inserido na foto crua. +.SH OPÇÕES DE INTERPOLAÇÃO +.TP +.B -d +Mostra dados crus como escala de cinza, sem interpolação. +Bom para fotografar documentos em preto-e-branco. +.TP +.B -D +O mesmo que +.BR -d , +porém totalmente cru (sem redimensionamento de cor). +.TP +.B -h +Gera uma imagem em cor com metade do tamanho. +Duas vezes mais rápido do que +.BR -q\ 0 . +.TP +.B -q 0 +Usa interpolação bilinear de alta velocidade e baixa qualidade. +.TP +.B -q 1 +Usa interpolação de Número Variável de Gradientes (VNG). +.TP +.B -q 2 +Usa interpolação por padrão de pixel (PPG). +.TP +.B -q 3 +Usa interpolação Adaptativa Direcionada para Homogeneidade (AHD). +.TP +.B -f +Interpola RGGB como quatro cores. Use isso se a saída resultante +mostrar falsos padrões em 2x2 com VNG ou borrões com AHD. +.TP +.B -m número_de_passagens +Depois da interpolação, limpa artefatos de cor aplicando +repetidamente um filtro mediano 3x3 nos canais R-G e B-G. +.SH OPÇÕES DE SAÍDA +Por padrão, +.B dcraw +escreve PGM/PPM/PAM com amostras de 8 bits, curva de gama BT.709, +nível de branco baseado em histograma e nenhum metadado. +.TP +.B -W +Usa um nível de branco fixo, ignorando o histograma da imagem. +.TP +.B -b brilho +Divide o nível de branco por este número, 1.0 por padrão. +.TP +.B -g potência inclinação_máxima +Define a curva gamma, por padrão BT.709 +.RB ( -g\ 2.222\ 4.5 ). +Se preferir gamma sRGB, use +.BR -g\ 2.4\ 12.92 . +Para uma curva simples de potência, defina a inclinação máxima em zero. +.TP +.B -6 +Grava dezesseis bits por amostra, em vez de oito. +.TP +.B -4 +16-bit linear, o mesmo que +.BR -6\ -W\ -g\ 1\ 1 . +.TP +.B -T +Grava a saída em TIFF com metadados, em vez de PGM/PPM/PAM. +.TP +.B -t [0-7,90,180,270] +Inverte a imagem de saída. Por padrão, +.B dcraw +aplica a inversão especificada pela câmera. +.B -t 0 +desabilita qualquer inversão. +.TP +.B -j +Para as câmeras Fuji\ Super\ CCD, mostra a imagem inclinada 45 +graus. Para câmeras com pixels não quadrados, não estica a imagem +para a sua proporção correta. De qualquer forma, essa opção +assegura que cada pixel de saída corresponde a um pixel cru. +.TP +.BR "-s [0..N-1]" " ou " "-s all" +Se um arquivo contém N imagens cruas, escolha uma ou "all" (todas) +para decodificar. +Por exemplo, as câmeras Fuji\ Super\ CCD\ SR geram +uma segunda imagem subexposta quatro pontos para mostrar detalhe +nas áreas superexpostas. +.SH ARQUIVOS +.TP +\:./.badpixels, ../.badpixels, ../../.badpixels, ... +Lista de pixels mortos da sua câmera, para que o +.B dcraw +possa interpolar entre eles. Cada linha especifica coluna, linha +e a hora UNIX de morte para cada pixel. Por exemplo: +.sp 1 +.nf + 962 91 1028350000 # morreu entre 1 e 4 de Agosto, de 2002 +1285 1067 0 # não sei quando esse pixel morreu +.fi +.sp 1 +Essas coordenadas devem ficar antes de qualquer corte ou rotação, +portanto use +.B dcraw -j -t 0 +para localizar os pixels mortos. +.SH "VEJA TAMBÉM" +.BR pgm (5), +.BR ppm (5), +.BR pam (5), +.BR pamsumm (1), +.BR pnmgamma (1), +.BR pnmtotiff (1), +.BR pnmtopng (1), +.BR gphoto2 (1), +.BR cjpeg (1), +.BR djpeg (1) +.SH AUTOR +Escrito por David Coffin, dcoffin a cybercom o net +.SH TRADUTOR +Bruno Buys, brunobuys a gmail o com diff -Nru dcraw-8.99/dcraw_pt.po dcraw-9.17/dcraw_pt.po --- dcraw-8.99/dcraw_pt.po 1970-01-01 00:00:00.000000000 +0000 +++ dcraw-9.17/dcraw_pt.po 2013-01-03 13:09:39.000000000 +0000 @@ -0,0 +1,387 @@ +# translation of dcraw_pt_BR.po to Brazilian Portuguese +# by Bruno Buys brunobuys a gmail o com, 2009. +# (c) 2009 Dave Coffin dcoffin a cybercom o net, +# Distribute freely. +# +msgid "" +msgstr "" +"Project-Id-Version: dcraw 8.94\n" +"Report-Msgid-Bugs-To: dcoffin a cybercom o net\n" +"POT-Creation-Date: 2006-12-21 22:45-0500\n" +"PO-Revision-Date: 2011-07-23 17:00-0400\n" +"Last-Translator: Bruno Buys \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +msgid "%s: Out of memory in %s\n" +msgstr "%s: Memória insuficiente em %s\n" + +msgid "Unexpected end of file\n" +msgstr "Fim de arquivo inesperado\n" + +msgid "Corrupt data near 0x%lx\n" +msgstr "Dados corrompidos perto de 0x%lx\n" + +msgid "Corrupt data near 0x%llx\n" +msgstr "Dados corrompidos perto de 0x%llx\n" + +msgid "%s: decoder table overflow\n" +msgstr "%s: estouro da tabela do decodificador\n" + +msgid "Phase One correction...\n" +msgstr "Correção Phase One...\n" + +msgid "%s: incorrect JPEG dimensions\n" +msgstr "%s: dimensões JPEG incorretas\n" + +msgid "%s: \"%s\" matrix not found!\n" +msgstr "%s: \"%s\" matriz não encontrada!\n" + +msgid "Foveon interpolation...\n" +msgstr "Interpolação Foveon...\n" + +msgid "%s: Invalid white balance \"%s\"\n" +msgstr "%s: Balanço de branco inválido \"%s\"\n" + +msgid "Fixed bad pixels at:" +msgstr "Pixels mortos corrigidos em:" + +msgid "Fixed dead pixels at:" +msgstr "Pixels mortos consertados em:" + +msgid "%s is not a valid PGM file!\n" +msgstr "%s não é um arquivo PGM válido!\n" + +msgid "%s has the wrong dimensions!\n" +msgstr "%s possui dimensões incorretas!\n" + +msgid "Wavelet denoising...\n" +msgstr "Remoção de ruído por wavelet...\n" + +msgid "%s: Cannot use camera white balance.\n" +msgstr "%s: Não pode usar o balanço de branco da câmera.\n" + +msgid "Scaling with black %d, multipliers" +msgstr "Dimensionando com preto %d, multiplicadores" + +msgid "Scaling with darkness %d, saturation %d, and\nmultipliers" +msgstr "Dimensionando com negro %d, saturação %d, e\nmultiplicadores" + +msgid "Correcting chromatic aberration...\n" +msgstr "Corrigindo aberração cromática...\n" + +msgid "Bilinear interpolation...\n" +msgstr "Interpolação bilinear...\n" + +msgid "VNG interpolation...\n" +msgstr "Interpolação VNG...\n" + +msgid "PPG interpolation...\n" +msgstr "Interpolação PPG...\n" + +msgid "AHD interpolation...\n" +msgstr "Interpolação AHD...\n" + +msgid "Median filter pass %d...\n" +msgstr "Passagem de filtro mediano %d...\n" + +msgid "Bilateral filtering...\n" +msgstr "Filtragem bilateral...\n" + +msgid "Blending highlights...\n" +msgstr "Misturando as superexposições...\n" + +msgid "Rebuilding highlights...\n" +msgstr "Reconstruindo as superexposições...\n" + +msgid "Highlight recovery...\n" +msgstr "Recuperação de superexposição...\n" + +msgid "Reading metadata from %s ...\n" +msgstr "Lendo metadados de %s ...\n" + +msgid "Failed to read metadata from %s\n" +msgstr "A leitura de metadados de %s falhou\n" + +msgid "%s: You must link dcraw with libjpeg!!\n" +msgstr "%s: Você deve linkar o dcraw com libjpeg!!\n" + +msgid "%s: You must link dcraw with %s!!\n" +msgstr "%s: Você deve linkar o dcraw com %s!!\n" + +msgid "%s has no embedded profile.\n" +msgstr "%s não possui um perfil inserido\n" + +msgid "Cannot open file %s!\n" +msgstr "Não pode abrir o arquivo %s!\n" + +msgid "Applying color profile...\n" +msgstr "Aplicando perfil de cor...\n" + +msgid "Building histograms...\n" +msgstr "Construindo histogramas...\n" + +msgid "Converting to %s colorspace...\n" +msgstr "Convertendo para %s espaço de cor...\n" + +msgid "Rotating image 45 degrees...\n" +msgstr "Rotacionando a imagem em 45 graus...\n" + +msgid "Stretching the image...\n" +msgstr "Esticando a imagem...\n" + +msgid "\nRaw photo decoder \"dcraw\" v%s" +msgstr "\nDecodificador de fotos cruas (raw) \"dcraw\" v%s" + +msgid "\nby Dave Coffin, dcoffin a cybercom o net\n" +msgstr "\npor Dave Coffin, dcoffin a cybercom o net\n" + +msgid "\nUsage: %s [OPTION]... [FILE]...\n\n" +msgstr "\nUso: %s [OPÇÃO]... [ARQUIVO]...\n\n" + +msgid "-v Print verbose messages" +msgstr "-v Imprime mensagens detalhadas" + +msgid "-c Write image data to standard output" +msgstr "-c Escreve os dados da imagem na saída-padrão" + +msgid "-e Extract embedded thumbnail image" +msgstr "-e Extrai a miniatura inserida" + +msgid "-i Identify files without decoding them" +msgstr "-i Identifica os arquivos, porém sem decodificá-los" + +msgid "-i -v Identify files and show metadata" +msgstr "-i -v Identifica os arquivos e mostra metadados" + +msgid "-z Change file dates to camera timestamp" +msgstr "-z Muda as datas dos arquivos de acordo com as datas da câmera" + +msgid "-a Use automatic white balance" +msgstr "-a Usa balanço de branco automático" + +msgid "-w Use camera white balance, if possible" +msgstr "-w Usa o balanço de branco da câmera, se possível" + +msgid "-a Average the whole image for white balance" +msgstr "-a Pondera a imagem inteira para o balanço de branco" + +msgid "-A Average a grey box for white balance" +msgstr "-A Pondera um retângulo cinza para o balanço de branco" + +msgid "-r Set custom white balance" +msgstr "-r Define um balanço de branco personalizado" + +msgid "-r <4 numbers> Set custom white balance" +msgstr "-r <4 números> Define um balanço de branco personalizado" + +msgid "+M/-M Use/don't use an embedded color matrix" +msgstr "+M/-M Usa/não usa uma matriz de cores embutidas" + +msgid "-C Correct chromatic aberration" +msgstr "-C Corrige aberrações cromáticas" + +msgid "-P Fix the dead pixels listed in this file" +msgstr "-P Conserta pixels mortos neste arquivo" + +msgid "-K Subtract dark frame (16-bit raw PGM)" +msgstr "-K Subtrai um quadro escuro (16 bits raw PGM)" + +msgid "-k Set black point" +msgstr "-k Define o ponto negro" + +msgid "-k Set the black level" +msgstr "-k Define o nível de preto" + +msgid "-k Set the darkness level" +msgstr "-k Define o nível de negro" + +msgid "-S Set the saturation level" +msgstr "-S Define o nível de saturação" + +msgid "-n Set threshold for wavelet denoising" +msgstr "-n Define um valor limite para remoção de ruído por wavelet" + +msgid "-H [0-9] Highlight mode (0=clip, 1=no clip, 2+=recover)" +msgstr "-H [0-9] Modo de superexposição (0=exclui, 1=não exclui, 2+=recupera)" + +msgid "-H [0-9] Highlight mode (0=clip, 1=unclip, 2=blend, 3+=rebuild)" +msgstr "-H [0-9] Modo de superexposição (0=corta, 1=não corta, 2=mistura, 3+=reconstrói)" + +msgid "-t [0-7] Flip image (0=none, 3=180, 5=90CCW, 6=90CW)" +msgstr "-t [0-7] Rotaciona a imagem (0=nada, 3=180, 5=90AH, 6=90H)" + +msgid "-o [0-5] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" +msgstr "-o [0-5] Espaço de cor de saída (cru,sRGB,Adobe,Wide,ProPhoto,XYZ)" + +msgid "-o Apply output ICC profile from file" +msgstr "-o Aplica o perfil ICC de saída deste arquivo" + +msgid "-p Apply camera ICC profile from file or \"embed\"" +msgstr "-p Aplica o perfil ICC da câmera, do arquivo, ou \"embed\"" + +msgid "-d Document mode (no color, no interpolation)" +msgstr "-d Modo documento (sem cores e sem interpolação)" + +msgid "-D Document mode without scaling (totally raw)" +msgstr "-D Modo documento, sem redimensionamento (totalmente cru)" + +msgid "-j Don't stretch or rotate raw pixels" +msgstr "-j Não estica nem rotaciona pixels crus" + +msgid "-W Don't automatically brighten the image" +msgstr "-W Não aumenta o brilho da imagem automaticamente" + +msgid "-b Adjust brightness (default = 1.0)" +msgstr "-b Ajusta o brilho (padrão = 1.0)" + +msgid "-g

Set custom gamma curve (default = 2.222 4.5)" +msgstr "-g

Define a curva gamma personalizada (padrão = 2.222 4.5)" + +msgid "-q [0-3] Set the interpolation quality" +msgstr "-q [0-3] Define a qualidade de interpolação" + +msgid "-h Half-size color image (twice as fast as \"-q 0\")" +msgstr "-h Imagem em cor, com metade do tamanho (2 vezes mais rápido que \"-q 0\")" + +msgid "-f Interpolate RGGB as four colors" +msgstr "-f Interpola RGGB como quatro cores" + +msgid "-m Apply a 3x3 median filter to R-G and B-G" +msgstr "-m Aplica um filtro mediano 3x3 em R-G e B-G" + +msgid "-B Apply bilateral filter to smooth noise" +msgstr "-B Aplica filtro bilateral para suavizar o ruído" + +msgid "-s [0-99] Select a different raw image from the same file" +msgstr "-s [0-99] Seleciona uma imagem crua diferente do mesmo arquivo" + +msgid "-s [0..N-1] Select one raw image or \"all\" from each file" +msgstr "-s [0..N-1] Selecione uma imagem crua ou \"all\" (todas) de cada arquivo" + +msgid "-6 Write 16-bit instead of 8-bit" +msgstr "-6 Grava em 16-bit em vez de 8-bit" + +msgid "-4 Linear 16-bit, same as \"-6 -W -g 1 1\"" +msgstr "-4 16-bit linear, o mesmo que \"-6 -W -g 1 1\"" + +msgid "-4 Write 16-bit linear instead of 8-bit with gamma" +msgstr "-4 Grava em 16 bits linear, em vez de 8 bits com gamma" + +msgid "-T Write TIFF instead of PPM" +msgstr "-T Grava TIFF, em vez de PPM" + +msgid "Non-numeric argument to \"-%c\"\n" +msgstr "Argumento não numérico para \"-%c\"\n" + +msgid "Unknown option \"-%c\".\n" +msgstr "Opção desconhecida \"-%c\".\n" + +msgid "No files to process.\n" +msgstr "Nenhum arquivo a processar\n" + +msgid "Will not write an image to the terminal!\n" +msgstr "Não vou gravar uma imagem no terminal!\n" + +msgid "%s has no timestamp.\n" +msgstr "%s não tem registro de data.\n" + +msgid "%s time set to %d.\n" +msgstr "%s hora definida como %d.\n" + +msgid "%s has no thumbnail.\n" +msgstr "%s não possui miniatura.\n" + +msgid "\nFilename: %s\n" +msgstr "\nNome do arquivo: %s\n" + +msgid "Timestamp: %s" +msgstr "Registro de data: %s" + +msgid "Camera: %s %s\n" +msgstr "Câmera: %s %s\n" + +msgid "Owner: %s\n" +msgstr "Dono: %s\n" + +msgid "DNG Version: " +msgstr "Versão DNG: " + +msgid "ISO speed: %d\n" +msgstr "Velocidade ISO: %d\n" + +msgid "Shutter: " +msgstr "Disparador: " + +msgid "%0.1f sec\n" +msgstr "%0.1f seg\n" + +msgid "Aperture: f/%0.1f\n" +msgstr "Abertura: f/%0.1f\n" + +msgid "Focal length: %0.1f mm\n" +msgstr "Distância focal: %0.1f mm\n" + +msgid "Secondary pixels: %s\n" +msgstr "Pixels secundários: %s\n" + +msgid "yes" +msgstr "sim" + +msgid "no" +msgstr "não" + +msgid "Embedded ICC profile: %s\n" +msgstr "Perfil ICC inserido: %s\n" + +msgid "Decodable with dcraw: %s\n" +msgstr "Decodificável com o dcraw: %s\n" + +msgid "Number of raw images: %d\n" +msgstr "Número de imagens cruas: %d\n" + +msgid "Pixel Aspect Ratio: %0.6f\n" +msgstr "Proporção em pixels: %0.6f\n" + +msgid "Thumb size: %4d x %d\n" +msgstr "Tamanho da miniatura: %4d x %d\n" + +msgid "Full size: %4d x %d\n" +msgstr "Tamanho real: %4d x %d\n" + +msgid "Cannot decode file %s\n" +msgstr "Não pode decodificar o arquivo %s\n" + +msgid "Image size: %4d x %d\n" +msgstr "Tamanho da imagem: %4d x %d\n" + +msgid "Output size: %4d x %d\n" +msgstr "Tamanho de saída: %4d x %d\n" + +msgid "Raw colors: %d" +msgstr "Cores cruas: %d" + +msgid "\nFilter pattern: " +msgstr "\nPadrão de filtro: " + +msgid "\nDaylight multipliers:" +msgstr "\nMultiplicadores de luz do dia:" + +msgid "\nCamera multipliers:" +msgstr "\nMultiplicadores da câmera:" + +msgid "%s is a %s %s image.\n" +msgstr "%s é uma imagem %s %s.\n" + +msgid "Loading %s %s image from %s ...\n" +msgstr "Carregando %s %s imagens de %s ...\n" + +msgid "%s: \"-s %d\" requests a nonexistent image!\n" +msgstr "%s: \"-s %d\" requer uma imagem inexistente!\n" + +msgid "standard output" +msgstr "saída padrão" + +msgid "Writing data to %s ...\n" +msgstr "Gravando dados em %s ...\n" diff -Nru dcraw-8.99/dcraw_ru.1 dcraw-9.17/dcraw_ru.1 --- dcraw-8.99/dcraw_ru.1 1970-01-01 00:00:00.000000000 +0000 +++ dcraw-9.17/dcraw_ru.1 2013-01-03 13:09:39.000000000 +0000 @@ -0,0 +1,302 @@ +.\" +.\" Руководство к программе dcraw ("Декодер сырых фотографий") +.\" +.\" (c) Дэвид Коффин, 2009 +.\" +.\" Распространяется свободно. +.\" +.\" David Coffin +.\" dcoffin a cybercom o net +.\" http://www.cybercom.net/~dcoffin +.\" +.TH dcraw 1 "14 май 2009" +.LO 1 +.SH ИМЯ +dcraw - консольный декодер сырых (RAW) цифровых фотографий +.SH ОБЗОР +.B dcraw +[\fIОПЦИЯ\fR]... [\fIФАЙЛ\fR]... +.SH ОПИСАНИЕ +.B dcraw +конвертирует сырые (RAW) фотографии, показывает +метаданные и извлекает уменьшенные изображения - миниатюры. +.SH ОСНОВНЫЕ ОПЦИИ +.TP +.B -v +Выдает подробные сообщения, а не только предупреждения и ошибки. +.TP +.B -c +Выдает расшифрованное изображение или миниатюру на стандартный +вывод (stdout). +.TP +.B -e +Извлекает сгенерированное фотокамерой изображение-миниатюру, +но не сырое изображение. Выдается файл JPEG или PPM, в +зависимости от используемой фотокамеры. +.TP +.B -z +Изменяет время последнего доступа и модификации AVI, JPEG, +TIFF и сырых файлов на время получения снимка, предполагая, +что часы фотокамеры настроены на время по Гринвичу. +.TP +.B -i +Идентифицирует файлы без их расшифровки. +Статус завершения равен 0 если +.B dcraw +может расшифровать последний файл и 1, если нет. +.B -i -v +показывает метаданные. +.TP +.B "" +.B dcraw +не расшифровывает JPEG файлы!!! +.SH КОРРЕКТИРУЮЩИЕ ОПЦИИ +.TP +.B -P повреж_пиксели.txt +Читает список поврежденных пикселей из данного файла вместо файла ".badpixels". +Смотри в разделе +.B ФАЙЛЫ +описание данного формата. +.TP +.B -K темновой_кадр.pgm +Вычитает темновой кадр из сырых данных. Для получения темнового +кадра сделайте сырой снимок в полной темноте (например, закрыв +объектив фотокамеры светонепроницаемой крышкой) и выполните +.BR dcraw\ -D\ -4\ -j\ -t\ 0 . +.TP +.B -k темновой_уровень +Когда тени выглядят туманными, необходимо поднять темновой уровень. +Для измерения этого, примените +.B pamsumm -mean +к темновому кадру, полученному выше. +.TP +.B -S насыщенность +Когда пересвеченные области выглядят розовыми, необходимо понизить уровень +насыщенности. Для измерения этого, сделайте снимок какого-либо блестящего +объекта и выполните +.B dcraw -D -4 -j -c +фото.raw +.B | pamsumm -max +.TP +.B "" +Темновой уровень и насыщенность, установленные по умолчанию, обычно верны. +.TP +.B -n шумовой_порог +Использует вейвлеты для подавления шума с сохранением настоящих +деталей изображения. Лучшее пороговое значение должно лежать где-то +в промежутке от 100 до 1000. +.TP +.B -C увел_красный увел_синий +Увеличить красный и синий слои в заданное множителями количество раз +(обычно от 0.999 до 1.001) для устранения хроматической аберрации. +.TP +.B -H 0 +Урезает все пересвеченные области до сплошного белого +(действие по умолчанию). +.TP +.B -H 1 +Оставляет пересвеченные области неурезанными в различных +оттенках розового. Позволяет выявить сохранившиеся детали. +.TP +.B -H 2 +Смешивает урезанные и неурезанные значения для постепенного +перехода к белому. +.TP +.B -H 3+ +Восстанавливает пересвеченные области. Малые числа больше +подходят для белых областей, большие числа - для цветных. +Попробуйте +.B -H 5 +в качестве компромиссного варианта. Если результат +выглядит недостаточно хорошим, выполните +.BR -H\ 9 , +вырежьте цветные пересвеченные области, и вставьте их в +изображение, сгенерированное командой +.BR -H\ 3 . +.SH ЦВЕТОВЫЕ ОПЦИИ +По умолчанию, +.B dcraw +использует фиксированный баланс белого, полученный с помощью +цветной испытательной таблицы, освещенной стандартной лампой D65. +.TP +.B -w +Использует баланс белого, заданный камерой. В случае, если таковой +не задан, выводит предупреждение и использует другой метод. +.TP +.B -a +Расчитывает баланс белого, используя всё изображение. +.TP +.B -A отступ_слева отступ_сверху ширина высота +Рассчитывает баланс белого, используя прямоугольную область изображения. +Вначале выполните +.B dcraw\ -j\ -t\ 0 +и выберите область с нейтрально-серым цветом. +.TP +.B -r множ0 множ1 множ2 множ3 +Позволяет задать пользовательский баланс белого. +Эти множители могут быть взяты из вывода команды +.BR dcraw\ -v . +.TP +.BR +M " или " -M +Использует (или не использует) матрицу цвета из метаданных фотокамеры. +По умолчанию установлено +.BR +M , +если выбрана опция +.BR -w . +В противном случае +.BR -M . +Эта опция влияет только на камеры Olympus, Leaf и Phase One. +.TP +.B -o [0-5] +Позволяет выбрать выходное цветовое пространство, при +использовании опции +.B -p +: + +.B 0 +\ \ Вывод в собственном цветовом пространстве камеры +(уникально для каждой фотокамеры) +.br +.B 1 +\ \ sRGB D65 (по умолчанию) +.br +.B 2 +\ \ Adobe RGB (1998) D65 +.br +.B 3 +\ \ Wide Gamut RGB D65 +.br +.B 4 +\ \ Kodak ProPhoto RGB D65 +.br +.B 5 +\ \ XYZ +.TP +.BR -p\ фотокамера.icm \ [\ -o\ вывод.icm \ ] +Использует ICC профили для задания собственного цветового +пространства фотокамеры и выводимого цветового пространства +(sRGB по умолчанию). +.TP +.B -p embed +Использует ICC профиль, внедренный в сырой снимок. +.SH ОПЦИИ ИНТЕРПОЛЯЦИИ +.TP +.B -d +Показывает сырые данные как изображение в градациях серого без +интерполяции. Хорош для фотографирования черно-белых документов. +.TP +.B -D +То же, что и +.BR -d , +но в полностью необработанном виде (без цветового баланса). +.TP +.B -h +Выдает цветное изображение, уменьшенное вдвое. +В два раза быстрее, чем +.BR -q\ 0 . +.TP +.B -q 0 +Использует быструю низкокачественную билинейную интерполяцию. +.TP +.B -q 1 +Использует интерполяцию VNG (по Переменному Числу Градиентов). +.TP +.B -q 2 +Использует интерполяцию PPG (Группировка Пикселей по Шаблону). +.TP +.B -q 3 +Использует интерполяцию AHD (Адаптивную Гомогенно-Ориентированную). +.TP +.B -f +Интерполирует RGB как четыре цвета. Используется, когда на +полученном изображении видны искажения в виде ложной сетки +2x2 (при VNG интерполяции), или узор в виде лабиринта при +AHD интерполяции. +.TP +.B -m число_проходов +Подчищает цветовые артефакты (искажения) путем многократного +применения медианного фильтра 3x3 к цветовым каналам R-G и B-G. +.SH ОПЦИИ ВЫВОДА +По умолчанию, +.B dcraw +записывает 8-битные PGM/PPM/PAM данные с гамма кривой BT.709, +уровнем белого, базирующемся на гистограмме, и без метаданных. +.TP +.B -W +Использует фиксированный уровень белого, игнорируя гистограмму изображения. +.TP +.B -b яркость +Делит уровень белого на это число, равное 1.0 по умолчанию. +.TP +.B -g степень максимальный_подъём +Настройка гамма кривой, по умолчанию BT.709 +.RB ( -g\ 2.222\ 4.5 ). +Если вы предпочитаете sRGB гамму, воспользуйтесь +.BR -g\ 2.4\ 12.92 . +Для простой потенциальной кривой, установите максимальный подъём равный нулю. +.TP +.B -6 +Записывает 16-битное изображение вместо 8-битного. +.TP +.B -4 +Записывает линейные 16 бит, то же, что +.BR -6\ -W\ -g\ 1\ 1 . +.TP +.B -T +Выдает на выходе файл формата TIFF с метаданными вместо PGM/PPM/PAM. +.TP +.B -t [0-7,90,180,270] +Поворачивает выводимое фото. По умолчанию, +.B dcraw +применяется поворот, заданный фотокамерой. +.B -t 0 +отключает все виды вращения. +.TP +.B -j +Для фотокамер Fuji\ Super\ CCD показывает изображение, +повернутое на 45 градусов. Для фотокамер с неквадратными +пикселями выдает изображение нерастянутым, с сохранением его +оригинальных пропорций. В любом случае, каждый выводимый +пиксель соответствует одному сырому пикселю. +.TP +.BR "-s [0..N-1]" " или " "-s all" +Если файл содержит N сырых изображений, выбирает одно или +"all" (все) для расшифровки. +Например, фотокамеры Fuji\ Super\ CCD\ SR генерируют второе +изображение, недоэкспонированное на 4 шага диафрагмы, что +позволяет запечатлеть детали в пересвеченных областях. +.SH ФАЙЛЫ +.TP +\:./.badpixels, ../.badpixels, ../../.badpixels, ... +Список поврежденных пикселей вашей фотокамеры, указывающий +.B dcraw +интерполировать вокруг них. Каждая строка определяет колонку, ряд +и Юниксовое время повреждения одного пикселя. Например: +.sp 1 +.nf + 962 91 1028350000 # пиксель поврежден между 1 и 4 августа 2002 +1285 1067 0 # время повреждения пикселя не известно +.fi +.sp 1 +Эти координаты определяются для изображений, к которым не были +применены какие-либо виды вырезания или вращения, поэтому используйте +.B dcraw -j -t 0 +для локализации поврежденных пикселей. +.SH "СМОТРИ ТАКЖЕ" +.BR pgm (5), +.BR ppm (5), +.BR pam (5), +.BR pamsumm (1), +.BR pnmgamma (1), +.BR pnmtotiff (1), +.BR pnmtopng (1), +.BR gphoto2 (1), +.BR cjpeg (1), +.BR djpeg (1) +.SH АВТОР +Дэвид Коффин, dcoffin улитка cybercom точка net +.SH +ПЕРЕВОДЧИКИ +Елена Буторина, elena улитка esperanto точка msx точка ru +.br +Максим, volmax улитка rambler точка ru diff -Nru dcraw-8.99/dcraw_ru.po dcraw-9.17/dcraw_ru.po --- dcraw-8.99/dcraw_ru.po 1970-01-01 00:00:00.000000000 +0000 +++ dcraw-9.17/dcraw_ru.po 2013-01-03 13:09:39.000000000 +0000 @@ -0,0 +1,389 @@ +# Russian translation of dcraw messages. +# (c) 2009 Dave Coffin dcoffin a cybercom o net +# Distribute freely. +# +msgid "" +msgstr "" +"Project-Id-Version: dcraw 9.10\n" +"Report-Msgid-Bugs-To: dcoffin a cybercom o net\n" +"POT-Creation-Date: 2006-12-21 22:45-0500\n" +"PO-Revision-Date: 2011-07-23 17:00-0400\n" +"Last-Translator: Elena \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +msgid "%s: Out of memory in %s\n" +msgstr "%s: Недостаточно памяти в %s\n" + +msgid "Unexpected end of file\n" +msgstr "Неожиданный конец файла\n" + +msgid "Corrupt data near 0x%lx\n" +msgstr "Поврежденные данные рядом с 0x%lx\n" + +msgid "Corrupt data near 0x%llx\n" +msgstr "Поврежденные данные рядом с 0x%llx\n" + +msgid "%s: decoder table overflow\n" +msgstr "%s: переполнение таблицы декодера\n" + +msgid "Phase One correction...\n" +msgstr "Применение коррекции Phase One...\n" + +msgid "%s: incorrect JPEG dimensions\n" +msgstr "%s: неверные размеры JPEG\n" + +msgid "%s: \"%s\" matrix not found!\n" +msgstr "%s: \"%s\" матрица не найдена!\n" + +msgid "Foveon interpolation...\n" +msgstr "Интерполяция Foveon...\n" + +msgid "%s: Invalid white balance \"%s\"\n" +msgstr "%s: Неверный баланс белого \"%s\"\n" + +msgid "Fixed bad pixels at:" +msgstr "Координаты восстановленных пикселей:" + +msgid "Fixed dead pixels at:" +msgstr "Координаты восстановленных поврежденных пикселей:" + +msgid "%s is not a valid PGM file!\n" +msgstr "%s не соответствует формату PGM!\n" + +msgid "%s has the wrong dimensions!\n" +msgstr "%s имеет неверные размеры!\n" + +msgid "Wavelet denoising...\n" +msgstr "Вейвлет-шумоподавление...\n" + +msgid "%s: Cannot use camera white balance.\n" +msgstr "%s: Не может использовать баланс белого фотокамеры.\n" + +msgid "Scaling with black %d, multipliers" +msgstr "Вычитание черного %d и умножение на" + +msgid "Scaling with darkness %d, saturation %d, and\nmultipliers" +msgstr "Масштабирование с темновым уровнем %d, насыщенностью %d и\nмножителями" + +msgid "Correcting chromatic aberration...\n" +msgstr "Корректировка хроматических аберраций...\n" + +msgid "Bilinear interpolation...\n" +msgstr "Билинейная интерполяция...\n" + +msgid "VNG interpolation...\n" +msgstr "Интерполяция VNG...\n" + +msgid "PPG interpolation...\n" +msgstr "Интерполяция PPG...\n" + +msgid "AHD interpolation...\n" +msgstr "Интерполяция AHD...\n" + +msgid "Median filter pass %d...\n" +msgstr "Проход медианного фильтра номер %d...\n" + +msgid "Bilateral filtering...\n" +msgstr "Билатеральная фильтрация...\n" + +msgid "Blending highlights...\n" +msgstr "Смешивание пересвеченных областей...\n" + +msgid "Rebuilding highlights...\n" +msgstr "Реконструкция пересвеченных областей...\n" + +msgid "Highlight recovery...\n" +msgstr "Восстановление пересвеченных областей...\n" + +msgid "Reading metadata from %s ...\n" +msgstr "Чтение метаданных из %s ...\n" + +msgid "Failed to read metadata from %s\n" +msgstr "Не удалось прочитать метаданные из %s\n" + +msgid "%s: Tail is missing, parsing from head...\n" +msgstr "%s: Нет конца файла, проводится парсинг с начала файла...\n" + +msgid "%s: You must link dcraw with libjpeg!!\n" +msgstr "%s: Необходимо скомпоновать dcraw с libjpeg!!\n" + +msgid "%s: You must link dcraw with %s!!\n" +msgstr "%s: Необходимо скомпоновать dcraw с %s!!\n" + +msgid "%s has no embedded profile.\n" +msgstr "%s не имеет внедренного профиля.\n" + +msgid "Cannot open file %s!\n" +msgstr "Не может открыть файл %s!\n" + +msgid "Applying color profile...\n" +msgstr "Применение цветового профиля...\n" + +msgid "Building histograms...\n" +msgstr "Построение гистограмм...\n" + +msgid "Converting to %s colorspace...\n" +msgstr "Конвертация в цветовое пространство %s...\n" + +msgid "Rotating image 45 degrees...\n" +msgstr "Поворот изображения на 45 градусов...\n" + +msgid "Stretching the image...\n" +msgstr "Растягивание изображения...\n" + +msgid "\nRaw photo decoder \"dcraw\" v%s" +msgstr "\nДекодер сырых (RAW) фотографий \"dcraw\" v%s" + +msgid "\nby Dave Coffin, dcoffin a cybercom o net\n" +msgstr "\nДэвид Коффин, dcoffin a cybercom o net\n" + +msgid "\nUsage: %s [OPTION]... [FILE]...\n\n" +msgstr "\nИспользование: %s [ОПЦИЯ]... [ФАЙЛ]...\n\n" + +msgid "-v Print verbose messages" +msgstr "-v Выдача подробных сообщений" + +msgid "-c Write image data to standard output" +msgstr "-c Выдача данных изображения на стандартный вывод" + +msgid "-e Extract embedded thumbnail image" +msgstr "-e Извлечение встроенной миниатюры" + +msgid "-i Identify files without decoding them" +msgstr "-i Идентификация файлов без их расшифровки" + +msgid "-i -v Identify files and show metadata" +msgstr "-i -v Идентификация файлов с выводом их метаданных" + +msgid "-z Change file dates to camera timestamp" +msgstr "-z Изменение даты файлов на время, указанное фотокамерой" + +msgid "-a Use automatic white balance" +msgstr "-a Использование автоматического баланса белого" + +msgid "-w Use camera white balance, if possible" +msgstr "-w Использование баланса белого, заданного фотокамерой, если возможно" + +msgid "-a Average the whole image for white balance" +msgstr "-a Использование баланса белого, получаемого усреднением всего изображения" + +msgid "-A Average a grey box for white balance" +msgstr "-A Использование баланса белого, получаемого усреднением по серому прямоугольнику" + +msgid "-r Set custom white balance" +msgstr "-r <к з с з> Установка пользовательского баланса белого" + +msgid "-r <4 numbers> Set custom white balance" +msgstr "-r <4 числа> Установка пользовательского баланса белого" + +msgid "+M/-M Use/don't use an embedded color matrix" +msgstr "+M/-M Использование/не использование матрицы цвета из метаданных" + +msgid "-C Correct chromatic aberration" +msgstr "-C <к с> Устранение хроматической аберрации" + +msgid "-P Fix the dead pixels listed in this file" +msgstr "-P <файл> Восстановление поврежденных пикселей, перечисленных в указанном файле" + +msgid "-K Subtract dark frame (16-bit raw PGM)" +msgstr "-K <файл> Вычитание темнового кадра (16-битный сырой PGM)" + +msgid "-k Set black point" +msgstr "-k <число> Настройка уровня черного" + +msgid "-k Set the black level" +msgstr "-k <число> Настройка уровня черного" + +msgid "-k Set the darkness level" +msgstr "-k <число> Установка темнового уровня" + +msgid "-S Set the saturation level" +msgstr "-S <число> Установка уровня насыщенности" + +msgid "-n Set threshold for wavelet denoising" +msgstr "-n <число> Установка порога вейвлет-шумоподавления" + +msgid "-H [0-9] Highlight mode (0=clip, 1=no clip, 2+=recover)" +msgstr "-H [0-9] Обработка пересветов (0=урезать, 1=не урезать, 2+=восстановить)" + +msgid "-H [0-9] Highlight mode (0=clip, 1=unclip, 2=blend, 3+=rebuild)" +msgstr "-H [0-9] Обработка пересветов (0=урезать, 1=не урезать, 2=смешать, 3+=восстановить)" + +msgid "-t [0-7] Flip image (0=none, 3=180, 5=90CCW, 6=90CW)" +msgstr "-t [0-7] Поворот изображения (0=нет, 3=180, 5=90 влево, 6=90 вправо)" + +msgid "-o [0-5] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" +msgstr "-o [0-5] Выводимое цветовое пространство (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" + +msgid "-o Apply output ICC profile from file" +msgstr "-o <файл> Использование выводимого ICC профиля из файла" + +msgid "-p Apply camera ICC profile from file or \"embed\"" +msgstr "-p <файл> Использование ICC профиля фотокамеры из файла или встроенного профиля \"embed\"" + +msgid "-d Document mode (no color, no interpolation)" +msgstr "-d Режим документа (без цвета, без интерполяции)" + +msgid "-D Document mode without scaling (totally raw)" +msgstr "-D Режим документа без масштабирования (полностью сырое изображение)" + +msgid "-j Don't stretch or rotate raw pixels" +msgstr "-j Не применять растяжение или поворот для пикселей сырого изображения" + +msgid "-W Don't automatically brighten the image" +msgstr "-W Не применять автоматической настройки яркости" + +msgid "-b Adjust brightness (default = 1.0)" +msgstr "-b <число> Настройка яркости (по умолчанию = 1.0)" + +msgid "-g

Set custom gamma curve (default = 2.222 4.5)" +msgstr "-g <с мп> Настройка пользовательской гамма кривой (по умолчанию = 2.222 4.5)" + +msgid "-q [0-3] Set the interpolation quality" +msgstr "-q [0-3] Выбор качества интерполяции" + +msgid "-h Half-size color image (twice as fast as \"-q 0\")" +msgstr "-h Цветное изображение, уменьшенное вдвое (в 2 раза быстрее, чем \"-q 0\")" + +msgid "-f Interpolate RGGB as four colors" +msgstr "-f Интерполировать RGGB как четыре цвета" + +msgid "-m Apply a 3x3 median filter to R-G and B-G" +msgstr "-m <число> Применение медианного фильтра 3x3 к R-G и B-G каналам" + +msgid "-B Apply bilateral filter to smooth noise" +msgstr "-B <область> <диапазон> Применение билатерального фильтра для сглаживания шума" + +msgid "-s [0-99] Select a different raw image from the same file" +msgstr "-s [0-99] Выбор другого сырого изображения из того же файла" + +msgid "-s [0..N-1] Select one raw image or \"all\" from each file" +msgstr "-s [0..N-1] Выбор одного сырого изображения или \"all\" (всех) из каждого файла" + +msgid "-6 Write 16-bit instead of 8-bit" +msgstr "-6 Запись 16-битного изображения вместо 8-битного" + +msgid "-4 Linear 16-bit, same as \"-6 -W -g 1 1\"" +msgstr "-4 Запись линейных 16 бит, то же, что \"-6 -W -g 1 1\"" + +msgid "-4 Write 16-bit linear instead of 8-bit with gamma" +msgstr "-4 Запись 16-битных линейных файлов вместо 8-битных с гаммой" + +msgid "-T Write TIFF instead of PPM" +msgstr "-T Запись TIFF файла вместо PPM" + +msgid "Non-numeric argument to \"-%c\"\n" +msgstr "Нечисловой аргумент для \"-%c\"\n" + +msgid "Unknown option \"-%c\".\n" +msgstr "Неизвестная опция \"-%c\".\n" + +msgid "No files to process.\n" +msgstr "Нет файлов для обработки.\n" + +msgid "Will not write an image to the terminal!\n" +msgstr "Изображение не будет выводиться на консоль!\n" + +msgid "%s has no timestamp.\n" +msgstr "%s не имеет временного штампа.\n" + +msgid "%s time set to %d.\n" +msgstr "%s время установлено на %d.\n" + +msgid "%s has no thumbnail.\n" +msgstr "%s не содержит миниатюру.\n" + +msgid "\nFilename: %s\n" +msgstr "\nИмя файла: %s\n" + +msgid "Timestamp: %s" +msgstr "Временной штамп: %s" + +msgid "Camera: %s %s\n" +msgstr "Фотоаппарат: %s %s\n" + +msgid "Owner: %s\n" +msgstr "Владелец: %s\n" + +msgid "DNG Version: " +msgstr "Версия DNG: " + +msgid "ISO speed: %d\n" +msgstr "Светочувствительность ISO: %d\n" + +msgid "Shutter: " +msgstr "Выдержка: " + +msgid "%0.1f sec\n" +msgstr "%0.1f сек\n" + +msgid "Aperture: f/%0.1f\n" +msgstr "Диафрагма: f/%0.1f\n" + +msgid "Focal length: %0.1f mm\n" +msgstr "Фокусное расстояние: %0.1f мм\n" + +msgid "Secondary pixels: %s\n" +msgstr "Вторичные пиксели: %s\n" + +msgid "yes" +msgstr "да" + +msgid "no" +msgstr "нет" + +msgid "Embedded ICC profile: %s\n" +msgstr "Встроенный ICC профиль: %s\n" + +msgid "Decodable with dcraw: %s\n" +msgstr "Расшифровывается программой dcraw: %s\n" + +msgid "Number of raw images: %d\n" +msgstr "Количество сырых изображений: %d\n" + +msgid "Pixel Aspect Ratio: %0.6f\n" +msgstr "Соотношение сторон пикселя: %0.6f\n" + +msgid "Thumb size: %4d x %d\n" +msgstr "Размеры миниатюры: %4d x %d\n" + +msgid "Full size: %4d x %d\n" +msgstr "Полные размеры: %4d x %d\n" + +msgid "Cannot decode file %s\n" +msgstr "Не может расшифровать файл %s\n" + +msgid "Image size: %4d x %d\n" +msgstr "Размеры изображения: %4d x %d\n" + +msgid "Output size: %4d x %d\n" +msgstr "Выводимые размеры: %4d x %d\n" + +msgid "Raw colors: %d" +msgstr "Сырых цветов: %d" + +msgid "\nFilter pattern: " +msgstr "\nУзор фильтра: " + +msgid "\nDaylight multipliers:" +msgstr "\nМножители для дневного света:" + +msgid "\nCamera multipliers:" +msgstr "\nМножители фотокамеры:" + +msgid "%s is a %s %s image.\n" +msgstr "%s изображение %s %s.\n" + +msgid "Loading %s %s image from %s ...\n" +msgstr "Загрузка изображения %s %s из %s ...\n" + +msgid "%s: \"-s %d\" requests a nonexistent image!\n" +msgstr "%s: \"-s %d\" запрашивает несуществующее изображение!\n" + +msgid "standard output" +msgstr "стандартный вывод" + +msgid "Writing data to %s ...\n" +msgstr "Запись данных в %s ...\n" diff -Nru dcraw-8.99/dcraw_sv.1 dcraw-9.17/dcraw_sv.1 --- dcraw-8.99/dcraw_sv.1 1970-01-01 00:00:00.000000000 +0000 +++ dcraw-9.17/dcraw_sv.1 2013-01-03 13:09:39.000000000 +0000 @@ -0,0 +1,282 @@ +.\" +.\" Man page for dcraw +.\" +.\" Copyright (c) 2009 by David Coffin +.\" +.\" You may distribute without restriction. +.\" +.\" David Coffin +.\" dcoffin a cybercom o net +.\" http://www.cybercom.net/~dcoffin +.\" +.TH dcraw 1 "14 maj 2009" +.LO 1 +.SH NAMN +dcraw - kommandoradsavkodare för digitala råfoton (raw) +.SH SYNTAX +.B dcraw +[\fIFLAGGA\fR]... [\fIFIL\fR]... +.SH BESKRIVNING +.B dcraw +avkodar råfoton, visar metadata och extraherar miniatyrbilder. +.SH GENERELLA FLAGGOR +.TP +.B -v +Skriv utförliga meddelanden, inte bara varningar och fel. +.TP +.B -c +Skriv avkodade bilder eller miniatyrbilder till standardutenhet. +.TP +.B -e +Extrahera den kameragenererade miniatyrbilden. Inte råfotot. +Du får antingen en JPEG- eller en PPM-fil, beroende på kameramodell. +.TP +.B -z +Ändra användnings- och förändringstiderna för en AVI, JPEG, TIFF eller +råfotofil till när bilden togs och anta att kamerans klocka var satt +enligt Universal Time (UTC). +.TP +.B -i +Identifiera filerna men avkoda dem inte. +Slutstatus är 0 om +.B dcraw +kan avkoda den sista filen och 1 om den inte kan det. +.B -i -v +visar metadata. +.TP +.B "" +.B dcraw +kan inte avkoda JPEG-filer!! +.SH REPARATIONSFLAGGOR +.TP +.B -P döda_bildpunkter.txt +Läs listan med döda bildpunkter från den här filen istället för ".badpixels". +Se +.B FILER +för en beskrivning av formatet på dessa filer. +.TP +.B -K mörkerbild.pgm +Subtrahera mörkerbild från råfotot. För att generera en +mörkerbild, ta en råfoto utan ljus (linsskydd på, t.ex.) och kör +.BR dcraw\ -D\ -4\ -j\ -t\ 0 . +.TP +.B -k mörkhet +När skuggorna ser dimmiga ut måste du öka mörkhetsnivån. +För att mäta detta, applicera +.B pamsumm -mean +på den mörkerbild du genererade ovan. +.TP +.B -S mättnad +När ljusdagrarna ser rosaaktiga ut måste du sänka mättnadsnivån. +För att mäta detta, ta en bild på något glansigt och kör +.B dcraw -D -4 -j -c +foto.raw +.B | pamsumm -max +.TP +.B "" +Standardvärdena för mörkhet och mättnad är vanligtvis korrekta. +.TP +.B -n bruströskel +Använd vågelement för att ta bort brus samtidigt som du behåller +riktiga detaljer. Det bästa tröskelvärdet torde vara mellan 100 och 1000. +.TP +.B -C röd_förstoring blå_förstoring +Förstora de råa röda och blå lagren med dessa faktorer, vanligen +mellan 0.999 och 1.001, för att rätta till kromatisk avvikelse. +.TP +.B -H 0 +Klipp alla högdagrar till solid vit (standard). +.TP +.B -H 1 +Låt högdagrar vara oklippta i diverse nyanser av rosa. +.TP +.B -H 2 +Blanda klippta och oklippta värden för en gradvis övergång +till vitt. +.TP +.B -H 3+ +Återskapa högdagrarna. Låga siffror gynnar vitt; höga siffror +gynnar färger. Prova +.B -H 5 +som en kompromiss. Är inte det bra nog, prova +.BR -H\ 9 , +klipp ut de icke-vita högdagrarna och klistra in dem i en bild +som genererats med +.BR -H\ 3 . +.SH FÄRGFLAGGOR +Som standard så använder +.B dcraw +en fast vitbalans baserad på en färgkarta upplyst med +en standard D65-lampa. +.TP +.B -w +Använd kamerans förvalda vitbalans. Skriv ut en varning och +använd en annan metod om ingen förvald vitbalans hittas. +.TP +.B -a +Beräkna vitbalansen genom att använda ett genomsnitt av hela bilden. +.TP +.B -A vänster topp bredd höjd +Beräkna vitbalansen genom att använda ett genomsnitt av en rektangulär yta. +Först kör +.B dcraw\ -j\ -t\ 0 +och välj en neutralt grå yta. +.TP +.B -r mul0 mul1 mul2 mul3 +Specifiera din egen råfotovitbalans. +Dessa multiplikatorer kan klippas ut och klistras in från utdatat av +.BR dcraw\ -v . +.TP +.BR +M " eller " -M +Använd (eller använd inte) någon färgmatris från kamerans metadata. +Standard är +.B +M +om +.B -w +är valt, annars +.BR -M . +Detta val påverkar bara Olympus-, Leaf-, och Phase One-kameror. +.TP +.B -o [0-5] +Välj utdatats färgrymd när valet +.B -p +inte används: + +.B \t0 +\ \ Rå färg (unik för varje kamera) +.br +.B \t1 +\ \ sRGB D65 (standard) +.br +.B \t2 +\ \ Adobe RGB (1998) D65 +.br +.B \t3 +\ \ Wide Gamut RGB D65 +.br +.B \t4 +\ \ Kodak ProPhoto RGB D65 +.br +.B \t5 +\ \ XYZ +.TP +.BR -p\ kamera.icm \ [\ -o\ utdata.icm \ ] +Använd ICC-profiler för att definiera kamerans råa färgrymd och den +önskade färgrymden för utdatat (sRGB är standard) +.TP +.B -p embed +Använd ICC-profilen inbäddad i råfotot. +.SH INTERPOLATIONSFLAGGOR +.TP +.B -d +Visa råfotot som en bild i gråskala utan interpolation. +Bra för att fotografera svartvita dokument. +.TP +.B -D +Samma som +.BR -d , +men helt rå (ingen färgskalning). +.TP +.B -h +Skapa en färgbild i halv storlek. Detta är dubbelt så snabbt som +.BR -q\ 0 . +.TP +.B -q 0 +Använd bilinjär interpolation. Detta är snabbt men har låg kvalitet. +.TP +.B -q 1 +Använd interpolation med ställbart antal gradienter (VNG). +.TP +.B -q 2 +Använd interpolation med grupperade bildpunktsmönster (PPG). +.TP +.B -q 3 +Använd anpassningsbart och enhetligt riktad interpolation (AHD). +.TP +.B -f +Interpolera RGB som fyra färger. Använd det här om utdatat visar +falska 2×2 nät med VNG eller labyrinter med AHD. +.TP +.B -m antal_upprepningar +Rensa bort färgartefakter efter interpolation genom att upprepade +gånger applicera ett 3×3-medianfilter till R-G- och B-G-kanalerna. +.SH UTDATAFLAGGOR +Som standard så skriver +.B dcraw +PGM/PPM/PAM med 8-bits samplingar, en BT.709-gammakurva, +en histogrambaserad vitnivå och inga metadata. +.TP +.B -W +Använd en fast vitnivå och ignorera bildens histogram. +.TP +.B -b ljusnivå +Dela vitnivån med denna siffra. 1.0 är standard. +.TP +.B -g upphöjt_till maximal_lutning +Ställ in gammakurvan, standard är BT.709 +.RB ( -g\ 2.222\ 4.5 ). +Om du föredrar sRGB-gamma, använd +.BR -g\ 2.4\ 12.92 . +För en enkel potenskurva, ställ maximal lutning på noll. +.TP +.B -6 +Skriv sexton bitar per sampel istället för åtta. +.TP +.B -4 +Linjär 16-bit, samma som +.BR -6\ -W\ -g\ 1\ 1 . +.TP +.B -T +Skriv TIFF med metadata istället för PGM/PPM/PAM. +.TP +.B -t [0-7,90,180,270] +Vrid utbilden. Som standard applicerar +.B dcraw +vridningen som kameran specifierat. +.B -t 0 +stänger av all vridning. +.TP +.B -j +För Fuji\ Super\ CCD-kameror så visas bilden vriden 45 grader. +För kameror med ickekvadratiska bildpunkter så sträcks inte bilden +ut till sitt korrekta förhållande mellan höjd och bredd. +Hur som helst, så garanterar detta val att varje bildpunkt på utbilden +motsvarar en rå bildpunkt. +.TP +.BR "-s [0..N-1]" " eller " "-s all" +Om en fil innehåller N råbilder, välj då en eller "all" för avkodning. +T.ex. genererar Fuji\ Super\ CCD\ SR-kameror en extra bild som är +underexponerad med fyra steg för att få fram detaljer i högdagrar. +.SH FILER +.TP +\:./.badpixels, ../.badpixels, ../../.badpixels, ... +Lista på din kameras döda bildpunkter, så att +.B dcraw +kan interpolera runt dem. Varje rad specificerar kolumn, rad och +UNIX-tid då bildpunkten dog. T.ex: +.sp 1 +.nf + 962 91 1028350000 # dog mellan 1:e och 4:e augusti 2002 +1285 1067 0 # Vet inte när denna bildpunkt dog. +.fi +.sp 1 +Dessa är koordinater innan rotation eller beskärning gjorts, så använd +.B dcraw -j -t 0 +för att söka rätt på döda bildpunkter. +.SH "SE OCKSÅ" +.BR pgm (5), +.BR ppm (5), +.BR pam (5), +.BR pamsumm (1), +.BR pnmgamma (1), +.BR pnmtotiff (1), +.BR pnmtopng (1), +.BR gphoto2 (1), +.BR cjpeg (1), +.BR djpeg (1) +.SH FÖRFATTARE +Skriven av David Coffin, dcoffin a cybercom o net +.SH ÖVERSÄTTARE +Lars Lindley, lindley a coyote o org +.br +Johnny Rosenberg, guraknugen a gmail o com diff -Nru dcraw-8.99/dcraw_sv.po dcraw-9.17/dcraw_sv.po --- dcraw-8.99/dcraw_sv.po 1970-01-01 00:00:00.000000000 +0000 +++ dcraw-9.17/dcraw_sv.po 2013-01-03 13:09:39.000000000 +0000 @@ -0,0 +1,344 @@ +# Swedish translation of dcraw messages. +# (c) 2009 Dave Coffin dcoffin a cybercom o net +# Distribute freely. +# +msgid "" +msgstr "" +"Project-Id-Version: dcraw 8.94\n" +"Report-Msgid-Bugs-To: dcoffin a cybercom o net\n" +"POT-Creation-Date: 2006-12-21 22:45-0500\n" +"PO-Revision-Date: 2011-07-23 17:00-0400\n" +"Last-Translator: Johnny Rosenberg \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +msgid "%s: Out of memory in %s\n" +msgstr "%s: Slut på minne i %s\n" + +msgid "Unexpected end of file\n" +msgstr "Oväntat filslut\n" + +msgid "Corrupt data near 0x%llx\n" +msgstr "Förvanskade data vid 0x%llx\n" + +msgid "%s: decoder table overflow\n" +msgstr "%s: avkodningstabell överskriden\n" + +msgid "Phase One correction...\n" +msgstr "Korrigerar för Phase One...\n" + +msgid "%s: incorrect JPEG dimensions\n" +msgstr "%s: felaktiga JPEG-dimensioner\n" + +msgid "%s: \"%s\" matrix not found!\n" +msgstr "%s: hittar ej \"%s\"-matris!\n" + +msgid "Foveon interpolation...\n" +msgstr "Foveon-interpolation...\n" + +msgid "%s: Invalid white balance \"%s\"\n" +msgstr "%s: \"%s\" är inte en tillåten vitbalans\n" + +msgid "Fixed dead pixels at:" +msgstr "Reparerade döda bildpunkter vid:" + +msgid "%s is not a valid PGM file!\n" +msgstr "%s är inte en tillåten PGM-fil!\n" + +msgid "%s has the wrong dimensions!\n" +msgstr "%s har fel dimensioner!\n" + +msgid "Wavelet denoising...\n" +msgstr "Brusreducering med vågelement...\n" + +msgid "%s: Cannot use camera white balance.\n" +msgstr "%s: Kan inte använda kamerans vitbalans.\n" + +msgid "Scaling with darkness %d, saturation %d, and\nmultipliers" +msgstr "Skalar med mörkhet %d, mättnad %d, och\nmultiplikatorer" + +msgid "Correcting chromatic aberration...\n" +msgstr "Korrigerar kromatisk avvikelse...\n" + +msgid "Bilinear interpolation...\n" +msgstr "Bilinjär interpolation...\n" + +msgid "VNG interpolation...\n" +msgstr "VNG-interpolation...\n" + +msgid "PPG interpolation...\n" +msgstr "PPG-interpolation...\n" + +msgid "AHD interpolation...\n" +msgstr "AHD-interpolation...\n" + +msgid "Median filter pass %d...\n" +msgstr "Medianfilter, varv %d...\n" + +msgid "Blending highlights...\n" +msgstr "Blandar högdagrar...\n" + +msgid "Rebuilding highlights...\n" +msgstr "Återskapar högdagrar...\n" + +msgid "Reading metadata from %s ...\n" +msgstr "Läser metadata från %s ...\n" + +msgid "Failed to read metadata from %s\n" +msgstr "Kunde inte läsa metadata från %s\n" + +msgid "%s: You must link dcraw with libjpeg!!\n" +msgstr "%s: Du måste länka dcraw med libjpeg!!\n" + +msgid "%s: You must link dcraw with %s!!\n" +msgstr "%s: Du måste länka dcraw med %s!!\n" + +msgid "%s has no embedded profile.\n" +msgstr "%s har ingen inbäddad profil.\n" + +msgid "Cannot open file %s!\n" +msgstr "Kan inte öppna filen %s!\n" + +msgid "Applying color profile...\n" +msgstr "Applicerar färgprofil...\n" + +msgid "Building histograms...\n" +msgstr "Bygger histogram...\n" + +msgid "Converting to %s colorspace...\n" +msgstr "Konverterar till färgrymd %s...\n" + +msgid "Rotating image 45 degrees...\n" +msgstr "Roterar bilden 45°...\n" + +msgid "Stretching the image...\n" +msgstr "Sträcker ut bilden...\n" + +msgid "\nRaw photo decoder \"dcraw\" v%s" +msgstr "\nRåfotoavkodare \"dcraw\" v%s" + +msgid "\nby Dave Coffin, dcoffin a cybercom o net\n" +msgstr "\nav Dave Coffin, dcoffin a cybercom o net\n" + +msgid "\nUsage: %s [OPTION]... [FILE]...\n\n" +msgstr "\nAnvändning: %s [FLAGGA]... [FIL]...\n\n" + +msgid "-v Print verbose messages" +msgstr "-v Skriv utförliga meddelanden" + +msgid "-c Write image data to standard output" +msgstr "-c Skriv bilddata till standardutenhet" + +msgid "-e Extract embedded thumbnail image" +msgstr "-e Extrahera inbäddad miniatyrbild" + +msgid "-i Identify files without decoding them" +msgstr "-i Identifiera filer utan att avkoda dem" + +msgid "-i -v Identify files and show metadata" +msgstr "-i -v Identifiera filer och visa metadata" + +msgid "-z Change file dates to camera timestamp" +msgstr "-z Ändra fildatum till kamerans tidsstämpel" + +msgid "-w Use camera white balance, if possible" +msgstr "-w Använd kamerans vitbalans om möjligt" + +msgid "-a Average the whole image for white balance" +msgstr "-a Vitbalans genom medelvärdesbildning av hela bilden" + +msgid "-A Average a grey box for white balance" +msgstr "-A Vitbalans genom medelvärdesbildning av en grå ruta" + +msgid "-r Set custom white balance" +msgstr "-r Justera vitbalans manuellt" + +msgid "+M/-M Use/don't use an embedded color matrix" +msgstr "+M/-M Använd/använd inte en inbäddad färgmatris" + +msgid "-C Correct chromatic aberration" +msgstr "-C Korrigera kromatisk avvikelse" + +msgid "-P Fix the dead pixels listed in this file" +msgstr "-P Reparera döda bildpunkter listade i denna fil" + +msgid "-K Subtract dark frame (16-bit raw PGM)" +msgstr "-K Subtrahera mörkerbild (16-bits rå PGM)" + +msgid "-k Set the darkness level" +msgstr "-k Välj mörkernivå" + +msgid "-S Set the saturation level" +msgstr "-S Välj mättnadsnivån" + +msgid "-n Set threshold for wavelet denoising" +msgstr "-n Välj tröskelvärde för krusningseliminering" + +msgid "-H [0-9] Highlight mode (0=clip, 1=unclip, 2=blend, 3+=rebuild)" +msgstr "-H [0-9] Hantera högdagrar (0=beskär, 1=beskär ej, 2=blanda, 3+=återskapa)" + +msgid "-t [0-7] Flip image (0=none, 3=180, 5=90CCW, 6=90CW)" +msgstr "-t [0-7] Vrid bilden (0=inget, 3=180°, 5=90° moturs, 6=90° medurs)" + +msgid "-o [0-5] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" +msgstr "-o [0-5] Färgrymd för utdata (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" + +msgid "-o Apply output ICC profile from file" +msgstr "-o Applicera ICC-profil från fil på utdata" + +msgid "-p Apply camera ICC profile from file or \"embed\"" +msgstr "-p Applicera kamerans ICC-profil från fil eller \"embed\"" + +msgid "-d Document mode (no color, no interpolation)" +msgstr "-d Dokumentläge (ingen färg eller interpolation)" + +msgid "-D Document mode without scaling (totally raw)" +msgstr "-D Dokumentläge utan skalning (helt rå)" + +msgid "-j Don't stretch or rotate raw pixels" +msgstr "-j Varken sträck eller rotera rådata" + +msgid "-W Don't automatically brighten the image" +msgstr "-W Gör inte bilden ljusare automatiskt" + +msgid "-b Adjust brightness (default = 1.0)" +msgstr "-b Justera ljusnivå (standard = 1.0)" + +msgid "-g

Set custom gamma curve (default = 2.222 4.5)" +msgstr "-g

Ställ in egen gammakurva (standard = 2.222 4.5)" + +msgid "-q [0-3] Set the interpolation quality" +msgstr "-q [0-3] Välj interpolationskvalitet" + +msgid "-h Half-size color image (twice as fast as \"-q 0\")" +msgstr "-h Halvstorleksfärgbild (dubbelt så snabbt som \"-q 0\")" + +msgid "-f Interpolate RGGB as four colors" +msgstr "-f Interpolera RGGB till fyra färger" + +msgid "-m Apply a 3x3 median filter to R-G and B-G" +msgstr "-m Applicera ett 3×3-medianfilter på R-G och B-G" + +msgid "-s [0..N-1] Select one raw image or \"all\" from each file" +msgstr "-s [0..N-1] Välj en råbild eller \"all\" från varje fil" + +msgid "-6 Write 16-bit instead of 8-bit" +msgstr "-6 Skriv 16-bit istället för 8-bit" + +msgid "-4 Linear 16-bit, same as \"-6 -W -g 1 1\"" +msgstr "-4 Linjär 16-bit, samma som \"-6 -W -g 1 1\"" + +msgid "-4 Write 16-bit linear instead of 8-bit with gamma" +msgstr "-4 Skriv 16-bit linjärt istället för 8-bit med gamma" + +msgid "-T Write TIFF instead of PPM" +msgstr "-T Skriv TIFF istället för PPM" + +msgid "Non-numeric argument to \"-%c\"\n" +msgstr "Ickenumeriska argument till \"-%c\"\n" + +msgid "Unknown option \"-%c\".\n" +msgstr "Okänd flagga \"-%c\".\n" + +msgid "No files to process.\n" +msgstr "Inga filer att behandla.\n" + +msgid "Will not write an image to the terminal!\n" +msgstr "Kommer inte att skriva en bild till terminalen!\n" + +msgid "%s has no timestamp.\n" +msgstr "%s har ingen tidsstämpel.\n" + +msgid "%s time set to %d.\n" +msgstr "%s-tid ställd till %d.\n" + +msgid "%s has no thumbnail.\n" +msgstr "%s har ingen miniatyrbild.\n" + +msgid "\nFilename: %s\n" +msgstr "\nFilnamn: %s\n" + +msgid "Timestamp: %s" +msgstr "Tidsstämpel: %s" + +msgid "Camera: %s %s\n" +msgstr "Kamera: %s %s\n" + +msgid "Owner: %s\n" +msgstr "Ägare: %s\n" + +msgid "DNG Version: " +msgstr "DNG-version: " + +msgid "ISO speed: %d\n" +msgstr "ISO-hastighet: %d\n" + +msgid "Shutter: " +msgstr "Slutare: " + +msgid "%0.1f sec\n" +msgstr "%0.1f sek\n" + +msgid "Aperture: f/%0.1f\n" +msgstr "Bländare: f/%0.1f\n" + +msgid "Focal length: %0.1f mm\n" +msgstr "Brännvidd: %0.1f mm\n" + +msgid "yes" +msgstr "ja" + +msgid "no" +msgstr "nej" + +msgid "Embedded ICC profile: %s\n" +msgstr "Inbäddad ICC-profil: %s\n" + +msgid "Number of raw images: %d\n" +msgstr "Antal råbilder: %d\n" + +msgid "Pixel Aspect Ratio: %0.6f\n" +msgstr "Bredd/höjd-förhållande: %0.6f\n" + +msgid "Thumb size: %4d x %d\n" +msgstr "Miniatyrstorlek: %4d x %d\n" + +msgid "Full size: %4d x %d\n" +msgstr "Full storlek: %4d x %d\n" + +msgid "Cannot decode file %s\n" +msgstr "Kan inte avkoda filen %s\n" + +msgid "Image size: %4d x %d\n" +msgstr "Bildstorlek: %4d x %d\n" + +msgid "Output size: %4d x %d\n" +msgstr "Storlek, utdata: %4d x %d\n" + +msgid "Raw colors: %d" +msgstr "Råfärger: %d" + +msgid "\nFilter pattern: " +msgstr "\nFiltermönster: " + +msgid "\nDaylight multipliers:" +msgstr "\nDagsljusmultiplikator:" + +msgid "\nCamera multipliers:" +msgstr "\nKameramultiplikator:" + +msgid "%s is a %s %s image.\n" +msgstr "%s är en %s %s-bild.\n" + +msgid "Loading %s %s image from %s ...\n" +msgstr "Laddar %s %s-bild från %s ...\n" + +msgid "%s: \"-s %d\" requests a nonexistent image!\n" +msgstr "%s: \"-s %d\" försöker öppna en icke existerande bild!\n" + +msgid "standard output" +msgstr "standardutmatning" + +msgid "Writing data to %s ...\n" +msgstr "Skriver data till %s ...\n" diff -Nru dcraw-8.99/dcraw_zh_CN.1 dcraw-9.17/dcraw_zh_CN.1 --- dcraw-8.99/dcraw_zh_CN.1 1970-01-01 00:00:00.000000000 +0000 +++ dcraw-9.17/dcraw_zh_CN.1 2013-01-03 13:09:39.000000000 +0000 @@ -0,0 +1,262 @@ +.\" +.\" Man page for dcraw +.\" +.\" Copyright (c) 2009 by David Coffin +.\" +.\" You may distribute without restriction. +.\" +.\" David Coffin +.\" dcoffin a cybercom o net +.\" http://www.cybercom.net/~dcoffin +.\" +.TH dcraw 1 "2009 年 3 月 3 日" +.LO 1 +.SH 名　称 +dcraw - 命令行界面 raw 影像解码工具 +.SH 总　览 +.B dcraw +[\fI参数\fR]... [\fI图档路径\fR]... +.SH 概　要 +.B dcraw +解码原始影像档案，显示图档之元数据 (metadata) 以及产生预览图片。 +.SH 一般选项 +.TP +.B -v +在除了警告与错误信息外并显示额外的执行情报。 +.TP +.B -c +将解码后图片与预览图片资料送至标准输出埠 (STDOUT) +.TP +.B -e +自原始影像档案中解出由相机产生的预览图片。视相机厂牌型号的不同，产生的图档有可能是 JPEG 或 PPM 格式。 +.TP +.B -z +将产生之档案的最后存取时间设定为照片的实际拍摄时间。 +.TP +.B -i +仅辨识输入档案的格式而不进行解码。如果 +.B dcraw +可以支援该种档案，本命令结束时的状态码会是 0，反之如果辨识失败状态码则是 1。 +.B -i -v +则可以显示图档之元数据 (metadata)。 +.TP +.B "" +请注意 +.B dcraw +不能解码 JPEG 格式档案！ +.SH 影像修补选项 +.TP +.B -P deadpixels.txt +忽略 .badpixels 参数，自此档案中读取损坏感应元件之资料列表 +参见 +.B 相关档案 +中之档案格式叙述 +.TP +.B -K darkframe.pgm +使用黑框抵消法来消除影像杂讯。如欲产生黑框影像，请将相机镜头盖上后拍摄一张原始影像照片， +并使用 +.B dcraw -D -4 -j -t 0 +命令来产生参考档案。 +.TP +.B -k 黑暗度 +当影像中的阴影显得模糊时，你可以试著增加黑暗度来改善这个问题。 +你可以利用上述命令来产生参考档案后，再利用下述命令来测量黑暗度： +.B pamsumm -mean +.TP +.B -S 饱和度 +当影像中的亮处显得发红时，你可以试著减低饱和度来改善问题。 +请先到一个明亮的地方拍张照片，再利用下述命令来度量饱和度的参考值： +.B dcraw -D -4 -j -c +photo.raw +.B | pamsumm -max +.TP +.B "" +在一般的情况下，预设的黑暗度与饱和度应该是不需调整的。 +.TP +.B -n 杂讯消除临界值 +利用微波法来消除杂讯同时保存影像细节。 +杂讯消除临界值我们建议使用 100 至 1000 之间的数值。 +.TP +.B -C 红色缩放倍数 蓝色缩放倍数 +根据参数来缩放红色与蓝色图层。通常倍数是在 0.999 至 1.001 之间， +此命令可以透过红蓝图层的缩放来消除影像的色像差。 +.TP +.B -H 0 +将影像中过亮部份改成纯白色。（预设功能） +.TP +.B -H 1 +影像中过亮部份以淡粉红色阶调来取代。 +.TP +.B -H 2 +混合过曝与正常曝光值来产生均匀的渐层白色。 +.TP +.B -H 3+ +重建影像中高亮度部份的色彩。参数值较低时会比较偏向采用白色来取代高亮度部份的色彩； +高数值时则会使用颜色渐层来取代。建议尝试您先设定成 +.B -H 5 +来进行试验。如果对于效果不满意，可再试试先用 +.B -H 9 +来进行转换后，在影像编辑软体中把带有颜色的高亮度部份除去后，再与一张使用 +.B -H 3 +参数来转换的同一图档进行合并。 +.SH 色彩选项 +在一般状态下 +.B dcraw +程式使用固定的白平衡值，这个数值是经由测量在 D65 灯光下的标准色表所得。 +.TP +.B -w +使用相机所指定的白平衡值。 +如果在档案中找不到此项资料，显示警告信息并改用其他方式调整白平衡。 +.TP +.B -a +利用整个影像的平均值来计算白平衡。 +.TP +.B -A 左方座标 上方座标 宽度 高度 +利用一个矩形区域的影像平均值来计算白平衡。 +这项功能首先会执行 +.B dcraw -j -t 0 +接著选择一个有中性灰色的区域来进行计算。 +.TP +.B -r 系数0 系数1 系数2 系数3 +使用自定白平衡值。 +上述四个参数可以拷贝自以下命令的输出： +.BR dcraw\ -v . +.TP +.BR +M " or " -M +使用或是舍弃影像档案中的色彩矩阵资料。 +如果一并使用 +.B -w +选项，则预设值为 +.B +M +否则将会使用 +.B -M +这个参数只会影响 Olympus、Leaf 以及 Phase One 等品牌相机所拍摄的照片。 +.TP +.B -o [0-5] +选定当 +.B -p +选项没有使用时所输出的色域： + +.B \t0 +\ \原始影像色彩 (各厂牌均有不同值) +.br +.B \t1 +\ \ sRGB D65 (预设值) +.br +.B \t2 +\ \ Adobe RGB (1998) D65 +.br +.B \t3 +\ \ Wide Gamut RGB D65 +.br +.B \t4 +\ \ Kodak ProPhoto RGB D65 +.br +.B \t5 +\ \ XYZ +.TP +.BR -p\ camera.icm \ [\ -o\ output.icm \ ] +利用 ICC 描述档案来定义相机的输入以及输出 colorspace。(预设的 profile 值为 sRGB) +.TP +.B -p embed +使用嵌在原始影像档案中的 ICC 描述来决定 colorspace +.SH 内插运算选项 +.TP +.B -d +将原始影像档案内容以灰阶方式解码，不使用内插法来改善影像品质。 +这个模式最适合翻拍文件 +.TP +.B -D +此模式与 +.B -d +一样会输出灰阶影像， +但是影像解码过程完全不经过任何处理。 +.TP +.B -h +输出影像的长宽减半，相对的解码速度也会比 +.B -q 0 +快上一倍。 +.TP +.B -q 0 +使用品质略逊，但速度较快的双线性 (bilinear) 内插法来进行影像的解码。 +.TP +.B -q 1 +使用变数渐层 (Variable Number of Gradients, VNG) 内插法来进行影像的解码。 +.TP +.B -q 2 +使用像素图样组群 (Patterned Pixel Grouping, PPG) 内插法。 +.TP +.B -q 3 +使用 Adaptive Homogeneity-Directed (AHD) 内插法来进行影像的解码。 +.TP +.B -f +在进行内插法演算时将 RGB 当成四种颜色。 如果利用 VNG 或是 AHD 内插法来产生影像结果 +出现格状杂讯的话，请加上这个选项来减少杂讯。 +.TP +.B -m 重复运算次数 +在使用内插法产生中介数值后，在红绿与蓝绿色频上重复利用 3x3 大小的中间值滤镜来消除色彩杂讯。 +.SH 输出选项 +在一般情况下 +.B dcraw +会产生利用八位元取样、采用 BT.709 gamma 曲线、根据平均值所计算之全白色值、以及没有元数据的 PGM/PPM/PAM 档案。 +.TP +.B -W +忽略平均值计算所得之全白色值，使用参数指定的全白色值。 +.TP +.B -b 亮度 +将全白色值除以这个参数，预设值为 1.0。 +.TP +.B -g 次方 斜率极大值 +设定 gamma 曲线值，预设值为 BT.709 +.RB ( -g\ 2.222\ 4.5 ). +如果你想要使用 sRGB 色域的 gamma 曲线，请使用 +.BR -g\ 2.4\ 12.92 . +如欲使用简单乘方曲线，请将斜率极大值设定成 0 +.TP +.B -4 +输出 16 位元线性档案（固定全白色值，不改变 gamma 值） +.TP +.B -T +输出 TIFF 格式（附元数据）的影像档案。 +.TP +.B -t [0-7,90,180,270] +旋转图片。此命令的预设值是根据相机之方向感应器资料而定。使用 +.B -t 0 +命令则可以取消自动旋转功能。 +.TP +.B -j +使用 Fuji\ Super\ CCD 的数码相机因为像素不是正方形，在电脑萤幕上无法以正确的长宽比显示。 +使用这个参数会产生转 45 度角的影像，如此可以确保每个像素都对应到一个感应元件。 +.TP +.BR "-s [0..N-1]" " or " "-s all" +如果在一个影像档案里夹有 N 个 RAW 影像档案，利用此参数可以选择要解码那个影像。 +以 Fuji\ Super\ CCD\ SR 相机为例，每个 RAW 影像档案里都包含有两个影像， +其中一个是专门记录高亮度区域的资料。 +.SH 相关档案 +.TP +\:./.badpixels, ../.badpixels, ../../.badpixels, ... +列出相机感光元件上损坏的感应元件（dead pixels）。 +.B dcraw +将会参考这个档案在解码时避开这些像素。这种档案的格式为： +.sp 1 +.nf + 962 91 1028350000 # 该感光元件在 2001 年八月一日至四日之间出现问题 +1285 1067 0 # 不确定此感光元件损坏的确实时间 +.fi +.sp 1 +这些座标是以照片转向与被裁切之前的状态为准。请使用 +.B dcraw -j -t 0 +命令来找寻有问题像素的座标。 +.SH "参　见" +.BR pgm (5), +.BR ppm (5), +.BR pam (5), +.BR pamsumm (1), +.BR pnmgamma (1), +.BR pnmtotiff (1), +.BR pnmtopng (1), +.BR gphoto2 (1), +.BR cjpeg (1), +.BR djpeg (1) +.SH 作　者 +本软体由 David Coffin 制作，电邮地址： dcoffin a cybercom o net diff -Nru dcraw-8.99/dcraw_zh_CN.po dcraw-9.17/dcraw_zh_CN.po --- dcraw-8.99/dcraw_zh_CN.po 1970-01-01 00:00:00.000000000 +0000 +++ dcraw-9.17/dcraw_zh_CN.po 2013-01-03 13:09:39.000000000 +0000 @@ -0,0 +1,377 @@ +# Simplified Chinese translation of dcraw messages. +# (c) 2009 Dave Coffin dcoffin a cybercom o net +# Distribute freely. +# +msgid "" +msgstr "" +"Project-Id-Version: dcraw 8.92\n" +"Report-Msgid-Bugs-To: dcoffin a cybercom o net\n" +"POT-Creation-Date: 2006-12-21 22:45-0500\n" +"PO-Revision-Date: 2011-07-23 17:00-0400\n" +"Last-Translator: Bryan Chang \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +msgid "%s: Out of memory in %s\n" +msgstr "%s : 在 %s 发生记忆体不足错误\n" + +msgid "Unexpected end of file\n" +msgstr "档案内容提前终止\n" + +msgid "Corrupt data near 0x%lx\n" +msgstr "资料在 0x%lx 附近毁损\n" + +msgid "Corrupt data near 0x%llx\n" +msgstr "资料在 0x%llx 附近毁损\n" + +msgid "%s: decoder table overflow\n" +msgstr "%s : 解码表容量不足导致发生错误\n" + +msgid "Phase One correction...\n" +msgstr "转换 Phase One 格式档案...\n" + +msgid "%s: incorrect JPEG dimensions\n" +msgstr "%s : JPEG 档案长宽尺寸有误\n" + +msgid "%s: \"%s\" matrix not found!\n" +msgstr "%s : 找不到 \"%s\" 矩阵！\n" + +msgid "Foveon interpolation...\n" +msgstr "使用 Foveon 内插法...\n" + +msgid "%s: Invalid white balance \"%s\"\n" +msgstr "%s : 无效的白平衡数值 \"%s\"\n" + +msgid "Fixed bad pixels at:" +msgstr "资料修复中，损坏像素之座标 :" + +msgid "Fixed dead pixels at:" +msgstr "资料修复中，损坏像素之座标 :" + +msgid "%s is not a valid PGM file!\n" +msgstr "%s 是无效的 PGM 档案。\n" + +msgid "%s has the wrong dimensions!\n" +msgstr "%s 的尺寸错误。\n" + +msgid "Wavelet denoising...\n" +msgstr "微波法消除杂讯...\n" + +msgid "%s: Cannot use camera white balance.\n" +msgstr "%s : 无法使用相机内存之白平衡值。\n" + +msgid "Scaling with black %d, multipliers" +msgstr "以黑色点与白平衡系数来调整色彩" + +msgid "Scaling with darkness %d, saturation %d, and\nmultipliers" +msgstr "以黑暗度值 %d，色彩饱和度 %d 以及\n乘算参数" + +msgid "Correcting chromatic aberration...\n" +msgstr "校正色像差...\n" + +msgid "Bilinear interpolation...\n" +msgstr "两面过滤法...\n" + +msgid "VNG interpolation...\n" +msgstr "VNG 影像内插法处理中...\n" + +msgid "PPG interpolation...\n" +msgstr "PPG 影像内插法处理中...\n" + +msgid "AHD interpolation...\n" +msgstr "AHD 影像内插法处理中...\n" + +msgid "Median filter pass %d...\n" +msgstr "第 %d 次中间值滤镜运算...\n" + +msgid "Bilateral filtering...\n" +msgstr "两面过滤法处理中...\n" + +msgid "Blending highlights...\n" +msgstr "混合高亮度区域数值...\n" + +msgid "Rebuilding highlights...\n" +msgstr "重建高量度区域影像...\n" + +msgid "Highlight recovery...\n" +msgstr "重建高亮度部份之资料...\n" + +msgid "Reading metadata from %s ...\n" +msgstr "自 %s 中读取诠释资料...\n" + +msgid "Failed to read metadata from %s\n" +msgstr "无法自 %s 中读取诠释资料\n" + +msgid "%s: You must link dcraw with libjpeg!!\n" +msgstr "%s dcraw 需要系统安装有 libjpeg。\n" + +msgid "%s: You must link dcraw with %s!!\n" +msgstr "%s dcraw 需要系统安装有 %s。\n" + +msgid "%s has no embedded profile.\n" +msgstr "%s 没有内嵌的色彩描述资料。\n" + +msgid "Cannot open file %s!\n" +msgstr "无法开启档案： %s\n" + +msgid "Applying color profile...\n" +msgstr "加入色彩描述...\n" + +msgid "Building histograms...\n" +msgstr "产生直方统计图...\n" + +msgid "Converting to %s colorspace...\n" +msgstr "转换至 %s colorspace...\n" + +msgid "Rotating image 45 degrees...\n" +msgstr "将影像翻转 45 度...\n" + +msgid "Stretching the image...\n" +msgstr "将影像展开...\n" + +msgid "\nRaw photo decoder \"dcraw\" v%s" +msgstr "\n原始影像解码工具 \"dcraw\" v%s" + +msgid "\nby Dave Coffin, dcoffin a cybercom o net\n" +msgstr "\n本软体由 Dave Coffin 制作 dcoffin a cybercom o net\n" + +msgid "\nUsage: %s [OPTION]... [FILE]...\n\n" +msgstr "\n指令用法： %s [参数]... [图档路径]...\n\n" + +msgid "-v Print verbose messages" +msgstr "-v 显示详细讯息" + +msgid "-c Write image data to standard output" +msgstr "-c 将影像资料输出终端机标准输出埠" + +msgid "-e Extract embedded thumbnail image" +msgstr "-e 抽出内嵌于原始图档中的预览图片" + +msgid "-i Identify files without decoding them" +msgstr "-i 确认图档格式但不进行解码" + +msgid "-i -v Identify files and show metadata" +msgstr "-i -v 确认图档格式并显示诠释资料 (metadata)。" + +msgid "-z Change file dates to camera timestamp" +msgstr "-z 将输出档案的产生时间设定成相片拍摄的时间。" + +msgid "-a Use automatic white balance" +msgstr "-a 使用自动白平衡" + +msgid "-w Use camera white balance, if possible" +msgstr "-w 在允许的情况下使用相机指定的白平衡值" + +msgid "-a Average the whole image for white balance" +msgstr "-a 利用整个影像的平均值来计算白平衡" + +msgid "-A Average a grey box for white balance" +msgstr "-A 取灰色矩形区域平均值来计算白平衡" + +msgid "-r Set custom white balance" +msgstr "-r 使用自定白平衡值" + +msgid "-r <4 numbers> Set custom white balance" +msgstr "-r <四个数值> 使用订制白平衡" + +msgid "+M/-M Use/don't use an embedded color matrix" +msgstr "+M/-M 使用或舍弃影像档案中的 color matrix 资料" + +msgid "-C Correct chromatic aberration" +msgstr "-C 校正色像差" + +msgid "-P Fix the dead pixels listed in this file" +msgstr "-P <资料档名> 修正列在资料档中的损坏感光元件资料" + +msgid "-K Subtract dark frame (16-bit raw PGM)" +msgstr "-K <档案路径> 使用黑框抵消法来消除影像杂讯 (黑框档案格式必须是 16-bit raw PGM)" + +msgid "-k Set black point" +msgstr "-k <数值> 设定黑色点" + +msgid "-k Set the darkness level" +msgstr "-k <数值> 设定黑色调数值" + +msgid "-S Set the saturation level" +msgstr "-S <数值> 设定色彩饱和度值" + +msgid "-n Set threshold for wavelet denoising" +msgstr "-n <数值> 设定微波杂讯消除临界值" + +msgid "-H [0-9] Highlight mode (0=clip, 1=no clip, 2+=recover)" +msgstr "-H [0-9] 重建影像中高亮度处色彩 (0：纯白色，1：以淡粉红色阶调取代，2-9：使用颜色渐层取代)" + +msgid "-H [0-9] Highlight mode (0=clip, 1=unclip, 2=blend, 3+=rebuild)" +msgstr "-H [0-9] 高亮度区域影像处理" + +msgid "-t [0-7] Flip image (0=none, 3=180, 5=90CCW, 6=90CW)" +msgstr "-t [0-7] 翻转影像 (0：不翻转，3：转 180 度，5：逆时针转 90 度， 6：顺时针转 90 度)" + +msgid "-o [0-5] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" +msgstr "-o [0-5] 输出 colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" + +msgid "-o Apply output ICC profile from file" +msgstr "-o <档案路径> 读取相机 ICC 描述档案" + +msgid "-p Apply camera ICC profile from file or \"embed\"" +msgstr "-p <档案路径> 读取相机 ICC 描述档案或者是使用内嵌描述档" + +msgid "-d Document mode (no color, no interpolation)" +msgstr "-d 文件翻拍模式（黑白，不使用内插法）" + +msgid "-D Document mode without scaling (totally raw)" +msgstr "-D 黑白翻拍模式（完全不调整影像。）" + +msgid "-j Don't stretch or rotate raw pixels" +msgstr "-j 不要拉长或是旋转原始影像中的像素" + +msgid "-W Don't automatically brighten the image" +msgstr "-W        不要自动提高影像亮度" + +msgid "-b Adjust brightness (default = 1.0)" +msgstr "-b <数值> 调整亮度(预设值 = 1.0)" + +msgid "-g

Set custom gamma curve (default = 2.222 4.5)" +msgstr "-g <次方 斜率>  设定订制 gamma 曲线 (预设值为 2.222 4.5)" + +msgid "-q [0-3] Set the interpolation quality" +msgstr "-q [0-3] 设定内插法所产生影像的品质。" + +msgid "-h Half-size color image (twice as fast as \"-q 0\")" +msgstr "-h 输出影像的尺寸减半，相对的解码速度也会比 \"-q 0\" 要快两倍。" + +msgid "-f Interpolate RGGB as four colors" +msgstr "-f 在进行内插法演算时将 RGGB 当成四种颜色。" + +msgid "-m Apply a 3x3 median filter to R-G and B-G" +msgstr "-m  以 3x3 大小中间值滤镜过滤红绿与蓝绿杂讯" + +msgid "-B Apply bilateral filter to smooth noise" +msgstr "-B <领域> <范围> 采用两面过滤法 (bilateral filter) 来减低杂讯并同时保持细节的锐利度。" + +msgid "-s [0-99] Select a different raw image from the same file" +msgstr "-s [0-99] 解码同一原始影像档中所内含的某个原始影像档案。" + +msgid "-s [0..N-1] Select one raw image or \"all\" from each file" +msgstr "-s [0..N-1] 选择第 N 个 raw 档案，或使用 \"all\" 参数来指定转换档案里所有的影像" + +msgid "-4 Write 16-bit linear instead of 8-bit with gamma" +msgstr "-4 改用十六位元线性解码，而不以八位元加 Gamma 曲线格式输出" + +msgid "-T Write TIFF instead of PPM" +msgstr "-T 放弃 PPM 格式，改以 TIFF 格式输出" + +msgid "Non-numeric argument to \"-%c\"\n" +msgstr "\"-%c\" 指令的非数值参数\n" + +msgid "Unknown option \"-%c\".\n" +msgstr "未定义的参数 \"-%c\".\n" + +msgid "No files to process.\n" +msgstr "找不到档案来处理。\n" + +msgid "Will not write an image to the terminal!\n" +msgstr "不会将影像资料输出至终端机。\n" + +msgid "%s has no timestamp.\n" +msgstr "%s 档案没有时间戳记\n" + +msgid "%s time set to %d.\n" +msgstr "%s 的时间被设成 %d。\n" + +msgid "%s has no thumbnail.\n" +msgstr "%s 档案没有预览小图\n" + +msgid "\nFilename: %s\n" +msgstr "\n档名： %s\n" + +msgid "Timestamp: %s" +msgstr "时间： %s" + +msgid "Camera: %s %s\n" +msgstr "相机型号： %s %s\n" + +msgid "Owner: %s\n" +msgstr "拍摄相机拥有者: %s\n" + +msgid "DNG Version: " +msgstr "DNG 版本： " + +msgid "ISO speed: %d\n" +msgstr "ISO 感光度： %d\n" + +msgid "Shutter: " +msgstr "快门速度： " + +msgid "%0.1f sec\n" +msgstr "%0.1f 秒\n" + +msgid "Aperture: f/%0.1f\n" +msgstr "光圈： f/%0.1f\n" + +msgid "Focal length: %0.1f mm\n" +msgstr "焦距： %0.1f mm\n" + +msgid "Secondary pixels: %s\n" +msgstr "次要像素： %s\n" + +msgid "yes" +msgstr "是" + +msgid "no" +msgstr "否" + +msgid "Embedded ICC profile: %s\n" +msgstr "内含 ICC 描述档案： %s\n" + +msgid "Decodable with dcraw: %s\n" +msgstr "dcraw 支援此档案之解码： %s\n" + +msgid "Number of raw images: %d\n" +msgstr "raw 影像档数目: %d\n" + +msgid "Pixel Aspect Ratio: %0.6f\n" +msgstr "像素高宽比： %0.6f\n" + +msgid "Thumb size: %4d x %d\n" +msgstr "预览图片尺寸： %4d x %d\n" + +msgid "Full size: %4d x %d\n" +msgstr "原尺寸： %4d x %d\n" + +msgid "Cannot decode file %s\n" +msgstr "无法解码档案。档案路径： %s\n" + +msgid "Image size: %4d x %d\n" +msgstr "图档大小： %4d x %d\n" + +msgid "Output size: %4d x %d\n" +msgstr "图形输出尺寸： %4d x %d\n" + +msgid "Raw colors: %d" +msgstr "原始色彩： %d" + +msgid "\nFilter pattern: " +msgstr "\n滤镜图案： " + +msgid "\nDaylight multipliers:" +msgstr "\n日光系数：" + +msgid "\nCamera multipliers:" +msgstr "\n相机系数：" + +msgid "%s is a %s %s image.\n" +msgstr "%s 是 %s %s 格式档案。\n" + +msgid "Loading %s %s image from %s ...\n" +msgstr "载入 %s %s 格式档案中，档案路径： %s ...\n" + +msgid "%s: \"-s %d\" requests a nonexistent image!\n" +msgstr "%s: \"-s %d\" 所需要的影像档并不存在！\n" + +msgid "standard output" +msgstr "终端机标准输出埠" + +msgid "Writing data to %s ...\n" +msgstr "资料正写出至： %s ...\n" diff -Nru dcraw-8.99/dcraw_zh_TW.1 dcraw-9.17/dcraw_zh_TW.1 --- dcraw-8.99/dcraw_zh_TW.1 1970-01-01 00:00:00.000000000 +0000 +++ dcraw-9.17/dcraw_zh_TW.1 2013-01-03 13:09:39.000000000 +0000 @@ -0,0 +1,262 @@ +.\" +.\" Man page for dcraw +.\" +.\" Copyright (c) 2009 by David Coffin +.\" +.\" You may distribute without restriction. +.\" +.\" David Coffin +.\" dcoffin a cybercom o net +.\" http://www.cybercom.net/~dcoffin +.\" +.TH dcraw 1 "2009 年 3 月 3 日" +.LO 1 +.SH 名　稱 +dcraw - 指令界面原始影像解碼工具 +.SH 總　覽 +.B dcraw +[\fI參數\fR]... [\fI圖檔路徑\fR]... +.SH 概　要 +.B dcraw +解碼原始影像檔案，顯示圖檔之詮釋資料 (metadata) 以及產生預覽圖片。 +.SH 一般選項 +.TP +.B -v +在除了警告與錯誤訊息外並顯示額外的執行資訊。 +.TP +.B -c +將解碼後圖片與預覽圖片資料送至標準輸出埠 (STDOUT) +.TP +.B -e +自原始影像檔案中解出由相機產生的預覽圖片。視相機廠牌型號的不同，產生的圖檔有可能是 JPEG 或 PPM 格式。 +.TP +.B -z +將產生之檔案的最後存取時間設定為照片的實際拍攝時間。 +.TP +.B -i +僅辨識輸入檔案的格式而不進行解碼。如果 +.B dcraw +可以支援該種檔案，本指令結束時的狀態碼會是 0，反之如果辨識失敗狀態碼則是 1。 +.B -i -v +則可以顯示圖檔之詮釋資料 (metadata)。 +.TP +.B "" +請注意 +.B dcraw +不能解碼 JPEG 格式檔案！ +.SH 影像修補選項 +.TP +.B -P deadpixels.txt +忽略 .badpixels 參數，自此檔案中讀取損壞感應元件之資料列表 +參見 +.B 相關檔案 +中之檔案格式敘述 +.TP +.B -K darkframe.pgm +使用黑框抵消法來消除影像雜訊。如欲產生黑框影像，請將相機鏡頭蓋上後拍攝一張原始影像照片， +並使用 +.B dcraw -D -4 -j -t 0 +指令來產生參考檔案。 +.TP +.B -k 黑暗度 +當影像中的陰影顯得模糊時，你可以試著增加黑暗度來改善這個問題。 +你可以利用上述指令來產生參考檔案後，再利用下述指令來測量黑暗度： +.B pamsumm -mean +.TP +.B -S 飽和度 +當影像中的亮處顯得發紅時，你可以試著減低飽和度來改善問題。 +請先到一個明亮的地方拍張照片，再利用下述指令來度量飽和度的參考值： +.B dcraw -D -4 -j -c +photo.raw +.B | pamsumm -max +.TP +.B "" +在一般的情況下，預設的黑暗度與飽和度應該是不需調整的。 +.TP +.B -n 雜訊消除臨界值 +利用微波法來消除雜訊同時保存影像細節。 +雜訊消除臨界值我們建議使用 100 至 1000 之間的數值。 +.TP +.B -C 紅色縮放倍數 藍色縮放倍數 +根據參數來縮放紅色與藍色圖層。通常倍數是在 0.999 至 1.001 之間， +此指令可以透過紅藍圖層的縮放來消除影像的色像差。 +.TP +.B -H 0 +將影像中過亮部份改成純白色。（預設功能） +.TP +.B -H 1 +影像中過亮部份以淡粉紅色階調來取代。 +.TP +.B -H 2 +混合過曝與正常曝光值來產生均勻的漸層白色。 +.TP +.B -H 3+ +重建影像中高亮度部份的色彩。參數值較低時會比較偏向採用白色來取代高亮度部份的色彩； +高數值時則會使用顏色漸層來取代。建議嘗試您先設定成 +.B -H 5 +來進行試驗。如果對於效果不滿意，可再試試先用 +.B -H 9 +來進行轉換後，在影像編輯軟體中把帶有顏色的高亮度部份除去後，再與一張使用 +.B -H 3 +參數來轉換的同一圖檔進行合併。 +.SH 色彩選項 +在一般狀態下 +.B dcraw +程式使用固定的白平衡值，這個數值是經由測量在 D65 燈光下的標準色表所得。 +.TP +.B -w +使用相機所指定的白平衡值。 +如果在檔案中找不到此項資料，顯示警告訊息並改用其他方式調整白平衡。 +.TP +.B -a +利用整個影像的平均值來計算白平衡。 +.TP +.B -A 左方座標 上方座標 寬度 高度 +利用一個矩形區域的影像平均值來計算白平衡。 +這項功能首先會執行 +.B dcraw -j -t 0 +接著選擇一個有中性灰色的區域來進行計算。 +.TP +.B -r 係數0 係數1 係數2 係數3 +使用自定白平衡值。 +上述四個參數可以拷貝自以下指令的輸出： +.BR dcraw\ -v . +.TP +.BR +M " or " -M +使用或是捨棄影像檔案中的 color matrix 資料。 +如果一併使用 +.B -w +選項，則預設值為 +.B +M +否則將會使用 +.B -M +這個參數只會影響 Olympus、Leaf 以及 Phase One 等品牌相機所拍攝的照片。 +.TP +.B -o [0-5] +選定當 +.B -p +選項沒有使用時所輸出的色域： + +.B \t0 +\ \原始影像色彩 (各廠牌均有不同值) +.br +.B \t1 +\ \ sRGB D65 (預設值) +.br +.B \t2 +\ \ Adobe RGB (1998) D65 +.br +.B \t3 +\ \ Wide Gamut RGB D65 +.br +.B \t4 +\ \ Kodak ProPhoto RGB D65 +.br +.B \t5 +\ \ XYZ +.TP +.BR -p\ camera.icm \ [\ -o\ output.icm \ ] +利用 ICC 描述檔案來定義相機的輸入以及輸出 colorspace。(預設的 profile 值為 sRGB) +.TP +.B -p embed +使用嵌在原始影像檔案中的 ICC 描述來決定 colorspace +.SH 內插運算選項 +.TP +.B -d +將原始影像檔案內容以灰階方式解碼，不使用內插法來改善影像品質。 +這個模式最適合翻拍文件 +.TP +.B -D +此模式與 +.B -d +一樣會輸出灰階影像， +但是影像解碼過程完全不經過任何處理。 +.TP +.B -h +輸出影像的長寬減半，相對的解碼速度也會比 +.B -q 0 +快上一倍。 +.TP +.B -q 0 +使用品質略遜，但速度較快的雙線性 (bilinear) 內插法來進行影像的解碼。 +.TP +.B -q 1 +使用變數漸層 (Variable Number of Gradients, VNG) 內插法來進行影像的解碼。 +.TP +.B -q 2 +使用像素圖樣組群 (Patterned Pixel Grouping, PPG) 內插法。 +.TP +.B -q 3 +使用 Adaptive Homogeneity-Directed (AHD) 內插法來進行影像的解碼。 +.TP +.B -f +在進行內插法演算時將 RGB 當成四種顏色。 如果利用 VNG 或是 AHD 內插法來產生影像結果 +出現格狀雜訊的話，請加上這個選項來減少雜訊。 +.TP +.B -m 重複運算次數 +在使用內插法產生中介數值後，在紅綠與藍綠色頻上重複利用 3x3 大小的中間值濾鏡來消除色彩雜訊。 +.SH 輸出選項 +在一般情況下 +.B dcraw +會產生利用八位元取樣、採用 BT.709 gamma 曲線、根據平均值所計算之全白色值、以及沒有詮釋資料的 PGM/PPM/PAM 檔案。 +.TP +.B -W +忽略平均值計算所得之全白色值，使用參數指定的全白色值。 +.TP +.B -b 亮度 +將全白色值除以這個參數，預設值為 1.0。 +.TP +.B -g 次方 斜率極大值 +設定 gamma 曲線值，預設值為 BT.709 +.RB ( -g\ 2.222\ 4.5 ). +如果你想要使用 sRGB 色域的 gamma 曲線，請使用 +.BR -g\ 2.4\ 12.92 . +如欲使用簡單乘方曲線，請將斜率極大值設定成 0 +.TP +.B -4 +輸出 16 位元線性檔案（固定全白色值，不改變 gamma 值） +.TP +.B -T +輸出 TIFF 格式（附詮釋資料）的影像檔案。 +.TP +.B -t [0-7,90,180,270] +旋轉圖片。此指令的預設值是根據相機之方向感應器資料而定。使用 +.B -t 0 +指令則可以取消自動旋轉功能。 +.TP +.B -j +使用 Fuji\ Super\ CCD 的數位相機因為像素不是正方形，在電腦螢幕上無法以正確的長寬比顯示。 +使用這個參數會產生轉 45 度角的影像，如此可以確保每個像素都對應到一個感應元件。 +.TP +.BR "-s [0..N-1]" " or " "-s all" +如果在一個影像檔案裡夾有 N 個 RAW 影像檔案，利用此參數可以選擇要解碼那個影像。 +以 Fuji\ Super\ CCD\ SR 相機為例，每個 RAW 影像檔案裡都包含有兩個影像， +其中一個是專門記錄高亮度區域的資料。 +.SH 相關檔案 +.TP +\:./.badpixels, ../.badpixels, ../../.badpixels, ... +列出相機感光元件上損壞的感應元件（dead pixels）。 +.B dcraw +將會參考這個檔案在解碼時避開這些像素。這種檔案的格式為： +.sp 1 +.nf + 962 91 1028350000 # 該感光元件在 2001 年八月一日至四日之間出現問題 +1285 1067 0 # 不確定此感光元件損壞的確實時間 +.fi +.sp 1 +這些座標是以照片轉向與被裁切之前的狀態為準。請使用 +.B dcraw -j -t 0 +指令來找尋有問題的像素的座標。 +.SH "參　見" +.BR pgm (5), +.BR ppm (5), +.BR pam (5), +.BR pamsumm (1), +.BR pnmgamma (1), +.BR pnmtotiff (1), +.BR pnmtopng (1), +.BR gphoto2 (1), +.BR cjpeg (1), +.BR djpeg (1) +.SH 作　者 +本軟體由 David Coffin 製作，電郵信箱： dcoffin a cybercom o net diff -Nru dcraw-8.99/dcraw_zh_TW.po dcraw-9.17/dcraw_zh_TW.po --- dcraw-8.99/dcraw_zh_TW.po 1970-01-01 00:00:00.000000000 +0000 +++ dcraw-9.17/dcraw_zh_TW.po 2013-01-03 13:09:39.000000000 +0000 @@ -0,0 +1,377 @@ +# Traditional Chinese translation of dcraw messages. +# (c) 2009 Dave Coffin dcoffin a cybercom o net +# Distribute freely. +# +msgid "" +msgstr "" +"Project-Id-Version: dcraw 8.92\n" +"Report-Msgid-Bugs-To: dcoffin a cybercom o net\n" +"POT-Creation-Date: 2006-12-21 22:45-0500\n" +"PO-Revision-Date: 2011-07-23 17:00-0400\n" +"Last-Translator: Bryan Chang \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +msgid "%s: Out of memory in %s\n" +msgstr "%s : 在 %s 發生記憶體不足錯誤\n" + +msgid "Unexpected end of file\n" +msgstr "檔案內容提前終止\n" + +msgid "Corrupt data near 0x%lx\n" +msgstr "資料在 0x%lx 附近毀損\n" + +msgid "Corrupt data near 0x%llx\n" +msgstr "資料在 0x%llx 附近毀損\n" + +msgid "%s: decoder table overflow\n" +msgstr "%s : 解碼表容量不足導致發生錯誤\n" + +msgid "Phase One correction...\n" +msgstr "轉換 Phase One 格式檔案...\n" + +msgid "%s: incorrect JPEG dimensions\n" +msgstr "%s : JPEG 檔案長寬尺寸有誤\n" + +msgid "%s: \"%s\" matrix not found!\n" +msgstr "%s : 找不到 \"%s\" 矩陣！\n" + +msgid "Foveon interpolation...\n" +msgstr "使用 Foveon 內插法...\n" + +msgid "%s: Invalid white balance \"%s\"\n" +msgstr "%s : 無效的白平衡數值 \"%s\"\n" + +msgid "Fixed bad pixels at:" +msgstr "資料修復中，損壞像素之座標 :" + +msgid "Fixed dead pixels at:" +msgstr "資料修復中，損壞像素之座標 :" + +msgid "%s is not a valid PGM file!\n" +msgstr "%s 是無效的 PGM 檔案。\n" + +msgid "%s has the wrong dimensions!\n" +msgstr "%s 的尺寸錯誤。\n" + +msgid "Wavelet denoising...\n" +msgstr "微波法消除雜訊...\n" + +msgid "%s: Cannot use camera white balance.\n" +msgstr "%s : 無法使用相機內存之白平衡值。\n" + +msgid "Scaling with black %d, multipliers" +msgstr "以黑色點與白平衡系數來調整色彩" + +msgid "Scaling with darkness %d, saturation %d, and\nmultipliers" +msgstr "以黑暗度值 %d，色彩飽和度 %d 以及\n乘算參數" + +msgid "Correcting chromatic aberration...\n" +msgstr "校正色像差...\n" + +msgid "Bilinear interpolation...\n" +msgstr "兩面過濾法...\n" + +msgid "VNG interpolation...\n" +msgstr "VNG 影像內插法處理中...\n" + +msgid "PPG interpolation...\n" +msgstr "PPG 影像內插法處理中...\n" + +msgid "AHD interpolation...\n" +msgstr "AHD 影像內插法處理中...\n" + +msgid "Median filter pass %d...\n" +msgstr "第 %d 次中間值濾鏡運算...\n" + +msgid "Bilateral filtering...\n" +msgstr "兩面過濾法處理中...\n" + +msgid "Blending highlights...\n" +msgstr "混合高亮度區域數值...\n" + +msgid "Rebuilding highlights...\n" +msgstr "重建高量度區域影像...\n" + +msgid "Highlight recovery...\n" +msgstr "重建高亮度部份之資料...\n" + +msgid "Reading metadata from %s ...\n" +msgstr "自 %s 中讀取詮釋資料...\n" + +msgid "Failed to read metadata from %s\n" +msgstr "無法自 %s 中讀取詮釋資料\n" + +msgid "%s: You must link dcraw with libjpeg!!\n" +msgstr "%s dcraw 需要系統安裝有 libjpeg。\n" + +msgid "%s: You must link dcraw with %s!!\n" +msgstr "%s dcraw 需要系統安裝有 %s。\n" + +msgid "%s has no embedded profile.\n" +msgstr "%s 沒有內嵌的色彩描述資料。\n" + +msgid "Cannot open file %s!\n" +msgstr "無法開啟檔案： %s\n" + +msgid "Applying color profile...\n" +msgstr "加入色彩描述...\n" + +msgid "Building histograms...\n" +msgstr "產生直方統計圖...\n" + +msgid "Converting to %s colorspace...\n" +msgstr "轉換至 %s colorspace...\n" + +msgid "Rotating image 45 degrees...\n" +msgstr "將影像翻轉 45 度...\n" + +msgid "Stretching the image...\n" +msgstr "將影像展開...\n" + +msgid "\nRaw photo decoder \"dcraw\" v%s" +msgstr "\n原始影像解碼工具 \"dcraw\" v%s" + +msgid "\nby Dave Coffin, dcoffin a cybercom o net\n" +msgstr "\n本軟體由 Dave Coffin 製作 dcoffin a cybercom o net\n" + +msgid "\nUsage: %s [OPTION]... [FILE]...\n\n" +msgstr "\n指令用法： %s [參數]... [圖檔路徑]...\n\n" + +msgid "-v Print verbose messages" +msgstr "-v 顯示詳細訊息" + +msgid "-c Write image data to standard output" +msgstr "-c 將影像資料輸出終端機標準輸出埠" + +msgid "-e Extract embedded thumbnail image" +msgstr "-e 抽出內嵌於原始圖檔中的預覽圖片" + +msgid "-i Identify files without decoding them" +msgstr "-i 確認圖檔格式但不進行解碼" + +msgid "-i -v Identify files and show metadata" +msgstr "-i -v 確認圖檔格式並顯示詮釋資料 (metadata)。" + +msgid "-z Change file dates to camera timestamp" +msgstr "-z 將輸出檔案的產生時間設定成相片拍攝的時間。" + +msgid "-a Use automatic white balance" +msgstr "-a 使用自動白平衡" + +msgid "-w Use camera white balance, if possible" +msgstr "-w 在允許的情況下使用相機指定的白平衡值" + +msgid "-a Average the whole image for white balance" +msgstr "-a 利用整個影像的平均值來計算白平衡" + +msgid "-A Average a grey box for white balance" +msgstr "-A 取灰色矩形區域平均值來計算白平衡" + +msgid "-r Set custom white balance" +msgstr "-r 使用自定白平衡值" + +msgid "-r <4 numbers> Set custom white balance" +msgstr "-r <四個數值> 使用訂製白平衡" + +msgid "+M/-M Use/don't use an embedded color matrix" +msgstr "+M/-M 使用或捨棄影像檔案中的 color matrix 資料" + +msgid "-C Correct chromatic aberration" +msgstr "-C 校正色像差" + +msgid "-P Fix the dead pixels listed in this file" +msgstr "-P <資料檔名> 修正列在資料檔中的損壞感光元件資料" + +msgid "-K Subtract dark frame (16-bit raw PGM)" +msgstr "-K <檔案路徑> 使用黑框抵消法來消除影像雜訊 (黑框檔案格式必須是 16-bit raw PGM)" + +msgid "-k Set black point" +msgstr "-k <數值> 設定黑色點" + +msgid "-k Set the darkness level" +msgstr "-k <數值> 設定黑色調數值" + +msgid "-S Set the saturation level" +msgstr "-S <數值> 設定色彩飽和度值" + +msgid "-n Set threshold for wavelet denoising" +msgstr "-n <數值> 設定微波雜訊消除臨界值" + +msgid "-H [0-9] Highlight mode (0=clip, 1=no clip, 2+=recover)" +msgstr "-H [0-9] 重建影像中高亮度處色彩 (0：純白色，1：以淡粉紅色階調取代，2-9：使用顏色漸層取代)" + +msgid "-H [0-9] Highlight mode (0=clip, 1=unclip, 2=blend, 3+=rebuild)" +msgstr "-H [0-9] 高亮度區域影像處理" + +msgid "-t [0-7] Flip image (0=none, 3=180, 5=90CCW, 6=90CW)" +msgstr "-t [0-7] 翻轉影像 (0：不翻轉，3：轉 180 度，5：逆時針轉 90 度， 6：順時針轉 90 度)" + +msgid "-o [0-5] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" +msgstr "-o [0-5] 輸出 colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" + +msgid "-o Apply output ICC profile from file" +msgstr "-o <檔案路徑> 讀取相機 ICC 描述檔案" + +msgid "-p Apply camera ICC profile from file or \"embed\"" +msgstr "-p <檔案路徑> 讀取相機 ICC 描述檔案或者是使用內嵌描述檔" + +msgid "-d Document mode (no color, no interpolation)" +msgstr "-d 文件翻拍模式（黑白，不使用內插法）" + +msgid "-D Document mode without scaling (totally raw)" +msgstr "-D 黑白翻拍模式（完全不調整影像。）" + +msgid "-j Don't stretch or rotate raw pixels" +msgstr "-j 不要拉長或是旋轉原始影像中的像素" + +msgid "-W Don't automatically brighten the image" +msgstr "-W 不要自動提高影像亮度" + +msgid "-b Adjust brightness (default = 1.0)" +msgstr "-b <數值> 調整亮度(預設值 = 1.0)" + +msgid "-g

Set custom gamma curve (default = 2.222 4.5)" +msgstr "-g <次方 斜率> 設定訂製 gamma 曲線 (預設值為 2.222 4.5)" + +msgid "-q [0-3] Set the interpolation quality" +msgstr "-q [0-3] 設定內插法所產生影像的品質。" + +msgid "-h Half-size color image (twice as fast as \"-q 0\")" +msgstr "-h 輸出影像的尺寸減半，相對的解碼速度也會比 \"-q 0\" 要快兩倍。" + +msgid "-f Interpolate RGGB as four colors" +msgstr "-f 在進行內插法演算時將 RGGB 當成四種顏色。" + +msgid "-m Apply a 3x3 median filter to R-G and B-G" +msgstr "-m 以 3x3 大小中間值濾鏡過濾紅綠與藍綠雜訊" + +msgid "-B Apply bilateral filter to smooth noise" +msgstr "-B <領域> <範圍> 採用兩面過濾法 (bilateral filter) 來減低雜訊並同時保持細節的銳利度。" + +msgid "-s [0-99] Select a different raw image from the same file" +msgstr "-s [0-99] 解碼同一原始影像檔中所內含的某個原始影像檔案。" + +msgid "-s [0..N-1] Select one raw image or \"all\" from each file" +msgstr "-s [0..N-1] 選擇第 N 個 raw 檔案，或使用 \"all\" 參數來指 定轉換檔案裡所有的影像" + +msgid "-4 Write 16-bit linear instead of 8-bit with gamma" +msgstr "-4 改用十六位元線性解碼，而不以八位元加 Gamma 曲線格式輸出" + +msgid "-T Write TIFF instead of PPM" +msgstr "-T 放棄 PPM 格式，改以 TIFF 格式輸出" + +msgid "Non-numeric argument to \"-%c\"\n" +msgstr "\"-%c\" 指令的非數值參數\n" + +msgid "Unknown option \"-%c\".\n" +msgstr "未定義的參數 \"-%c\".\n" + +msgid "No files to process.\n" +msgstr "找不到檔案來處理。\n" + +msgid "Will not write an image to the terminal!\n" +msgstr "不會將影像資料輸出至終端機。\n" + +msgid "%s has no timestamp.\n" +msgstr "%s 檔案沒有時間戳記\n" + +msgid "%s time set to %d.\n" +msgstr "%s 的時間被設成 %d。\n" + +msgid "%s has no thumbnail.\n" +msgstr "%s 檔案沒有預覽小圖\n" + +msgid "\nFilename: %s\n" +msgstr "\n檔名： %s\n" + +msgid "Timestamp: %s" +msgstr "時間： %s" + +msgid "Camera: %s %s\n" +msgstr "相機型號： %s %s\n" + +msgid "Owner: %s\n" +msgstr "拍攝相機擁有者： %s\n" + +msgid "DNG Version: " +msgstr "DNG 版本： " + +msgid "ISO speed: %d\n" +msgstr "ISO 感光度： %d\n" + +msgid "Shutter: " +msgstr "快門速度： " + +msgid "%0.1f sec\n" +msgstr "%0.1f 秒\n" + +msgid "Aperture: f/%0.1f\n" +msgstr "光圈： f/%0.1f\n" + +msgid "Focal length: %0.1f mm\n" +msgstr "焦距： %0.1f mm\n" + +msgid "Secondary pixels: %s\n" +msgstr "次要像素： %s\n" + +msgid "yes" +msgstr "是" + +msgid "no" +msgstr "否" + +msgid "Embedded ICC profile: %s\n" +msgstr "內含 ICC 描述檔案： %s\n" + +msgid "Decodable with dcraw: %s\n" +msgstr "dcraw 支援此檔案之解碼： %s\n" + +msgid "Number of raw images: %d\n" +msgstr "raw 影像檔數目: %d\n" + +msgid "Pixel Aspect Ratio: %0.6f\n" +msgstr "像素高寬比： %0.6f\n" + +msgid "Thumb size: %4d x %d\n" +msgstr "預覽圖片尺寸： %4d x %d\n" + +msgid "Full size: %4d x %d\n" +msgstr "原尺寸： %4d x %d\n" + +msgid "Cannot decode file %s\n" +msgstr "無法解碼檔案。檔案路徑： %s\n" + +msgid "Image size: %4d x %d\n" +msgstr "圖檔大小： %4d x %d\n" + +msgid "Output size: %4d x %d\n" +msgstr "圖形輸出尺寸： %4d x %d\n" + +msgid "Raw colors: %d" +msgstr "原始色彩： %d" + +msgid "\nFilter pattern: " +msgstr "\n濾鏡圖案： " + +msgid "\nDaylight multipliers:" +msgstr "\n日光系數：" + +msgid "\nCamera multipliers:" +msgstr "\n相機系數：" + +msgid "%s is a %s %s image.\n" +msgstr "%s 是 %s %s 格式檔案。\n" + +msgid "Loading %s %s image from %s ...\n" +msgstr "載入 %s %s 格式檔案中，檔案路徑： %s ...\n" + +msgid "%s: \"-s %d\" requests a nonexistent image!\n" +msgstr "%s: \"-s %d\" 所需要的影像檔並不存在！\n" + +msgid "standard output" +msgstr "終端機標準輸出埠" + +msgid "Writing data to %s ...\n" +msgstr "資料正寫出至： %s ...\n" diff -Nru dcraw-8.99/debian/README.Debian dcraw-9.17/debian/README.Debian --- dcraw-8.99/debian/README.Debian 2013-01-03 16:12:14.000000000 +0000 +++ dcraw-9.17/debian/README.Debian 2012-02-04 11:23:04.000000000 +0000 @@ -1,16 +1,7 @@ dcraw for Debian ---------------- -This is a snapshot of dcraw downloaded on 12th Feb 2010 -Date in package: $Date: 2009/12/25 18:51:16 $ +Dcraw 9.12 -I personally have a Canon EOS 10D and have found the output from -dcraw comparable to software supplied by Canon (which is for -windows only of course). -Typically, I have found, dcraw produces improved contrast images -making better use of the available dynamic range. - -There is also a plugin for the gimp to read raw images directly. - - -- Steve King + -- Dariusz Duma diff -Nru dcraw-8.99/debian/changelog dcraw-9.17/debian/changelog --- dcraw-8.99/debian/changelog 2013-01-03 16:12:14.000000000 +0000 +++ dcraw-9.17/debian/changelog 2013-01-03 16:12:14.000000000 +0000 @@ -1,200 +1,24 @@ -dcraw (8.99-1build1) precise; urgency=low +dcraw (9.17-1dhor~quantal) quantal; urgency=low - * Rebuild for libjpeg8. + * Dcraw 9.17 - -- Colin Watson Wed, 19 Oct 2011 09:35:57 +0100 + -- Dariusz Duma Thu, 03 Jan 2013 14:01:25 +0100 -dcraw (8.99-1) unstable; urgency=low +dcraw (9.12-3dhor~quantal) quantal; urgency=low - * New upstream version. (Closes: #506705, #523789, #519604) + * Dcraw 9.12 - -- Steve King Fri, 12 Feb 2010 14:29:24 +0000 + -- Dariusz Duma Sat, 04 Feb 2012 10:00:18 +0100 -dcraw (8.86-1) unstable; urgency=low +dcraw (9.08-1dhor~quantal) quantal; urgency=low - * New upstream version. (Closes: #489931) - * Remove .LO lines from man pages - * Added Homepage reference to source stanza + * Dcraw 9.08 - -- Steve King Fri, 25 Jul 2008 09:58:25 +0100 + -- Dariusz Duma Thu, 09 Jun 2011 15:44:42 +0200 -dcraw (8.80-1) unstable; urgency=low +dcraw (9.06-1dhor~quantal) quantal; urgency=low - * Modified Makefile: -O4 instead of -03 - * Modified Makefile: removed "-s" flag from $(CC) lines - * Closes: #411920 - * Closes: #436707 - * Now distributed under a different license - * Closes: #431883 - * Closes: #424663 - * New upstream version + * Initial release - -- Steve King Wed, 14 Nov 2007 10:01:57 +0000 - -dcraw (8.39-1) unstable; urgency=low - - * New upstream version - * Maintainer email change - - -- Steve King Sun, 24 Sep 2006 21:27:50 +0100 - -dcraw (8.38-1) unstable; urgency=low - - * New upstream version - * Packaged .badpixels as examples/badpixels - - -- Steve King Sun, 17 Sep 2006 20:34:11 +0100 - -dcraw (8.23-1) unstable; urgency=low - - * Removed substvars - * Made compliant to debian-policy 3.7.2.1 - * Removed build dependancy on libc6-dev - * Added fujiturn/fuji_green and clean_crw (Closes: #351364) - * New upsream version (Closes: #368856) - * Removed dcfixdates, dcwrap (no longer maintained upstream) - - -- Steve King Mon, 26 Jun 2006 13:48:05 +0000 - -dcraw (7.94-1) unstable; urgency=low - - * New upstream version (Closes: #341370) - * Checked against debian policy and debhelper and a few minor corrections made - * Added build script "getsource" installed in examples (should be considered - * alpha quality) - - -- Steve King Wed, 21 Dec 2005 16:01:39 +0000 - -dcraw (7.17-1) unstable; urgency=low - - * New upstream version (Close: #306606) - - -- Steve King Sat, 30 Apr 2005 19:17:37 +0100 - -dcraw (7.02-1) unstable; urgency=low - - * New upstream version - * Fixes a typo in the Makefile which caused dcparse to be installed with an - absolute path. (Closes: #300105) - * Modified source priority to extra - - -- Steve King Sat, 19 Mar 2005 09:26:21 +0000 - -dcraw (7.00-1) unstable; urgency=low - - * New upstream version - * Support for automatically or manually rotating images (if your - * camera has support) - * Support for Canon D20 (among others) - * Closes: #274603 - * Modified synopsis to remove initial capital letter - * Closes: #293383 - * Includes the fixdates and parse binaries for reading internal dates - * and retriving thumbnail images from certain files (experts only) - * Added /usr/share/doc/dcraw/examples/dcrwap, from D. Coffin's web site - - -- Steve King Thu, 10 Mar 2005 22:40:54 +0000 - -dcraw (5.88-1) unstable; urgency=low - - * New upstream version - * Closes: #241165: Produces wrong color in output file - * Closes: #258298: Please package new version - - -- Steve King Fri, 6 Aug 2004 20:52:50 +0100 - -dcraw (5.73-1) unstable; urgency=low - - * New upstream version - - -- Steve King Sat, 17 Apr 2004 09:46:51 +0100 - -dcraw (5.71-1) unstable; urgency=low - - * New upstream version - - -- Steve King Tue, 6 Apr 2004 19:55:33 +0100 - -dcraw (5.53-1) unstable; urgency=low - - * New upstream version: - * New Camera Support: Pentax Optio S4, - * Nikon D70, Minolta DiMAGE A2, and Olympus C8080WZ - * Significant speed improvements (Uses about 70% of cpu time compared - * with 5.43-1 on my data) - * Native support for cameras using lossless jpeg - * (Avoids licensing problems with 3rd party lossless jpeg support) - - -- Steve King Sun, 22 Feb 2004 08:02:24 +0000 - -dcraw (5.43-1) unstable; urgency=low - - * New upstream version (support for Sony DSC-F828) - - -- Steve King Sat, 10 Jan 2004 14:25:19 +0000 - -dcraw (5.18-1) unstable; urgency=low - - * New upstream version (support for Phase One medium format digital backs) - * Changed Makefile to -O3 for slightly faster operation - * Patch for Segfault on 64bit architectures - - -- Steve King Fri, 21 Nov 2003 14:35:04 +0000 - -dcraw (5.08-1) unstable; urgency=low - - * New upstream version - - -- Steve King Wed, 15 Oct 2003 14:40:25 +0100 - -dcraw (5.05-1) unstable; urgency=low - - * New upstream version - - -- Steve King Sun, 12 Oct 2003 15:44:12 +0100 - -dcraw (5.02-1) unstable; urgency=low - - * New upstream version - * Removed reference to lossless jpeg support in debian/control description - * Changed source http reference and upstream authors contact details - * Removed the Makefile from _orig.tar.gz. Makefile was added by me. - * Changed debian/control dependance from libc6 to ${shlibs:Depends} for ia64 - * closes: Bug#213473 - - -- Steve King Tue, 30 Sep 2003 18:42:11 +0100 - -dcraw (4.88-4) unstable; urgency=low - - * Built on an unstable system - * Removed lossless jpeg support due to licensing (See README.Debian) - - -- Steve King Sun, 31 Aug 2003 20:13:23 +0100 - -dcraw (4.88-3) unstable; urgency=low - - * Removed debian/compat and added "export DH_COMPAT=3W to debian/rules - - -- Steve King Thu, 31 Jul 2003 07:27:08 +0100 - -dcraw (4.88-2) unstable; urgency=low - - * Reworded debian/copyright file - * Removed some unnecessary cruft from debian/rules - * Modified Makefile to install man page into /usr/share/man/man1 - - -- Steve King Wed, 30 Jul 2003 18:04:07 +0100 - -dcraw (4.88-1) unstable; urgency=low - - * Upstream update - - -- Steve King Tue, 29 Jul 2003 21:56:12 +0100 - -dcraw (4.87-1) unstable; urgency=low - - * Initial Release. - * closes: Bug#194280 - - -- Steve King Thu, 10 Jul 2003 10:55:29 +0100 + -- Dariusz Duma Tue, 22 Feb 2011 13:35:36 +0100 diff -Nru dcraw-8.99/debian/control dcraw-9.17/debian/control --- dcraw-8.99/debian/control 2013-01-03 16:12:14.000000000 +0000 +++ dcraw-9.17/debian/control 2012-02-04 11:23:18.000000000 +0000 @@ -1,8 +1,8 @@ Source: dcraw Section: graphics Priority: extra -Maintainer: Steve King -Build-Depends: debhelper (>= 5.0.0), libjpeg-dev, liblcms1-dev +Maintainer: Dariusz Duma +Build-Depends: debhelper (>= 5.0.0), libjpeg-dev, liblcms1-dev, libjasper-dev, gettext Standards-Version: 3.8.4 Homepage: http://www.cybercom.net/~dcoffin/dcraw/ diff -Nru dcraw-8.99/debian/copyright dcraw-9.17/debian/copyright --- dcraw-8.99/debian/copyright 2013-01-03 16:12:14.000000000 +0000 +++ dcraw-9.17/debian/copyright 2012-02-04 11:22:01.000000000 +0000 @@ -10,24 +10,27 @@ dcraw Copyright: dcraw.c -- Dave Coffin's raw photo decoder - Copyright 1997-2004 by Dave Coffin, dcoffin a cybercom o net + Copyright 1997-2011 by Dave Coffin, dcoffin a cybercom o net This is a command-line ANSI C program to convert raw photos from any digital camera on any computer running any operating system. - Attention! Some parts of this program are restricted under the - terms of the GNU General Public License. Such code is enclosed - in "BEGIN GPL BLOCK" and "END GPL BLOCK" declarations. - - All the code currently under GPL is specific to Foveon cameras. - This began in Revision 1.237. - - To lawfully redistribute dcraw.c, you must either (a) include - full source code for all executable files containing restricted - functions, (b) remove these functions, re-implement them, or - copy them from an earlier, non-GPL Revision of dcraw.c, or (c) - purchase a license from the author. + No license is required to download and use dcraw.c. However, + to lawfully redistribute dcraw, you must either (a) offer, at + no extra charge, full source code* for all executable files + containing RESTRICTED functions, (b) distribute this code under + the GPL Version 2 or later, (c) remove all RESTRICTED functions, + re-implement them, or copy them from an earlier, unrestricted + Revision of dcraw.c, or (d) purchase a license from the author. + The functions that process Foveon images have been RESTRICTED + since Revision 1.237. All other code remains free for all uses. + + *If you have not modified dcraw.c in any way, a link to my + homepage qualifies as "full source code". This software may be redistributed under the terms of the GNU GPL, Version 2 or later, found on Debian systems in the file /usr/share/common-licenses/GPL + +Sources have been repacked to include several "3rd party" tools from the same +author: badpixels, parse.c, clean_crw.c, fujiturn.c fuji_green.c diff -Nru dcraw-8.99/debian/dirs dcraw-9.17/debian/dirs --- dcraw-8.99/debian/dirs 2013-01-03 16:12:14.000000000 +0000 +++ dcraw-9.17/debian/dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -usr/bin -usr/share/man/man1 diff -Nru dcraw-8.99/debian/rules dcraw-9.17/debian/rules --- dcraw-8.99/debian/rules 2013-01-03 16:12:14.000000000 +0000 +++ dcraw-9.17/debian/rules 2012-02-04 11:22:01.000000000 +0000 @@ -5,11 +5,18 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +CFLAGS = -Wall -g +ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + build: build-stamp build-stamp: dh_testdir - $(MAKE) + $(MAKE) CFLAGS="$(CFLAGS)" PREFIX="/usr" touch build-stamp @@ -32,10 +39,10 @@ dh_testroot dh_clean -k dh_installdirs - $(MAKE) DESTDIR=`pwd`/debian/`dh_listpackages` install + $(MAKE) DESTDIR=$(CURDIR)/debian/dcraw PREFIX="/usr" install dh_installchangelogs dh_installdocs - dh_installexamples getsource badpixels + dh_installexamples badpixels dh_installman dcraw.1 dcparse.1 dcfujiturn.1 dcfujiturn16.1 dccleancrw.1 dcfujigreen.1 dh_link dh_strip diff -Nru dcraw-8.99/getsource dcraw-9.17/getsource --- dcraw-8.99/getsource 2010-02-12 14:29:14.000000000 +0000 +++ dcraw-9.17/getsource 1970-01-01 00:00:00.000000000 +0000 @@ -1,92 +0,0 @@ -#!/bin/bash - -PATH=/usr/bin:/bin - -set -x -set -u -set -e - -DCRAWHOME=http://www.cybercom.net/~dcoffin/dcraw/ -WGET=wget - -http_proxy= -export http_proxy - -TMPFILE=dcraw.c_new -TEMPLATEDIR=dcraw-template - -# Get the new source -${WGET} -O ${TMPFILE} ${DCRAWHOME}dcraw.c - -# grep for the current version -#NEWVERSION=$(grep -i v[0-9][.][0-9][0-9] ${TMPFILE} | sed -e 's/^.*Raw Photo Decoder.*v\([0-9][.][0-9][0-9]\).*$/\1/') -NEWVERSION=$(grep -i '^#define VERSION "[0-9][.][0-9][0-9]"$' ${TMPFILE} | sed -e 's/^#define VERSION "\([0-9][.][0-9][0-9]\)"$/\1/') - -if [ -z "${NEWVERSION}" ] -then - echo "error: Could not get new version number" - exit 1 -fi - - -# Build a working directory -WORKDIR=dcraw-${NEWVERSION} -if [ -d ${WORKDIR} ] -then - echo "Working directory for current version already exists. stop" - exit 0 -fi - -rm -rf ${WORKDIR} -mkdir ${WORKDIR} -mv ${TMPFILE} ${WORKDIR}/dcraw.c - -cp "${0}" "${WORKDIR}/getsource" - -# Get the other bits and pieces -cd ${WORKDIR} -${WGET} ${DCRAWHOME}dcraw.1 -#${WGET} ${DCRAWHOME}dcwrap -${WGET} ${DCRAWHOME}parse.c -#${WGET} ${DCRAWHOME}fixdates.c -${WGET} ${DCRAWHOME}fujiturn.c -${WGET} ${DCRAWHOME}fuji_green.c -${WGET} ${DCRAWHOME}clean_crw.c -${WGET} ${DCRAWHOME}.badpixels - -cd .. - -# Build the .orig tar file -rm -rf ${WORKDIR}.orig -cp -a ${WORKDIR} ${WORKDIR}.orig - -mv ${WORKDIR}/.badpixels ${WORKDIR}/badpixels - -#tar -cvzf ${WORKDIR}.orig.tar.gz ${WORKDIR}.orig -#rm -rf ${WORKDIR}.orig - -# Build a template directory with apt-get source -rm -rf ${TEMPLATEDIR} -mkdir ${TEMPLATEDIR} -cd ${TEMPLATEDIR} -apt-get source dcraw -cd .. - -# Copy in the template debian bits and pieces -cp -a ${TEMPLATEDIR}/dcraw-*/debian ${WORKDIR} -#cp -a ${TEMPLATEDIR}/dcraw-*/dcfixdates.1 ${WORKDIR} -cp -a ${TEMPLATEDIR}/dcraw-*/dcparse.1 ${WORKDIR} -cp -a ${TEMPLATEDIR}/dcraw-*/Makefile ${WORKDIR} -cp -a ${TEMPLATEDIR}/dcraw-*/dcfujiturn.1 ${WORKDIR} -cp -a ${TEMPLATEDIR}/dcraw-*/dcfujiturn16.1 ${WORKDIR} -cp -a ${TEMPLATEDIR}/dcraw-*/dccleancrw.1 ${WORKDIR} -cp -a ${TEMPLATEDIR}/dcraw-*/dcfujigreen.1 ${WORKDIR} - -# Prep the changelog -cd ${WORKDIR} -dch --newversion=${NEWVERSION}-1 -egrep '\$Date: [0-9]{4}/[0-9]+/[0-9]+ [0-9]+:[0-9]+:[0-9]+.*\$$' dcraw.c >> debian/README.Debian - -vi debian/README.Debian - -dpkg-buildpackage -rfakeroot diff -Nru dcraw-8.99/install dcraw-9.17/install --- dcraw-8.99/install 1970-01-01 00:00:00.000000000 +0000 +++ dcraw-9.17/install 2013-01-03 13:09:39.000000000 +0000 @@ -0,0 +1,31 @@ +#!/bin/sh +# Simple installer for dcraw executable, manpages, and message catalogs. +# Dave Coffin, dcoffin a cybercom o net + +# You will need these: +# apt-get install libjasper-dev libjpeg-dev liblcms-dev gettext + +prefix=/usr/local + +gcc -O4 -march=native -o $prefix/bin/dcraw dcraw.c \ + -Wall -Wno-unused-result -Wno-array-bounds \ + -lm -ljasper -ljpeg -llcms -s -DLOCALEDIR=\"$prefix/share/locale/\" + +mkdir -p -m 755 $prefix/share/man/man1 +cp dcraw.1 $prefix/share/man/man1 + +# Please help me add more languages +for langchar in \ + fr.latin1 it.latin1 de.latin1 pt.latin1 es.latin1 nl.latin1 sv.latin1 \ + ca.latin1 da.latin1 cs.latin2 hu.latin2 pl.latin2 eo.latin3 ru.koi8-r \ + zh_TW.big5 zh_CN.gb2312 +do + lang=`echo $langchar | cut -d. -f1` + char=`echo $langchar | cut -d. -f2-` + mkdir -p -m 755 $prefix/share/man/$lang/man1 + iconv -f utf-8 -t $char dcraw_$lang.1 > $prefix/share/man/$lang/man1/dcraw.1 + mkdir -p -m 755 $prefix/share/man/$lang.UTF-8/man1 + cp dcraw_$lang.1 $prefix/share/man/$lang.UTF-8/man1/dcraw.1 + mkdir -p -m 755 $prefix/share/locale/$lang/LC_MESSAGES + msgfmt -o $prefix/share/locale/$lang/LC_MESSAGES/dcraw.mo dcraw_$lang.po +done diff -Nru dcraw-8.99/install2 dcraw-9.17/install2 --- dcraw-8.99/install2 1970-01-01 00:00:00.000000000 +0000 +++ dcraw-9.17/install2 2012-02-04 11:22:01.000000000 +0000 @@ -0,0 +1,13 @@ +#!/bin/sh +# Simple installer for dcraw executable, manpages, and message catalogs. +# Dave Coffin, dcoffin a cybercom o net + +# You will need these: +# apt-get install libjasper-dev libjpeg-dev liblcms-dev gettext + +prefix=/usr + +gcc -O4 -march=native -o dcraw dcraw.c \ + -Wall -Wno-unused-result -Wno-array-bounds \ + -lm -ljasper -ljpeg -llcms -s -DLOCALEDIR=\"$prefix/share/locale/\" + diff -Nru dcraw-8.99/parse.c dcraw-9.17/parse.c --- dcraw-8.99/parse.c 2009-08-28 22:52:20.000000000 +0000 +++ dcraw-9.17/parse.c 2013-01-03 13:09:39.000000000 +0000 @@ -1,12 +1,12 @@ /* Raw Photo Parser - Copyright 2004-2006 by Dave Coffin, dcoffin a cybercom o net + Copyright 2004-2010 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.69 $ - $Date: 2009/08/28 22:52:20 $ + $Revision: 1.74 $ + $Date: 2012/01/24 07:15:43 $ */ #include @@ -89,6 +89,42 @@ return u.d; } +unsigned getbithuff (int nbits, const ushort *huff) +{ + static unsigned bitbuf=0; + static int vbits=0, reset=0; + unsigned c; + + if (nbits == -1) + return bitbuf = vbits = reset = 0; + if (nbits == 0 || vbits < 0) return 0; + while (vbits < nbits && (c = fgetc(ifp)) != EOF) { + bitbuf = (bitbuf << 8) + (uchar) c; + vbits += 8; + } + c = bitbuf << (32-vbits) >> (32-nbits); + if (huff) { + vbits -= huff[c] >> 8; + c = (uchar) huff[c]; + } else + vbits -= nbits; + return c; +} + +#define getbits(n) getbithuff(n,0) +#define gethuff(h) getbithuff(*h,h+1) + +int ljpeg_diff (ushort *huff) +{ + int len, diff; + + len = gethuff(huff); + diff = getbits(len); + if ((diff & (1 << (len-1))) == 0) + diff -= (1 << len) - 1; + return diff; +} + void tiff_dump(int base, int tag, int type, int count, int level) { int save, j, num, den; @@ -221,26 +257,31 @@ } 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 + else { fseek (ifp, -10, SEEK_CUR); + if (!strncmp(make,"SAMSUNG",7)) + base = ftell(ifp); + } entries = get2(); if (entries > 127) return; - puts(" MakerNote:"); + printf ("%*sMakerNote:\n", level*2-2, ""); while (entries--) { save = ftell(ifp); tag = get2(); @@ -285,7 +326,7 @@ { int entries, tag, type, count, save; - puts("EXIF table:"); + printf ("%*sEXIF table:\n", level*2-2, ""); entries = get2(); while (entries--) { save = ftell(ifp); @@ -300,6 +341,20 @@ } void parse_mos(int level); +void parse_minolta (int base); +void parse_tiff (int base, int level); + +void parse_thumb (int base, int level) +{ + int i=order; + order = 0x4d4d; + fseek (ifp, base, SEEK_SET); + if (get4()==0xffd8ffe1 && get2() && get4()==0x45786966 && !get2()) { + printf ("%*sEmbedded JPEG:\n", level*2, ""); + parse_tiff (ftell(ifp), level+1); + } + order = i; +} void sony_decrypt (unsigned *data, int len, int start, int key) { @@ -334,17 +389,18 @@ slen = count; if (slen > 128) slen = 128; tiff_dump (base, tag, type, count, level); + if (type == 13) tag = 0x14a; switch (tag) { - case 0x10f: /* Make tag */ + case 271: /* Make tag */ fgets (make, slen, ifp); break; - case 0x110: /* Model tag */ + case 272: /* Model tag */ fgets (model, slen, ifp); break; case 33405: /* Model2 tag */ fgets (model2, slen, ifp); break; - case 0x14a: /* SubIFD tag */ + case 330: /* SubIFD tag */ save2 = ftell(ifp); for (i=0; i < count; i++) { printf ("SubIFD #%d:\n", i+1); @@ -353,9 +409,19 @@ parse_tiff_ifd (base, level+1); } break; + case 273: /* StripOffset */ + case 513: /* JpegIFOffset */ + case 61447: + fseek (ifp, get4()+base, SEEK_SET); + case 46: + parse_thumb (ftell(ifp), level); + break; case 29184: sony_offset = get4(); break; case 29185: sony_length = get4(); break; case 29217: sony_key = get4(); break; + case 29264: + parse_minolta (ftell(ifp)); + break; case 33424: case 65024: puts("Kodak private data:"); @@ -379,16 +445,16 @@ save2 = ftell(ifp); order = get2(); fseek (ifp, save2 + (get2(),get4()), SEEK_SET); - parse_tiff_ifd (save2, level+1); + parse_tiff_ifd (save2, level+1); order = i; break; case 50706: is_dng = 1; break; case 50740: - if (count != 4 || type != 1) break; - puts("Sony SR2 private IFD:"); - fseek (ifp, get4()+base, SEEK_SET); + if (is_dng) break; + parse_minolta (i = get4()+base); + fseek (ifp, i, SEEK_SET); parse_tiff_ifd (base, level+1); } fseek (ifp, save+12, SEEK_SET); @@ -414,9 +480,9 @@ /* Parse a TIFF file looking for camera model and decompress offsets. */ -void parse_tiff (int base) +void parse_tiff (int base, int level) { - int doff, ifd=0; + int doff, ifd=0, sorder=order; fseek (ifp, base, SEEK_SET); order = get2(); @@ -424,25 +490,32 @@ get2(); while ((doff = get4())) { fseek (ifp, doff+base, SEEK_SET); - printf ("IFD #%d:\n", ifd++); - if (parse_tiff_ifd (base, 0)) break; + printf ("%*sIFD #%d:\n", level*2, "", ifd++); + if (parse_tiff_ifd (base, level)) break; } + order = sorder; } -void parse_minolta() +void parse_minolta (int base) { - int data_offset, save, tag, len; + unsigned offset, save, len, j; + char tag[4]; - fseek (ifp, 4, SEEK_SET); - data_offset = get4() + 8; - while ((save=ftell(ifp)) < data_offset) { - tag = get4(); + fseek (ifp, base, SEEK_SET); + if (fgetc(ifp) || fgetc(ifp)-'M' || fgetc(ifp)-'R') return; + order = fgetc(ifp) * 0x101; + offset = base + get4() + 8; + while ((save=ftell(ifp)) < offset) { + fread (tag, 1, 4, ifp); len = get4(); - printf ("Tag %c%c%c offset %06x length %06x\n", - tag>>16, tag>>8, tag, save, len); - switch (tag) { - case 0x545457: /* TTW */ - parse_tiff (ftell(ifp)); + printf ("Minolta tag %3.3s offset %06x length %06x", tag+1, save, len); + if (!strncmp (tag+1,"TTW",3)) { + putchar ('\n'); + parse_tiff (ftell(ifp),0); + } else { + for (j = 0; j < len/2 && j < 128; j++) + printf ("%c%04x",(j & 15) || len < 9 ? ' ':'\n', get2()); + putchar ('\n'); } fseek (ifp, save+len+8, SEEK_SET); } @@ -542,7 +615,7 @@ hlen = get4(); if (get4() == 0x48454150) /* "HEAP" */ parse_ciff (save+hlen, len-hlen, 0); - parse_tiff (save+6); + parse_tiff (save+6,0); fseek (ifp, save+len, SEEK_SET); } return 1; @@ -655,8 +728,9 @@ void parse_foveon() { unsigned entries, off, len, tag, save, i, j, k, pent, poff[256][2]; - char name[128], value[128], camf[0x20000], *pos, *cp, *dp; - unsigned val, key, type, num, ndim, dim[3]; + char name[128], value[128], *camf, *pos, *cp, *dp; + unsigned val, wide, high, row, col, diff, type, num, ndim, dim[3]; + ushort huff[258], vpred[2][2], hpred[2]; order = 0x4949; /* Little-endian */ fseek (ifp, -4, SEEK_END); @@ -693,26 +767,51 @@ order = 0x4949; break; case 0x464d4143: /* CAMF */ - printf ("type %d, ", get4()); - get4(); - for (i=0; i < 4; i++) - putchar(fgetc(ifp)); - val = get4(); - printf (" version %d.%d:\n",val >> 16, val & 0xffff); - key = get4(); - if ((len -= 28) > 0x20000) - len = 0x20000; - fread (camf, 1, len, ifp); - for (i=0; i < len; i++) { - key = (key * 1597 + 51749) % 244944; - val = key * (INT64) 301593171 >> 24; - camf[i] ^= ((((key << 8) - val) >> 1) + val) >> 17; + type = get4(); + printf ("type %d\n", type); + get4(); get4(); + wide = get4(); + high = get4(); + if (type == 2) { + camf = malloc (len -= 28); + fread (camf, 1, len, ifp); + for (i=0; i < len; i++) { + high = (high * 1597 + 51749) % 244944; + val = high * (INT64) 301593171 >> 24; + camf[i] ^= ((((high << 8) - val) >> 1) + val) >> 17; + } + } else if (type == 4) { + camf = malloc (len = wide*high*3/2); + memset (huff, 0xff, sizeof huff); + huff[0] = 8; + for (i=0; i < 13; i++) { + tag = getc(ifp); + val = getc(ifp); + for (j=0; j < 256 >> tag; ) + huff[val+ ++j] = tag << 8 | i; + } + fseek (ifp, 6, SEEK_CUR); + getbits(-1); + vpred[0][0] = vpred[0][1] = + vpred[1][0] = vpred[1][1] = 512; + for (j=row=0; row < high; row++) { + for (col=0; col < wide; col++) { + diff = ljpeg_diff(huff); + if (col < 2) hpred[col] = vpred[row & 1][col] += diff; + else hpred[col & 1] += diff; + if (col & 1) { + camf[j++] = hpred[0] >> 4; + camf[j++] = hpred[0] << 4 | hpred[1] >> 8; + camf[j++] = hpred[1]; + } + } + } + } else { + printf ("Unknown CAMF type %d\n", type); + break; } for (pos=camf; (unsigned) (pos-camf) < len; pos += sget4(pos+8)) { - if (strncmp (pos, "CMb", 3)) { - printf("Bad CAMF tag \"%.4s\"\n", pos); - break; - } + if (strncmp (pos, "CMb", 3)) goto done; val = sget4(pos+4); printf (" %4.4s version %d.%d: ", pos, val >> 16, val & 0xffff); switch (pos[3]) { @@ -775,6 +874,7 @@ printf ("\n"); } } +done: free (camf); break; case 0x504f5250: /* PROP */ printf ("entries %d, ", pent=get4()); @@ -805,7 +905,7 @@ 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; @@ -957,24 +1057,30 @@ if ((cp = memmem (head, 32, "MMMM", 4)) || (cp = memmem (head, 32, "IIII", 4))) { parse_phase_one (cp-head); - if (cp-head) parse_tiff (0); + if (cp-head) parse_tiff (0,0); } else if (order == 0x4949 || order == 0x4d4d) { if (!memcmp(head+6,"HEAPCCDR",8)) { parse_ciff (hlen, fsize - hlen, 0); fseek (ifp, hlen, SEEK_SET); } else - parse_tiff (0); + parse_tiff (0,0); } else if (!memcmp (head,"NDF0",4)) { - parse_tiff (12); + parse_tiff (12,0); } else if (!memcmp (head,"\0MRM",4)) { - parse_minolta(); + parse_minolta (0); } else if (!memcmp (head,"FUJIFILM",8)) { fseek (ifp, 84, SEEK_SET); toff = get4(); tlen = get4(); parse_fuji (92); - if (toff > 120) parse_fuji (120); - parse_tiff (toff+12); + 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); parse_riff(0);